Index: vhUnitTest/WSimpl/Unishop/Login/Aanmelder/Test.cls.xml
===================================================================
diff -u -r33387 -r33388
--- vhUnitTest/WSimpl/Unishop/Login/Aanmelder/Test.cls.xml	(.../Test.cls.xml)	(revision 33387)
+++ vhUnitTest/WSimpl/Unishop/Login/Aanmelder/Test.cls.xml	(.../Test.cls.xml)	(revision 33388)
@@ -12,9 +12,9 @@
 	
 	#dim WebshopSessieSettingsInvullerMock As vhTest.Mock.WSimpl.Unishop.Login.WebshopSessieSettingsInvuller = ##class(vhTest.Mock.WSimpl.Unishop.Login.WebshopSessieSettingsInvuller).%New()
 	
-	Do WebshopSessieSettingsInvullerMock.VerwachtMethodCall("VulIn",$$$ElkeWaarde).DanDoeNiks()
+	Do WebshopSessieSettingsInvullerMock.VerwachtMethodCall("VulIn",SessionServiceDummy.WebshopSessie).DanDoeNiks()
 	
-	#dim Aanmelder As WSimpl.Unishop.Login.Aanmelder = ##class(WSimpl.Unishop.Login.Aanmelder).%New(LoginParameterBepalerDummy, LoginKortingBewaarderDummy, SessionServiceDummy, WebshopSessieSettingsInvullerMock,RefSessieBepalerDummy)
+	#dim Aanmelder As vhTest.Subclass.WSimpl.Unishop.Login.Aanmelder = ##class(vhTest.Subclass.WSimpl.Unishop.Login.Aanmelder).%New(LoginParameterBepalerDummy, LoginKortingBewaarderDummy, SessionServiceDummy, WebshopSessieSettingsInvullerMock,RefSessieBepalerDummy)
 	Do Aanmelder.LoginMetEncryptedParameters("","","","")
 
 	Do WebshopSessieSettingsInvullerMock.Verifieer()
Index: vhTest/Subclass/WSimpl/Unishop/Login/Aanmelder.cls.xml
===================================================================
diff -u
--- vhTest/Subclass/WSimpl/Unishop/Login/Aanmelder.cls.xml	(revision 0)
+++ vhTest/Subclass/WSimpl/Unishop/Login/Aanmelder.cls.xml	(revision 33388)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Subclass.WSimpl.Unishop.Login.Aanmelder">
+<Super>WSimpl.Unishop.Login.Aanmelder</Super>
+
+<Method name="ZetWebshopModus">
+<FormalSpec>Ref:%String,SessieID:%String</FormalSpec>
+<Private>1</Private>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Dummy/APPS/EC/WebshopSessionService.cls.xml
===================================================================
diff -u -r33387 -r33388
--- vhTest/Dummy/APPS/EC/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 33387)
+++ vhTest/Dummy/APPS/EC/WebshopSessionService.cls.xml	(.../WebshopSessionService.cls.xml)	(revision 33388)
@@ -5,37 +5,25 @@
 
 <Property name="WebshopSessie">
 <Type>APPS.EC.impl.WebshopSessie</Type>
-<Private>1</Private>
 </Property>
 
-<Property name="Sleutel">
-<Type>%String</Type>
+<Method name="%OnNew">
 <Private>1</Private>
-</Property>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..WebshopSessie = ##class(APPS.EC.dto.WebshopSessie).%New()
+	Set ..WebshopSessie.VhintraSessie = ##class(APPS.algemeen.VhintraShell.dto.VhintraSessie).%New()
+	Set ..WebshopSessie.VhintraSessie.SessieSleutel = ""
+	quit $$$OK
+]]></Implementation>
+</Method>
 
-<Property name="GebruikerID">
-<Type>%String</Type>
-<InitialExpression>"vhUnitTest.WSimpl.Unishop.Login.Aanmelder.Test"</InitialExpression>
-</Property>
-
 <Method name="Login">
 <FormalSpec>LoginParameters:WSimpl.Unishop.Login.Parameters</FormalSpec>
 <ReturnType>APPS.EC.dto.WebshopSessie</ReturnType>
-<Implementation><![CDATA[
-	if ##class(APPS.EC.impl.VanHoeckeWebshopSessie).%ExistsId(..GebruikerID){
-		Set ..WebshopSessie = ##class(APPS.EC.impl.VanHoeckeWebshopSessie).%OpenId(..GebruikerID)
-	} else {
-		Set ..WebshopSessie = ##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New(..GebruikerID)
-		Do ..WebshopSessie.ZetWebshopModus(##class(APPS.EC.enu.WebshopModus).Normaal())
-		Do ..WebshopSessie.Save()		
-	}
-	
-	Set ..Sleutel = ..WebshopSessie.GeefSessieSleutel()
-
-	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ##class(APPS.EC.dto.WebshopSessie).%New()
-	Set WebshopSessie.VhintraSessie = ##class(APPS.algemeen.VhintraShell.dto.VhintraSessie).%New()
-	Set WebshopSessie.VhintraSessie.SessieSleutel = ..Sleutel
-	Quit WebshopSessie
+<Implementation><![CDATA[	Quit ..WebshopSessie
 ]]></Implementation>
 </Method>
 </Class>