Index: vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/TestVanHoeckeMetGekoppeldeOfferte.cls.xml
===================================================================
diff -u -r45862 -r52558
--- vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/TestVanHoeckeMetGekoppeldeOfferte.cls.xml	(.../TestVanHoeckeMetGekoppeldeOfferte.cls.xml)	(revision 45862)
+++ vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/TestVanHoeckeMetGekoppeldeOfferte.cls.xml	(.../TestVanHoeckeMetGekoppeldeOfferte.cls.xml)	(revision 52558)
@@ -8,27 +8,28 @@
 	#dim KlantPersonality As DOM.common.DestilPersonality = ##class(DOM.common.DestilPersonality).Instance()
 	#dim LeverancierPersonality As DOM.common.VanHoeckePersonality = ##class(DOM.common.VanHoeckePersonality).Instance()
 	
-	Set LeverancierOfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	#dim LeverancierOfferteStub As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
 	Do LeverancierOfferteStub.IndienMethodCall("GeefKlantID").DanReturn($$$DummyString)
 	Do LeverancierOfferteStub.IndienMethodCall("GeefAangemaaktDoor").DanReturn($$$DummyString)
 	Do LeverancierOfferteStub.IndienMethodCall("GeefPersonality").DanReturn(LeverancierPersonality)
 	Do LeverancierOfferteStub.IndienMethodCall("GeefLeverAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Geen())
+	Do LeverancierOfferteStub.IndienMethodCall("IsVhisie4").DanReturn($$$False)
 	
-	Set BestellingBijKlantStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	#dim BestellingBijKlantStub As vhTest.Mock.APPS.VKP.Offerte= ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
 	Do BestellingBijKlantStub.IndienMethodCall("GeefKlantID").DanReturn($$$DummyString)
 	Do BestellingBijKlantStub.IndienMethodCall("GeefAangemaaktDoor").DanReturn("")
 	Do BestellingBijKlantStub.IndienMethodCall("GeefPersonality").DanReturn(KlantPersonality)
 	Do BestellingBijKlantStub.IndienMethodCall("GeefLeverAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
 	Do OfferteServiceStub.IndienMethodCall("HeeftOfferteVanHandel",LeverancierOfferteStub).DanReturn($$$true)
 	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanHandel",LeverancierOfferteStub).DanReturn(BestellingBijKlantStub)
 
-	Set DataServiceStub = ##class(vhTest.Mock.APPS.EC.DataService).%New()
+	#dim DataServiceStub As vhTest.Mock.APPS.EC.DataService = ##class(vhTest.Mock.APPS.EC.DataService).%New()
 	Do DataServiceStub.IndienMethodCall("GeefKlantData", KlantPersonality.GeefID(), $$$DummyString).DanReturn(..GeefKlantData())
 	Do DataServiceStub.IndienMethodCall("GeefGebruikerData", KlantPersonality.GeefID() ,$$$DummyString).DanReturn(##class(DOM.common.dto.GebruikerData).%New())
 	
-	Set KlantDataReferentieBepaler = ##class(APPS.EC.impl.KlantDataReferentieBepaler).%New(OfferteServiceStub,DataServiceStub)
+	#dim KlantDataReferentieBepaler As APPS.EC.impl.KlantDataReferentieBepaler = ##class(APPS.EC.impl.KlantDataReferentieBepaler).%New(OfferteServiceStub,DataServiceStub)
 	
 	#dim VerwachteKlantDataReferentie As %String = "Dummy Naam - DummyGemeente - DummyStraat - DummyEmailAdres - Tel: DummyTelefoonNummer - Fax: DummyFaxNummer - Adres: Een Belg, Ankerstraat 91, 9100 Sint-Niklaas, BE"
 	Do $$$AssertEquals(KlantDataReferentieBepaler.GeefKlantDataReferentie(LeverancierOfferteStub),VerwachteKlantDataReferentie)
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/Base.cls.xml
===================================================================
diff -u -r52186 -r52558
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/Base.cls.xml	(.../Base.cls.xml)	(revision 52186)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel/Base.cls.xml	(.../Base.cls.xml)	(revision 52558)
@@ -76,6 +76,7 @@
 	Do OfferteStub.IndienMethodCall("GeefWebshopVersie").DanReturn(..GeefWebshopVersie())
 	Do OfferteStub.IndienMethodCall("GeefExterneId").DanReturn(..GeefExterneId())
 	Do OfferteStub.IndienMethodCall("GeefOfferteVanHandel").DanReturn(OfferteVanHandelDummy)
+	Do OfferteStub.IndienMethodCall("IsVhisie4").DanReturn($$$False)
 	
 	#dim MailApi As vhUnitTest.TECH.Mail.impl.MailAPIMock = ##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).%New()
 	
Index: vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/Test.cls.xml
===================================================================
diff -u -r45862 -r52558
--- vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/Test.cls.xml	(.../Test.cls.xml)	(revision 45862)
+++ vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/Test.cls.xml	(.../Test.cls.xml)	(revision 52558)
@@ -52,22 +52,24 @@
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(..#PersonalityID)
 	
-	Set DataServiceStub = ##class(vhTest.Mock.APPS.EC.DataService).%New()
+	#dim DataServiceStub As vhTest.Mock.APPS.EC.DataService = ##class(vhTest.Mock.APPS.EC.DataService).%New()
 	Do DataServiceStub.IndienMethodCall("GeefKlantData", Personality.GeefID(), $$$DummyString).DanReturn(..DummyKlant)
 	Do DataServiceStub.IndienMethodCall("GeefGebruikerData", Personality.GeefID(), $$$DummyString).DanReturn(..DummyGebruiker)
 	
+	#dim AdminTekstUtils As  APPS.common.impl.AdminTekstUtils = ##class(APPS.common.impl.AdminTekstUtils).%New()
 	#dim CommonAPI As vhTest.Mock.APPS.common.CommonAPI = ##class(vhTest.Mock.APPS.common.CommonAPI).MockInstance()
-	Set DummyAdminTekstUtils = ##class(APPS.common.impl.AdminTekstUtils).%New()
-	Do CommonAPI.IndienMethodCall("GeefAdminTekstUtils").DanReturn(DummyAdminTekstUtils)
+	Do CommonAPI.IndienMethodCall("GeefAdminTekstUtils").DanReturn(AdminTekstUtils)
 	
-	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	#dim OfferteStub As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
 	Do OfferteStub.IndienMethodCall("GeefKlantID").DanReturn($$$DummyString)
 	Do OfferteStub.IndienMethodCall("GeefAangemaaktDoor").DanReturn(..GebruikerID)
 	Do OfferteStub.IndienMethodCall("GeefPersonality").DanReturn(Personality)
 	Do OfferteStub.IndienMethodCall("GeefLeverAdres").DanReturn(..GeenAdres())
+	Do OfferteStub.IndienMethodCall("IsVhisie4").DanReturn($$$False)
 	
-	Set KlantDataReferentieBepaler = ##class(APPS.EC.impl.KlantDataReferentieBepaler).%New(,DataServiceStub)
-	quit KlantDataReferentieBepaler.GeefKlantDataReferentie(OfferteStub)
+	#dim KlantDataReferentieBepaler As APPS.EC.impl.KlantDataReferentieBepaler = ##class(APPS.EC.impl.KlantDataReferentieBepaler).%New(,DataServiceStub)
+	
+	Quit KlantDataReferentieBepaler.GeefKlantDataReferentie(OfferteStub)
 ]]></Implementation>
 </Method>