Index: vhUnitTest/ECONimpl/PM/Maatwerk/EdiConverter/ConverteerEdiNaarEcon/TestTBX.cls.xml
===================================================================
diff -u -r39669 -r39932
--- vhUnitTest/ECONimpl/PM/Maatwerk/EdiConverter/ConverteerEdiNaarEcon/TestTBX.cls.xml	(.../TestTBX.cls.xml)	(revision 39669)
+++ vhUnitTest/ECONimpl/PM/Maatwerk/EdiConverter/ConverteerEdiNaarEcon/TestTBX.cls.xml	(.../TestTBX.cls.xml)	(revision 39932)
@@ -4,74 +4,52 @@
 <Super>vhUnitTest.TestCase</Super>
 
 <Method name="Test: converteer Standaardlade">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLade()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon(TeConverterenProduct),##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).StandaardLade())
+<Implementation><![CDATA[	Do ..AssertConverter("StandaardLade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer DMZLade">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).DMZLade()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon(TeConverterenProduct),##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).DMZLade())
+<Implementation><![CDATA[	Do ..AssertConverter("DMZLade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer SifonLadeMet1Uitsparing">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SifonLadeMet1Uitsparing()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon(TeConverterenProduct),##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).SifonLadeMet1Uitsparing())
+<Implementation><![CDATA[	Do ..AssertConverter("SifonLadeMet1Uitsparing")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer SifonLadeMet2Uitsparingen">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SifonLadeMet2Uitsparingen()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon(TeConverterenProduct),##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).SifonLadeMet2Uitsparingen())
+<Implementation><![CDATA[	Do ..AssertConverter("SifonLadeMet2Uitsparingen")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer SpoelbakLade">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SpoelbakLade()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon(TeConverterenProduct),##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).SpoelbakLade())
+<Implementation><![CDATA[	Do ..AssertConverter("SpoelbakLade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer LadeMetVeelExtras">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).LadeMetVeelExtras()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon(TeConverterenProduct),##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).LadeMetVeelExtras())
+<Implementation><![CDATA[	Do ..AssertConverter("LadeMetVeelExtras")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer StandaardLadeMetNietMeeleveren">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLadeMetNietMeeleveren()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon(TeConverterenProduct),##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).StandaardLadeMetNietMeeleveren())
+<Implementation><![CDATA[	Do ..AssertConverter("StandaardLadeMetNietMeeleveren")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer LadeMetVerlaagdeRug">
+<Implementation><![CDATA[	Do ..AssertConverter("LadeMetVerlaagdeRug")
+]]></Implementation>
+</Method>
+
+<Method name="AssertConverter">
+<FormalSpec>SoortLade:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).LadeMetVerlaagdeRug()
 	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
 	
-	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon(TeConverterenProduct),##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).LadeMetVerlaagdeRug())
+	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon($ClassMethod("vhTest.Utils.APPS.EDI.common.dto.LadeTBX",SoortLade)),$ClassMethod("vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken",SoortLade))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/EXT/Unishop/PurchaseOrder001/ProductConverter/Converteer/TestTBX.cls.xml
===================================================================
diff -u -r39252 -r39932
--- vhUnitTest/EXT/Unishop/PurchaseOrder001/ProductConverter/Converteer/TestTBX.cls.xml	(.../TestTBX.cls.xml)	(revision 39252)
+++ vhUnitTest/EXT/Unishop/PurchaseOrder001/ProductConverter/Converteer/TestTBX.cls.xml	(.../TestTBX.cls.xml)	(revision 39932)
@@ -4,65 +4,37 @@
 <Super>vhUnitTest.TestCase</Super>
 
 <Method name="Test : Converteer StandaardLade">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).StandaardLade()
-	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLade())
+<Implementation><![CDATA[	Do ..AssertConverter("StandaardLade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Converteer DM/Z lade">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).DMZLade()
-	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).DMZLade())
+<Implementation><![CDATA[	Do ..AssertConverter("DMZLade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Converteer SpoelbakLade">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).SpoelbakLade()
-	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SpoelbakLade())
+<Implementation><![CDATA[	Do ..AssertConverter("SpoelbakLade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Converteer SifonLadeMet1Uitsparing">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).SifonLadeMet1Uitsparing()
-	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SifonLadeMet1Uitsparing())
+<Implementation><![CDATA[	Do ..AssertConverter("LadeMetVerlaagdeRug")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Converteer SifonLadeMet2Uitsparingen">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).SifonLadeMet2Uitsparingen()
-	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SifonLadeMet2Uitsparingen())
+<Implementation><![CDATA[	Do ..AssertConverter("SifonLadeMet2Uitsparingen")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Converteer LadeMetVeelExtras">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).LadeMetVeelExtras()
-	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).LadeMetVeelExtras())
+<Implementation><![CDATA[	Do ..AssertConverter("LadeMetVerlaagdeRug")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Converteer StandaardLadeMetNietMeeleveren">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).StandaardLadeMetNietMeeleveren()
-	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLadeMetNietMeeleveren())
+<Implementation><![CDATA[	Do ..AssertConverter("StandaardLadeMetNietMeeleveren")
 ]]></Implementation>
 </Method>
 
@@ -77,11 +49,18 @@
 </Method>
 
 <Method name="Test : Converteer LadeMetVerlaagdeRug">
+<Implementation><![CDATA[	Do ..AssertConverter("LadeMetVerlaagdeRug")
+]]></Implementation>
+</Method>
+
+<Method name="AssertConverter">
+<FormalSpec>SoortLade:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).LadeMetVerlaagdeRug()
+	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = $ClassMethod("vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX",SoortLade)
 	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
 	
-	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).LadeMetVerlaagdeRug())
+	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),$ClassMethod("vhTest.Utils.APPS.EDI.common.dto.LadeTBX",SoortLade))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/ECONimpl/PM/Maatwerk/EdiConverter/ConverteerEconNaarEdi/TestTBX.cls.xml
===================================================================
diff -u -r39545 -r39932
--- vhUnitTest/ECONimpl/PM/Maatwerk/EdiConverter/ConverteerEconNaarEdi/TestTBX.cls.xml	(.../TestTBX.cls.xml)	(revision 39545)
+++ vhUnitTest/ECONimpl/PM/Maatwerk/EdiConverter/ConverteerEconNaarEdi/TestTBX.cls.xml	(.../TestTBX.cls.xml)	(revision 39932)
@@ -4,74 +4,52 @@
 <Super>vhUnitTest.TestCase</Super>
 
 <Method name="Test: converteer Standaardlade">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).StandaardLade()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLade())
+<Implementation><![CDATA[	Do ..AssertConverter("StandaardLade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer DMZLade">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).DMZLade()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).DMZLade())
+<Implementation><![CDATA[	Do ..AssertConverter("DMZLade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer SifonLadeMet1Uitsparing">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).SifonLadeMet1Uitsparing()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SifonLadeMet1Uitsparing())
+<Implementation><![CDATA[	Do ..AssertConverter("SifonLadeMet1Uitsparing")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer SifonLadeMet2Uitsparingen">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).SifonLadeMet2Uitsparingen()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SifonLadeMet2Uitsparingen())
+<Implementation><![CDATA[	Do ..AssertConverter("SifonLadeMet2Uitsparingen")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer SpoelbakLade">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).SpoelbakLade()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SpoelbakLade())
+<Implementation><![CDATA[	Do ..AssertConverter("SpoelbakLade")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer LadeMetVeelExtras">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).LadeMetVeelExtras()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).LadeMetVeelExtras())
+<Implementation><![CDATA[	Do ..AssertConverter("LadeMetVeelExtras")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer StandaardLadeMetNietMeeleveren">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).StandaardLadeMetNietMeeleveren()
-	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
-	
-	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLadeMetNietMeeleveren())
+<Implementation><![CDATA[	Do ..AssertConverter("StandaardLadeMetNietMeeleveren")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: converteer LadeMetVerlaagdeRug">
+<Implementation><![CDATA[	Do ..AssertConverter("LadeMetVerlaagdeRug")
+]]></Implementation>
+</Method>
+
+<Method name="AssertConverter">
+<FormalSpec>SoortLade:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).LadeMetVerlaagdeRug()
 	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
 	
-	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).LadeMetVerlaagdeRug())
+	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi($ClassMethod("vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken",SoortLade)),$ClassMethod("vhTest.Utils.APPS.EDI.common.dto.LadeTBX",SoortLade))
 ]]></Implementation>
 </Method>
 </Class>