Index: vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test2.cls.xml
===================================================================
diff -u -r29059 -r35709
--- vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test2.cls.xml	(.../Test2.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test2.cls.xml	(.../Test2.cls.xml)	(revision 35709)
@@ -16,13 +16,20 @@
 <Implementation><![CDATA[
 	Do ..SFSOfferte.IndienMethodCall("IsBesteld").DanReturn(1)
 	Do ..VanHoeckeOfferte.IndienMethodCall("IsBesteld").DanReturn(1)
-	
+		
 	Do ..ZetMockExtras()
 	
+	#dim VanHoeckeOfferteID As %Integer = ..EDInr+1
+	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceStub.IndienMethodCall("GeefBestelStatusUpdater").DanReturn(..BestelStatusUpdater)
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",..EDInr).DanReturn(..SFSOfferte)
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanVH",..SFSOfferte).DanReturn(..VanHoeckeOfferte)
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",VanHoeckeOfferteID).DanReturn(..VanHoeckeOfferte)	
+	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Order already confirmed")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
 	
-	#dim BestelOfferteResultaat As WS.EC.UNI.SFS.ConfirmOrderResult =..GeefOrderServiceInternal().ConfirmOrder(..EDInr,..sfsref,..sfsDeliveryDate)
+	#dim BestelOfferteResultaat As WS.EC.UNI.SFS.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub).ConfirmOrder(..EDInr,..sfsref,..sfsDeliveryDate)
 ]]></Implementation>
 </Method>
 
@@ -34,9 +41,6 @@
 	Do ..VanHoeckeOfferte.IndienMethodCall("ZijnPrijzenVervallen").DanReturn(0)
 	Do ..VanHoeckeOfferte.IndienMethodCall("GeefPersonalityID").DanReturn(##class(DOM.common.enu.Personality).VanHoecke())
 	Do ..VanHoeckeOfferte.IndienMethodCall("GeefLeverDatum").DanReturn($$INTDATE^vhLib.DataTypes("31-12-2099"))
-
-	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService()
-	Do OfferteServiceStub.IndienMethodCall("GeefBestelStatusUpdater").DanReturn(..BestelStatusUpdater)
 	
 	#dim ECommerceAPIFake As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI()
 	Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceSFS).%New()
@@ -48,9 +52,19 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set ..BestelStatusUpdater=##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService().GeefBestelStatusUpdater()
-	Set ..ExterneVerkoopService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefExterneVerkoopService()
+	;
 ]]></Implementation>
 </Method>
+
+<Method name="GeefOrderServiceInternal">
+<FormalSpec>OfferteService:APPS.VKP.OfferteService=""</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EC.UNI.SFS.impl.OrderServiceInternal</ReturnType>
+<Implementation><![CDATA[
+	Set ..ExterneVerkoopService = ##class(APPS.EC.impl.ExterneVerkoopService).%New(OfferteService)
+	Quit ##class(vhUnitTest.APPS.EC.UNI.SFS.impl.OrderServiceInternal.ConfirmOrder.OrderServiceInternalMock).%New(OfferteService, ..ExterneVerkoopService)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/TestBase.cls.xml
===================================================================
diff -u -r29059 -r35709
--- vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 35709)
@@ -54,18 +54,10 @@
 
 	#dim VanHoeckeOfferteID As %Integer = ..EDInr+1
 	Do ..ZetMockVanHoeckeOfferte(VanHoeckeOfferteID)
-	Do ..ZetMockOfferteService(VanHoeckeOfferteID)
 	Do ..ZetMockECommerceAPI(VanHoeckeOfferteID)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefOrderServiceInternal">
-<Private>1</Private>
-<ReturnType>APPS.EC.UNI.SFS.OrderServiceInternal</ReturnType>
-<Implementation><![CDATA[	Quit ##class(vhUnitTest.APPS.EC.UNI.SFS.impl.OrderServiceInternal.ConfirmOrder.OrderServiceInternalMock).%New()
-]]></Implementation>
-</Method>
-
 <Method name="ZetObjectenVoorMockData">
 <Abstract>1</Abstract>
 <Private>1</Private>
@@ -84,25 +76,13 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetMockOfferteService">
-<FormalSpec>VanHoeckeOfferteID:%Integer</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim VerkoopAPIFake As vhTest.Mock.APPS.VKP.VerkoopAPI = ##class(vhTest.Mock.APPS.VKP.VerkoopAPI).MockInstance()
-	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",..EDInr).DanReturn(..SFSOfferte)
-	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanVH",..SFSOfferte).DanReturn(..VanHoeckeOfferte)
-	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",VanHoeckeOfferteID).DanReturn(..VanHoeckeOfferte)
-	Do VerkoopAPIFake.IndienMethodCall("GeefOfferteService").DanReturn(OfferteServiceStub)
-]]></Implementation>
-</Method>
-
 <Method name="ZetMockECommerceAPI">
 <FormalSpec>VanHoeckeOfferteID:%Integer</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim ECommerceAPIFake As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()
 	Do ECommerceAPIFake.IndienMethodCall("GeefExterneVerkoopService").DanReturn(..ExterneVerkoopService)
+	Do ECommerceAPIFake.IndienMethodCall("GeefWebshopSessionService").DanReturn(##class(APPS.EC.impl.WebshopSessionService).%New())
 
 	Set ..AuthorisatieControleurMock = ##class(vhTest.Mock.APPS.EC.AuthorisatieControleur).%New()
 	Do ..AuthorisatieControleurMock.IndienMethodCall("ControleerWerkenMetBestellingVanHandel",VanHoeckeOfferteID)
Index: vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test1.cls.xml
===================================================================
diff -u -r29059 -r35709
--- vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test1.cls.xml	(.../Test1.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test1.cls.xml	(.../Test1.cls.xml)	(revision 35709)
@@ -9,31 +9,42 @@
 
 <Method name="TestConfirmNogNietBesteldeSFSOfferte">
 <Implementation><![CDATA[
+	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",..EDInr).DanReturn(..SFSOfferte)
 	Do ..SFSOfferte.IndienMethodCall("IsBesteld").DanReturn(0)
 	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Unable to confirm order")
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Unable to confirm order","Offerte '6' van handel is nog niet besteld.")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
-	
-	#dim BestelOfferteResultaat As WS.EC.UNI.SFS.ConfirmOrderResult =..GeefOrderServiceInternal().ConfirmOrder(..EDInr,..sfsref,..sfsDeliveryDate)
+
+	#dim BestelOfferteResultaat As WS.EC.UNI.SFS.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub).ConfirmOrder(..EDInr,..sfsref,..sfsDeliveryDate)
 ]]></Implementation>
 </Method>
 
 <Method name="TestConfirmVanOngeldigeEDINummer">
 <Implementation><![CDATA[
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Unable to confirm order")
+	#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()
+	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)
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
 	
-	#dim OngeldigEDINummer As %String = "OngeldigEDINr"
-	#dim BestelOfferteResultaat As WS.EC.UNI.SFS.ConfirmOrderResult =..GeefOrderServiceInternal().ConfirmOrder(OngeldigEDINummer,..sfsref,..sfsDeliveryDate)
+	#dim BestelOfferteResultaat As WS.EC.UNI.SFS.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub).ConfirmOrder(OngeldigEDINummer,..sfsref,..sfsDeliveryDate)
 ]]></Implementation>
 </Method>
 
 <Method name="TestConfirmVanGeldigeEDINummer">
 <Implementation><![CDATA[
+	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",..EDInr).DanReturn(..SFSOfferte)
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanVH",..SFSOfferte).DanReturn(..VanHoeckeOfferte)
+
 	Do ..SFSOfferte.IndienMethodCall("IsBesteld").DanReturn(1)
 	Do ..ZetMockBestelOfferteVerwacht()
 	
-	#dim BestelOfferteResultaat As WS.EC.UNI.SFS.ConfirmOrderResult =..GeefOrderServiceInternal().ConfirmOrder(..EDInr,..sfsref,..sfsDeliveryDate)
+	#dim BestelOfferteResultaat As WS.EC.UNI.SFS.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub).ConfirmOrder(..EDInr,..sfsref,..sfsDeliveryDate)
 	
 	If $$$AssertTrue($IsObject(BestelOfferteResultaat)) {
 		Do $$$AssertEquals(BestelOfferteResultaat.EDINr,..EDInr)
@@ -63,6 +74,14 @@
 <Implementation><![CDATA[	Set ..ExterneVerkoopService = ##class(vhTest.Mock.APPS.EC.ExterneVerkoopService).%New()
 ]]></Implementation>
 </Method>
+
+<Method name="GeefOrderServiceInternal">
+<FormalSpec>OfferteService:APPS.VKP.OfferteService=""</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EC.UNI.SFS.impl.OrderServiceInternal</ReturnType>
+<Implementation><![CDATA[	Quit ##class(vhUnitTest.APPS.EC.UNI.SFS.impl.OrderServiceInternal.ConfirmOrder.OrderServiceInternalMock).%New(OfferteService)
+]]></Implementation>
+</Method>
 </Class>