Index: vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/FromArray/Test.cls.xml
===================================================================
diff -u -r39616 -r56880
--- vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/FromArray/Test.cls.xml	(.../Test.cls.xml)	(revision 39616)
+++ vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/FromArray/Test.cls.xml	(.../Test.cls.xml)	(revision 56880)
@@ -3,55 +3,77 @@
 <Class name="vhUnitTest.ECON.PM.Maatwerk.dto.TbxKenmerken.FromArray.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="KenmerkenArray">
+<Type>%ArrayOfDataTypes</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TbxKenmerken">
+<Type>ECON.PM.Maatwerk.dto.TbxKenmerken</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..KenmerkenArray = ##class(%ArrayOfDataTypes).%New()
+	Set ..TbxKenmerken = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
+]]></Implementation>
+</Method>
+
 <Method name="Test: Niet-hoofdletter gevoelige property">
 <Implementation><![CDATA[
-	Set Array = ##class(%ArrayOfDataTypes).%New()
-	Do Array.SetAt("Lade","Data.Toepassing")
+	Do ..KenmerkenArray.SetAt("Lade", "Data.Kenmerken.Toepassing")
 	
-	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
-	Do Object.FromArray(Array)
+	Do $$$AssertEquals(..TbxKenmerken.Toepassing, "")
 	
-	Do $$$AssertEquals(Object.Toepassing,"Lade")
+	Do ..TbxKenmerken.FromArray(..KenmerkenArray)
+	
+	Do $$$AssertEquals(..TbxKenmerken.Toepassing, "Lade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Hoofdletter gevoelige property">
 <Implementation><![CDATA[
-	Set Array = ##class(%ArrayOfDataTypes).%New()
-	Do Array.SetAt("18","Data.Corpuswanddikte")
+	Do ..KenmerkenArray.SetAt("18", "Data.Kenmerken.Corpuswanddikte")
 	
-	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
-	Do Object.FromArray(Array)
+	Do $$$AssertEquals(..TbxKenmerken.CorpusWandDikte, "")
 	
-	do $$$AssertEquals(Object.CorpusWandDikte,"18")
+	Do ..TbxKenmerken.FromArray(..KenmerkenArray)
+	
+	Do $$$AssertEquals(..TbxKenmerken.CorpusWandDikte, "18")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Meerdere properties">
 <Implementation><![CDATA[
-	Set Array = ##class(%ArrayOfDataTypes).%New()
-	Do Array.SetAt("18","Data.Corpuswanddikte")
-	Do Array.SetAt("Lade","Data.Toepassing")
+	Do ..KenmerkenArray.SetAt("18", "Data.Kenmerken.Corpuswanddikte")
+	Do ..KenmerkenArray.SetAt("Lade", "Data.Kenmerken.Toepassing")
 	
-	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
-	Do Object.FromArray(Array)
+	Do $$$AssertEquals(..TbxKenmerken.CorpusWandDikte, "")
+	Do $$$AssertEquals(..TbxKenmerken.Toepassing, "")
 	
-	do $$$AssertEquals(Object.CorpusWandDikte,"18")
-	do $$$AssertEquals(Object.Toepassing,"Lade")
+	Do ..TbxKenmerken.FromArray(..KenmerkenArray)
+	
+	Do $$$AssertEquals(..TbxKenmerken.CorpusWandDikte, "18")
+	Do $$$AssertEquals(..TbxKenmerken.Toepassing, "Lade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Embedded objects - bv NietMeeleveren">
 <Implementation><![CDATA[
-	Set Array = ##class(%ArrayOfDataTypes).%New()
-	Do Array.SetAt("false","Data.Nietmeeleveren.Nietmeeleveren_afdekkap")
-	Do Array.SetAt("true","Data.Nietmeeleveren.Nietmeeleveren_antislipmat")
+	Do ..KenmerkenArray.SetAt("false", "Data.Kenmerken.Nietmeeleveren.Nietmeeleveren_afdekkap")
+	Do ..KenmerkenArray.SetAt("true", "Data.Kenmerken.Nietmeeleveren.Nietmeeleveren_antislipmat")
 	
-	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
-	Do Object.FromArray(Array)
+	Do $$$AssertEquals(..TbxKenmerken.NietMeeleveren.Afdekkap, "false")
+	Do $$$AssertEquals(..TbxKenmerken.NietMeeleveren.Antislipmat, "false")
 	
-	do $$$AssertEquals(Object.NietMeeleveren.Afdekkap,"false")
-	do $$$AssertEquals(Object.NietMeeleveren.Antislipmat,"true")
+	Do ..TbxKenmerken.FromArray(..KenmerkenArray)
+	
+	Do $$$AssertEquals(..TbxKenmerken.NietMeeleveren.Afdekkap, "false")
+	Do $$$AssertEquals(..TbxKenmerken.NietMeeleveren.Antislipmat, "true")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerkenOld/FromArray/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerkenOld/FromArray/Test.cls.xml	(revision 0)
+++ vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerkenOld/FromArray/Test.cls.xml	(revision 56880)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.ECON.PM.Maatwerk.dto.TbxKenmerkenOld.FromArray.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="KenmerkenArray">
+<Type>%ArrayOfDataTypes</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TbxKenmerken">
+<Type>ECON.PM.Maatwerk.dto.TbxKenmerkenOld</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..KenmerkenArray = ##class(%ArrayOfDataTypes).%New()
+	Set ..TbxKenmerken = ##class(ECON.PM.Maatwerk.dto.TbxKenmerkenOld).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Niet-hoofdletter gevoelige property">
+<Implementation><![CDATA[
+	Do ..KenmerkenArray.SetAt("Lade", "Data.Toepassing")
+	
+	Do $$$AssertEquals(..TbxKenmerken.Toepassing, "")
+	
+	Do ..TbxKenmerken.FromArray(..KenmerkenArray)
+	
+	Do $$$AssertEquals(..TbxKenmerken.Toepassing, "Lade")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Hoofdletter gevoelige property">
+<Implementation><![CDATA[
+	Do ..KenmerkenArray.SetAt("18", "Data.Corpuswanddikte")
+	
+	Do $$$AssertEquals(..TbxKenmerken.CorpusWandDikte, "")
+	
+	Do ..TbxKenmerken.FromArray(..KenmerkenArray)
+	
+	Do $$$AssertEquals(..TbxKenmerken.CorpusWandDikte, "18")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Meerdere properties">
+<Implementation><![CDATA[
+	Do ..KenmerkenArray.SetAt("18", "Data.Corpuswanddikte")
+	Do ..KenmerkenArray.SetAt("Lade", "Data.Toepassing")
+	
+	Do $$$AssertEquals(..TbxKenmerken.CorpusWandDikte, "")
+	Do $$$AssertEquals(..TbxKenmerken.Toepassing, "")
+	
+	Do ..TbxKenmerken.FromArray(..KenmerkenArray)
+	
+	Do $$$AssertEquals(..TbxKenmerken.CorpusWandDikte, "18")
+	Do $$$AssertEquals(..TbxKenmerken.Toepassing, "Lade")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Embedded objects - bv NietMeeleveren">
+<Implementation><![CDATA[
+	Do ..KenmerkenArray.SetAt("false", "Data.Nietmeeleveren.Nietmeeleveren_afdekkap")
+	Do ..KenmerkenArray.SetAt("true", "Data.Nietmeeleveren.Nietmeeleveren_antislipmat")
+	
+	Do $$$AssertEquals(..TbxKenmerken.NietMeeleveren.Afdekkap, "false")
+	Do $$$AssertEquals(..TbxKenmerken.NietMeeleveren.Antislipmat, "false")
+	
+	Do ..TbxKenmerken.FromArray(..KenmerkenArray)
+	
+	Do $$$AssertEquals(..TbxKenmerken.NietMeeleveren.Afdekkap, "false")
+	Do $$$AssertEquals(..TbxKenmerken.NietMeeleveren.Antislipmat, "true")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerkenOld/ToArray/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerkenOld/ToArray/Test.cls.xml	(revision 0)
+++ vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerkenOld/ToArray/Test.cls.xml	(revision 56880)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.ECON.PM.Maatwerk.dto.TbxKenmerkenOld.ToArray.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="KenmerkenArray">
+<Type>%ArrayOfDataTypes</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TbxKenmerken">
+<Type>ECON.PM.Maatwerk.dto.TbxKenmerkenOld</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..KenmerkenArray = ##class(%ArrayOfDataTypes).%New()
+	Set ..TbxKenmerken = ##class(ECON.PM.Maatwerk.dto.TbxKenmerkenOld).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Niet-hoofdletter gevoelige property">
+<Implementation><![CDATA[
+	Set ..TbxKenmerken.Toepassing = "Lade"
+	
+	Set ..KenmerkenArray = ..TbxKenmerken.ToArray()
+	
+	Do $$$AssertEquals(..KenmerkenArray.GetAt("Data.Toepassing"), "Lade")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Hoofdletter gevoelige property">
+<Implementation><![CDATA[
+	Set ..TbxKenmerken.CorpusWandDikte = 18
+	
+	Set ..KenmerkenArray = ..TbxKenmerken.ToArray()
+	
+	do $$$AssertEquals(..KenmerkenArray.GetAt("Data.Corpuswanddikte"), "18")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Meerdere properties">
+<Implementation><![CDATA[
+	Set ..TbxKenmerken.Toepassing = "Lade"
+	Set ..TbxKenmerken.CorpusWandDikte = 18
+	
+	Set ..KenmerkenArray = ..TbxKenmerken.ToArray()
+	
+	Do $$$AssertEquals(..KenmerkenArray.GetAt("Data.Corpuswanddikte"), "18")
+	Do $$$AssertEquals(..KenmerkenArray.GetAt("Data.Toepassing"), "Lade")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Embedded objects (type NietMeeleveren)">
+<Implementation><![CDATA[
+	Set ..TbxKenmerken.NietMeeleveren.Afdekkap = $$$False
+	Set ..TbxKenmerken.NietMeeleveren.Antislipmat = $$$True
+	
+	Set ..KenmerkenArray = ..TbxKenmerken.ToArray()
+	
+	Do $$$AssertEquals(..KenmerkenArray.GetAt("Data.Nietmeeleveren.Nietmeeleveren_afdekkap"), "0")
+	Do $$$AssertEquals(..KenmerkenArray.GetAt("Data.Nietmeeleveren.Nietmeeleveren_antislipmat"), "1")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/ToArray/Test.cls.xml
===================================================================
diff -u -r39628 -r56880
--- vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/ToArray/Test.cls.xml	(.../Test.cls.xml)	(revision 39628)
+++ vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/ToArray/Test.cls.xml	(.../Test.cls.xml)	(revision 56880)
@@ -3,47 +3,67 @@
 <Class name="vhUnitTest.ECON.PM.Maatwerk.dto.TbxKenmerken.ToArray.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: Niet-hoofdletter gevoelige property">
+<Property name="KenmerkenArray">
+<Type>%ArrayOfDataTypes</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TbxKenmerken">
+<Type>ECON.PM.Maatwerk.dto.TbxKenmerken</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
-	Set Object.Toepassing = "Lade"
+	Do ##super(aTestName)
+	
+	Set ..KenmerkenArray = ##class(%ArrayOfDataTypes).%New()
+	Set ..TbxKenmerken = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
+]]></Implementation>
+</Method>
 
-	#dim Array As %ArrayOfDataTypes = Object.ToArray()
-	Do $$$AssertEquals(Array.GetAt("Data.Toepassing"),"Lade")
+<Method name="Test: Niet-hoofdletter gevoelige property">
+<Implementation><![CDATA[
+	Set ..TbxKenmerken.Toepassing = "Lade"
+	
+	Set ..KenmerkenArray = ..TbxKenmerken.ToArray()
+	
+	Do $$$AssertEquals(..KenmerkenArray.GetAt("Data.Kenmerken.Toepassing"), "Lade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Hoofdletter gevoelige property">
 <Implementation><![CDATA[
-	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
-	Set Object.CorpusWandDikte = 18
-
-	#dim Array As %ArrayOfDataTypes = Object.ToArray()
-	do $$$AssertEquals(Array.GetAt("Data.Corpuswanddikte"),"18")
+	Set ..TbxKenmerken.CorpusWandDikte = 18
+	
+	Set ..KenmerkenArray = ..TbxKenmerken.ToArray()
+	
+	do $$$AssertEquals(..KenmerkenArray.GetAt("Data.Kenmerken.Corpuswanddikte"), "18")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Meerdere properties">
 <Implementation><![CDATA[
-	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
-	Set Object.Toepassing = "Lade"
-	Set Object.CorpusWandDikte = 18
-
-	#dim Array As %ArrayOfDataTypes = Object.ToArray()
-	Do $$$AssertEquals(Array.GetAt("Data.Corpuswanddikte"),"18")
-	Do $$$AssertEquals(Array.GetAt("Data.Toepassing"),"Lade")
+	Set ..TbxKenmerken.Toepassing = "Lade"
+	Set ..TbxKenmerken.CorpusWandDikte = 18
+	
+	Set ..KenmerkenArray = ..TbxKenmerken.ToArray()
+	
+	Do $$$AssertEquals(..KenmerkenArray.GetAt("Data.Kenmerken.Corpuswanddikte"), "18")
+	Do $$$AssertEquals(..KenmerkenArray.GetAt("Data.Kenmerken.Toepassing"), "Lade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Embedded objects (type NietMeeleveren)">
 <Implementation><![CDATA[
-	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
-	Set Object.NietMeeleveren.Afdekkap = $$$False
-	Set Object.NietMeeleveren.Antislipmat = $$$True
-
-	#dim Array As %ArrayOfDataTypes = Object.ToArray()
-	Do $$$AssertEquals(Array.GetAt("Data.Nietmeeleveren.Nietmeeleveren_afdekkap"),"0")
-	Do $$$AssertEquals(Array.GetAt("Data.Nietmeeleveren.Nietmeeleveren_antislipmat"),"1")
+	Set ..TbxKenmerken.NietMeeleveren.Afdekkap = $$$False
+	Set ..TbxKenmerken.NietMeeleveren.Antislipmat = $$$True
+	
+	Set ..KenmerkenArray = ..TbxKenmerken.ToArray()
+	
+	Do $$$AssertEquals(..KenmerkenArray.GetAt("Data.Kenmerken.Nietmeeleveren.Nietmeeleveren_afdekkap"), "0")
+	Do $$$AssertEquals(..KenmerkenArray.GetAt("Data.Kenmerken.Nietmeeleveren.Nietmeeleveren_antislipmat"), "1")
 ]]></Implementation>
 </Method>
 </Class>