Index: vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/GeefParent/Test.cls.xml
===================================================================
diff -u -r29059 -r37587
--- vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/GeefParent/Test.cls.xml	(.../Test.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/GeefParent/Test.cls.xml	(.../Test.cls.xml)	(revision 37587)
@@ -3,24 +3,11 @@
 <Class name="vhUnitTest.APPS.EC.Winkelkar.impl.WinkelkarService.GeefParent.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="WinkelkarService">
-<Type>DOM.EC.Winkelkar.WinkelkarService</Type>
-<Private>1</Private>
-</Property>
-
 <Parameter name="DummyWinkelkarID">
 <Type>%String</Type>
 <Default>123</Default>
 </Parameter>
 
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##Super(aTestName)
-	set ..WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New()
-]]></Implementation>
-</Method>
-
 <Method name="TestOfferte">
 <Implementation><![CDATA[
 	#dim OfferteID As %String = $$$DummyString
@@ -38,10 +25,12 @@
 <Method name="AssertGeefParent">
 <FormalSpec>OfferteID:%String,Type:APPS.EC.Winkelkar.enu.ParentType</FormalSpec>
 <Implementation><![CDATA[
-	#dim Query As %String =  "SELECT ID FROM  APPS_VKP_impl.Offerte WHERE WinkelkarID = ?"
-	#dim QueryAPI As vhTest.Mock.TECH.Query.QueryAPI = ##class(vhTest.Mock.TECH.Query.QueryAPI).MockInstance()
-	Do QueryAPI.IndienMethodCall("GeefIDVanEnigeOptioneleRecord",Query, $LB(..#DummyWinkelkarID), "").DanReturn(OfferteID)
-	#dim Parent As APPS.EC.Winkelkar.Parent = ..WinkelkarService.GeefParent(..#DummyWinkelkarID)
+	#dim QueryAPI As vhTest.Mock.TECH.Query.QueryAPI = ##class(vhTest.Mock.TECH.Query.QueryAPI).%New()
+	Do QueryAPI.IndienMethodCall("GeefIDVanEnigeOptioneleRecord","SELECT ID FROM  APPS_VKP_impl.Offerte WHERE WinkelkarID = ?", $LB(..#DummyWinkelkarID), "").DanReturn(OfferteID)
+	
+	set WinkelkarService = ##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New(,,,,,,,,,QueryAPI)
+	
+	#dim Parent As APPS.EC.Winkelkar.Parent = WinkelkarService.GeefParent(..#DummyWinkelkarID)
 	Do $$$AssertEquals(Parent.ID,OfferteID)
 	Do $$$AssertEquals(Parent.Type, Type)
 ]]></Implementation>
Index: APPS/EC/Winkelkar/impl/WinkelkarService.cls.xml
===================================================================
diff -u -r37586 -r37587
--- APPS/EC/Winkelkar/impl/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 37586)
+++ APPS/EC/Winkelkar/impl/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 37587)
@@ -25,6 +25,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="QueryAPI">
+<Type>TECH.Query.QueryAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="MaatwerkLijnBuilder">
 <Type>APPS.EC.Winkelkar.impl.MaatwerkLijnBuilder</Type>
 <Private>1</Private>
@@ -61,7 +66,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>MagMaatwerklijnGewijzigdWordenBepaler:APPS.EC.Winkelkar.impl.WinkelkarService.MagMaatwerklijnGewijzigdWorden,MaatwerklijnInputValidator:APPS.EC.Winkelkar.impl.WinkelkarService.MaatwerklijnInputValidator,BestelService:DOM.VKP.Maatwerk.BestelService,VroegsteLeverdatumBepaler:APPS.EC.impl.VroegsteLeverdatumBepaler,WinkelkarPrijsUpdater:APPS.EC.impl.WinkelkarPrijsUpdater,WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository,ProductLijnBuilder:APPS.EC.Winkelkar.impl.ProductLijnBuilder,WinkelkarLijnRepository:DOM.EC.Winkelkar.impl.LijnRepository,MaatwerkLijnBuilder:APPS.EC.Winkelkar.impl.MaatwerkLijnBuilder</FormalSpec>
+<FormalSpec>MagMaatwerklijnGewijzigdWordenBepaler:APPS.EC.Winkelkar.impl.WinkelkarService.MagMaatwerklijnGewijzigdWorden,MaatwerklijnInputValidator:APPS.EC.Winkelkar.impl.WinkelkarService.MaatwerklijnInputValidator,BestelService:DOM.VKP.Maatwerk.BestelService,VroegsteLeverdatumBepaler:APPS.EC.impl.VroegsteLeverdatumBepaler,WinkelkarPrijsUpdater:APPS.EC.impl.WinkelkarPrijsUpdater,WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository,ProductLijnBuilder:APPS.EC.Winkelkar.impl.ProductLijnBuilder,WinkelkarLijnRepository:DOM.EC.Winkelkar.impl.LijnRepository,MaatwerkLijnBuilder:APPS.EC.Winkelkar.impl.MaatwerkLijnBuilder,QueryAPI:TECH.Query.QueryAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -79,6 +84,9 @@
 
 	Set ..MaatwerkLijnBuilder = $$$Inject(MaatwerkLijnBuilder,##class(APPS.EC.Winkelkar.impl.MaatwerkLijnBuilder).%New())
 	Set ..GroepnaamVoorIngegevenKenmerkenBepaler = ##class(APPS.EC.Winkelkar.impl.GroepNaamVoorIngegevenKenmerkenBepaler).%New()
+	
+	Set ..QueryAPI = $$$Inject(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -220,7 +228,7 @@
 <Implementation><![CDATA[
 	#dim WinkelkarParent As APPS.EC.Winkelkar.Parent = ##class(APPS.EC.Winkelkar.Parent).%New()
 	#dim Query As %String = "SELECT ID FROM  APPS_VKP_impl.Offerte WHERE WinkelkarID = ?"
-	#dim OfferteID As %String = ##class(TECH.Context).Instance().GeefQueryAPI().GeefIDVanEnigeOptioneleRecord(Query, $LB(WinkelkarID))
+	#dim OfferteID As %String = ..QueryAPI.GeefIDVanEnigeOptioneleRecord(Query, $LB(WinkelkarID))
 	If (OfferteID '=""){
 		Set WinkelkarParent.ID = OfferteID
 		Set WinkelkarParent.Type = ##class(APPS.EC.Winkelkar.enu.ParentType).WebshopOfferte()