Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml
===================================================================
diff -u -r42747 -r42748
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 42747)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 42748)
@@ -5,8 +5,10 @@
 
 <Method name="Test: Een standaard order zonder lijnen wordt verwerkt en bewaard">
 <Implementation><![CDATA[
+	#dim AfleverAdres As DOM.VKP.LeverAdres = ##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch()
+	
 	Set OrderMock = ##class(vhTest.Mock.DOM.VKP.Order).%New()
-	Do OrderMock.VerwachtMethodCall("ZetAfleveradres", $$$ElkeWaarde).ExactAantalKeer(1)
+	Do OrderMock.VerwachtMethodCall("ZetAfleveradres", ..Matches.Object(AfleverAdres)).ExactAantalKeer(1)
 	
 	Set OrderAPIMock = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
 	Do OrderAPIMock.VerwachtMethodCall("Bewaar", OrderMock).ExactAantalKeer(1)
Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r42747 -r42748
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 42747)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 42748)
@@ -52,7 +52,8 @@
 	Do LeverAdres.ZetPostcode(OrderHeader.DlvAddrZipCode)
 	Do LeverAdres.ZetStraat(OrderHeader.DlvAddrStreet1)
 	Do LeverAdres.ZetLandNr(OrderHeader.DlvAddrCountry)
-
+	Do LeverAdres.ZetNaam(OrderHeader.DeliveryName)
+	
 	Do Order.ZetAfleveradres(LeverAdres)
 	
 	Do ..OrderAPI.Bewaar(Order)
Index: vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml
===================================================================
diff -u -r42747 -r42748
--- vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml	(.../Envelope.cls.xml)	(revision 42747)
+++ vhTest/Utils/AXif/Dynamics/SalesOrderIn/Envelope.cls.xml	(.../Envelope.cls.xml)	(revision 42748)
@@ -11,11 +11,12 @@
 	
 	Set OrderHeader = ##class(AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader).%New()
 	Set OrderHeader.CustAccount = "12526"
-	Set OrderHeader.DlvAddrCity = "Sint Niklaas"
+	Set OrderHeader.DlvAddrCity = "Sint-Niklaas"
 	Set OrderHeader.DlvAddrZipCode = "9100"
-	Set OrderHeader.DlvAddrStreet1 = "Hofstraat 6"
-	Set OrderHeader.DlvAddrCountry = "BE"
-
+	Set OrderHeader.DlvAddrStreet1 = "Ankerstraat 91"
+	Set OrderHeader.DlvAddrCountry = "1019"
+	Set OrderHeader.DeliveryName = "Een Belg"
+	
 	Do StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.Insert(OrderHeader)
 	
 	Quit StandaardOrder