Index: vhTest/Fake/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u -r34079 -r37197
--- vhTest/Fake/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 34079)
+++ vhTest/Fake/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37197)
@@ -3,12 +3,25 @@
 <Class name="vhTest.Fake.APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler">
 <Super>APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler</Super>
 
+<Property name="CheckoutType">
+<Type>APPS.EC.Unishop.enu.CheckoutType</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="Bepaal">
 <FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
 <ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze()
+<Implementation><![CDATA[
+	Quit:..CheckoutType="" ##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze() 
+	Quit ..CheckoutType
 ]]></Implementation>
 </Method>
+
+<Method name="ZetCheckoutType">
+<FormalSpec>CheckoutType:APPS.EC.Unishop.enu.CheckoutType</FormalSpec>
+<Implementation><![CDATA[	Set ..CheckoutType = CheckoutType
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r36970 -r37197
--- APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 36970)
+++ APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 37197)
@@ -23,6 +23,23 @@
 <Private>1</Private>
 </Property>
 
+<Property name="CheckoutTypeBepaler">
+<Type>APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>CheckoutTypeBepaler:APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..CheckoutTypeBepaler = $$$Inject(CheckoutTypeBepaler,##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="IsGeldig">
 <FormalSpec>Offerte:APPS.VKP.Offerte,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
@@ -72,7 +89,7 @@
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New().Bepaal(..PersonalityID, ..KlantID) = ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+<Implementation><![CDATA[	Quit (..CheckoutTypeBepaler.Bepaal(..PersonalityID, ..KlantID) = ##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/OfferteVoorBestellingValidator/TestVanHoecke.cls.xml
===================================================================
diff -u -r36817 -r37197
--- vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/OfferteVoorBestellingValidator/TestVanHoecke.cls.xml	(.../TestVanHoecke.cls.xml)	(revision 36817)
+++ vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/OfferteVoorBestellingValidator/TestVanHoecke.cls.xml	(.../TestVanHoecke.cls.xml)	(revision 37197)
@@ -19,6 +19,10 @@
 
 <Method name="TestVerwachtExceptieLeverdatumNietIngevuld">
 <Implementation><![CDATA[
+	#dim CheckoutTypeBepalerFake As APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler = ##class(vhTest.Fake.APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	Do CheckoutTypeBepalerFake.ZetCheckoutType(##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
+	Set ..OfferteVoorBestellingValidator = ##class(APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator).%New(CheckoutTypeBepalerFake)
+	
 	#define NogNietBesteld 0
 	#define PrijzenVervallen 0
 	#dim LeverDatum As %String = ""