Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml
===================================================================
diff -u -r45315 -r45316
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 45315)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 45316)
@@ -28,6 +28,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="InventoryOutConverterStub">
+<Type>vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
 	Do ##super()
@@ -46,17 +51,17 @@
 	
 	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer("01.05.2016")
 	Set ..OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	Set ..InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Standaardgedrag met 1 InventSync van 1 productlijn">
 <Implementation><![CDATA[
-	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
-	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(1))
+	Do ..InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(1))
 	
 	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(1))
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, ..MaakBouwsteenIteratorFactory(1))
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(..InventoryOutConverterStub, ..OrderApiStub, ..MaakBouwsteenIteratorFactory(1))
 	
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
 	
@@ -68,14 +73,11 @@
 
 <Method name="Test: antwoord met 2 InventSync van 1 productlijn">
 <Implementation><![CDATA[
-	#dim Antwoord As AXif.Dynamics.Inventory.MessageParts = ..MaakInventSyncAntwoord(2)
+	Do ..InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(2))
 	
-	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
-	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(Antwoord)
-	
 	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(1))
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, ..MaakBouwsteenIteratorFactory(1))
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(..InventoryOutConverterStub, ..OrderApiStub, ..MaakBouwsteenIteratorFactory(1))
 	
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
 	
@@ -86,12 +88,11 @@
 
 <Method name="Test: uitlevering met 0 producten">
 <Implementation><![CDATA[
-	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
-	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(0))
+	Do ..InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(0))
 	
 	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(0))
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub)
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(..InventoryOutConverterStub, ..OrderApiStub)
 	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,GUID)
@@ -105,12 +106,11 @@
 <Implementation><![CDATA[
 	Set ..RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "9000001,9000002")
 	
-	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
-	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(2))
+	Do ..InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(2))
 	
 	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(2))
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, ..MaakBouwsteenIteratorFactory(2))
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(..InventoryOutConverterStub, ..OrderApiStub, ..MaakBouwsteenIteratorFactory(2))
 	
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
 	
@@ -121,12 +121,11 @@
 
 <Method name="Test: InventSync geeft error -&gt; opeten">
 <Implementation><![CDATA[
-	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
-	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanException($$$DummyException)
+	Do ..InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanException($$$DummyException)
 	
 	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(1))
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, ..MaakBouwsteenIteratorFactory(1))
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(..InventoryOutConverterStub, ..OrderApiStub, ..MaakBouwsteenIteratorFactory(1))
 	
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)