Index: APPS/EC/UNI/SFS/impl/OrderServiceInternal.cls.xml
===================================================================
diff -u -r41327 -r54812
--- APPS/EC/UNI/SFS/impl/OrderServiceInternal.cls.xml	(.../OrderServiceInternal.cls.xml)	(revision 41327)
+++ APPS/EC/UNI/SFS/impl/OrderServiceInternal.cls.xml	(.../OrderServiceInternal.cls.xml)	(revision 54812)
@@ -19,15 +19,15 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>OfferteService:APPS.VKP.OfferteService="",ExterneVerkoopService:APPS.EC.Verkoop.ExterneVerkoopService</FormalSpec>
+<FormalSpec>OfferteService:APPS.VKP.OfferteService="",ExterneVerkoopService:APPS.EC.Verkoop.ExterneVerkoopService,AuthorisatieControleur:APPS.EC.Winkelkar.AuthorisatieControleur</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..OfferteService = $$$Inject(OfferteService,##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
-	Set ..ExterneVerkoopService = $$$Inject(ExterneVerkoopService, ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefExterneVerkoopService())
-	Set ..AuthorisatieControleur = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur()
+	Set ..ExterneVerkoopService = $$$Inject(ExterneVerkoopService, ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New())
+	Set ..AuthorisatieControleur = $$$Inject(AuthorisatieControleur, ##class(APPS.EC.Winkelkar.impl.AuthorisatieControleur).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test2.cls.xml
===================================================================
diff -u -r45332 -r54812
--- vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test2.cls.xml	(.../Test2.cls.xml)	(revision 45332)
+++ vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test2.cls.xml	(.../Test2.cls.xml)	(revision 54812)
@@ -64,7 +64,7 @@
 <ReturnType>APPS.EC.UNI.SFS.impl.OrderServiceInternal</ReturnType>
 <Implementation><![CDATA[
 	Set ..ExterneVerkoopService = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New(OfferteService)
-	Quit ##class(vhUnitTest.APPS.EC.UNI.SFS.impl.OrderServiceInternal.ConfirmOrder.OrderServiceInternalMock).%New(OfferteService, ..ExterneVerkoopService)
+	Quit ##class(vhUnitTest.APPS.EC.UNI.SFS.impl.OrderServiceInternal.ConfirmOrder.OrderServiceInternalMock).%New(OfferteService, ..ExterneVerkoopService, ..AuthorisatieControleurMock)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test1.cls.xml
===================================================================
diff -u -r36815 -r54812
--- vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test1.cls.xml	(.../Test1.cls.xml)	(revision 36815)
+++ vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/Test1.cls.xml	(.../Test1.cls.xml)	(revision 54812)
@@ -79,7 +79,7 @@
 <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><![CDATA[	Quit ##class(vhUnitTest.APPS.EC.UNI.SFS.impl.OrderServiceInternal.ConfirmOrder.OrderServiceInternalMock).%New(OfferteService, ..ExterneVerkoopService, ..AuthorisatieControleurMock)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/TestBase.cls.xml
===================================================================
diff -u -r42893 -r54812
--- vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 42893)
+++ vhUnitTest/APPS/EC/UNI/SFS/impl/OrderServiceInternal/ConfirmOrder/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 54812)
@@ -82,14 +82,12 @@
 <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())
 	Do ECommerceAPIFake.IndienMethodCall("GeefMagOfferteInSamenvattingenBepaler").DanReturn(##class(APPS.EC.impl.MagOfferteInSamenvattingenBepaler).%New())
 	Do ECommerceAPIFake.IndienMethodCall("GeefOfferteSelectieCriteriaBepaler").DanReturn(##class(APPS.EC.impl.OfferteSelectieCriteriaBepaler).%New())
 
+	// AuthorisatieControleur wordt rechtstreeks ge-inject.  Deze 2 lijnen code kunnen nog verplaatst worden --> Opgepast: parameter "VanHoeckeOfferteID" 
 	Set ..AuthorisatieControleurMock = ##class(vhTest.Mock.APPS.EC.Winkelkar.AuthorisatieControleur).%New()
 	Do ..AuthorisatieControleurMock.IndienMethodCall("ControleerWerkenMetBestellingVanHandel",VanHoeckeOfferteID)
-	Do ECommerceAPIFake.IndienMethodCall("GeefAuthorisatieControleur").DanReturn(..AuthorisatieControleurMock)
 ]]></Implementation>
 </Method>
 </Class>