Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/OrganizationCommon/Test.cls.xml
===================================================================
diff -u -r34273 -r34605
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/OrganizationCommon/Test.cls.xml	(.../Test.cls.xml)	(revision 34273)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/OrganizationCommon/Test.cls.xml	(.../Test.cls.xml)	(revision 34605)
@@ -8,8 +8,7 @@
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	do ..Partij.IndienMethodCall("GeefHandelRegisterNr").DanReturn("1234567")
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -23,8 +22,7 @@
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Nederlands())
 	do ..Partij.IndienMethodCall("GeefHandelRegisterNr").DanReturn("1234567")
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml
===================================================================
diff -u -r34225 -r34605
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 34225)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 34605)
@@ -4,6 +4,11 @@
 <Abstract>1</Abstract>
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="Converter">
+<Type>AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Partij">
 <Type>vhTest.Mock.DOM.PARTIJ.Partij</Type>
 <Private>1</Private>
@@ -14,6 +19,13 @@
 <Private>1</Private>
 </Property>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	do ##super()
+	set ..Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
+]]></Implementation>
+</Method>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34479 -r34605
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34479)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34605)
@@ -5,8 +5,7 @@
 
 <Method name="Test: Hardcoded waarden">
 <Implementation><![CDATA[
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.Currency,"EUR")
@@ -18,8 +17,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -41,8 +39,7 @@
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(Adres)
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -59,8 +56,7 @@
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(Adres)
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -77,8 +73,7 @@
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(Adres)
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -93,8 +88,7 @@
 	do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam ")
 	do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -110,8 +104,7 @@
 	do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
 	do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("Toenaam")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -126,8 +119,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Nederlands())
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -140,8 +132,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Frans())
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -154,8 +145,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Duits())
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -168,8 +158,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Engels())
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -182,8 +171,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefCode").DanReturn(4682)
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.AccountNum,"04682")
@@ -194,8 +182,7 @@
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefRegio").DanReturn(9)
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
@@ -207,8 +194,7 @@
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefRegio").DanReturn(97)
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
@@ -221,8 +207,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(0)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("")
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"")
@@ -234,8 +219,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn("")
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("")
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"")
@@ -247,8 +231,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(0)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("10D")
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"")
@@ -260,8 +243,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(2)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("0D")
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"08D2%")
@@ -273,8 +255,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(1)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("")
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"08D1%")
@@ -286,8 +267,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(1)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("0")
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"08D1%")
@@ -298,9 +278,8 @@
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(3)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("10D")
-
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"10D3%")
@@ -312,8 +291,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(3)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("0D")
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"08D3%")
@@ -324,8 +302,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("BE0402775276")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"BTW BE 0402.775.276")
@@ -337,8 +314,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"")
@@ -350,8 +326,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL814120313B01")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"")
@@ -363,8 +338,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("G")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"")
@@ -376,8 +350,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("GEEN")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"")
@@ -389,8 +362,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("BE0000000000")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"BE 0000.000.097")
@@ -402,8 +374,7 @@
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("IsLidBTWEenheidVanHoecke").DanReturn($$$true)
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
@@ -417,8 +388,7 @@
 	do ..Klant.IndienMethodCall("GeefBTWNr").DanReturn("BE 1234.587.369")
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
@@ -432,8 +402,7 @@
 	do ..Klant.IndienMethodCall("GeefBTWNr").DanReturn("NL 1234.587.369")
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).EuLid())
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
@@ -447,10 +416,8 @@
 	do ..Klant.IndienMethodCall("GeefBTWNr").DanReturn("DE 1234.587.369")
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).NietEuLid())
 	
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
-	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.TaxGroup,"BX")
@@ -466,8 +433,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -484,8 +450,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -506,8 +471,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -534,8 +498,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -557,8 +520,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -582,8 +544,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("iemand@ergens.be")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -612,8 +573,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("iemand@ergens.be")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("http://www.ergens.be")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -660,8 +620,8 @@
 <Method name="Test Blocked - Commercieel actief">
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefCommercieleStatus").DanReturn(##class(DOM.CRM.enu.CommercieleStatus).Actief())
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.Blocked,"")
@@ -671,8 +631,8 @@
 <Method name="Test Blocked - Commercieel Inactief">
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefCommercieleStatus").DanReturn(##class(DOM.CRM.enu.CommercieleStatus).NietActief())
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.Blocked,"Invoice")
@@ -684,8 +644,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Vooruitbetaling())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"VOORUIT")
@@ -698,9 +657,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Rembours())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("")
 
-	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"REMBOURS")
@@ -713,8 +670,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Incasso())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"NET00")
@@ -727,8 +683,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("30D")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"NET30")
@@ -741,8 +696,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("8D")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"NET08")
@@ -755,8 +709,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("30DEM")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"EOM30")
@@ -769,8 +722,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("1M")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"NET30")
@@ -783,8 +735,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("2M")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"NET60")
@@ -797,8 +748,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("1MEM")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"EOM30")
@@ -811,8 +761,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("2MEM")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"EOM60")
@@ -824,8 +773,7 @@
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("IsLidBTWEenheidVanHoecke").DanReturn($$$true)
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CustGroup,"IC")
@@ -836,8 +784,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefID").DanReturn("K||9544")
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CustGroup,"IC")
@@ -848,8 +795,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CustGroup,"BE")
@@ -860,8 +806,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).EuLid())
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CustGroup,"EU")
@@ -872,8 +817,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).NietEuLid())
 
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CustGroup,"EX")
@@ -886,8 +830,7 @@
 	Do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
 	Do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("")
 	
-	Set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -904,8 +847,7 @@
 	Do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
 	Do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("")
 	
-	Set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -921,8 +863,7 @@
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
 	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	Set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -943,8 +884,7 @@
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("BE0402775276")
 	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	Set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -960,8 +900,7 @@
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("GEEN")
 	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	Set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -977,10 +916,9 @@
 <Implementation><![CDATA[
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("G")
 	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
+
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
-	Set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
-	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
@@ -996,8 +934,7 @@
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("")
 	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	Set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)