Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/OrganizationCommon/Test.cls.xml
===================================================================
diff -u -r34666 -r34673
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/OrganizationCommon/Test.cls.xml	(.../Test.cls.xml)	(revision 34666)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/OrganizationCommon/Test.cls.xml	(.../Test.cls.xml)	(revision 34673)
@@ -8,7 +8,7 @@
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	do ..Partij.IndienMethodCall("GeefHandelRegisterNr").DanReturn("1234567")
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -22,7 +22,7 @@
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Nederlands())
 	do ..Partij.IndienMethodCall("GeefHandelRegisterNr").DanReturn("1234567")
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34666 -r34673
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34666)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34673)
@@ -13,7 +13,18 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PartijAPI">
+<Type>DOM.PARTIJ.PartijAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="VerkoopAPI">
+<Type>DOM.VKP.VerkoopAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
+<FormalSpec>PartijAPI:DOM.PARTIJ.PartijAPI,VerkoopAPI:DOM.VKP.VerkoopAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -26,9 +37,15 @@
 </Method>
 
 <Method name="Convert">
-<FormalSpec>Partij:DOM.PARTIJ.Partij,Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<FormalSpec>Id:%String</FormalSpec>
 <ReturnType>AXaif.Customer.AxdCustomer</ReturnType>
 <Implementation><![CDATA[
+	set ..PartijAPI = ##class(DOM.DomeinContext).Instance().GeefPartijAPI()
+	set ..VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
+	
+	#dim Partij As DOM.PARTIJ.Partij = ..PartijAPI.GeefPartij(Id)
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(Id)
+	
 	set AxKlant = ##class(AXaif.Customer.AxdCustomer).%New()
 	
 	set Custable = ##class(AXaif.Customer.AxdEntityCustTable).%New()
Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34605 -r34673
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34605)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34673)
@@ -5,7 +5,7 @@
 
 <Method name="Test: Hardcoded waarden">
 <Implementation><![CDATA[
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.Currency,"EUR")
@@ -17,7 +17,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -39,7 +39,7 @@
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(Adres)
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -56,7 +56,7 @@
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(Adres)
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -73,7 +73,7 @@
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(Adres)
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -88,7 +88,7 @@
 	do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam ")
 	do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -104,7 +104,7 @@
 	do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
 	do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("Toenaam")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -119,7 +119,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Nederlands())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -132,7 +132,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Frans())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -145,7 +145,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Duits())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -158,7 +158,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Engels())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -171,7 +171,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefCode").DanReturn(4682)
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.AccountNum,"04682")
@@ -182,7 +182,7 @@
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefRegio").DanReturn(9)
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
@@ -194,7 +194,7 @@
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefRegio").DanReturn(97)
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
@@ -207,7 +207,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(0)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("")
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"")
@@ -219,7 +219,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn("")
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("")
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"")
@@ -231,7 +231,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(0)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("10D")
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"")
@@ -243,7 +243,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(2)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("0D")
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"08D2%")
@@ -255,7 +255,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(1)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("")
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"08D1%")
@@ -267,7 +267,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(1)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("0")
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"08D1%")
@@ -279,7 +279,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(3)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("10D")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"10D3%")
@@ -291,7 +291,7 @@
 	do ..Klant.IndienMethodCall("GeefKortingContantPercentage").DanReturn(3)
 	do ..Klant.IndienMethodCall("GeefKortingContantTermijn").DanReturn("0D")
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CashDisc,"08D3%")
@@ -302,7 +302,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("BE0402775276")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"BTW BE 0402.775.276")
@@ -314,7 +314,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"")
@@ -326,7 +326,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL814120313B01")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"")
@@ -338,7 +338,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("G")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"")
@@ -350,7 +350,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("GEEN")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"")
@@ -362,7 +362,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("BE0000000000")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	do $$$AssertEquals(CustTable.EnterpriseNumber,"BE 0000.000.097")
@@ -374,7 +374,7 @@
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("IsLidBTWEenheidVanHoecke").DanReturn($$$true)
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
@@ -388,7 +388,7 @@
 	do ..Klant.IndienMethodCall("GeefBTWNr").DanReturn("BE 1234.587.369")
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
@@ -402,7 +402,7 @@
 	do ..Klant.IndienMethodCall("GeefBTWNr").DanReturn("NL 1234.587.369")
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).EuLid())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
@@ -416,7 +416,7 @@
 	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)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
@@ -433,7 +433,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -450,7 +450,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -471,7 +471,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -498,7 +498,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -520,7 +520,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -544,7 +544,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("iemand@ergens.be")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -573,7 +573,7 @@
 	do ..Partij.IndienMethodCall("GeefEmail").DanReturn("iemand@ergens.be")
 	do ..Partij.IndienMethodCall("GeefWebstek").DanReturn("http://www.ergens.be")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
 	
@@ -621,7 +621,7 @@
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefCommercieleStatus").DanReturn(##class(DOM.CRM.enu.CommercieleStatus).Actief())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.Blocked,"")
@@ -632,7 +632,7 @@
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("GeefCommercieleStatus").DanReturn(##class(DOM.CRM.enu.CommercieleStatus).NietActief())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.Blocked,"Invoice")
@@ -644,7 +644,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Vooruitbetaling())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"VOORUIT")
@@ -657,7 +657,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Rembours())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("")
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"REMBOURS")
@@ -670,7 +670,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Incasso())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"NET00")
@@ -683,7 +683,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("30D")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"NET30")
@@ -696,7 +696,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("8D")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"NET08")
@@ -709,7 +709,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("30DEM")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"EOM30")
@@ -722,7 +722,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("1M")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"NET30")
@@ -735,7 +735,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("2M")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"NET60")
@@ -748,7 +748,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("1MEM")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"EOM30")
@@ -761,7 +761,7 @@
 	do ..Klant.IndienMethodCall("GeefBetalingwijze").DanReturn(##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn())
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("2MEM")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.PaymTermId,"EOM60")
@@ -773,7 +773,7 @@
 <Implementation><![CDATA[
 	do ..Klant.IndienMethodCall("IsLidBTWEenheidVanHoecke").DanReturn($$$true)
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CustGroup,"IC")
@@ -783,8 +783,8 @@
 <Method name="Test: KlantenCategorie - Van Hoecke BV- IC">
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefID").DanReturn("K||9544")
-
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CustGroup,"IC")
@@ -795,7 +795,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CustGroup,"BE")
@@ -806,7 +806,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).EuLid())
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CustGroup,"EU")
@@ -817,7 +817,7 @@
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).NietEuLid())
 
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	
 	do $$$AssertEquals(CustTable.CustGroup,"EX")
@@ -830,7 +830,7 @@
 	Do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
 	Do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -847,7 +847,7 @@
 	Do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
 	Do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("")
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -863,7 +863,7 @@
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
 	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -884,7 +884,7 @@
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("BE0402775276")
 	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -900,7 +900,7 @@
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("GEEN")
 	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -917,7 +917,7 @@
 	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)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
 	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
@@ -934,7 +934,7 @@
 	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("")
 	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	#dim AxKlant As AXaif.Customer.AxdCustomer = ..Converter.Convert(..Partij,..Klant)
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
 	
 	#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 -r34605 -r34673
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 34605)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 34673)
@@ -4,11 +4,6 @@
 <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>
@@ -19,13 +14,6 @@
 <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[
@@ -61,6 +49,21 @@
 	do ..Klant.IndienMethodCall("GeefBetalingTermijn").DanReturn("30D")
 ]]></Implementation>
 </Method>
+
+<Method name="ConvertToAxdCustomer">
+<Private>1</Private>
+<ReturnType>AXaif.Customer.AxdCustomer</ReturnType>
+<Implementation><![CDATA[
+	#dim PartijAPI As vhTest.Mock.DOM.PARTIJ.PartijAPI = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).MockInstance()
+	do PartijAPI.IndienMethodCall("GeefPartij",..Partij.GeefID()).DanReturn(..Partij)
+	
+	#dim VerkoopAPI As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
+	do VerkoopAPI.IndienMethodCall("GeefKlant",..Partij.GeefID()).DanReturn(..Klant)
+	
+	set AifConverter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New(PartijAPI,VerkoopAPI)
+	quit AifConverter.Convert(..Partij.GeefID())
+]]></Implementation>
+</Method>
 </Class>