Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/DummyService/Test.cls.xml
===================================================================
diff -u -r33974 -r33991
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/DummyService/Test.cls.xml	(.../Test.cls.xml)	(revision 33974)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/DummyService/Test.cls.xml	(.../Test.cls.xml)	(revision 33991)
@@ -5,10 +5,10 @@
 
 <Method name="Test: ZetGekozenVerzendingMogelijkheid ">
 <Implementation><![CDATA[
-	#dim OfferteId As %String = "1"
+	#dim OfferteId As %String = "DummyOfferteID"
 	#dim OptieKeuze As %Intger = 1
 	
-	#dim TestUnit As WS.EC.Unishop.InternationaleZending.DummyService = ##class(WS.EC.Unishop.InternationaleZending.DummyService).%New()
+	#dim TestUnit As WS.EC.Unishop.InternationaleZending.DummyService = ##class(WS.EC.Unishop.InternationaleZending.DummyService).%New(..MaakOfferteServiceMock())
 	Do TestUnit.ZetGekozenVerzendingMogelijkheid(OfferteId, 1,OptieKeuze)
 ]]></Implementation>
 </Method>
@@ -75,6 +75,9 @@
 	#dim OfferteDummy As vhTest.Fake.APPS.VKP.Offerte = ##class(vhTest.Fake.APPS.VKP.Offerte).%New()
 	Set OfferteDummy.DocumentReferenties.OrderReferentie = "Mijn Dummy Referentie"
 	Do OfferteServiceMock.IndienMethodCall("GeefOfferte", "DummyOfferteID").DanReturn(OfferteDummy)
+	#dim OfferteBewaarder As vhTest.Mock.APPS.VKP.OfferteBewaarder = ##class(vhTest.Mock.APPS.VKP.OfferteBewaarder).%New()
+	Do OfferteServiceMock.IndienMethodCall("GeefOfferteBewaarder").DanReturn(OfferteBewaarder)
+	Do OfferteBewaarder.IndienMethodCall("Bewaar",OfferteDummy).DanDoeNiks()
 	
 	Quit OfferteServiceMock
 ]]></Implementation>
Index: vhUnitTest/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler/Test.cls.xml
===================================================================
diff -u -r33981 -r33991
--- vhUnitTest/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 33981)
+++ vhUnitTest/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 33991)
@@ -11,9 +11,9 @@
 	
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 		
-	#dim WebshopSessieSettingsInvuller As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	#dim CheckoutTypeBepaler As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
 	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+	Do $$$AssertEquals(CheckoutTypeBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
 ]]></Implementation>
 </Method>
 
@@ -24,11 +24,11 @@
 
 	do ..PushKlant(Klant)
 	
-	#dim WebshopSessieSettingsInvuller As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	#dim CheckoutTypeBepaler As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
 	
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+	Do $$$AssertEquals(CheckoutTypeBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
 ]]></Implementation>
 </Method>
 
@@ -40,9 +40,9 @@
 	
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).Daro()
 
-	#dim WebshopSessieSettingsInvuller As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	#dim CheckoutTypeBepaler As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
 	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+	Do $$$AssertEquals(CheckoutTypeBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
 ]]></Implementation>
 </Method>
 
@@ -56,9 +56,9 @@
 
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 
-	#dim WebshopSessieSettingsInvuller As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	#dim CheckoutTypeBepaler As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
 	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+	Do $$$AssertEquals(CheckoutTypeBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
 ]]></Implementation>
 </Method>
 
@@ -72,9 +72,9 @@
 
 	#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
 
-	#dim WebshopSessieSettingsInvuller As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	#dim CheckoutTypeBepaler As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
 	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+	Do $$$AssertEquals(CheckoutTypeBepaler.Bepaal(PersonalityID, Klant.GeefID()),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
 ]]></Implementation>
 </Method>
 
Index: vhTest/Fake/APPS/VKP/Offerte.cls.xml
===================================================================
diff -u -r33966 -r33991
--- vhTest/Fake/APPS/VKP/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 33966)
+++ vhTest/Fake/APPS/VKP/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 33991)
@@ -96,6 +96,10 @@
 <Implementation><![CDATA[	Quit 0
 ]]></Implementation>
 </Method>
+
+<Method name="ZetLeverDatum">
+<FormalSpec>LeverDatum:%Date</FormalSpec>
+</Method>
 </Class>