Index: vhUnitTest/BL/PPS/TBX/DocsV1/EtikettenCommissieOne/Test.cls.xml
===================================================================
diff -u -r40835 -r40843
--- vhUnitTest/BL/PPS/TBX/DocsV1/EtikettenCommissieOne/Test.cls.xml	(.../Test.cls.xml)	(revision 40835)
+++ vhUnitTest/BL/PPS/TBX/DocsV1/EtikettenCommissieOne/Test.cls.xml	(.../Test.cls.xml)	(revision 40843)
@@ -13,9 +13,16 @@
 	
 	Set LogoBepalerMock = ##class(vhTest.Mock.BL.PPS.common.impl.OnderdelendoosLogoBepaler).%New()
 	Do LogoBepalerMock.VerwachtMethodCall("GeefLogo",Klant).DanReturn("DummyLogo")
+
+	set ToeleveringStub = ##class(vhTest.Mock.DOM.AKP.Toelevering).%New()
+	do ToeleveringStub.IndienMethodCall("GeefOrderID").DanReturn($$$DummyInteger)
 	
-	#dim ToeleveringService As vhTest.Mock.DOM.AKP.ToeleveringService = ..InitMocks(Klant,$$$DummyInteger)
+	#dim ToeleveringAPI As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
+	do ToeleveringAPI.IndienMethodCall("GeefToelevering",$$$DummyInteger).DanReturn(ToeleveringStub)
 	
+	#dim ToeleveringService As vhTest.Mock.DOM.AKP.ToeleveringService = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	do ToeleveringService.IndienMethodCall("GeefKlant",$$$DummyInteger).DanReturn(Klant)
+	
 	Set DocsV1 = ##class(BL.PPS.TBX.DocsV1).%New(,,,ToeleveringService,LogoBepalerMock)
 	#dim Etiket As BL.PPS.TBX.sub.pxCommissie = DocsV1.EtikettenCommissieOne($$$DummyInteger,1,"")
 
@@ -24,23 +31,6 @@
 	Do LogoBepalerMock.Verifieer()
 ]]></Implementation>
 </Method>
-
-<Method name="InitMocks">
-<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,ToeleveringId:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.AKP.ToeleveringService</ReturnType>
-<Implementation><![CDATA[
-	set ToeleveringStub = ##class(vhTest.Mock.DOM.AKP.Toelevering).%New()
-	do ToeleveringStub.IndienMethodCall("GeefOrderID").DanReturn($$$DummyInteger)
-	
-	#dim ToeleveringAPI As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
-	do ToeleveringAPI.IndienMethodCall("GeefToelevering",ToeleveringId).DanReturn(ToeleveringStub)
-	
-	#dim ToeleveringService As vhTest.Mock.DOM.AKP.ToeleveringService = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
-	do ToeleveringService.IndienMethodCall("GeefKlant",ToeleveringId).DanReturn(Klant)
-	Quit ToeleveringService
-]]></Implementation>
-</Method>
 </Class>