Index: vhUnitTest/DOM/AKP/ToeleveringService/GeefKlant/Test.cls.xml
===================================================================
diff -u -r33209 -r38035
--- vhUnitTest/DOM/AKP/ToeleveringService/GeefKlant/Test.cls.xml	(.../Test.cls.xml)	(revision 33209)
+++ vhUnitTest/DOM/AKP/ToeleveringService/GeefKlant/Test.cls.xml	(.../Test.cls.xml)	(revision 38035)
@@ -8,24 +8,25 @@
 	#dim ToeleveringAPIMock As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
 	
 	#dim ToeleveringID As TECH.String = "123456"
-	#dim ToeleveringService As DOM.AKP.ToeleveringService = ##class(DOM.AKP.impl.ToeleveringService).%New()
 	
-	#dim OrderAPIMock As vhTest.Mock.DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).MockInstance()
 	
 	#dim KlantID As %String = "UT_KlantID"
-	#dim VerkoopAPIMock As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
 	#dim KlantDummy As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
-	do VerkoopAPIMock.VerwachtMethodCall("GeefKlant",KlantID).DanReturn(KlantDummy)
+	#dim VerkoopAPIMock As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
+	Do VerkoopAPIMock.VerwachtMethodCall("GeefKlant",KlantID).DanReturn(KlantDummy)
 		
 	#dim OrderMock As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
-	do OrderMock.VerwachtMethodCall("GeefKlantID").DanReturn(KlantID)
-	do OrderAPIMock.VerwachtMethodCall("GeefOrder",1).DanReturn(OrderMock)
+	Do OrderMock.VerwachtMethodCall("GeefKlantID").DanReturn(KlantID)
+
+	#dim OrderAPIMock As vhTest.Mock.DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	Do OrderAPIMock.VerwachtMethodCall("GeefOrder",1).DanReturn(OrderMock)
 	
 	#dim ToeleveringMock As vhTest.Mock.DOM.AKP.Toelevering = ##class(vhTest.Mock.DOM.AKP.Toelevering).%New()
-	do ToeleveringMock.VerwachtMethodCall("GeefOrderID").DanReturn(1)
+	Do ToeleveringMock.VerwachtMethodCall("GeefOrderID").DanReturn(1)
 		
-	do ToeleveringAPIMock.VerwachtMethodCall("GeefToelevering",ToeleveringID).DanReturn(ToeleveringMock)
+	Do ToeleveringAPIMock.VerwachtMethodCall("GeefToelevering",ToeleveringID).DanReturn(ToeleveringMock)
 	
+	#dim ToeleveringService As DOM.AKP.ToeleveringService = ##class(DOM.AKP.impl.ToeleveringService).%New(,,OrderAPIMock,,VerkoopAPIMock)
 	#dim Klant As DOM.VKP.VanHoeckeKlant = ToeleveringService.GeefKlant(ToeleveringID)
 	Do $$$AssertEquals(Klant,KlantDummy)