Index: vhTest/Integratie/Webshop/Winkelkar/WinkelkarKopieerder.cls.xml
===================================================================
diff -u -r31580 -r33279
--- vhTest/Integratie/Webshop/Winkelkar/WinkelkarKopieerder.cls.xml	(.../WinkelkarKopieerder.cls.xml)	(revision 31580)
+++ vhTest/Integratie/Webshop/Winkelkar/WinkelkarKopieerder.cls.xml	(.../WinkelkarKopieerder.cls.xml)	(revision 33279)
@@ -10,7 +10,7 @@
 	do Winkelkar.ZetKlantID("K||1000")
 	Do Winkelkar.Save()
 	
-	#dim WinkelService As APPS.EC.Winkelkar.impl.WinkelkarService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService()
+	#dim WinkelService As APPS.EC.Winkelkar.WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
 	do WinkelService.VoegToeMaatwerk(Winkelkar.GeefID(),"GroepNaam",##class(vhTest.Utils.APPS.PM.Maatwerk.dto.LBXKenmerken).CLade(),1)
 	
 	Set WinkelkarKopieerder = ##class(APPS.VKP.impl.WinkelkarKopieerder).%New()
Index: vhPowerTools/APPS/EC/ExterneVerkoopPowerService.cls.xml
===================================================================
diff -u -r29059 -r33279
--- vhPowerTools/APPS/EC/ExterneVerkoopPowerService.cls.xml	(.../ExterneVerkoopPowerService.cls.xml)	(revision 29059)
+++ vhPowerTools/APPS/EC/ExterneVerkoopPowerService.cls.xml	(.../ExterneVerkoopPowerService.cls.xml)	(revision 33279)
@@ -36,10 +36,10 @@
 N.B. Houdt geen rekening met het al dan niet gemaakt zijn van een order voor deze offerte.</Description>
 <FormalSpec>WinkelkarID:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim WinkelkarService As APPS.EC.Winkelkar.WinkelkarService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService()
+	#dim WinkelkarService As APPS.EC.Winkelkar.WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
 	#dim WinkelkarParent As APPS.EC.Winkelkar.Parent = WinkelkarService.GeefParent(WinkelkarID)
 
-	If (WinkelkarParent.Type '= ##class(APPS.EC.Winkelkar.enu.ParentType).WebshopOfferte()) {
+	If $$$Not(WinkelkarParent.Type = ##class(APPS.EC.Winkelkar.enu.ParentType).WebshopOfferte()) {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidUserInputException).%New("Aan deze winkelkar ("_WinkelkarID_") is geen offerte gekoppeld (type="_WinkelkarParent.Type_")"))
 	}
 	
Index: APPS/EC/Winkelkar/impl/WinkelkarControleur.cls.xml
===================================================================
diff -u -r29059 -r33279
--- APPS/EC/Winkelkar/impl/WinkelkarControleur.cls.xml	(.../WinkelkarControleur.cls.xml)	(revision 29059)
+++ APPS/EC/Winkelkar/impl/WinkelkarControleur.cls.xml	(.../WinkelkarControleur.cls.xml)	(revision 33279)
@@ -35,7 +35,7 @@
 <Method name="ControleerWinkelkar">
 <FormalSpec>Winkelkar:DOM.EC.Winkelkar.Winkelkar</FormalSpec>
 <Implementation><![CDATA[
-	#dim WinkelkarService As APPS.EC.Winkelkar.impl.WinkelkarService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService()
+	#dim WinkelkarService As APPS.EC.Winkelkar.impl.WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
 	
 	Set ..VerpakkingControleur = ##class(APPS.EC.Winkelkar.impl.VerpakkingControleurWinkelkarVisitor).%New()
 	Do Winkelkar.Accept(..VerpakkingControleur)
Index: vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/TestVanHoecke.cls.xml
===================================================================
diff -u -r32046 -r33279
--- vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/TestVanHoecke.cls.xml	(.../TestVanHoecke.cls.xml)	(revision 32046)
+++ vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/TestVanHoecke.cls.xml	(.../TestVanHoecke.cls.xml)	(revision 33279)
@@ -61,11 +61,12 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(aTestName)
-	#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("GeefVanHoeckeSessie",##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
-	Do ECommerceAPIMock.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceFake)
-	Do ECommerceAPIMock.IndienMethodCall("GeefWinkelkarService").DanReturn(..WinkelkarService)
+	
+	#dim ECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
+	#dim WebshopSessionServiceStub As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
+	
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefVanHoeckeSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
+	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
 		
 	#dim MailAPI As vhUnitTest.TECH.Mail.impl.MailAPIMock = ##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).MockInstance()
 ]]></Implementation>
@@ -210,7 +211,7 @@
 	Quit:( '$$$AssertEquals(Lijn.LijnID, MaatwerkLijnID))
 	
 	#dim VerwachteKenmerken As APPS.PM.Maatwerk.dto.TAORKenmerken = ##class(vhTest.Utils.APPS.PM.Maatwerk.dto.TAORKenmerken).StandaardBinnenlade()
-	Quit:( '$$$AssertTrue(Lijn.IngegevenKenmerken.%IsA(VerwachteKenmerken.%ClassName(/*fullname=*/ 1))) )
+	Quit:( '$$$AssertTrue(Lijn.IngegevenKenmerken.%IsA(VerwachteKenmerken.%ClassName(1))) )
 
 	Quit:( '$$$AssertEquals(..#AantalProductenInLijn, Lijn.Aantal))
 	Quit:( '$$$AssertTrue(Lijn.EenheidPrijs > 0) )
Index: APPS/EC/impl/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r32535 -r33279
--- APPS/EC/impl/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 32535)
+++ APPS/EC/impl/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 33279)
@@ -20,16 +20,29 @@
 <Private>1</Private>
 </Property>
 
+<Property name="WinkelkarService">
+<Type>APPS.EC.Winkelkar.WinkelkarService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Applicatie">
+<Type>APPS.common.dto.Applicatie</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>OfferteService:APPS.VKP.OfferteService</FormalSpec>
+<FormalSpec>OfferteService:APPS.VKP.OfferteService,WinkelkarService:APPS.EC.Winkelkar.WinkelkarService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..OfferteService = $$$Implementation(OfferteService,##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
-	set ..OfferteHerberekening = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening).%New()
-	set ..GeldigheidVermeldingBepaler = ##class(APPS.EC.ExterneVerkoopService.GeldigheidVermeldingBepaler).%New()
+	Set ..Applicatie = ..GeefApplicatie()
+	Set ..OfferteService = $$$Inject(OfferteService, ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
+	Set ..WinkelkarService = $$$Inject(WinkelkarService, ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New())
+	Set ..OfferteHerberekening = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening).%New()
+	Set ..GeldigheidVermeldingBepaler = ##class(APPS.EC.ExterneVerkoopService.GeldigheidVermeldingBepaler).%New()
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -58,8 +71,8 @@
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <ReturnType>APPS.EC.dto.OfferteIDEnWinkelkarID</ReturnType>
 <Implementation><![CDATA[
-	#Dim Offerte As APPS.VKP.impl.Offerte = ##class(APPS.VKP.impl.Offerte).%New(KlantID)
-	#Dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().MaakWinkelkar(..GeefApplicatie(),KlantID, PersonalityID)
+	#dim Offerte As APPS.VKP.impl.Offerte = ##class(APPS.VKP.impl.Offerte).%New(KlantID)
+	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ..WinkelkarService.MaakWinkelkar(..Applicatie, KlantID, PersonalityID)
 	
 	Set Offerte.WinkelkarID = Winkelkar.WinkelkarID
 	Set Offerte.PersonalityID = PersonalityID
@@ -125,7 +138,7 @@
 	Set OfferteIterator = ##class(TECH.ListIterator).%New(Offertes)
 	While OfferteIterator.HasNext(){
 		#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteIterator.Next())
-		#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().OpenWinkelkar(Offerte.GeefWinkelkarID())
+		#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ..WinkelkarService.OpenWinkelkar(Offerte.GeefWinkelkarID())
 		If (Winkelkar.GeefLijnIterator().HasNext() && MagOfferteInSamenvattingenBepaler.MagOfferteInSamenvattingen( Offerte ))
 		{
 			#dim OfferteSamenvatting As APPS.EC.dto.OfferteSamenvatting = ..GeefOfferteSamenvatting(Offerte)
@@ -141,9 +154,8 @@
 <Private>1</Private>
 <ReturnType>APPS.EC.dto.OfferteSamenvatting</ReturnType>
 <Implementation><![CDATA[
-	#Dim OfferteSamenvatting As APPS.EC.dto.OfferteSamenvatting = ##class(APPS.EC.dto.OfferteSamenvatting).%New()
-	#dim WinkelkarService As APPS.EC.Winkelkar.WinkelkarService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService()
-	#Dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = WinkelkarService.GeefWinkelkarSamenvatting(Offerte.GeefWinkelkarID())
+	#dim OfferteSamenvatting As APPS.EC.dto.OfferteSamenvatting = ##class(APPS.EC.dto.OfferteSamenvatting).%New()
+	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ..WinkelkarService.GeefWinkelkarSamenvatting(Offerte.GeefWinkelkarID())
 	
 	Set OfferteSamenvatting.AantalLijnen = Winkelkar.AantalProductLijnen
 	Set OfferteSamenvatting.AantalProducten = Winkelkar.AantalProducten
@@ -236,7 +248,7 @@
 <ReturnTypeParams>ELEMENTTYPE="%Date"</ReturnTypeParams>
 <Implementation><![CDATA[
 	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
-	Quit ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().GeefMogelijkeLeverdatums(Offerte.WinkelkarID)
+	Quit ..WinkelkarService.GeefMogelijkeLeverdatums(Offerte.WinkelkarID)
 ]]></Implementation>
 </Method>
 
@@ -297,9 +309,11 @@
 <Private>1</Private>
 <ReturnType>APPS.common.dto.Applicatie</ReturnType>
 <Implementation><![CDATA[
-	Set Applicatie = ##class(APPS.common.dto.Applicatie).%New()
+	#dim Applicatie As APPS.common.dto.Applicatie = ##class(APPS.common.dto.Applicatie).%New()
+	
 	Set Applicatie.Naam = "Uni_Webshop"
 	Set Applicatie.Type = ##class(APPS.common.enu.ApplicatieType).Extern()
+	
 	Quit Applicatie
 ]]></Implementation>
 </Method>
Index: vhTest/Integratie/ProductBeheer/Maatwerk/Configurator/Legrabox/GeefDefaults/Test002.cls.xml
===================================================================
diff -u -r32363 -r33279
--- vhTest/Integratie/ProductBeheer/Maatwerk/Configurator/Legrabox/GeefDefaults/Test002.cls.xml	(.../Test002.cls.xml)	(revision 32363)
+++ vhTest/Integratie/ProductBeheer/Maatwerk/Configurator/Legrabox/GeefDefaults/Test002.cls.xml	(.../Test002.cls.xml)	(revision 33279)
@@ -20,7 +20,7 @@
 <Method name="GeefOptioneleWinkelkar">
 <Private>1</Private>
 <ReturnType>APPS.EC.Winkelkar.dto.Winkelkar</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().GeefWinkelkar(..WinkelkarID)
+<Implementation><![CDATA[	Quit ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New().GeefWinkelkar(..WinkelkarID)
 ]]></Implementation>
 </Method>
 
Index: APPS/EC/impl/ExterneVerkoopService/OfferteHerberekening.cls.xml
===================================================================
diff -u -r32535 -r33279
--- APPS/EC/impl/ExterneVerkoopService/OfferteHerberekening.cls.xml	(.../OfferteHerberekening.cls.xml)	(revision 32535)
+++ APPS/EC/impl/ExterneVerkoopService/OfferteHerberekening.cls.xml	(.../OfferteHerberekening.cls.xml)	(revision 33279)
@@ -45,8 +45,9 @@
 	set ..ActieWijzigingenBepaler = $$$Implementation(ActieWijzigingenBepaler,##class(APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening.ActieWijzigingenBepaler).%New())
 	set ..RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
 	set ..OfferteService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService()
-	set ..WinkelkarService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService()
-	quit $$$OK
+	Set ..WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
+
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
Index: APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService.cls.xml
===================================================================
diff -u -r32121 -r33279
--- APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService.cls.xml	(.../PrijsBerekeningService.cls.xml)	(revision 32121)
+++ APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService.cls.xml	(.../PrijsBerekeningService.cls.xml)	(revision 33279)
@@ -33,7 +33,7 @@
 	Set ..PrijsBerekeningRepository = $$$Implementation(PrijsBerekeningRepository,##class(APPS.EDI.PrijsBerekening.impl.PrijsBerekeningRepository).%New())
 	Set ..EDIAanvraagConvertor = ##class(APPS.EDI.PrijsBerekening.impl.PrijsBerekeningService.EDIAanvraagConvertor).%New()
 	Set ..PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
-	Set ..WinkelkarService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService()
+	Set ..WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
Index: WS/EC/Winkelkar/WinkelkarService.cls.xml
===================================================================
diff -u -r32440 -r33279
--- WS/EC/Winkelkar/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 32440)
+++ WS/EC/Winkelkar/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 33279)
@@ -13,6 +13,11 @@
 <Default>http://www.vanhoecke.be/EC/Winkelkar</Default>
 </Parameter>
 
+<Property name="WinkelkarService">
+<Type>APPS.EC.Winkelkar.WinkelkarService</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Utils">
 <Type>APPS.EC.Winkelkar.impl.WinkelkarServiceUtils</Type>
 <Private>1</Private>
@@ -24,6 +29,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
 	Set ..Utils = ##class(APPS.EC.Winkelkar.impl.WinkelkarServiceUtils).%New()
 
 	Quit $$$OK
@@ -38,9 +44,9 @@
 	$$$chkRequiredParameter(WinkelkarID)
 
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetWinkelkar(WinkelkarID)
+
+	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ..WinkelkarService.GeefWinkelkar(WinkelkarID)
 	
-	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().GeefWinkelkar(WinkelkarID)
-	
 	Do ..Utils.CorrigeerWinkelkar(Winkelkar)
 	
 	Quit Winkelkar
@@ -62,7 +68,7 @@
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetKlant(KlantID)
 	
 	#dim PartijID As DOM.common.PartijID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KlantID)
-	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().MaakWinkelkar(Applicatie, PartijID,..GeefPersonalityID())
+	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ..WinkelkarService.MaakWinkelkar(Applicatie, PartijID,..GeefPersonalityID())
 
 	Do ..Utils.CorrigeerWinkelkar(Winkelkar)
 	
@@ -80,7 +86,7 @@
 
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetWinkelkar(WinkelkarID)
 	
-	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().VerwijderLijn(WinkelkarID, LijnID)
+	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ..WinkelkarService.VerwijderLijn(WinkelkarID, LijnID)
 		
 	Do ..Utils.CorrigeerWinkelkar(Winkelkar)
 	
@@ -102,7 +108,7 @@
 	
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetWinkelkar(WinkelkarID)
 	
-	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().VoegToeMaatwerkEnGeefWinkelkarTerug(WinkelkarID, GroepNaam, IngegevenKenmerken, Aantal, .ProjectReferentie)
+	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ..WinkelkarService.VoegToeMaatwerkEnGeefWinkelkarTerug(WinkelkarID, GroepNaam, IngegevenKenmerken, Aantal, .ProjectReferentie)
 		
 	Do ..Utils.CorrigeerWinkelkar(Winkelkar)
 	
@@ -122,7 +128,7 @@
 	$$$chkValidateObject(IngegevenKenmerken)
 
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetWinkelkar(WinkelkarID)
-	Quit ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().VoegToeMaatwerk(WinkelkarID, GroepNaam, IngegevenKenmerken, Aantal, .ProjectReferentie)
+	Quit ..WinkelkarService.VoegToeMaatwerk(WinkelkarID, GroepNaam, IngegevenKenmerken, Aantal, .ProjectReferentie)
 ]]></Implementation>
 </Method>
 
@@ -133,7 +139,7 @@
 	$$$chkRequiredParameter(WinkelkarID)
 
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetWinkelkar(WinkelkarID)
-	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().WisWinkelkar(WinkelkarID)
+	Do ..WinkelkarService.WisWinkelkar(WinkelkarID)
 ]]></Implementation>
 </Method>
 
@@ -146,7 +152,7 @@
 	
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetWinkelkar(WinkelkarID)
 	
-	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().MaakLeegWinkelkar(WinkelkarID)
+	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ..WinkelkarService.MaakLeegWinkelkar(WinkelkarID)
 			
 	Do ..Utils.CorrigeerWinkelkar(Winkelkar)
 	
@@ -164,7 +170,7 @@
 	
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetWinkelkar(WinkelkarID)
 	
-	#dim Lijn As APPS.EC.Winkelkar.dto.Lijn = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().GeefLijn(WinkelkarID, LijnID)
+	#dim Lijn As APPS.EC.Winkelkar.dto.Lijn = ..WinkelkarService.GeefLijn(WinkelkarID, LijnID)
 	
 	Do ..Utils.CorrigeerLijn(Lijn)
 	
@@ -182,7 +188,7 @@
 
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetWinkelkar(WinkelkarID)
 	
-	#dim Lijn As APPS.EC.Winkelkar.dto.Lijn = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().DupliceerLijn(WinkelkarID, LijnID)
+	#dim Lijn As APPS.EC.Winkelkar.dto.Lijn = ..WinkelkarService.DupliceerLijn(WinkelkarID, LijnID)
 	
 	Do ..Utils.CorrigeerLijn(Lijn)
 	
@@ -199,7 +205,7 @@
 	$$$chkRequiredParameter(Aantal)
 
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetWinkelkar(WinkelkarID)
-	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().WijzigLijnAantal(WinkelkarID, LijnID, Aantal)
+	Do ..WinkelkarService.WijzigLijnAantal(WinkelkarID, LijnID, Aantal)
 ]]></Implementation>
 </Method>
 
@@ -216,7 +222,7 @@
 	$$$chkValidateObject(IngegevenKenmerken)
 
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetWinkelkar(WinkelkarID)
-	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().WijzigMaatwerkLijn(WinkelkarID, LijnID, IngegevenKenmerken, Aantal, GroepNaam, ProjectReferentie)
+	Do ..WinkelkarService.WijzigMaatwerkLijn(WinkelkarID, LijnID, IngegevenKenmerken, Aantal, GroepNaam, ProjectReferentie)
 ]]></Implementation>
 </Method>
 
@@ -228,7 +234,7 @@
 	$$$chkRequiredParameter(LijnID)
 	
 	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetWinkelkar(WinkelkarID)
-	Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().WijzigLijnProjectReferentie(WinkelkarID, LijnID, NieuweProjectReferentie)
+	Do ..WinkelkarService.WijzigLijnProjectReferentie(WinkelkarID, LijnID, NieuweProjectReferentie)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/WS/EC/TestInterneWinkelkarService.cls.xml
===================================================================
diff -u -r30029 -r33279
--- vhUnitTest/WS/EC/TestInterneWinkelkarService.cls.xml	(.../TestInterneWinkelkarService.cls.xml)	(revision 30029)
+++ vhUnitTest/WS/EC/TestInterneWinkelkarService.cls.xml	(.../TestInterneWinkelkarService.cls.xml)	(revision 33279)
@@ -23,14 +23,13 @@
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	do ##super(aTestName)
+	Do ##super(aTestName)
 	
-	#dim ECommerceAPIMock As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
-	#dim WebshopSessionServiceFake As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
+	#dim ECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
+	#dim WebshopSessionServiceStub As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	
-	do WebshopSessionServiceFake.IndienMethodCall("GeefVanHoeckeSessie",##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
-	do ECommerceAPIMock.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceFake)
-	do ECommerceAPIMock.IndienMethodCall("GeefWinkelkarService").DanReturn(##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New())
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefVanHoeckeSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
+	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/EC/ExterneVerkoopService/Base.cls.xml
===================================================================
diff -u -r31022 -r33279
--- vhUnitTest/APPS/EC/ExterneVerkoopService/Base.cls.xml	(.../Base.cls.xml)	(revision 31022)
+++ vhUnitTest/APPS/EC/ExterneVerkoopService/Base.cls.xml	(.../Base.cls.xml)	(revision 33279)
@@ -142,17 +142,17 @@
 <Implementation><![CDATA[
 	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
 
-	#dim ECommerceAPIMock As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
-	Do ECommerceAPIMock.IndienMethodCall("GeefWinkelkarService").DanReturn(##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New())
+	#dim ECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
+	#dim WebshopSessionServiceStub As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
+	
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefWebshopModus").DanReturn(##class(APPS.EC.enu.WebshopModus).Normaal())
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefVanHoeckeSessie", $$$DummySessieID).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefSFSSessie", "").DanReturn(##class(APPS.EC.impl.SFSWebshopSessie).%New($$$DummyString))
+	Do WebshopSessionServiceStub.IndienMethodCall("BestaatWebshopSessie", $$$DummySessieID).DanReturn(1)
+	
+	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
 
-	Set WebshopSessionServiceFake = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
-	Do WebshopSessionServiceFake.IndienMethodCall("GeefWebshopModus").DanReturn(##class(APPS.EC.enu.WebshopModus).Normaal())
-	Do WebshopSessionServiceFake.IndienMethodCall("GeefVanHoeckeSessie",$$$DummySessieID).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
-	Do WebshopSessionServiceFake.IndienMethodCall("GeefSFSSessie","").DanReturn(##class(APPS.EC.impl.SFSWebshopSessie).%New($$$DummyString))
-	Do WebshopSessionServiceFake.IndienMethodCall("BestaatWebshopSessie",$$$DummySessieID).DanReturn(1)
-	Do ECommerceAPIMock.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceFake)
-
-	Do ..SetupMockKlantInstellingService(ECommerceAPIMock)
+	Do ..SetupMockKlantInstellingService(ECommerceAPIStub)
 ]]></Implementation>
 </Method>
 
Index: APPS/VKP/VerkoopService.cls.xml
===================================================================
diff -u -r29059 -r33279
--- APPS/VKP/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 29059)
+++ APPS/VKP/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 33279)
@@ -7,11 +7,11 @@
 <FormalSpec>WinkelkarID:%String,Kenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken,LijnIDIndienBestaandeLijn:%String=""</FormalSpec>
 <ReturnType>APPS.VKP.dto.MaatwerkIngaveEvaluatie</ReturnType>
 <Implementation><![CDATA[
-	Set MaatwerkIngaveEvaluatie = ##class(APPS.VKP.dto.MaatwerkIngaveEvaluatie).%New()		
+	#dim MaatwerkIngaveEvaluatie As APPS.VKP.dto.MaatwerkIngaveEvaluatie = ##class(APPS.VKP.dto.MaatwerkIngaveEvaluatie).%New()		
 	#dim ConfiguratorService As APPS.VKP.Maatwerk.ConfiguratorService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefMaatwerkConfiguratorService()
-	Set WinkelkarService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService()
-	
+	#dim WinkelkarService As APPS.EC.Winkelkar.WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()	
 	#dim WinkelKar As APPS.EC.Winkelkar.dto.Winkelkar = WinkelkarService.GeefWinkelkar(WinkelkarID)
+	
 	Set MaatwerkIngaveEvaluatie.KenmerkMogelijkheden = ConfiguratorService.GeefKenmerkMogelijkheden(Kenmerken,WinkelKar.KlantID)
 	Set MaatwerkIngaveEvaluatie.Winkelkar = WinkelkarService.GeefWinkelkarInclusiefBewerkteIngaveGroeperingGewijzigd(WinkelkarID, Kenmerken,LijnIDIndienBestaandeLijn)
 		
Index: APPS/EC/impl/ECommerceAPI.cls.xml
===================================================================
diff -u -r29059 -r33279
--- APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 29059)
+++ APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 33279)
@@ -3,12 +3,6 @@
 <Class name="APPS.EC.impl.ECommerceAPI">
 <Super>TECH.RegisteredObject,APPS.EC.ECommerceAPI</Super>
 
-<Method name="GeefWinkelkarService">
-<ReturnType>APPS.EC.Winkelkar.impl.WinkelkarService</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
-]]></Implementation>
-</Method>
-
 <Method name="GeefInterneConfiguratorService">
 <ReturnType>APPS.EC.InterneConfiguratorService</ReturnType>
 <Implementation><![CDATA[	quit ##class(APPS.EC.impl.ConfiguratorService.InterneConfiguratorService).%New()
Index: APPS/EC/Winkelkar/impl/WinkelkarService/MagMaatwerklijnGewijzigdWorden.cls.xml
===================================================================
diff -u -r30089 -r33279
--- APPS/EC/Winkelkar/impl/WinkelkarService/MagMaatwerklijnGewijzigdWorden.cls.xml	(.../MagMaatwerklijnGewijzigdWorden.cls.xml)	(revision 30089)
+++ APPS/EC/Winkelkar/impl/WinkelkarService/MagMaatwerklijnGewijzigdWorden.cls.xml	(.../MagMaatwerklijnGewijzigdWorden.cls.xml)	(revision 33279)
@@ -20,8 +20,9 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..WinkelkarService = $$$Implementation(WinkelkarService,##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService())
-	set ..DocumentServiceFactory = $$$Implementation(DocumentServiceFactory,##class(APPS.VKP.impl.DocumentServiceFactory).%New())
+	Set ..WinkelkarService = $$$Inject(WinkelkarService, ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New())
+	Set ..DocumentServiceFactory = $$$Inject(DocumentServiceFactory, ##class(APPS.VKP.impl.DocumentServiceFactory).%New())
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: APPS/EC/InterneVerkoopService.cls.xml
===================================================================
diff -u -r29059 -r33279
--- APPS/EC/InterneVerkoopService.cls.xml	(.../InterneVerkoopService.cls.xml)	(revision 29059)
+++ APPS/EC/InterneVerkoopService.cls.xml	(.../InterneVerkoopService.cls.xml)	(revision 33279)
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EC.InterneVerkoopService">
-<Super>%RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Method name="AnnuleerIngaveIntern">
 <FormalSpec>Applicatie:APPS.common.dto.Applicatie,WinkelkarID:%String,ParameterID:%String</FormalSpec>
 <Implementation><![CDATA[
 	#dim OperatieScope As TECH.OperatieScope = ##class(TECH.OperatieScope).StartMetTx()
-	Try{
+	Try {
 		#dim Parameters As APPS.VKP.Maatwerk.impl.ConfiguratorParameters = ..OpenParameters(ParameterID)
 	
-		If ('Parameters.%Extends("APPS.VKP.Maatwerk.impl.AdminSessieParameters"))
-		{
+		If $$$Not(Parameters.%Extends("APPS.VKP.Maatwerk.impl.AdminSessieParameters")) {
 			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Niet AdminSessieParameters kunnen niet geannuleerd worden. ParameterID: "_ParameterID))
 		}
 		
-		If ('##class(APPS.VKP.Maatwerk.impl.BesteldeProducten).%ExistsId(Parameters.GeefDocumentType()_"||"_Parameters.GeefDocumentID()))
-		{
+		If $$$Not(##class(APPS.VKP.Maatwerk.impl.BesteldeProducten).%ExistsId(Parameters.GeefDocumentType() _ "||" _ Parameters.GeefDocumentID())) {
 			Set BesteldeProducten = ##class(APPS.VKP.Maatwerk.impl.BesteldeProducten).%New(Parameters.GeefDocumentType(), Parameters.GeefDocumentID())
-			Set Status = BesteldeProducten.%Save()
-			If ($$$ISERR(Status))
-			{
+			#dim Status As %Status = BesteldeProducten.%Save()
+			If ($$$ISERR(Status)) {
 				Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).SaveFailed(),"De nodige interne afhandeling konden niet worden uitgevoerd",Status))
 			}
 		}
 		
 		Do Parameters.Delete()
-	
-		Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().MaakLeegWinkelkar(WinkelkarID)
+		
+		#dim WinkelkarService As APPS.EC.Winkelkar.WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
+		
+		Do WinkelkarService.MaakLeegWinkelkar(WinkelkarID)
 		Do OperatieScope.Gelukt()
-	}Catch(E){
+	} Catch {
 		Do OperatieScope.Gefaald()
 		Do ##class(APPS.common.ErrorHandling.ErrorHandler).LogEnRethrow()
 	}
+
 	Quit
 ]]></Implementation>
 </Method>
Index: APPS/EC/Winkelkar/impl/WinkelkarService.cls.xml
===================================================================
diff -u -r32438 -r33279
--- APPS/EC/Winkelkar/impl/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 32438)
+++ APPS/EC/Winkelkar/impl/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 33279)
@@ -244,8 +244,8 @@
 <ReturnType>%ListOfDataTypes</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="%Date"</ReturnTypeParams>
 <Implementation><![CDATA[
-	#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().OpenWinkelkar(WinkelkarID)
-	Set Bepaler = ##class(APPS.EC.impl.VroegsteLeverdatumBepaler).%New(Winkelkar)
+	#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ..OpenWinkelkar(WinkelkarID)
+	#dim Bepaler As APPS.EC.impl.VroegsteLeverdatumBepaler = ##class(APPS.EC.impl.VroegsteLeverdatumBepaler).%New(Winkelkar)
 	#dim LeveringTermijn As APPS.VKP.LeveringsTermijn = ##class(APPS.EC.impl.Utils).GeefLeveringTermijn(Winkelkar)
 	
 	Quit ##class(TECH.ListUtils).ListbuildToList(LeveringTermijn.GetLeverDatums(Bepaler.GeefVroegsteLeverdatum()))
@@ -257,12 +257,11 @@
 <ReturnType>APPS.EC.Winkelkar.dto.Lijn</ReturnType>
 <Implementation><![CDATA[
 	#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ..OpenWinkelkar(WinkelkarID)	
-	#dim Lijn As DOM.EC.Winkelkar.Lijn = ..GeefWinkelkarLijn(Winkelkar, LijnID)
-	
+	#dim Lijn As DOM.EC.Winkelkar.Lijn = ..GeefWinkelkarLijn(Winkelkar, LijnID)	
 	#dim WinkelkarDto As APPS.EC.Winkelkar.dto.Winkelkar = ##class(APPS.EC.Winkelkar.dto.Winkelkar).%New()
 	Set WinkelkarDto.Klant = ##class(APPS.ApplicatieContext).Instance().GeefCommonAPI().GeefDataService().GeefKlantData(Winkelkar.GeefKlantID())
 	#dim LijnNaarDtoVisitor As APPS.EC.Winkelkar.impl.LijnNaarDtoVisitor = ##class(APPS.EC.Winkelkar.impl.LijnNaarDtoVisitor).%New(WinkelkarDto,Winkelkar.GeefApplicatieType())
-
+	
 	Do Lijn.Accept(LijnNaarDtoVisitor)
 	
 	Quit WinkelkarDto.Lijnen.GetNext()
@@ -355,8 +354,7 @@
 	#dim VolledigeOmschrijving As %Stream = ##class(%GlobalCharacterStream).%New()
 	#dim DataService As APPS.common.DataService = ##class(APPS.ApplicatieContext).Instance().GeefCommonAPI().GeefDataService(Winkelkar.GeefPersonalityID())
 	#dim KlantData As DOM.common.dto.KlantData = DataService.GeefKlantData(Winkelkar.GeefKlantID())
-	#dim WinkelkarService As APPS.EC.Winkelkar.WinkelkarService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService()
-	#dim WinkelkarParent As APPS.EC.Winkelkar.Parent = WinkelkarService.GeefParent(Winkelkar.GeefID())
+	#dim WinkelkarParent As APPS.EC.Winkelkar.Parent = ..GeefParent(Winkelkar.GeefID())
 	
 	Do VolledigeOmschrijving.WriteLine("Klant : "_KlantData.Naam_" ("_Winkelkar.GeefKlantID()_")")
 	If WinkelkarParent.ID '= "" {
Index: vhUnitTest/APPS/VKP/TestVerkoopService.cls.xml
===================================================================
diff -u -r31022 -r33279
--- vhUnitTest/APPS/VKP/TestVerkoopService.cls.xml	(.../TestVerkoopService.cls.xml)	(revision 31022)
+++ vhUnitTest/APPS/VKP/TestVerkoopService.cls.xml	(.../TestVerkoopService.cls.xml)	(revision 33279)
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.APPS.VKP.TestVerkoopService">
-<Description>
-Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.VKP.TestVerkoopService")</Description>
 <Super>vhUnitTest.TestCase</Super>
 
 <Property name="WinkelkarService">
-<Type>APPS.EC.Winkelkar.impl.WinkelkarService</Type>
+<Type>APPS.EC.Winkelkar.WinkelkarService</Type>
 </Property>
 
-<Method name="TestEvalueerMaatwerkIngaveNieuweLijn">
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	Set VerkoopService = ##class(APPS.VKP.VerkoopService).%New()
+	Do ##super(aTestName)
 	
+	#dim VanHoeckeWebshopSessie As APPS.EC.impl.VanHoeckeWebshopSessie = ##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString)
+	#dim WebshopSessionServiceStub = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
+	#dim ECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
+	
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefVanHoeckeSessie",##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(VanHoeckeWebshopSessie)		
+	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
+	
+	Set ..WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
+	
+	Do ##class(TECH.Context.RuntimeContext).Instance().ZetTaal(##class(DOM.enu.Taal).Nederlands())
+]]></Implementation>
+</Method>
+
+<Method name="TestEvalueerMaatwerkIngaveNieuweLijn">
+<Implementation><![CDATA[
+	#dim VerkoopService As APPS.VKP.VerkoopService = ##class(APPS.VKP.VerkoopService).%New()
 	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ..MaakWinkelkar()
 		
 	Do $$$AssertEquals(Winkelkar.Lijnen.Count(),0)
@@ -76,23 +91,6 @@
 	Quit Applicatie
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	Set VanHoeckeWebshopSessie = ##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString)
-	
-	#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("GeefVanHoeckeSessie",##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(VanHoeckeWebshopSessie)
-	Do ECommerceAPIMock.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceFake)
-	Do ECommerceAPIMock.IndienMethodCall("GeefWinkelkarService").DanReturn(##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New())
-	
-	Set ..WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
-	Do ##class(TECH.Context.RuntimeContext).Instance().ZetTaal(##class(DOM.enu.Taal).Nederlands())
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: APPS/EC/Winkelkar/WinkelkarService/impl/MeerdereMaatwerkLijnenAanpasser.cls.xml
===================================================================
diff -u -r29059 -r33279
--- APPS/EC/Winkelkar/WinkelkarService/impl/MeerdereMaatwerkLijnenAanpasser.cls.xml	(.../MeerdereMaatwerkLijnenAanpasser.cls.xml)	(revision 29059)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/MeerdereMaatwerkLijnenAanpasser.cls.xml	(.../MeerdereMaatwerkLijnenAanpasser.cls.xml)	(revision 33279)
@@ -17,8 +17,9 @@
 <FormalSpec>WinkelkarID:%String,MaatwerkLijnIngegevenKenmerkenLijst:%ListOfObjects(ELEMENTTYPE="APPS.EC.Winkelkar.WinkelkarService.dto.MaatwerkLijnIngegevenKenmerken")</FormalSpec>
 <ReturnType>APPS.EC.Winkelkar.dto.Winkelkar</ReturnType>
 <Implementation><![CDATA[
-	Set ..WinkelkarService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService()
+	Set ..WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
 	Set ..Winkelkar = ..WinkelkarService.OpenWinkelkar(WinkelkarID)
+	
 	Set MaatwerkLijnIngegevenKenmerkenLijstIt = ##class(TECH.ListIterator).%New(MaatwerkLijnIngegevenKenmerkenLijst)
 	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar
 	While MaatwerkLijnIngegevenKenmerkenLijstIt.HasNext() {
Index: APPS/VKP/impl/Offerte.cls.xml
===================================================================
diff -u -r31796 -r33279
--- APPS/VKP/impl/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 31796)
+++ APPS/VKP/impl/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 33279)
@@ -126,16 +126,20 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim PersonalityID As String
+	
 	If $Length(..PersonalityID) {
 		Set PersonalityID = ..PersonalityID
 	} Else {
 		Set PersonalityID = ""
-		if $length(..WinkelkarID) {
-			#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().GeefWinkelkar(..WinkelkarID)
+		
+		If $Length(..WinkelkarID) {
+			#dim WinkelkarService As APPS.EC.Winkelkar.WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
+			#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = WinkelkarService.GeefWinkelkar(..WinkelkarID)
 			Set PersonalityID = Winkelkar.Personality.ID
 		}
 	}
-	quit PersonalityID
+	
+	Quit PersonalityID
 ]]></Implementation>
 </Method>
 
Index: APPS/EC/ECommerceAPI.cls.xml
===================================================================
diff -u -r29059 -r33279
--- APPS/EC/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 29059)
+++ APPS/EC/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 33279)
@@ -4,12 +4,6 @@
 <Abstract>1</Abstract>
 <Super>TECH.Interface</Super>
 
-<Method name="GeefWinkelkarService">
-<Abstract>1</Abstract>
-<ReturnType>APPS.EC.Winkelkar.impl.WinkelkarService</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
-</Method>
-
 <Method name="GeefWebshopConfiguratorService">
 <Abstract>1</Abstract>
 <ReturnType>APPS.EC.WebshopConfiguratorService</ReturnType>
Index: vhTest/Mock/APPS/EC/ECommerceAPI.cls.xml
===================================================================
diff -u -r29059 -r33279
--- vhTest/Mock/APPS/EC/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 29059)
+++ vhTest/Mock/APPS/EC/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 33279)
@@ -90,12 +90,6 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefWebshopSessionService")
 ]]></Implementation>
 </Method>
-
-<Method name="GeefWinkelkarService">
-<ReturnType>APPS.EC.Winkelkar.impl.WinkelkarService</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefWinkelkarService")
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: CHUI/Flow/ConfiguratorHelper.cls.xml
===================================================================
diff -u -r29059 -r33279
--- CHUI/Flow/ConfiguratorHelper.cls.xml	(.../ConfiguratorHelper.cls.xml)	(revision 29059)
+++ CHUI/Flow/ConfiguratorHelper.cls.xml	(.../ConfiguratorHelper.cls.xml)	(revision 33279)
@@ -24,15 +24,17 @@
 	Set Parameters = ""
 	Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
 	#dim Product As DOM.PM.MaatwerkProduct = ProductAPI.GeefProduct(PRNr)
-	If (Product.%Extends("DOM.PM.MaatwerkProduct"))
-	{
+	
+	If (Product.%Extends("DOM.PM.MaatwerkProduct")) {
 		Set Familie = Product.GeefFamilie()
 		Set Variant = Product.GeefVariant()
 		Set Applicatie = ##class(APPS.common.dto.Applicatie).%New()
 		Set Applicatie.Type = ##class(APPS.common.enu.ApplicatieType).Intern()
 		Set Applicatie.Naam = ..#ApplicatieID
-		Set WinkelkarService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService()
+		
+		#dim WinkelkarService As APPS.EC.Winkelkar.WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
 		#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = WinkelkarService.MaakWinkelkar(Applicatie, KlantID)
+		
 		Set IngegevenKenmerkenConverter = ##class(APPS.PM.Maatwerk.impl.IngegevenKenmerkenConverter).%New()
 		#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken = Product.GeefProductSpecificatie().GeefIngegevenKenmerken()
 		#dim IngegevenKenmerkenDto As APPS.PM.Maatwerk.dto.IngegevenKenmerken = IngegevenKenmerkenConverter.NaarDataTransferObject(IngegevenKenmerken)
@@ -55,12 +57,15 @@
 	Set Applicatie = ##class(APPS.common.dto.Applicatie).%New()
 	Set Applicatie.Type = ##class(APPS.common.enu.ApplicatieType).Intern()
 	Set Applicatie.Naam = ..#ApplicatieID
-	Set WinkelkarService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService()
+	
+	#dim WinkelkarService As APPS.EC.Winkelkar.WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
 	#dim PersonalityID As %String = ##class(DOM.common.enu.Personality).VanHoecke()
 	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = WinkelkarService.MaakWinkelkar(Applicatie, KlantID,PersonalityID)
 	#dim Gebruiker As DOM.common.Gebruiker = ##class(DOM.DomeinContext).Instance().GeefGebruikerAPI().GeefVanHoeckeGebruikerBeheerder().GeefGebruiker($$USERID^vhUSER)
+	
 	Set Parameters = ##class(APPS.VKP.Maatwerk.impl.ProductToevoegenParameters).%New(KlantID,Gebruiker.GeefID(),Winkelkar.WinkelkarID,DocumentType,DocumentId)
  	Do Parameters.Save()
+ 	
  	Quit Parameters
 ]]></Implementation>
 </Method>
Index: vhTest/Fake/APPS/EC/Winkelkar/impl/WinkelkarService/MagMaatwerklijnGewijzigdWorden.cls.xml
===================================================================
diff -u -r30089 -r33279
--- vhTest/Fake/APPS/EC/Winkelkar/impl/WinkelkarService/MagMaatwerklijnGewijzigdWorden.cls.xml	(.../MagMaatwerklijnGewijzigdWorden.cls.xml)	(revision 30089)
+++ vhTest/Fake/APPS/EC/Winkelkar/impl/WinkelkarService/MagMaatwerklijnGewijzigdWorden.cls.xml	(.../MagMaatwerklijnGewijzigdWorden.cls.xml)	(revision 33279)
@@ -16,8 +16,7 @@
 
 <Method name="Valideer">
 <FormalSpec>WinkelkarID:%String,LijnID:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/Base.cls.xml
===================================================================
diff -u -r30400 -r33279
--- vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/Base.cls.xml	(.../Base.cls.xml)	(revision 30400)
+++ vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/Base.cls.xml	(.../Base.cls.xml)	(revision 33279)
@@ -38,12 +38,11 @@
 	do ##super(aTestName)
 	
 	#dim MailAPI As vhUnitTest.TECH.Mail.impl.MailAPIMock = ##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).MockInstance()
-	#dim ECommerceAPIMock As APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
-	#dim WebshopSessionServiceFake As APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
+	#dim ECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
+	#dim WebshopSessionServiceStub As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	
-	do WebshopSessionServiceFake.IndienMethodCall("GeefVanHoeckeSessie",##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
-	do ECommerceAPIMock.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceFake)
-	do ECommerceAPIMock.IndienMethodCall("GeefWinkelkarService").DanReturn(..WinkelkarService)
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefVanHoeckeSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
+	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/EC/impl/ExterneVerkoopService/GeefOfferteSamenvattingenVoorKlant/Base.cls.xml
===================================================================
diff -u -r32131 -r33279
--- vhUnitTest/APPS/EC/impl/ExterneVerkoopService/GeefOfferteSamenvattingenVoorKlant/Base.cls.xml	(.../Base.cls.xml)	(revision 32131)
+++ vhUnitTest/APPS/EC/impl/ExterneVerkoopService/GeefOfferteSamenvattingenVoorKlant/Base.cls.xml	(.../Base.cls.xml)	(revision 33279)
@@ -94,36 +94,42 @@
 	Do OfferteServiceStub.IndienMethodCall("GeefOfferte", FakeOfferte.GeefID()).DanReturn(FakeOfferte)
 	Do OfferteServiceStub.IndienMethodCall("HeeftOfferteVanHandel", FakeOfferte).DanReturn(0)
 	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanHandel", FakeOfferte).DanReturn("")
+
+
+	#dim DOMWinkelkarServiceStub As vhTest.Mock.DOM.EC.Winkelkar.WinkelkarService = ##class(vhTest.Mock.DOM.EC.Winkelkar.WinkelkarService).%New()
+	Do DOMWinkelkarServiceStub.IndienMethodCall("GeefWinkelkar", "DummyWinkelkarID").DanReturn(WinkelkarStub)
 	
-	Set ..ExterneVerkoopService = ##class(APPS.EC.impl.ExterneVerkoopService).%New(OfferteServiceStub)
-	
-	#dim DOMECommerceAPIMock As vhTest.Mock.DOM.EC.ECommerceAPI = ##class(vhTest.Mock.DOM.EC.ECommerceAPI).MockInstance()
-	Set WinkelkarServiceStub = ##class(vhTest.Mock.DOM.EC.Winkelkar.WinkelkarService).%New()
-	Do WinkelkarServiceStub.IndienMethodCall("GeefWinkelkar", "DummyWinkelkarID").DanReturn(WinkelkarStub)
-	Do DOMECommerceAPIMock.IndienMethodCall("GeefWinkelkarService").DanReturn(WinkelkarServiceStub)
-	
-	#dim APPSECommerceAPIMock As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()
-	Set WinkelkarServiceStub = ##class(vhTest.Mock.APPS.EC.Winkelkar.WinkelkarService).%New()
-	Set WinkelkarDummyDto = ##class(APPS.EC.Winkelkar.dto.Winkelkar).%New()
-	Set WinkelkarDummyDto.AantalProductLijnen = 1
-	Set WinkelkarDummyDto.AantalProducten = 1
-	Set WinkelkarDummyDto.TotaalPrijs = ..#TotaalPrijs
-	Set OfferteSelectieCriteriaBepaler = ##class(vhTest.Mock.APPS.EC.OfferteSelectieCriteriaBepaler).%New()
-	Do OfferteSelectieCriteriaBepaler.IndienMethodCall("BepaalSelectieCriteria", ..#KlantID).DanReturn(SelectieCriteria)
-	Do APPSECommerceAPIMock.IndienMethodCall("GeefOfferteSelectieCriteriaBepaler").DanReturn(OfferteSelectieCriteriaBepaler)
-	Do WinkelkarServiceStub.IndienMethodCall("GeefWinkelkarSamenvatting", "DummyWinkelkarID").DanReturn(WinkelkarDummyDto)
-	Do WinkelkarServiceStub.IndienMethodCall("OpenWinkelkar", "DummyWinkelkarID").DanReturn(WinkelkarStub)
-	Do APPSECommerceAPIMock.IndienMethodCall("GeefWinkelkarService").DanReturn(WinkelkarServiceStub)
-	Set KlantDataReferentieBepalerStub = ##class(vhTest.Mock.APPS.EC.KlantDataReferentieBepaler).%New()
+	#dim DOMECommerceAPIStub As vhTest.Mock.DOM.EC.ECommerceAPI = ##class(vhTest.Mock.DOM.EC.ECommerceAPI).MockInstance()
+	Do DOMECommerceAPIStub.IndienMethodCall("GeefWinkelkarService").DanReturn(DOMWinkelkarServiceStub)
+
+	#dim WinkelkarDummy As APPS.EC.Winkelkar.dto.Winkelkar = ##class(APPS.EC.Winkelkar.dto.Winkelkar).%New()
+	Set WinkelkarDummy.AantalProductLijnen = 1
+	Set WinkelkarDummy.AantalProducten = 1
+	Set WinkelkarDummy.TotaalPrijs = ..#TotaalPrijs
+
+	#dim KlantDataReferentieBepalerStub As vhTest.Mock.APPS.EC.KlantDataReferentieBepaler = ##class(vhTest.Mock.APPS.EC.KlantDataReferentieBepaler).%New()
 	Do KlantDataReferentieBepalerStub.IndienMethodCall("GeefKlantDataReferentie", FakeOfferte).DanReturn($$$DummyString)
-	Do APPSECommerceAPIMock.IndienMethodCall("GeefKlantDataReferentieBepaler").DanReturn(KlantDataReferentieBepalerStub)
-	Do APPSECommerceAPIMock.IndienMethodCall("GeefWebshopSessionService").DanReturn(##class(APPS.EC.impl.WebshopSessionService).%New())
-	Set MagOfferteInSamenvattingenBepalerStub = ##class(vhTest.Mock.APPS.EC.MagOfferteInSamenvattingenBepaler).%New()
+
+	#dim MagOfferteInSamenvattingenBepalerStub As vhTest.Mock.APPS.EC.MagOfferteInSamenvattingenBepaler = ##class(vhTest.Mock.APPS.EC.MagOfferteInSamenvattingenBepaler).%New()
 	Do MagOfferteInSamenvattingenBepalerStub.IndienMethodCall("MagOfferteInSamenvattingen", FakeOfferte).DanReturn($$$True)
-	Do APPSECommerceAPIMock.IndienMethodCall("GeefMagOfferteInSamenvattingenBepaler").DanReturn(MagOfferteInSamenvattingenBepalerStub)
+		
+	#dim OfferteSelectieCriteriaBepalerStub As vhTest.Mock.APPS.EC.OfferteSelectieCriteriaBepaler = ##class(vhTest.Mock.APPS.EC.OfferteSelectieCriteriaBepaler).%New()
+	Do OfferteSelectieCriteriaBepalerStub.IndienMethodCall("BepaalSelectieCriteria", ..#KlantID).DanReturn(SelectieCriteria)
 	
+	#dim APPSECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()
+	Do APPSECommerceAPIStub.IndienMethodCall("GeefOfferteSelectieCriteriaBepaler").DanReturn(OfferteSelectieCriteriaBepalerStub)
+	Do APPSECommerceAPIStub.IndienMethodCall("GeefKlantDataReferentieBepaler").DanReturn(KlantDataReferentieBepalerStub)
+	Do APPSECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(##class(APPS.EC.impl.WebshopSessionService).%New())
+	Do APPSECommerceAPIStub.IndienMethodCall("GeefMagOfferteInSamenvattingenBepaler").DanReturn(MagOfferteInSamenvattingenBepalerStub)
+	
 	#dim VerkoopAPIMock As vhTest.Mock.APPS.VKP.VerkoopAPI = ##class(vhTest.Mock.APPS.VKP.VerkoopAPI).MockInstance()
 	Do VerkoopAPIMock.IndienMethodCall("GeefOfferteService").DanReturn(OfferteServiceStub)
+	
+	#dim APPSWinkelkarServiceStub As vhTest.Mock.APPS.EC.Winkelkar.WinkelkarService = ##class(vhTest.Mock.APPS.EC.Winkelkar.WinkelkarService).%New()
+	Do APPSWinkelkarServiceStub.IndienMethodCall("GeefWinkelkarSamenvatting", "DummyWinkelkarID").DanReturn(WinkelkarDummy)
+	Do APPSWinkelkarServiceStub.IndienMethodCall("OpenWinkelkar", "DummyWinkelkarID").DanReturn(WinkelkarStub)
+	
+	Set ..ExterneVerkoopService = ##class(APPS.EC.impl.ExterneVerkoopService).%New(OfferteServiceStub, APPSWinkelkarServiceStub)
 ]]></Implementation>
 </Method>