Index: vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/Test.cls.xml
===================================================================
diff -u -r39917 -r45862
--- vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/Test.cls.xml	(.../Test.cls.xml)	(revision 39917)
+++ vhUnitTest/APPS/EC/impl/KlantDataReferentieBepaler/GeefKlantDataReferentie/Test.cls.xml	(.../Test.cls.xml)	(revision 45862)
@@ -52,12 +52,11 @@
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(..#PersonalityID)
 	
-	Set DataServiceStub = ##class(vhTest.Mock.APPS.common.DataService).%New()
-	Do DataServiceStub.IndienMethodCall("GeefKlantData", $$$DummyString).DanReturn(..DummyKlant)
-	Do DataServiceStub.IndienMethodCall("GeefGebruikerData", $$$DummyString).DanReturn(..DummyGebruiker)
+	Set DataServiceStub = ##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 CommonAPI As vhTest.Mock.APPS.common.CommonAPI = ##class(vhTest.Mock.APPS.common.CommonAPI).MockInstance()
-	Do CommonAPI.IndienMethodCall("GeefDataService",..#PersonalityID).DanReturn(DataServiceStub)
 	Set DummyAdminTekstUtils = ##class(APPS.common.impl.AdminTekstUtils).%New()
 	Do CommonAPI.IndienMethodCall("GeefAdminTekstUtils").DanReturn(DummyAdminTekstUtils)
 	
@@ -67,13 +66,14 @@
 	Do OfferteStub.IndienMethodCall("GeefPersonality").DanReturn(Personality)
 	Do OfferteStub.IndienMethodCall("GeefLeverAdres").DanReturn(..GeenAdres())
 	
-	Set KlantDataReferentieBepaler = ##class(APPS.EC.impl.KlantDataReferentieBepaler).%New()
+	Set KlantDataReferentieBepaler = ##class(APPS.EC.impl.KlantDataReferentieBepaler).%New(,DataServiceStub)
 	quit KlantDataReferentieBepaler.GeefKlantDataReferentie(OfferteStub)
 ]]></Implementation>
 </Method>
 
 <Method name="AssertKlantDataReferentie">
 <Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeenAdres">