Index: vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/VroegsteAfhaalDatum/Test.cls.xml
===================================================================
diff -u -r33645 -r34519
--- vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/VroegsteAfhaalDatum/Test.cls.xml	(.../Test.cls.xml)	(revision 33645)
+++ vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/VroegsteAfhaalDatum/Test.cls.xml	(.../Test.cls.xml)	(revision 34519)
@@ -21,7 +21,7 @@
 	#dim WinkelKarService As vhUnitTest.APPS.EC.Winkelkar.WinkelkarService.SubClass = ##class(vhUnitTest.APPS.EC.Winkelkar.WinkelkarService.SubClass).%New("","","",VroegsteLeverDatumBepalerSpy)
 	#dim VroegsteAfhaalDatum As %Date = WinkelKarService.GeefVroegsteAfhaalDatum("DummyWinkelKarID")
 
-	Do $$$AssertTrue(VroegsteLeverDatumBepalerSpy.Verzendwijze.IsAfhaling())
+	Do $$$AssertTrue(VroegsteLeverDatumBepalerSpy.Verzendwijze.VerzendWijzeID = "AFH")
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EC/Winkelkar/impl/WinkelkarService.cls.xml
===================================================================
diff -u -r34473 -r34519
--- APPS/EC/Winkelkar/impl/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 34473)
+++ APPS/EC/Winkelkar/impl/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 34519)
@@ -255,8 +255,8 @@
 <FormalSpec>WinkelKarID:%String</FormalSpec>
 <ReturnType>%Date</ReturnType>
 <Implementation><![CDATA[
-	#dim VerzendWijze As DOM.VKP.VerzendWijze = ##class(DOM.VKP.VerzendWijze).%OpenId("AFH") 
-	Quit ..VroegsteLeverdatumBepaler.GeefVroegsteLeverdatum(..GeefWinkelkar(WinkelKarID), VerzendWijze)
+	Set VerzendWijze = ##class(APPS.VKP.VerzendWijze).%New(##class(DOM.VKP.enu.Klant).VanHoecke(), "AFH","B","9100")
+	Quit ..VroegsteLeverdatumBepaler.GeefVroegsteLeverdatum(..OpenWinkelkar(WinkelKarID), VerzendWijze)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/SubClass.cls.xml
===================================================================
diff -u -r33580 -r34519
--- vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/SubClass.cls.xml	(.../SubClass.cls.xml)	(revision 33580)
+++ vhUnitTest/APPS/EC/Winkelkar/WinkelkarService/SubClass.cls.xml	(.../SubClass.cls.xml)	(revision 34519)
@@ -9,6 +9,13 @@
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
+
+<Method name="OpenWinkelkar">
+<FormalSpec>WinkelkarID:%String</FormalSpec>
+<ReturnType>DOM.EC.Winkelkar.Winkelkar</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>