Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml
===================================================================
diff -u -r45587 -r45665
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 45587)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 45665)
@@ -13,7 +13,7 @@
 <Private>1</Private>
 </Property>
 
-<Property name="KlantDataDummy">
+<Property name="KlantData">
 <Type>DOM.common.dto.KlantData</Type>
 <Private>1</Private>
 </Property>
@@ -61,9 +61,9 @@
 	Set ..LoginParameters.RemoteIP = "127.0.0.257"
 	Set ..LoginParameters.Taal = "E"
 
-	Set ..KlantDataDummy = ##class(DOM.common.dto.KlantData).%New()
-	Set ..KlantDataDummy.ID = "5"
-	Set ..KlantDataDummy.Naam = $$$DummyString
+	Set ..KlantData = ##class(DOM.common.dto.KlantData).%New()
+	Set ..KlantData.ID = "5"
+	Set ..KlantData.Naam = "Een Naam"
 	
 	Set ..UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do ..UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
@@ -89,7 +89,7 @@
 	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())
 	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("daro_")
 	
-	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantDataDummy)
+	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantData)
 	
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
 	Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",..DecrypteerRequestStub.Header.PersonalityId).DanReturn(HandelPersonalityStub)
@@ -101,7 +101,7 @@
 	Do KortingBewaarderMock.VerwachtMethodCall("BewaarMeegegevenKorting",..DecrypteerRequestStub.Ref,..DecrypteerRequestStub.DataOpt).ExactAantalKeer(1)
 	
 	Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy)
+	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantData)
 		
 	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,KortingBewaarderMock,..UrlBepalerStub)
 	
@@ -112,7 +112,7 @@
 	Do $$$AssertEquals(Response.IsGeldig,"1")
 	Do $$$AssertEquals(Response.IsContactGegevensFormulierNodig,"0")
 	Do $$$AssertEquals(Response.KlantId,"5")
-	Do $$$AssertEquals(Response.KlantNaam,$$$DummyString)
+	Do $$$AssertEquals(Response.KlantNaam,"Een Naam")
 	Do $$$AssertEquals(Response.PersonalityId,##class(DOM.common.enu.Personality).Daro())
 	Do $$$AssertEquals(Response.Taal,"E")
 	Do $$$AssertEquals(Response.ToegelatenLadetypes.Count(),2)
@@ -195,7 +195,7 @@
 	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Destil())
 	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("destil_")
 	
-	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantDataDummy)
+	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantData)
 	
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
 	Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",##class(DOM.common.enu.Personality).Destil()).DanReturn(HandelPersonalityStub)
@@ -204,7 +204,7 @@
 	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("destil_")
 
 	Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy)
+	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantData)
 		
 	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub)
 	
@@ -232,7 +232,7 @@
 	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Kisch())
 	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("kisch")
 			
-	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantDataDummy)
+	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantData)
 	
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
 	Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",##class(DOM.common.enu.Personality).Kisch()).DanReturn(HandelPersonalityStub)
@@ -241,7 +241,7 @@
 	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("kisch_")
 
 	Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy)
+	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantData)
 		
 	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub)
 	
@@ -269,7 +269,7 @@
 	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())
 	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("daro")
 			
-	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantDataDummy)
+	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantData)
 	
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
 	Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",##class(DOM.common.enu.Personality).Daro()).DanReturn(HandelPersonalityStub)
@@ -278,7 +278,7 @@
 	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro_")
 
 	Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy)
+	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantData)
 		
 	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub)
 	
@@ -306,7 +306,7 @@
 	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())
 	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("daro_")
 				
-	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantDataDummy)
+	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantData)
 	
 	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
 	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro")
@@ -334,7 +334,7 @@
 	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())
 	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("daro_")
 
-	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantDataDummy)
+	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantData)
 
 	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
 	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro_")