Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml
===================================================================
diff -u -r45577 -r45580
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 45577)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 45580)
@@ -151,7 +151,7 @@
 	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 
 	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.impl.HandelPersonality).%New(##class(DOM.common.enu.Personality).Destil(),$$$DummyInteger)
-	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())
+	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Destil())
 	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("destil_")
 	
 	Set KlantDataDummy = ##class(DOM.common.dto.KlantData).%New()
@@ -160,6 +160,9 @@
 		
 	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(KlantDataDummy)
 	
+	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
+	Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",##class(DOM.common.enu.Personality).Destil()).DanReturn(HandelPersonalityStub)
+	
 	Set WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
 	
 	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
@@ -173,7 +176,7 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,WebshopSessionServiceDummy,,KortingBewaarderDummy,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,HandelPersonalityRepositoryStub,WebshopSessionServiceDummy,SettingsManagerStub,KortingBewaarderDummy,UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -184,6 +187,7 @@
 	}
 	
 	Do LoginParameterBepalerMock.Verifieer()
+	Do HandelPersonalityRepositoryStub.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -195,7 +199,7 @@
 	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 
 	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.impl.HandelPersonality).%New(##class(DOM.common.enu.Personality).Kisch(),$$$DummyInteger)
-	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())
+	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Kisch())
 	Do HandelPersonalityStub.IndienMethodCall("GeefPrefix").DanReturn("kisch")
 	
 	Set KlantDataDummy = ##class(DOM.common.dto.KlantData).%New()
@@ -206,6 +210,9 @@
 		
 	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(KlantDataDummy)
 	
+	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
+	Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",##class(DOM.common.enu.Personality).Kisch()).DanReturn(HandelPersonalityStub)
+	
 	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
 	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("kisch_")
 
@@ -217,7 +224,7 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,WebshopSessionServiceDummy,,KortingBewaarderDummy,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,HandelPersonalityRepositoryStub,WebshopSessionServiceDummy,SettingsManagerStub,KortingBewaarderDummy,UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -228,6 +235,7 @@
 	}
 	
 	Do LoginParameterBepalerMock.Verifieer()
+	Do HandelPersonalityRepositoryStub.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -369,13 +377,15 @@
 	Do LoginParameterBepalerStub.IndienMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 	
 	Set WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
+	
+	Set SettingsManagerDummy = ##class(vhTest.Dummy.WSimpl.Vhisie4.SettingsManager).%New()
 
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl","10").DanReturn("darotest.taorbox.com")
 	
 	Set KortingBewaarderDummy = ##class(vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder).%New()
 
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,,WebshopSessionServiceDummy,,KortingBewaarderDummy,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,,WebshopSessionServiceDummy,SettingsManagerDummy,KortingBewaarderDummy,UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -397,12 +407,14 @@
 	
 	Set WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
 
+	Set SettingsManagerDummy = ##class(vhTest.Dummy.WSimpl.Vhisie4.SettingsManager).%New()
+
 	Set UrlBepalerMock = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerMock.VerwachtMethodCall("GeefUrl","10").DanReturn("darotest.taorbox.com").ExactAantalKeer(0)
 	
 	Set KortingBewaarderDummy = ##class(vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder).%New()
 
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,,WebshopSessionServiceDummy,,KortingBewaarderDummy,UrlBepalerMock)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,,WebshopSessionServiceDummy,SettingsManagerDummy,KortingBewaarderDummy,UrlBepalerMock)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
Index: vhTest/Dummy/WSimpl/Vhisie4/SettingsManager.cls.xml
===================================================================
diff -u
--- vhTest/Dummy/WSimpl/Vhisie4/SettingsManager.cls.xml	(revision 0)
+++ vhTest/Dummy/WSimpl/Vhisie4/SettingsManager.cls.xml	(revision 45580)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Dummy.WSimpl.Vhisie4.SettingsManager">
+<Super>WSimpl.Vhisie4.SettingsManager</Super>
+
+<Method name="GeefVhisie4Prefix">
+<FormalSpec>HandelPersonality:DOM.common.HandelPersonality</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="GeefWebshopVerwerker">
+<FormalSpec>HandelPersonality:DOM.common.HandelPersonality</FormalSpec>
+<ReturnType>APPS.EC.enu.WebShopVerwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).RandomValue()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml
===================================================================
diff -u -r43472 -r45580
--- APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 43472)
+++ APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 45580)
@@ -92,11 +92,6 @@
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<StreamLocation>^APPS.EC.enu.W6ED2.AutoCompleteS</StreamLocation>
-</Storage>
 </Class>
 
 
Index: APPS/EC/enu/WebShopVerwerker.cls.xml
===================================================================
diff -u -r36502 -r45580
--- APPS/EC/enu/WebShopVerwerker.cls.xml	(.../WebShopVerwerker.cls.xml)	(revision 36502)
+++ APPS/EC/enu/WebShopVerwerker.cls.xml	(.../WebShopVerwerker.cls.xml)	(revision 45580)
@@ -96,6 +96,23 @@
 <Implementation><![CDATA[	Quit "DARO"
 ]]></Implementation>
 </Method>
+
+<Method name="RandomValue">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ValueToBeIgnored...:TECH.String</FormalSpec>
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[
+	#dim Value As TECH.String = ""
+	#dim ValueList As TECH.Iterator = ..ValueList()
+	#dim ValueToBeIgnoredIterator As TECH.Iterator = ##class(TECH.ArrayOneDimIterator).%New(.ValueToBeIgnored)
+	While ( Value = "" ) || ( ( ValueToBeIgnoredIterator.HasNext() ) && (##class(TECH.ListUtils).IsValueInIterator(Value,ValueToBeIgnoredIterator)) ) {
+		Set Value = ValueList.GetAt($random(ValueList.Count()+1))
+		Do ValueToBeIgnoredIterator.Reset()
+	}
+
+	Quit Value
+]]></Implementation>
+</Method>
 </Class>