Index: vhUnitTest/APPS/PM/Maatwerk/End2End/common/Basis.cls.xml
===================================================================
diff -u -r29176 -r45495
--- vhUnitTest/APPS/PM/Maatwerk/End2End/common/Basis.cls.xml	(.../Basis.cls.xml)	(revision 29176)
+++ vhUnitTest/APPS/PM/Maatwerk/End2End/common/Basis.cls.xml	(.../Basis.cls.xml)	(revision 45495)
@@ -40,12 +40,9 @@
 <Method name="Initialiseer">
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ..GeefKlantID()
-	#dim Personality As DOM.common.impl.Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
-
 	Set ..Familie = ..GeefFamilie()
 	Set ..Variant = ..GeefVariant()
-	Set ..BerekeningSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie).%New(50,KlantID,Personality)
+	Set ..BerekeningSpecificatie = ..GeefBerekeningsSpecificatie()
 	Set ..HalffabContext = ##class(DOM.PM.Maatwerk.Calc.HF.HalffabContext).%New(..Familie,..Variant,..BerekeningSpecificatie)
 	Set ..KostContext = ##class(DOM.PM.Maatwerk.Calc.Kost.KostContext).%New(..Familie, ..Variant, ..BerekeningSpecificatie)
 ]]></Implementation>
@@ -81,6 +78,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBerekeningsSpecificatie">
+<Private>1</Private>
+<ReturnType>DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie).%New(50,..GeefKlantID(),..GeefPersonality())
+]]></Implementation>
+</Method>
+
+<Method name="GeefPersonality">
+<Private>1</Private>
+<ReturnType>DOM.common.impl.Personality</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.common.VanHoeckePersonality).Instance()
+]]></Implementation>
+</Method>
+
 <Method name="GeefPrijsVoorKenmerken">
 <FormalSpec>IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken</FormalSpec>
 <Private>1</Private>