Index: vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/TestVanHoeckeMetGekoppeldeOfferte.cls.xml
===================================================================
diff -u -r39923 -r39962
--- vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/TestVanHoeckeMetGekoppeldeOfferte.cls.xml	(.../TestVanHoeckeMetGekoppeldeOfferte.cls.xml)	(revision 39923)
+++ vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/TestVanHoeckeMetGekoppeldeOfferte.cls.xml	(.../TestVanHoeckeMetGekoppeldeOfferte.cls.xml)	(revision 39962)
@@ -3,110 +3,56 @@
 <Class name="vhUnitTest.APPS.EC.impl.KlantDataReferentieBepaler.GeefKlantDataReferentie.TestVanHoeckeMetGekoppeldeOfferte">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="DummyKlant">
-<Type>DOM.common.dto.HandelKlantData</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="DummyGebruiker">
-<Type>DOM.common.dto.GebruikerData</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="GebruikerID">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="OfferteStub">
-<Type>vhTest.Mock.APPS.VKP.Offerte</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
+<Method name="TestAllesIngevuld">
 <Implementation><![CDATA[
-	do ##super(aTestName)
-	set ..GebruikerID = ""
+	#dim HandelKlantData As DOM.common.dto.HandelKlantData = ..InitKlant()
+	#dim GebruikerData = ##class(DOM.common.dto.GebruikerData).%New()
 	
-	Set ..OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do ..OfferteStub.IndienMethodCall("GeefKlantID").DanReturn($$$DummyString)
-	Do ..OfferteStub.IndienMethodCall("GeefAangemaaktDoor").DanReturn(..GebruikerID)
-	Do ..OfferteStub.IndienMethodCall("GeefPersonality").DanReturn(##class(DOM.common.VanHoeckePersonality).Instance())
-	Do ..OfferteStub.IndienMethodCall("GeefLeverAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Geen())
+	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteStub.IndienMethodCall("GeefKlantID").DanReturn($$$DummyString)
+	Do OfferteStub.IndienMethodCall("GeefAangemaaktDoor").DanReturn($$$DummyString)
+	Do OfferteStub.IndienMethodCall("GeefPersonality").DanReturn(##class(DOM.common.VanHoeckePersonality).Instance())
+	Do OfferteStub.IndienMethodCall("GeefLeverAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Geen())
 	
 	Set GekoppeldeOfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
 	Do GekoppeldeOfferteStub.IndienMethodCall("GeefKlantID").DanReturn($$$DummyString)
-	Do GekoppeldeOfferteStub.IndienMethodCall("GeefAangemaaktDoor").DanReturn($$$DummyString)
+	Do GekoppeldeOfferteStub.IndienMethodCall("GeefAangemaaktDoor").DanReturn("")
 	Do GekoppeldeOfferteStub.IndienMethodCall("GeefPersonality").DanReturn(##class(DOM.common.DestilPersonality).Instance())
+	Do GekoppeldeOfferteStub.IndienMethodCall("GeefLeverAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
 	
-	
 	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Do OfferteServiceStub.IndienMethodCall("HeeftOfferteVanHandel",..OfferteStub).DanReturn(1)
-	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanHandel",..OfferteStub).DanReturn(GekoppeldeOfferteStub)
-	
-	#dim VerkoopAPIStub As vhTest.Mock.APPS.VKP.VerkoopAPI = ##class(vhTest.Mock.APPS.VKP.VerkoopAPI).MockInstance()
-	Do VerkoopAPIStub.IndienMethodCall("GeefOfferteService").DanReturn(OfferteServiceStub)
-]]></Implementation>
-</Method>
+	Do OfferteServiceStub.IndienMethodCall("HeeftOfferteVanHandel",OfferteStub).DanReturn($$$true)
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanHandel",OfferteStub).DanReturn(GekoppeldeOfferteStub)
 
-<Method name="TestAllesIngevuld">
-<Implementation><![CDATA[
-	;arrange
-	do ..InitKlant()
-	do ..InitGebruiker()
+	Set DataServiceStub = ##class(vhTest.Mock.APPS.common.DataService).%New()
+	Do DataServiceStub.IndienMethodCall("GeefKlantData", $$$DummyString).DanReturn(HandelKlantData)
+	Do DataServiceStub.IndienMethodCall("GeefGebruikerData", $$$DummyString).DanReturn(GebruikerData)
 	
-	;act
-	#dim KlantDataReferentie As %String = ..GeefKlantDataReferentieGekoppeldeOfferteVanDestil()
+	#dim CommonAPI As vhTest.Mock.APPS.common.CommonAPI = ##class(vhTest.Mock.APPS.common.CommonAPI).MockInstance()
+	Do CommonAPI.IndienMethodCall("GeefDataService", $$$ElkeWaarde).DanReturn(DataServiceStub)
 	
-	;assert
-	#dim VerwachteKlantDataReferentie As %String = "Dummy Naam - DummyGemeente - DummyStraat - DummyEmailAdres - Tel: DummyTelefoonNummer - Fax: DummyFaxNummer"
-	Do $$$AssertEquals(KlantDataReferentie,VerwachteKlantDataReferentie)
+	Set KlantDataReferentieBepaler = ##class(APPS.EC.impl.KlantDataReferentieBepaler).%New(OfferteServiceStub)
+	
+	#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(OfferteStub),VerwachteKlantDataReferentie)
 ]]></Implementation>
 </Method>
 
 <Method name="InitKlant">
 <Private>1</Private>
+<ReturnType>DOM.common.dto.HandelKlantData</ReturnType>
 <Implementation><![CDATA[
-	Set ..DummyKlant = ##class(DOM.common.dto.HandelKlantData).%New()
-	Set ..DummyKlant.Naam = "Dummy Naam"
-	Set ..DummyKlant.ID = "DummyKlantID"
-	Set ..DummyKlant.Gemeente = "DummyGemeente"
-	Set ..DummyKlant.StraatEnNr = "DummyStraat"
-	Set ..DummyKlant.EmailAdres = "DummyEmailAdres"
-	Set ..DummyKlant.TelefoonNummer = "DummyTelefoonNummer"
-	Set ..DummyKlant.FaxNummer = "DummyFaxNummer"
+	Set HandelKlantData = ##class(DOM.common.dto.HandelKlantData).%New()
+	Set HandelKlantData.Naam = "Dummy Naam"
+	Set HandelKlantData.ID = "DummyKlantID"
+	Set HandelKlantData.Gemeente = "DummyGemeente"
+	Set HandelKlantData.StraatEnNr = "DummyStraat"
+	Set HandelKlantData.EmailAdres = "DummyEmailAdres"
+	Set HandelKlantData.TelefoonNummer = "DummyTelefoonNummer"
+	Set HandelKlantData.FaxNummer = "DummyFaxNummer"
+	Quit HandelKlantData
 ]]></Implementation>
 </Method>
-
-<Method name="InitGebruiker">
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set ..GebruikerID = $$$DummyString
-	Set ..DummyGebruiker = ##class(DOM.common.dto.GebruikerData).%New()
-	Set ..DummyGebruiker.Naam = "Dummy Gebruiker Naam"
-]]></Implementation>
-</Method>
-
-<Method name="GeefKlantDataReferentieGekoppeldeOfferteVanDestil">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	Set DataServiceStub = ##class(vhTest.Mock.APPS.common.DataService).%New()
-	Do DataServiceStub.IndienMethodCall("GeefKlantData", $$$DummyString).DanReturn(..DummyKlant)
-	Do DataServiceStub.IndienMethodCall("GeefGebruikerData", $$$DummyString).DanReturn(..DummyGebruiker)
-	
-	#dim CommonAPI As vhTest.Mock.APPS.common.CommonAPI = ##class(vhTest.Mock.APPS.common.CommonAPI).MockInstance()
-	Do CommonAPI.IndienMethodCall("GeefDataService", ##class(DOM.common.enu.Personality).Destil()).DanReturn(DataServiceStub)
-	
-	Set KlantDataReferentieBepaler = ##class(APPS.EC.impl.KlantDataReferentieBepaler).%New()
-	quit KlantDataReferentieBepaler.GeefKlantDataReferentie(..OfferteStub)
-]]></Implementation>
-</Method>
-
-<Method name="AssertKlantDataReferentie">
-<Private>1</Private>
-</Method>
 </Class>
 
 
Index: APPS/EC/impl/KlantDataReferentieBepaler.cls.xml
===================================================================
diff -u -r39917 -r39962
--- APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 39917)
+++ APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 39962)
@@ -8,6 +8,11 @@
 <Default> - </Default>
 </Parameter>
 
+<Property name="OfferteService">
+<Type>APPS.VKP.OfferteService</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="KlantDataReferentie">
 <Type>%String</Type>
 <Private>1</Private>
@@ -18,6 +23,18 @@
 <Private>1</Private>
 </Property>
 
+<Method name="%OnNew">
+<FormalSpec>OfferteService:APPS.VKP.OfferteService</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..OfferteService = $$$Inject(OfferteService,##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
+	quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefKlantDataReferentie">
 <FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -26,10 +43,9 @@
 	Set ..Offerte = Offerte
 	
 	#dim Personality As DOM.common.Personality = Offerte.GeefPersonality()	
-	#dim OfferteService As APPS.VKP.OfferteService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService()
 	
-	If OfferteService.HeeftOfferteVanHandel(Offerte) {
-		#dim OfferteVanHandel As APPS.VKP.Offerte = OfferteService.GeefOfferteVanHandel(Offerte)
+	If ..OfferteService.HeeftOfferteVanHandel(Offerte) {
+		#dim OfferteVanHandel As APPS.VKP.Offerte = ..OfferteService.GeefOfferteVanHandel(Offerte)
 		Set Personality = OfferteVanHandel.GeefPersonality()
 	}	
 	
@@ -157,7 +173,7 @@
 	#dim FAX As %String = KlantData.FaxNummer
 	Do ..VoegToeIndienNodig(FAX,"Fax: ")
 	
-		#dim LeverAdresInStringFormaat As %String = ..GeefLeverAdresInStringFormaat(..Offerte)
+	#dim LeverAdresInStringFormaat As %String = ..GeefLeverAdresInStringFormaat(..Offerte)
 	Do ..VoegToeIndienNodig(LeverAdresInStringFormaat,"Adres: ")
 ]]></Implementation>
 </Method>
@@ -168,9 +184,8 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim KlantID As DOM.VKP.VanHoeckeKlantID = Offerte.GeefKlantID()
-	#dim OfferteService As APPS.VKP.OfferteService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService()
-	If OfferteService.HeeftOfferteVanHandel(Offerte) {
-		#dim OfferteVanHandel As APPS.VKP.Offerte = OfferteService.GeefOfferteVanHandel(Offerte)
+	If ..OfferteService.HeeftOfferteVanHandel(Offerte) {
+		#dim OfferteVanHandel As APPS.VKP.Offerte = ..OfferteService.GeefOfferteVanHandel(Offerte)
 		Set KlantID = OfferteVanHandel.GeefKlantID()
 	}	
 	Quit KlantID
@@ -181,6 +196,10 @@
 <FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	If ..OfferteService.HeeftOfferteVanHandel(Offerte) {
+		set Offerte = ..OfferteService.GeefOfferteVanHandel(Offerte)
+	}
+
 	#dim LeverAdres As DOM.VKP.LeverAdres = Offerte.GeefLeverAdres()
 	if $$$HasLength(LeverAdres.GeefNaam()) && $$$HasLength(LeverAdres.GeefStraat()) {
 		quit LeverAdres.GeefNaam()_ ", " _ LeverAdres.GeefStraat() _ ", " _ LeverAdres.GeefPostcode()_ " " _ LeverAdres.GeefGemeente() _ ", " _ LeverAdres.GeefLand().GeefCode()
Index: vhTest/Utils/DOM/VKP/LeverAdres.cls.xml
===================================================================
diff -u -r39922 -r39962
--- vhTest/Utils/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 39922)
+++ vhTest/Utils/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 39962)
@@ -15,10 +15,11 @@
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
 <Implementation><![CDATA[
 	#dim LeverAdres As DOM.VKP.impl.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	Do LeverAdres.ZetNaam("Een Belg")
 	Do LeverAdres.ZetLandNr(1019)
-	Do LeverAdres.ZetPostcode("9170")
-	Do LeverAdres.ZetStraat("Kemzekestraat 6")
-	Do LeverAdres.ZetGemeente("Sint-Gillis-Waas")
+	Do LeverAdres.ZetPostcode("9100")
+	Do LeverAdres.ZetStraat("Ankerstraat 91")
+	Do LeverAdres.ZetGemeente("Sint-Niklaas")
 	Quit LeverAdres
 ]]></Implementation>
 </Method>
Index: vhTest/Utils/APPS/common/dto/Adres.cls.xml
===================================================================
diff -u -r38937 -r39962
--- vhTest/Utils/APPS/common/dto/Adres.cls.xml	(.../Adres.cls.xml)	(revision 38937)
+++ vhTest/Utils/APPS/common/dto/Adres.cls.xml	(.../Adres.cls.xml)	(revision 39962)
@@ -28,9 +28,9 @@
 	#Dim Adres As APPS.common.dto.Adres = ##class(APPS.common.dto.Adres).%New()
 	Set Adres.ID = ""
 	Set Adres.Aanspreking = "Dhr"
-	Set Adres.Toenaam = "Jo"
+	Set Adres.Toenaam = ""
 	Set Adres.LandCode = "BE"
-	Set Adres.Naam = "Kapoen"
+	Set Adres.Naam = "Een Belg"
 	Set Adres.Postcode = "9100"
 	Set Adres.Straat = "ANKERSTRAAT 91"
 	Set Adres.Taal = "N"