Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml
===================================================================
diff -u -r50154 -r50197
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 50154)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 50197)
@@ -181,6 +181,9 @@
 
 <Method name="Test: ongeldig indien incorrecte data uit ref/dataopt">
 <Implementation><![CDATA[
+	Set ..DecrypteerRequestStub.DataOpt = ""
+	Set ..DecrypteerRequestStub.Ref = ""
+
 	Set LoginParameterBepalerStub = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
 	Do LoginParameterBepalerStub.IndienMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 	
@@ -191,9 +194,16 @@
 	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantData)
 	
 	Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",..LoginParameters.KlantID).DanReturn("")
+	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",..LoginParameters.KlantID).DanReturn(..KlantData)
+
+	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.HandelPersonality).%New()
+	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())
+	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("daro_")
+
+	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
+	Do HandelPersonalityRepositoryStub.IndienMethodCall("GeefViaID", ##class(DOM.common.enu.Personality).Daro()).DanReturn(HandelPersonalityStub)
 		
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,HandelKlantDataRepositoryStub,..HandelPersonalityRepositoryDummy,..WebshopSessionServiceDummy,..KortingBewaarderDummy,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,..KortingBewaarderDummy,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 		
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Daro.cls.xml
===================================================================
diff -u -r49971 -r50197
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Daro.cls.xml	(.../Daro.cls.xml)	(revision 49971)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Daro.cls.xml	(.../Daro.cls.xml)	(revision 50197)
@@ -49,12 +49,40 @@
 
 <Method name="Test: Geldig indien Ref en DataOpt voor Personality Daro">
 <Implementation><![CDATA[
+	Set LoginParameters = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
+	Set LoginParameters.GebruikerID = "1"
+	Set LoginParameters.KlantID = "daro_5"
+	Set LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()
+	Set LoginParameters.RemoteIP = "127.0.0.257"
+	Set LoginParameters.Taal = "E"
+
+	Set KlantData = ##class(DOM.common.dto.HandelKlantData).%New()
+	Set KlantData.ID = "5"
+	Set KlantData.Naam = "Een Naam"
+
 	#dim DecrypteerRequest As WS.Vhisie4.Auth.DecrypteerRequest = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New()
 	Set DecrypteerRequest.Hostname = "HostnameBevatDaro"
 	Set DecrypteerRequest.Ref = "RandomRef"
 	Set DecrypteerRequest.DataOpt = "RandomDataOpt"
 	
-	#dim Decrypteerder As WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New()
+	Set LoginParameterBepalerStub = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
+	Do LoginParameterBepalerStub.IndienMethodCall("GeefLoginParameters",DecrypteerRequest.Ref, DecrypteerRequest.DataOpt, DecrypteerRequest.Header.Taal, DecrypteerRequest.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(LoginParameters)
+	
+	#dim KortingBewaarderStub As vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder = ##class(vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder).%New()
+	Do KortingBewaarderStub.IndienMethodCall("BewaarMeegegevenKorting", DecrypteerRequest.Ref, DecrypteerRequest.DataOpt).DanDoeNiks()
+
+	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.HandelPersonality).%New()
+	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())
+	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("daro_")
+
+	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
+	Do HandelPersonalityRepositoryStub.IndienMethodCall("GeefViaID", ##class(DOM.common.enu.Personality).Daro()).DanReturn(HandelPersonalityStub)
+	
+	#dim HandelKlantDataRepositoryStub As vhTest.Mock.TECH.Persistentie.Repository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
+	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID", LoginParameters.KlantID).DanReturn(KlantData)
+	Do HandelKlantDataRepositoryStub.IndienMethodCall("BestaatViaID", LoginParameters.KlantID).DanReturn($$$True)
+	
+	#dim Decrypteerder As WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,HandelPersonalityRepositoryStub,,KortingBewaarderStub,,,,HandelKlantDataRepositoryStub)
 	#dim DecrypteerResponse As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(DecrypteerRequest)
 	
 	Do $$$AssertTrue(DecrypteerResponse.IsGeldig)