Index: vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/GeldigheidVermeldingBepaler/BepaalVermelding/Test.cls.xml
===================================================================
diff -u -r36817 -r54810
--- vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/GeldigheidVermeldingBepaler/BepaalVermelding/Test.cls.xml	(.../Test.cls.xml)	(revision 36817)
+++ vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/GeldigheidVermeldingBepaler/BepaalVermelding/Test.cls.xml	(.../Test.cls.xml)	(revision 54810)
@@ -5,6 +5,11 @@
 Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.EC.TestExterneVerkoopService")</Description>
 <Super>vhUnitTest.APPS.EC.Verkoop.impl.Externe.VerkoopService.BaseVanHoecke</Super>
 
+<Property name="WebshopSessionService">
+<Type>APPS.EC.WebshopSessionService</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="TestWebshopModusNormaal">
 <Implementation><![CDATA[
 	Do ..StelInWebshopModus(##class(APPS.EC.enu.WebshopModus).Normaal())
@@ -23,11 +28,11 @@
 <FormalSpec>WebshopModus:APPS.EC.enu.WebshopModus</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim ECommerceAPIMock As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()
-	Set WebshopSessionServiceFake = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
-	Do WebshopSessionServiceFake.IndienMethodCall("GeefWebshopModus").DanReturn(WebshopModus)
-	Do WebshopSessionServiceFake.IndienMethodCall("BestaatWebshopSessie",$$$DummySessieID).DanReturn(1)
-	Do ECommerceAPIMock.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceFake)
+	;#dim ECommerceAPIMock As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()
+	Set ..WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
+	Do ..WebshopSessionService.IndienMethodCall("GeefWebshopModus").DanReturn(WebshopModus)
+	Do ..WebshopSessionService.IndienMethodCall("BestaatWebshopSessie",$$$DummySessieID).DanReturn(1)
+	;Do ECommerceAPIMock.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceFake)
 ]]></Implementation>
 </Method>
 
@@ -36,7 +41,7 @@
 <Implementation><![CDATA[
 	Do ..VulInOfferte()	
 	#dim Offerte As APPS.VKP.Offerte = ##class(APPS.VKP.impl.Offerte).OpenId(..OfferteIDenWinkelkarID.OfferteID)
-	Set Bepaler = ##class(APPS.EC.Verkoop.impl.GeldigheidVermeldingBepaler).%New()	
+	Set Bepaler = ##class(APPS.EC.Verkoop.impl.GeldigheidVermeldingBepaler).%New( , ..WebshopSessionService)
 	#dim GeldigheidVermelding As %String = Bepaler.BepaalVermelding(Offerte)
 	Quit GeldigheidVermelding
 ]]></Implementation>
Index: APPS/EC/Verkoop/impl/GeldigheidVermeldingBepaler.cls.xml
===================================================================
diff -u -r46561 -r54810
--- APPS/EC/Verkoop/impl/GeldigheidVermeldingBepaler.cls.xml	(.../GeldigheidVermeldingBepaler.cls.xml)	(revision 46561)
+++ APPS/EC/Verkoop/impl/GeldigheidVermeldingBepaler.cls.xml	(.../GeldigheidVermeldingBepaler.cls.xml)	(revision 54810)
@@ -29,14 +29,14 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Vertaler:Res.Vertaling</FormalSpec>
+<FormalSpec>Vertaler:Res.Vertaling,WebshopSessionService:APPS.EC.WebshopSessionService</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..Vertaler = $$$Implementation(Vertaler,##class(APPS.EC.Verkoop.impl.IoCContainer).Instance().Resolve("Vertaler"))
-	set ..WebshopSessionService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWebshopSessionService()
+	set ..Vertaler = $$$Inject(Vertaler,##class(APPS.EC.Verkoop.impl.IoCContainer).Instance().Resolve("Vertaler"))
+	set ..WebshopSessionService = $$$Inject(WebshopSessionService, ##class(APPS.EC.impl.WebshopSessionService).%New())
 	set ..RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
 	set ..FormatAPI = ##class(TECH.Context).Instance().GeefFormatAPI()
 	set ..WinkelkarTaalBepaler = ##class(APPS.EC.Winkelkar.impl.TaalBepaler).%New()