Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestHein.cls.xml
===================================================================
diff -u -r53991 -r55808
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestHein.cls.xml	(.../TestHein.cls.xml)	(revision 53991)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestHein.cls.xml	(.../TestHein.cls.xml)	(revision 55808)
@@ -45,6 +45,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVerwachteKlantReferentie">
+<FormalSpec>KlantDataReferentie:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "Seefelder - 10135 - Seefelder@seefelder.net"
+]]></Implementation>
+</Method>
+
 <Method name="GeefRef">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestVanRaemdonck.cls.xml
===================================================================
diff -u -r50511 -r55808
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestVanRaemdonck.cls.xml	(.../TestVanRaemdonck.cls.xml)	(revision 50511)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestVanRaemdonck.cls.xml	(.../TestVanRaemdonck.cls.xml)	(revision 55808)
@@ -52,6 +52,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVerwachteKlantReferentie">
+<FormalSpec>KlantDataReferentie:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..HandelPrefix_"KLANT_1234 - " _ "1234" _ " - test@" _ ..HandelPrefix _ ".be"
+]]></Implementation>
+</Method>
+
 <Method name="GeefRef">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestDaro.cls.xml
===================================================================
diff -u -r50511 -r55808
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestDaro.cls.xml	(.../TestDaro.cls.xml)	(revision 50511)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestDaro.cls.xml	(.../TestDaro.cls.xml)	(revision 55808)
@@ -52,6 +52,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVerwachteKlantReferentie">
+<FormalSpec>KlantDataReferentie:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..HandelPrefix_"KLANT_1234 - " _ "1234" _ " - test@" _ ..HandelPrefix _ ".com"
+]]></Implementation>
+</Method>
+
 <Method name="GeefRef">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestSeefelder.cls.xml
===================================================================
diff -u -r53991 -r55808
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestSeefelder.cls.xml	(.../TestSeefelder.cls.xml)	(revision 53991)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestSeefelder.cls.xml	(.../TestSeefelder.cls.xml)	(revision 55808)
@@ -45,6 +45,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVerwachteKlantReferentie">
+<FormalSpec>KlantDataReferentie:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "schneiderei Hanz - 1234 - schneidereiHanz@germany.de"
+]]></Implementation>
+</Method>
+
 <Method name="GeefRef">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/Base.cls.xml
===================================================================
diff -u -r53692 -r55808
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/Base.cls.xml	(.../Base.cls.xml)	(revision 53692)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/Base.cls.xml	(.../Base.cls.xml)	(revision 55808)
@@ -203,31 +203,27 @@
 	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelAanspreking], <BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "<BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelIntro]<BR>")
-	
+	Do $$$AssertEquals(Inhoud.ReadLine(), "<BR>")
 	If (..GeefExterneId()) {
 		Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelBestellingLabel]: " _ ..GeefExterneId() _ "<BR>")
 	} Else {
 		Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelBestellingLabel]: " _ $$$DummyString _ "<BR>")
 	}
 	
-	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelKlantLabel]: " _ "<BR>")
-	
-	Do ..AssertKlantReferentie(Inhoud.ReadLine())
-	
+	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelKlantLabel]: " _ ..GeefVerwachteKlantReferentie() _"<BR>")
+		
 	Do $$$AssertEquals(Inhoud.ReadLine(), "<BR>")
-	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelReferentieLabel]: " _ "<BR>")
-	Do $$$AssertEquals(Inhoud.ReadLine(), "DummyOrderRef" _ "<BR>")
+	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelReferentieLabel]: DummyOrderRef<BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "<BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelOpmerkingLabel]: <BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), $$$DummyString _ "<BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "<BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelWensLeverDatumLabel]: <BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), ..#ZomaarEenWensLeverdatum _ "<BR>")
+	;Do $$$AssertEquals(Inhoud.ReadLine(), "<BR>")
+	;Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelSluitWebshop]<BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "<BR>")
-	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelSluitWebshop]<BR>")
-	Do $$$AssertEquals(Inhoud.ReadLine(), "<BR>")
-	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelVerwerkBestelling]<BR>")
-	Do $$$AssertEquals(Inhoud.ReadLine(), "<a href=""" _ ..GeefVerwerkBestellingUrl() _ """>" _ ..GeefVerwerkBestellingUrl() _ "</a>" _ "<BR>")
+	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelVerwerkBestelling]<a href=""" _ ..GeefVerwerkBestellingUrl() _ """>" _ ..GeefVerwerkBestellingUrl() _ "</a>" _ "<BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(),"<BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "[BesteldeOfferteHandelPrintBestelling]<a href=""" _ ..GeefLink() _ """>" _ ..GeefLink() _ "</a><BR>")
 	Do $$$AssertEquals(Inhoud.ReadLine(), "<BR>")
@@ -242,6 +238,13 @@
 <Implementation><![CDATA[	Do $$$AssertEquals(KlantDataReferentie, ..HandelPrefix _ "Gebruiker" _ " - " _ ..HandelPrefix _ "KLANT_1234 - " _ ..HandelPrefix _ "Gemeente_1234 - TestStraat1 - test@" _ ..HandelPrefix _ ".be - Tel: 09/444.55.66 - Fax: 09/111.22.33" _ "<BR>")
 ]]></Implementation>
 </Method>
+
+<Method name="GeefVerwachteKlantReferentie">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..HandelPrefix _ "Gebruiker" _ " - " _ ..HandelPrefix _ "KLANT_1234 - " _ ..HandelPrefix _ "Gemeente_1234 - TestStraat1 - test@" _ ..HandelPrefix _ ".be - Tel: 09/444.55.66 - Fax: 09/111.22.33"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestKisch.cls.xml
===================================================================
diff -u -r50511 -r55808
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestKisch.cls.xml	(.../TestKisch.cls.xml)	(revision 50511)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/TestKisch.cls.xml	(.../TestKisch.cls.xml)	(revision 55808)
@@ -51,6 +51,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVerwachteKlantReferentie">
+<FormalSpec>KlantDataReferentie:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..HandelPrefix_"KLANT_1234 - "_"1234"_" - test@"_..HandelPrefix_".be"
+]]></Implementation>
+</Method>
+
 <Method name="GeefRef">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>