Index: vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test1.cls.xml
===================================================================
diff -u -r54342 -r54534
--- vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test1.cls.xml	(.../Test1.cls.xml)	(revision 54342)
+++ vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test1.cls.xml	(.../Test1.cls.xml)	(revision 54534)
@@ -55,31 +55,17 @@
 <Method name="Test: SFS orders met ExternID &lt; 200000 die niet bestaan -&gt; Exceptie">
 <Implementation><![CDATA[
 	#dim OfferteBestaatNietMelding As %String = "UT_Melding_OfferteBestaatNiet"
-
-	Do ..OfferteVanHandel.IndienMethodCall("GeefID").DanReturn(..#OfferteNummer)
-	Do ..OfferteVanHandel.IndienMethodCall("IsBesteld").DanReturn(1)
 	
 	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
 	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",..#LageEDInummer).DanException(##class(TECH.Exceptions.InvalidInputException).%New(OfferteBestaatNietMelding))
-	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanVH",..OfferteVanHandel).DanReturn(..VanHoeckeOfferte)
-	Set ExterneVerkoopService = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do ExterneVerkoopService.VerwachtMethodCall("BestelOfferte", ..VanHoeckeOfferte.GeefID(), ##class(DOM.VKP.enu.Klant).SFS(), ##class(DOM.common.enu.Personality).VanHoecke())
 	
 	Set OfferteRepositoryMock = ##class(vhTest.Mock.APPS.VKP.Offerte.OfferteRepository).%New()
-	Do OfferteRepositoryMock.VerwachtMethodCall("BestaatViaExterneId",..#LageEDInummer).DanReturn($$$False)
-	Do OfferteRepositoryMock.VerwachtMethodCall("GeefViaExterneId",..#LageEDInummer).DanReturn(..OfferteVanHandel)
+	Do OfferteRepositoryMock.IndienMethodCall("BestaatViaExterneId",..#LageEDInummer).DanReturn($$$False)
 	
-	Set IntractoInformeerderMock = ##class(vhTest.Mock.WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.CartPort).%New()
-	Do IntractoInformeerderMock.VerwachtMethodCall("updateStatus",..#LageEDInummer,##class(WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.enu.Status).ERP()).ExactAantalKeer(1)
-	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Unable to confirm order","Invalid EDI number ")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
 
-	#dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub,ExterneVerkoopService,IntractoInformeerderMock,OfferteRepositoryMock).ConfirmOrder(..#LageEDInummer,..Shop,..BestelReferentie,..GevraagdeLeverdatum)
-	
-	Do OfferteRepositoryMock.Verifieer()
-	Do ExterneVerkoopService.Verifieer()
-	Do IntractoInformeerderMock.Verifieer()
+	#dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub,"","",OfferteRepositoryMock).ConfirmOrder(..#LageEDInummer,..Shop,..BestelReferentie,..GevraagdeLeverdatum)
 ]]></Implementation>
 </Method>
 
@@ -153,6 +139,7 @@
 	Do ..OfferteVanHandel.IndienMethodCall("GeefID").DanReturn(..#OfferteNummer)
 	Do ..OfferteVanHandel.IndienMethodCall("IsBesteld").DanReturn($$$True)
 	Do ..OfferteVanHandel.IndienMethodCall("GeefDocumentReferenties").DanReturn(DummyDocumentReferentiesKlantBestelling)
+	Do ..OfferteVanHandel.IndienMethodCall("IsVhisie4").DanReturn($$$True)
 	
 	Do ..VanHoeckeOfferte.IndienMethodCall("GeefBestelOpmerking").DanReturn("BestelOpmerking")
 	Do ..VanHoeckeOfferte.IndienMethodCall("GeefDocumentReferenties").DanReturn(DummyDocumentReferentiesLeverancierOfferte)
Index: vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/TestLeverDatum.cls.xml
===================================================================
diff -u -r54350 -r54534
--- vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/TestLeverDatum.cls.xml	(.../TestLeverDatum.cls.xml)	(revision 54350)
+++ vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/TestLeverDatum.cls.xml	(.../TestLeverDatum.cls.xml)	(revision 54534)
@@ -142,6 +142,7 @@
 <Implementation><![CDATA[
 	Do ..OfferteVanHandel.IndienMethodCall("GeefDocumentReferenties").DanReturn(##class(DOM.VKP.DocumentReferenties).%New())
 	Do ..OfferteVanHandel.IndienMethodCall("GeefID").DanReturn(..#OfferteNummer)
+	Do ..OfferteVanHandel.IndienMethodCall("IsVhisie4").DanReturn($$$True)
 	Do ..OfferteVanHandel.IndienMethodCall("IsBesteld").DanReturn(1)
 
 	Do ..VanHoeckeOfferte.IndienMethodCall("GeefExterneId",).DanReturn($$$DummyInteger)