diff --git a/Composition.Tests/Composition.Tests.lvlib b/Composition.Tests/Composition.Tests.lvlib
index 6674153..30e2160 100644
--- a/Composition.Tests/Composition.Tests.lvlib
+++ b/Composition.Tests/Composition.Tests.lvlib
@@ -88,6 +88,13 @@
+
+
+
+
+
+
+
diff --git a/Composition.Tests/Get Size of Data from TD - Error Cluster - Returns Correct Size.vi b/Composition.Tests/Get Size of Data from TD - Error Cluster - Returns Correct Size.vi
index 966c307..36a12f5 100644
Binary files a/Composition.Tests/Get Size of Data from TD - Error Cluster - Returns Correct Size.vi and b/Composition.Tests/Get Size of Data from TD - Error Cluster - Returns Correct Size.vi differ
diff --git a/Composition.Tests/Get Size of Data from TD - Variant (Boxed Empty) - Returns Correct Size.vi b/Composition.Tests/Get Size of Data from TD - Variant (Boxed Empty) - Returns Correct Size.vi
new file mode 100644
index 0000000..6f7e89d
Binary files /dev/null and b/Composition.Tests/Get Size of Data from TD - Variant (Boxed Empty) - Returns Correct Size.vi differ
diff --git a/Composition.Tests/Get Size of Data from TD - Variant (Empty) - Returns Correct Size.vi b/Composition.Tests/Get Size of Data from TD - Variant (Empty) - Returns Correct Size.vi
new file mode 100644
index 0000000..c8207f1
Binary files /dev/null and b/Composition.Tests/Get Size of Data from TD - Variant (Empty) - Returns Correct Size.vi differ
diff --git a/Composition.Tests/Get Size of Data from TD - Variant Cluster With Duplicate Items - Returns Correct Size.vi b/Composition.Tests/Get Size of Data from TD - Variant Cluster With Duplicate Items - Returns Correct Size.vi
new file mode 100644
index 0000000..eba52cc
Binary files /dev/null and b/Composition.Tests/Get Size of Data from TD - Variant Cluster With Duplicate Items - Returns Correct Size.vi differ
diff --git a/Composition.Tests/Get Size of Data from TD - Variant Error Cluster - Returns Correct Size.vi b/Composition.Tests/Get Size of Data from TD - Variant Error Cluster - Returns Correct Size.vi
new file mode 100644
index 0000000..f081025
Binary files /dev/null and b/Composition.Tests/Get Size of Data from TD - Variant Error Cluster - Returns Correct Size.vi differ
diff --git a/Composition.Tests/Get Size of Data from TD - Variant String - Returns Correct Size.vi b/Composition.Tests/Get Size of Data from TD - Variant String - Returns Correct Size.vi
new file mode 100644
index 0000000..830b2ca
Binary files /dev/null and b/Composition.Tests/Get Size of Data from TD - Variant String - Returns Correct Size.vi differ
diff --git a/Composition.Tests/Get Size of Data from TD - Variant With Attributes - Returns Correct Size.vi b/Composition.Tests/Get Size of Data from TD - Variant With Attributes - Returns Correct Size.vi
new file mode 100644
index 0000000..8de9441
Binary files /dev/null and b/Composition.Tests/Get Size of Data from TD - Variant With Attributes - Returns Correct Size.vi differ
diff --git a/Composition.Tests/Get Size of Data from TD - Variant With Nested Variant Attributes - Returns Correct Size.vi b/Composition.Tests/Get Size of Data from TD - Variant With Nested Variant Attributes - Returns Correct Size.vi
new file mode 100644
index 0000000..a7a9415
Binary files /dev/null and b/Composition.Tests/Get Size of Data from TD - Variant With Nested Variant Attributes - Returns Correct Size.vi differ
diff --git a/Composition/Composition.lvlib b/Composition/Composition.lvlib
index 0b74556..b0f79ba 100644
--- a/Composition/Composition.lvlib
+++ b/Composition/Composition.lvlib
@@ -17,24 +17,25 @@
-
2
- 3
+
+
+
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
diff --git a/Composition/Get Size of Data from TD.vi b/Composition/Get Size of Data from TD.vi
index 2ec3a42..6d48199 100644
Binary files a/Composition/Get Size of Data from TD.vi and b/Composition/Get Size of Data from TD.vi differ
diff --git a/Composition/Get Variant Boxed Type Data Size.vi b/Composition/Get Variant Boxed Type Data Size.vi
new file mode 100644
index 0000000..bfad5f7
Binary files /dev/null and b/Composition/Get Variant Boxed Type Data Size.vi differ
diff --git a/Composition/Get Variant Data Size.vi b/Composition/Get Variant Data Size.vi
new file mode 100644
index 0000000..2948589
Binary files /dev/null and b/Composition/Get Variant Data Size.vi differ
diff --git a/Composition/Get Waveform Data Size.vi b/Composition/Get Waveform Data Size.vi
index 825ff19..80d9a6b 100644
Binary files a/Composition/Get Waveform Data Size.vi and b/Composition/Get Waveform Data Size.vi differ
diff --git a/LabVIEW Composition.lvproj b/LabVIEW Composition.lvproj
index 84814b0..5d3b623 100644
--- a/LabVIEW Composition.lvproj
+++ b/LabVIEW Composition.lvproj
@@ -115,307 +115,59 @@
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -434,7 +186,7 @@
relativeToCommon
true
{6F314ACA-90D5-4015-90A0-231D4A305375}
- 18
+ 19
1
Composition.Tests.Runtime.exe
../builds/NI_AB_PROJECTNAME/Composition.Tests.Runtime/Composition.Tests.Runtime.exe
diff --git a/Tests/LV19_Maps_Sets/Decompose Map - Variant Map Value - Decomposes Successfully.vi b/Tests/LV19_Maps_Sets/Decompose Map - Variant Map Value - Decomposes Successfully.vi
new file mode 100644
index 0000000..42a7121
Binary files /dev/null and b/Tests/LV19_Maps_Sets/Decompose Map - Variant Map Value - Decomposes Successfully.vi differ
diff --git a/Tests/LV19_Maps_Sets/Decompose Map - Variant Mixed Value - Decomposes Successfully.vi b/Tests/LV19_Maps_Sets/Decompose Map - Variant Mixed Value - Decomposes Successfully.vi
new file mode 100644
index 0000000..0856a66
Binary files /dev/null and b/Tests/LV19_Maps_Sets/Decompose Map - Variant Mixed Value - Decomposes Successfully.vi differ
diff --git a/Tests/LV19_Maps_Sets/Decompose Map - Variant Value - Decomposes Successfully.vi b/Tests/LV19_Maps_Sets/Decompose Map - Variant Value - Decomposes Successfully.vi
new file mode 100644
index 0000000..60f941d
Binary files /dev/null and b/Tests/LV19_Maps_Sets/Decompose Map - Variant Value - Decomposes Successfully.vi differ
diff --git a/Tests/LV19_Maps_Sets/LV19_Maps_Sets.lvproj b/Tests/LV19_Maps_Sets/LV19_Maps_Sets.lvproj
new file mode 100644
index 0000000..d985d73
--- /dev/null
+++ b/Tests/LV19_Maps_Sets/LV19_Maps_Sets.lvproj
@@ -0,0 +1,161 @@
+
+
+ true
+
-
+ true
+ true
+ false
+ 0
+ My Computer/VI Server
+ My Computer/VI Server
+ true
+ true
+ false
+
+
+
+ -
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Tests/LV19_Maps_Sets/steps.yml b/Tests/LV19_Maps_Sets/steps.yml
new file mode 100644
index 0000000..5a1a316
--- /dev/null
+++ b/Tests/LV19_Maps_Sets/steps.yml
@@ -0,0 +1,6 @@
+steps:
+- task: CmdLine@2
+ displayName: 'LV19 - Maps & Sets - Run Tests'
+ inputs:
+ script: 'LabVIEWCLI -LabVIEWPath "%LabVIEW%\LabVIEW.exe" -AdditionalOperationDirectory "$(Build.SourcesDirectory)\Toolchain" -OperationName Test -Project "$(Build.SourcesDirectory)\Tests\LV19_Maps_Sets\LV19_Maps_Sets.lvproj" -ResultsFolder "$(System.DefaultWorkingDirectory)\TestResults"'
+ workingDirectory: '$(Build.SourcesDirectory)'
diff --git a/Tests/all-tests.yml b/Tests/all-tests.yml
index 4198ee1..16c4dff 100644
--- a/Tests/all-tests.yml
+++ b/Tests/all-tests.yml
@@ -1,4 +1,5 @@
steps:
- template: PPL_Inheritance/steps.yml
- template: PPL_PrivateClass/steps.yml
+- template: LV19_Maps_Sets/steps.yml
- template: LV20_Interfaces/steps.yml