Index: vhTest/Fake/DOM/VKP/VanHoeckeKlant.cls.xml
===================================================================
diff -u -r47154 -r47161
--- vhTest/Fake/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 47154)
+++ vhTest/Fake/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 47161)
@@ -5,36 +5,43 @@
 
 <Property name="Adres">
 <Type>DOM.VKP.LeverAdres</Type>
+<InitialExpression>##class(vhTest.Utils.DOM.common.Adres).StandaardAdres()</InitialExpression>
 <Private>1</Private>
 </Property>
 
 <Property name="BetalingTermijn">
 <Type>%String</Type>
+<InitialExpression>"30D"</InitialExpression>
 <Private>1</Private>
 </Property>
 
 <Property name="Betalingwijze">
 <Type>DOM.VKP.enu.Betalingwijze</Type>
+<InitialExpression>##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn()</InitialExpression>
 <Private>1</Private>
 </Property>
 
 <Property name="BTWRegime">
 <Type>DOM.VKP.enu.BTWRegimeKlant</Type>
+<InitialExpression>##class(DOM.VKP.enu.BTWRegimeKlant).Aanrekenen()</InitialExpression>
 <Private>1</Private>
 </Property>
 
 <Property name="Code">
 <Type>%String</Type>
+<InitialExpression>"1234"</InitialExpression>
 <Private>1</Private>
 </Property>
 
 <Property name="CommercieleStatus">
 <Type>DOM.CRM.enu.CommercieleStatus</Type>
+<InitialExpression>##class(DOM.CRM.enu.CommercieleStatus).Actief()</InitialExpression>
 <Private>1</Private>
 </Property>
 
 <Property name="Email">
 <Type>%String</Type>
+<InitialExpression>"someone@example.com"</InitialExpression>
 <Private>1</Private>
 </Property>
 
@@ -45,21 +52,25 @@
 
 <Property name="IsLidBTWEenheidVanHoecke">
 <Type>%Boolean</Type>
+<InitialExpression>0</InitialExpression>
 <Private>1</Private>
 </Property>
 
 <Property name="KortingContantPercentage">
 <Type>%Decimal</Type>
+<InitialExpression>3</InitialExpression>
 <Private>1</Private>
 </Property>
 
 <Property name="KortingContantTermijn">
 <Type>%String</Type>
+<InitialExpression>"10D"</InitialExpression>
 <Private>1</Private>
 </Property>
 
 <Property name="Kredietlimiet">
 <Type>%String</Type>
+<InitialExpression>"2000"</InitialExpression>
 <Private>1</Private>
 </Property>
 
@@ -71,11 +82,13 @@
 
 <Property name="Naam">
 <Type>%String</Type>
+<InitialExpression>"DE NAAM"</InitialExpression>
 <Private>1</Private>
 </Property>
 
 <Property name="Regio">
 <Type>%String</Type>
+<InitialExpression>"9"</InitialExpression>
 <Private>1</Private>
 </Property>
 
@@ -92,114 +105,114 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..ID = KlantID
+	Set ..ID = KlantID
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAdres">
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
-<Implementation><![CDATA[	quit ##class(vhTest.Utils.DOM.common.Adres).StandaardAdres()
+<Implementation><![CDATA[	Quit ..Adres
 ]]></Implementation>
 </Method>
 
 <Method name="GeefBetalingTermijn">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit "30D"
+<Implementation><![CDATA[	Quit ..BetalingTermijn
 ]]></Implementation>
 </Method>
 
 <Method name="GeefBetalingwijze">
 <ReturnType>DOM.VKP.enu.Betalingwijze</ReturnType>
-<Implementation><![CDATA[	quit ##class(DOM.VKP.enu.Betalingwijze).Betalingstermijn()
+<Implementation><![CDATA[	Quit ..Betalingwijze
 ]]></Implementation>
 </Method>
 
 <Method name="GeefBTWRegime">
 <ReturnType>DOM.VKP.enu.BTWRegimeKlant</ReturnType>
-<Implementation><![CDATA[	quit ##class(DOM.VKP.enu.BTWRegimeKlant).Aanrekenen()
+<Implementation><![CDATA[	Quit ..BTWRegime
 ]]></Implementation>
 </Method>
 
 <Method name="GeefCode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit "1234"
+<Implementation><![CDATA[	Quit ..Code
 ]]></Implementation>
 </Method>
 
 <Method name="GeefCommercieleStatus">
 <ReturnType>DOM.CRM.enu.CommercieleStatus</ReturnType>
-<Implementation><![CDATA[	quit ##class(DOM.CRM.enu.CommercieleStatus).Actief()
+<Implementation><![CDATA[	Quit ..CommercieleStatus
 ]]></Implementation>
 </Method>
 
 <Method name="GeefEmail">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit "someone@example.com"
+<Implementation><![CDATA[	Quit ..Email
 ]]></Implementation>
 </Method>
 
 <Method name="GeefID">
 <ReturnType>DOM.common.PartijID</ReturnType>
-<Implementation><![CDATA[	quit ..ID
+<Implementation><![CDATA[	Quit ..ID
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKortingContantPercentage">
 <ReturnType>%Decimal</ReturnType>
-<Implementation><![CDATA[	quit 3
+<Implementation><![CDATA[	Quit ..KortingContantPercentage
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKortingContantTermijn">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit "10D"
+<Implementation><![CDATA[	Quit ..KortingContantTermijn
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKredietlimiet">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit "2000"
+<Implementation><![CDATA[	Quit ..Kredietlimiet
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLeverAdressen">
 <ReturnType>DOM.VKP.LeverAdresList</ReturnType>
-<Implementation><![CDATA[	quit ..LeverAdressen
+<Implementation><![CDATA[	Quit ..LeverAdressen
 ]]></Implementation>
 </Method>
 
 <Method name="GeefNaam">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit "DE NAAM"
+<Implementation><![CDATA[	Quit ..Naam
 ]]></Implementation>
 </Method>
 
 <Method name="GeefRegio">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit "9"
+<Implementation><![CDATA[	Quit ..Regio
 ]]></Implementation>
 </Method>
 
 <Method name="GeefTaal">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..Taal
+<Implementation><![CDATA[	Quit ..Taal
 ]]></Implementation>
 </Method>
 
 <Method name="IsLidBTWEenheidVanHoecke">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit $$$False
+<Implementation><![CDATA[	Quit ..IsLidBTWEenheidVanHoecke
 ]]></Implementation>
 </Method>
 
 <Method name="ZetLeverAdressen">
 <FormalSpec>Aantal:%Integer=0</FormalSpec>
 <Implementation><![CDATA[
-	do ..LeverAdressen.Clear()
+	Do ..LeverAdressen.Clear()
 	#dim AdresID As %Integer 
-	for AdresID = 1 : 1 : Aantal {
-		do ..LeverAdressen.Insert(##class(vhTest.Fake.DOM.VKP.LeverAdres).%New(AdresID))	
+	For AdresID = 1 : 1 : Aantal {
+		Do ..LeverAdressen.Insert(##class(vhTest.Fake.DOM.VKP.LeverAdres).%New(AdresID))	
 	}
 ]]></Implementation>
 </Method>