Index: vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/SalesOrderConverter/Test.cls.xml
===================================================================
diff -u -r42705 -r42884
--- vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/SalesOrderConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 42705)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/SalesOrderConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 42884)
@@ -6,7 +6,7 @@
 <Method name="Test Converteert standaard orderhoofding">
 <Implementation><![CDATA[
 	#dim OrderAPI as vhTest.Mock.DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).MockInstance()
-	#dim Order as DOM.VKP.Order = ..GeefOrder()
+	#dim Order as DOM.VKP.Order = ##class(vhTest.Utils.DOM.VKP.Order).StandaardOrderHoofding()
 
 	Do OrderAPI.VerwachtMethodCall("GeefOrder",1000).DanReturn(Order)
 	
@@ -17,9 +17,9 @@
 	
 	do $$$AssertEquals(OrderHeader.ConfirmBody,"CommissieReferentie")
  	do $$$AssertEquals(OrderHeader.CurrencyCode,"EUR")
-	do $$$AssertEquals(OrderHeader.CustAccount,"01000")
+	do $$$AssertEquals(OrderHeader.CustAccount,"01234")
 	do $$$AssertEquals(OrderHeader.CustomerRef,"OrderReferentie")
-	do $$$AssertEquals(OrderHeader.InvoiceAccount,"01000")
+	do $$$AssertEquals(OrderHeader.InvoiceAccount,"01234")
 	do $$$AssertEquals(OrderHeader.ReceiptDateRequested,"")
 	do $$$AssertEquals(OrderHeader.SalesIdAX,"AXSalesId")
 
@@ -33,23 +33,6 @@
 <Implementation><![CDATA[	Quit ##class(AXimpl.Request).%New("SalesOrder/Create", 1000, $$$DummyString)
 ]]></Implementation>
 </Method>
-
-<Method name="GeefOrder">
-<Private>1</Private>
-<ReturnType>DOM.VKP.Order</ReturnType>
-<Implementation><![CDATA[
-	Set Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
-	
-	Do Order.IndienMethodCall("GeefKlantID").DanReturn("K||1000" )
-	Do Order.IndienMethodCall("GeefID").DanReturn(1000)
-	Do Order.IndienMethodCall("GeefCommissieReferentie").DanReturn("CommissieReferentie")
-	Do Order.IndienMethodCall("GeefOrderReferentie").DanReturn("OrderReferentie")
-	
-	Do Order.IndienMethodCall("GeefAxSalesId").DanReturn("AXSalesId")
-	
-	Quit Order
-]]></Implementation>
-</Method>
 </Class>