Index: vhUnitTest/APPS/EDI/common/impl/LegacyConverter/ConverteerLegacyNaarEdi/Test.cls.xml
===================================================================
diff -u -r39192 -r39232
--- vhUnitTest/APPS/EDI/common/impl/LegacyConverter/ConverteerLegacyNaarEdi/Test.cls.xml	(.../Test.cls.xml)	(revision 39192)
+++ vhUnitTest/APPS/EDI/common/impl/LegacyConverter/ConverteerLegacyNaarEdi/Test.cls.xml	(.../Test.cls.xml)	(revision 39232)
@@ -7,7 +7,7 @@
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 		
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.BodemKleur,"WI")
@@ -43,7 +43,7 @@
 	Set TeConverterenProduct.ItemDC = "A"
 	Set TeConverterenProduct.ItemKV = "ALU.BZ"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.BodemKleur,"TS")
@@ -72,7 +72,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemWD = "18"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.CorpusWandDikte,"18")
@@ -85,7 +85,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemWD = "B"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertTrue(GeconverteerdProduct.IsBinnenbreedte)
@@ -98,7 +98,7 @@
 	Set TeConverterenProduct.ItemOPVL = "L"
 	Set TeConverterenProduct.ItemKLROPVL = "PSG"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertTrue(GeconverteerdProduct.HeeftOpvullijstLinks)
@@ -113,7 +113,7 @@
 	Set TeConverterenProduct.ItemOPVL = "R"
 	Set TeConverterenProduct.ItemKLROPVL = "PSG"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertFalse(GeconverteerdProduct.HeeftOpvullijstLinks)
@@ -128,7 +128,7 @@
 	Set TeConverterenProduct.ItemOPVL = "L+R"
 	Set TeConverterenProduct.ItemKLROPVL = "PSG"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertTrue(GeconverteerdProduct.HeeftOpvullijstLinks)
@@ -142,7 +142,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemFS = 2
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.FrontOndersteuningAantal,"2")
@@ -154,7 +154,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemFS = "A"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.FrontOndersteuningAantal,"")
@@ -166,7 +166,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemBGRP = "Z"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.GreepEnMeenemer,"No")
@@ -178,7 +178,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemBGRP = "M"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.GreepEnMeenemer,"HandleAndLatch")
@@ -190,7 +190,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemBGRP = "G"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.GreepEnMeenemer,"Handle")
@@ -202,7 +202,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemKV = "FG8"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.ZijwandVerhogingMateriaal,##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Glas())
@@ -216,7 +216,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemKV = "FZ8"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.ZijwandVerhogingMateriaal,##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Glas())
@@ -230,7 +230,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemKV = "ALU.MG"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.ZijwandVerhogingMateriaal,##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Aluminium())
@@ -244,7 +244,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemKV = "ALU.SW"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.ZijwandVerhogingMateriaal,##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Aluminium())
@@ -258,7 +258,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemKV = "ALU.BZ"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.ZijwandVerhogingMateriaal,##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Aluminium())
@@ -272,7 +272,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemBM = "I"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	Do $$$AssertEquals(GeconverteerdProduct.GeleiderTechnologie,##class(DOM.PM.enu.TBXGeleiderTechnologie).Blumotion())
 ]]></Implementation>
@@ -283,7 +283,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemBX = "INSCHF"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	Do $$$AssertEquals(GeconverteerdProduct.ZijwandVerhogingType,"DesignElement")
 ]]></Implementation>
@@ -294,7 +294,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemASM = "ZW.AF"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertTrue(GeconverteerdProduct.HeeftMat)
@@ -308,7 +308,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemASM = ""
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertFalse(GeconverteerdProduct.HeeftMat)
@@ -322,7 +322,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemDWV = ""
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.AantalDwarsverdelingen,##class(DOM.PM.enu.TBXDwarsverdeling).Zonder())
@@ -334,7 +334,7 @@
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
 	Set TeConverterenProduct.ItemDWV = ##class(DOM.PM.enu.TBXDwarsverdeling).Twee()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.AantalDwarsverdelingen,##class(DOM.PM.enu.TBXDwarsverdeling).Twee())
@@ -347,7 +347,7 @@
 	Set TeConverterenProduct.ItemLT = "CM"
 	Set TeConverterenProduct.ItemRSTL = "M"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.RugHoogte,"M")
@@ -360,7 +360,7 @@
 	Set TeConverterenProduct.ItemLT = "CM"
 	Set TeConverterenProduct.ItemRSTL = ""
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.RugHoogte,"C")
@@ -373,7 +373,7 @@
 	Set TeConverterenProduct.ItemSPZK = "S;120;140;150"
 	Set TeConverterenProduct.ItemLT = "MY2"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.Klasse,"SY2")
@@ -390,7 +390,7 @@
 	Set TeConverterenProduct.ItemSPZK = "M.;120;140;42"
 	Set TeConverterenProduct.ItemLT = "MY2"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.Klasse,"SY2")
@@ -407,7 +407,7 @@
 	Set TeConverterenProduct.ItemSPZK = "SS;120;140;60;150;150"
 	Set TeConverterenProduct.ItemLT = "MY2"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.Klasse,"SY2")
@@ -426,7 +426,7 @@
 	Set TeConverterenProduct.ItemSPZK = "BB;120;140;60;250;250"
 	Set TeConverterenProduct.ItemLT = "MY2"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.Klasse,"SY2")
@@ -445,7 +445,7 @@
 	Set TeConverterenProduct.ItemSPZK = "SB;120;140;60;150;250"
 	Set TeConverterenProduct.ItemLT = "MY2"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.Klasse,"SY2")
@@ -464,7 +464,7 @@
 	Set TeConverterenProduct.ItemSPZK = "BS;120;140;60;250;150"
 	Set TeConverterenProduct.ItemLT = "MY2"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.Klasse,"SY2")
@@ -483,7 +483,7 @@
 	Set TeConverterenProduct.ItemSPZK = "MM;120;140;60;42;42"
 	Set TeConverterenProduct.ItemLT = "MY2"
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
 	Do $$$AssertEquals(GeconverteerdProduct.Klasse,"SY2")
Index: vhUnitTest/EXT/Unishop/PurchaseOrder001/ProductConverter/Converteer/TestTBX.cls.xml
===================================================================
diff -u -r39078 -r39232
--- vhUnitTest/EXT/Unishop/PurchaseOrder001/ProductConverter/Converteer/TestTBX.cls.xml	(.../TestTBX.cls.xml)	(revision 39078)
+++ vhUnitTest/EXT/Unishop/PurchaseOrder001/ProductConverter/Converteer/TestTBX.cls.xml	(.../TestTBX.cls.xml)	(revision 39232)
@@ -6,7 +6,7 @@
 <Method name="Test : Converteer StandaardLade">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).StandaardLade()
-	#dim ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
+	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLade())
 ]]></Implementation>
@@ -15,7 +15,7 @@
 <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()
-	#dim ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
+	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).DMZLade())
 ]]></Implementation>
@@ -24,7 +24,7 @@
 <Method name="Test : Converteer SpoelbakLade">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).SpoelbakLade()
-	#dim ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
+	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SpoelbakLade())
 ]]></Implementation>
@@ -33,7 +33,7 @@
 <Method name="Test : Converteer SifonLadeMet1Uitsparing">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).SifonLadeMet1Uitsparing()
-	#dim ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
+	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SifonLadeMet1Uitsparing())
 ]]></Implementation>
@@ -42,7 +42,7 @@
 <Method name="Test : Converteer SifonLadeMet2Uitsparingen">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).SifonLadeMet2Uitsparingen()
-	#dim ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
+	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SifonLadeMet2Uitsparingen())
 ]]></Implementation>
@@ -51,7 +51,7 @@
 <Method name="Test : Converteer LadeMetVeelExtras">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).LadeMetVeelExtras()
-	#dim ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
+	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).LadeMetVeelExtras())
 ]]></Implementation>
@@ -60,7 +60,7 @@
 <Method name="Test : Converteer StandaardLadeMetNietMeeleveren">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).StandaardLadeMetNietMeeleveren()
-	#dim ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
+	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.Converteer(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLadeMetNietMeeleveren())
 ]]></Implementation>
@@ -70,7 +70,7 @@
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrder001.CreateOrder.LadeEigenschappenTBX).StandaardLadeMetNietMeeleveren()
 	Set TeConverterenProduct.VerpakkingType = ##class(DOM.PM.enu.TBXVerpakkingType).Pallet()
-	#dim ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
+	Set ProductConverter = ##class(EXT.Unishop.PurchaseOrder001.ProductConverter).%New()
 	
 	Do $$$AssertEquals(ProductConverter.Converteer(TeConverterenProduct,"K||2265").VerpakkingType,##class(DOM.PM.enu.TBXVerpakkingType).Procom())
 ]]></Implementation>
Index: vhUnitTest/ECONimpl/PM/Maatwerk/EdiConverter/ConverteerEconNaarEdi/TestTBX.cls.xml
===================================================================
diff -u -r39231 -r39232
--- vhUnitTest/ECONimpl/PM/Maatwerk/EdiConverter/ConverteerEconNaarEdi/TestTBX.cls.xml	(.../TestTBX.cls.xml)	(revision 39231)
+++ vhUnitTest/ECONimpl/PM/Maatwerk/EdiConverter/ConverteerEconNaarEdi/TestTBX.cls.xml	(.../TestTBX.cls.xml)	(revision 39232)
@@ -6,7 +6,7 @@
 <Method name="Test: converteer Standaardlade">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).StandaardLade()
-	#dim ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
+	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLade())
 ]]></Implementation>
@@ -15,7 +15,7 @@
 <Method name="Test: converteer DMZLade">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).DMZLade()
-	#dim ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
+	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).DMZLade())
 ]]></Implementation>
@@ -24,7 +24,7 @@
 <Method name="Test: converteer LadeMetVeelExtras">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).LadeMetVeelExtras()
-	#dim ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
+	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).LadeMetVeelExtras())
 ]]></Implementation>
@@ -33,7 +33,7 @@
 <Method name="Test: converteer StandaardLadeMetNietMeeleveren">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).StandaardLadeMetNietMeeleveren()
-	#dim ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
+	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEconNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLadeMetNietMeeleveren())
 ]]></Implementation>
Index: vhUnitTest/APPS/EDI/common/impl/LegacyConverter/AcceptatieTest.cls.xml
===================================================================
diff -u -r39219 -r39232
--- vhUnitTest/APPS/EDI/common/impl/LegacyConverter/AcceptatieTest.cls.xml	(.../AcceptatieTest.cls.xml)	(revision 39219)
+++ vhUnitTest/APPS/EDI/common/impl/LegacyConverter/AcceptatieTest.cls.xml	(.../AcceptatieTest.cls.xml)	(revision 39232)
@@ -6,7 +6,7 @@
 <Method name="Test: EdiNaarLegacy Standaard M lade">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As APPS.EDI.common.dto.v001.LadeTBX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLade()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct),##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade())
 ]]></Implementation>
@@ -15,7 +15,7 @@
 <Method name="Test: EdiNaarLegacy DM/Z lade">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As APPS.EDI.common.dto.v001.LadeTBX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).DMZLade()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct),##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).DMZLade())
 ]]></Implementation>
@@ -24,7 +24,7 @@
 <Method name="Test: EdiNaarLegacy Spoelbaklade">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As APPS.EDI.common.dto.v001.LadeTBX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SpoelbakLade()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct),##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).SpoelbakLade())
 ]]></Implementation>
@@ -33,7 +33,7 @@
 <Method name="Test: EdiNaarLegacy M-sifon lade (1 uitsparing)">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As APPS.EDI.common.dto.v001.LadeTBX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SifonLadeMet1Uitsparing()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct),##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).SifonLadeMet1Uitsparing())
 ]]></Implementation>
@@ -42,7 +42,7 @@
 <Method name="Test: EdiNaarLegacy M-sifon lade (2 uitsparingen)">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As APPS.EDI.common.dto.v001.LadeTBX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SifonLadeMet2Uitsparingen()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct),##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).SifonLadeMet2Uitsparingen())
 ]]></Implementation>
@@ -51,7 +51,7 @@
 <Method name="Test: EdiNaarLegacy Master of All Schuifkes">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As APPS.EDI.common.dto.v001.LadeTBX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).LadeMetVeelExtras()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct),##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).LadeMetVeelExtras())
 ]]></Implementation>
@@ -60,7 +60,7 @@
 <Method name="Test: EdiNaarLegacy StandaardLadeMetNietMeeleveren">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As APPS.EDI.common.dto.v001.LadeTBX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLadeMetNietMeeleveren()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct),##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLadeMetNietMeeleveren())
 ]]></Implementation>
@@ -69,7 +69,7 @@
 <Method name="Test: LegacyNaarEdi Standaard M lade">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLade())
 ]]></Implementation>
@@ -78,7 +78,7 @@
 <Method name="Test: LegacyNaarEdi DM/Z lade">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).DMZLade()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).DMZLade())
 ]]></Implementation>
@@ -87,7 +87,7 @@
 <Method name="Test: LegacyNaarEdi Master of All Schuifkes">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).LadeMetVeelExtras()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).LadeMetVeelExtras())
 ]]></Implementation>
@@ -96,7 +96,7 @@
 <Method name="Test: LegacyNaarEdi Spoelbaklade">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).SpoelbakLade()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SpoelbakLade())
 ]]></Implementation>
@@ -105,7 +105,7 @@
 <Method name="Test: LegacyNaarEdi M-sifon lade (1 uitsparing)">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).SifonLadeMet1Uitsparing()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SifonLadeMet1Uitsparing())
 ]]></Implementation>
@@ -114,7 +114,7 @@
 <Method name="Test: LegacyNaarEdi M-sifon lade (2 uitsparingen)">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).SifonLadeMet2Uitsparingen()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).SifonLadeMet2Uitsparingen())
 ]]></Implementation>
@@ -123,7 +123,7 @@
 <Method name="Test: LegacyNaarEdi StandaardLadeMetNietMeeleveren">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLadeMetNietMeeleveren()
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct),##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLadeMetNietMeeleveren())
 ]]></Implementation>
Index: vhUnitTest/ECONimpl/PM/Maatwerk/EdiConverter/ConverteerEdiNaarEcon/TestTBX.cls.xml
===================================================================
diff -u -r39230 -r39232
--- vhUnitTest/ECONimpl/PM/Maatwerk/EdiConverter/ConverteerEdiNaarEcon/TestTBX.cls.xml	(.../TestTBX.cls.xml)	(revision 39230)
+++ vhUnitTest/ECONimpl/PM/Maatwerk/EdiConverter/ConverteerEdiNaarEcon/TestTBX.cls.xml	(.../TestTBX.cls.xml)	(revision 39232)
@@ -6,7 +6,7 @@
 <Method name="Test: converteer Standaardlade">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLade()
-	#dim ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
+	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon(TeConverterenProduct),##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).StandaardLade())
 ]]></Implementation>
@@ -15,7 +15,7 @@
 <Method name="Test: converteer DMZLade">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).DMZLade()
-	#dim ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
+	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon(TeConverterenProduct),##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).DMZLade())
 ]]></Implementation>
@@ -24,7 +24,7 @@
 <Method name="Test: converteer LadeMetVeelExtras">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).LadeMetVeelExtras()
-	#dim ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
+	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon(TeConverterenProduct),##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).LadeMetVeelExtras())
 ]]></Implementation>
@@ -33,7 +33,7 @@
 <Method name="Test: converteer StandaardLadeMetNietMeeleveren">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As ECON.PM.Maatwerk.dto.TbxKenmerken = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTBX).StandaardLadeMetNietMeeleveren()
-	#dim ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
+	Set ProductConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter).%New()
 	
 	Do $$$AssertObject(ProductConverter.ConverteerEdiNaarEcon(TeConverterenProduct),##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).StandaardLadeMetNietMeeleveren())
 ]]></Implementation>
Index: vhUnitTest/APPS/EDI/common/impl/LegacyConverter/ConverteerEdiNaarLegacy/Test.cls.xml
===================================================================
diff -u -r39062 -r39232
--- vhUnitTest/APPS/EDI/common/impl/LegacyConverter/ConverteerEdiNaarLegacy/Test.cls.xml	(.../Test.cls.xml)	(revision 39062)
+++ vhUnitTest/APPS/EDI/common/impl/LegacyConverter/ConverteerEdiNaarLegacy/Test.cls.xml	(.../Test.cls.xml)	(revision 39232)
@@ -9,7 +9,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemKB,"MG")
@@ -53,7 +53,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemKB,"BZ")
@@ -81,7 +81,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemWD,"18")
@@ -95,7 +95,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemWD,"B")
@@ -110,7 +110,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemOPVL,"L")
@@ -125,7 +125,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemOPVL,"R")
@@ -141,7 +141,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemOPVL,"L+R")
@@ -155,7 +155,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemFS,"2")
@@ -169,7 +169,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemFS,"A")
@@ -185,7 +185,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"Z")
@@ -201,7 +201,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"M")
@@ -216,7 +216,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"R")
@@ -232,7 +232,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"G")
@@ -247,7 +247,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"R")
@@ -262,7 +262,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"X")
@@ -278,7 +278,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemKV,"FG8")
@@ -294,7 +294,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemKV,"FZ8")
@@ -310,7 +310,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemKV,"ALU.MG")
@@ -326,7 +326,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemKV,"ALU.SW")
@@ -342,7 +342,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemKV,"ALU.BZ")
@@ -356,7 +356,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemBM,"I")
@@ -370,7 +370,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemBX,"INSCHF")
@@ -385,7 +385,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemASM,"Z")
@@ -400,7 +400,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemASM,"")
@@ -418,7 +418,7 @@
 	#dim TBXLadeCodeBepalerStub = ##class(vhTest.Mock.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	Do TBXLadeCodeBepalerStub.VerwachtMethodCall("BepaalLadeCode",TeConverterenProduct.Klasse, TeConverterenProduct.ZijkantHoogte, TeConverterenProduct.LadeHoogte, TeConverterenProduct.IsBinnenlade, "V", $$$ElkeWaarde).ExactAantalKeer(1)
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(TBXLadeCodeBepalerStub)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(TBXLadeCodeBepalerStub)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do TBXLadeCodeBepalerStub.Verifieer()
@@ -433,7 +433,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemDWV,"")
@@ -448,7 +448,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemDWV,"2")
@@ -462,7 +462,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemFB,"Z")
@@ -477,7 +477,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemRSTL,"M")
@@ -492,7 +492,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemRSTL,"")
@@ -510,7 +510,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemSPZK,"S;120;140;150")
@@ -528,7 +528,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemSPZK,"B;120;140;250")
@@ -546,7 +546,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemSPZK,"M.;120;140;42")
@@ -566,7 +566,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemSPZK,"SS;120;140;60;150;150")
@@ -586,7 +586,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemSPZK,"BB;120;140;60;250;250")
@@ -606,7 +606,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemSPZK,"SB;120;140;60;150;250")
@@ -626,7 +626,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemSPZK,"BS;120;140;60;250;150")
@@ -646,7 +646,7 @@
 	
 	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
+	Set ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
 	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
 	
 	Do $$$AssertEquals(WebOrderLijn.ItemSPZK,"MM;120;140;60;42;42")