Index: vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test1.cls.xml
===================================================================
diff -u -r38419 -r41335
--- vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test1.cls.xml	(.../Test1.cls.xml)	(revision 38419)
+++ vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test1.cls.xml	(.../Test1.cls.xml)	(revision 41335)
@@ -7,7 +7,7 @@
 
 <Method name="TestConfirmNogNietBesteldeOfferteVanHandel">
 <Implementation><![CDATA[
-	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
 	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",..EDInr).DanReturn(..OfferteVanHandel)
 	Do ..OfferteVanHandel.IndienMethodCall("IsBesteld").DanReturn(0)
 	
@@ -23,7 +23,7 @@
 	#dim OngeldigEDINummer As %String = "OngeldigEDINr"
 	#dim OfferteBestaatNietMelding As %String = "UT_Melding_OfferteBestaatNiet"
 	
-	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
 	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",OngeldigEDINummer).DanException(##class(TECH.Exceptions.InvalidInputException).%New(OfferteBestaatNietMelding))
 	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Unable to confirm order","Invalid EDI number (OngeldigEDINr)",OfferteBestaatNietMelding)
@@ -51,9 +51,7 @@
 	
 	Do $$$AssertEquals(..DocRefsVanHoeckeOfferte.KlantOrderNummer,..BestelReferentie)
 	
-	;Do ..AuthorisatieControleurMock.Verifieer()
 	Do ..ExterneVerkoopService.Verifieer()
-	;Do ..VanHoeckeOfferte.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test2.cls.xml
===================================================================
diff -u -r38417 -r41335
--- vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test2.cls.xml	(.../Test2.cls.xml)	(revision 38417)
+++ vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test2.cls.xml	(.../Test2.cls.xml)	(revision 41335)
@@ -48,9 +48,7 @@
 
 <Method name="ZetObjectenVoorMockData">
 <Private>1</Private>
-<Implementation><![CDATA[
-	Set ..BestelStatusUpdater=##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService().GeefBestelStatusUpdater()
-	;
+<Implementation><![CDATA[	Set ..BestelStatusUpdater=##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService().GeefBestelStatusUpdater()
 ]]></Implementation>
 </Method>