Index: Tools/Test/TestCase/OnAfterOneTest.cls.xml
===================================================================
diff -u -r1495 -r3187
--- Tools/Test/TestCase/OnAfterOneTest.cls.xml	(.../OnAfterOneTest.cls.xml)	(revision 1495)
+++ Tools/Test/TestCase/OnAfterOneTest.cls.xml	(.../OnAfterOneTest.cls.xml)	(revision 3187)
@@ -4,7 +4,7 @@
 <Super>%RegisteredObject</Super>
 
 <Method name="Exec">
-<FormalSpec>Debug:%Boolean</FormalSpec>
+<FormalSpec>TestCase:Tools.Test.TestCase,Debug:%Boolean</FormalSpec>
 <Implementation><![CDATA[	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
 ]]></Implementation>
 </Method>
Index: Tools/Test/TestCase/OnBeforeOneTest.cls.xml
===================================================================
diff -u -r3042 -r3187
--- Tools/Test/TestCase/OnBeforeOneTest.cls.xml	(.../OnBeforeOneTest.cls.xml)	(revision 3042)
+++ Tools/Test/TestCase/OnBeforeOneTest.cls.xml	(.../OnBeforeOneTest.cls.xml)	(revision 3187)
@@ -4,10 +4,24 @@
 <Super>%RegisteredObject</Super>
 
 <Method name="Exec">
-<FormalSpec>Debug:%Boolean</FormalSpec>
-<Implementation><![CDATA[	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
+<FormalSpec>TestCase:Tools.Test.TestCase,Debug:%Boolean</FormalSpec>
+<Implementation><![CDATA[
+	do ..SetRuntimeContext(TestCase)
+	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
 ]]></Implementation>
 </Method>
+
+<Method name="SetRuntimeContext">
+<FormalSpec>TestCase:Tools.Test.TestCase</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim RuntimeContext As TECH.Context.RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
+	do RuntimeContext.ZetApplicatie(TestCase.%GetParameter("Applicatie"))
+	do RuntimeContext.ZetGebruikerID(TestCase.%GetParameter("UserId"))
+	do RuntimeContext.ZetPersonalityID(TestCase.%GetParameter("PersonalityID"))
+	do RuntimeContext.ZetSessieID("")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: Tools/Test/TestCase/OnBeforeAllTests.cls.xml
===================================================================
diff -u -r3041 -r3187
--- Tools/Test/TestCase/OnBeforeAllTests.cls.xml	(.../OnBeforeAllTests.cls.xml)	(revision 3041)
+++ Tools/Test/TestCase/OnBeforeAllTests.cls.xml	(.../OnBeforeAllTests.cls.xml)	(revision 3187)
@@ -4,10 +4,24 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Method name="Exec">
-<FormalSpec>Debug:%Boolean</FormalSpec>
-<Implementation><![CDATA[	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
+<FormalSpec>TestCase:Tools.Test.TestCase,Debug:%Boolean</FormalSpec>
+<Implementation><![CDATA[
+	do ..SetRuntimeContext(TestCase)
+	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
 ]]></Implementation>
 </Method>
+
+<Method name="SetRuntimeContext">
+<FormalSpec>TestCase:Tools.Test.TestCase</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim RuntimeContext As TECH.Context.RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
+	do RuntimeContext.ZetApplicatie(TestCase.%GetParameter("Applicatie"))
+	do RuntimeContext.ZetGebruikerID(TestCase.%GetParameter("UserId"))
+	do RuntimeContext.ZetPersonalityID(TestCase.%GetParameter("PersonalityID"))
+	do RuntimeContext.ZetSessieID("")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: Tools/Test/TestCase.cls.xml
===================================================================
diff -u -r3064 -r3187
--- Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 3064)
+++ Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 3187)
@@ -120,33 +120,30 @@
 
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
-	do ..SetRuntimeContext()
-	do ##class(Tools.Test.TestCase.OnBeforeAllTests).%New().Exec(..Debug)
+	do ##class(Tools.Test.TestCase.OnBeforeAllTests).%New().Exec($this,..Debug)
  	set ..StartTime = ##class(TECH.DateTime).CurrentTimeStamp()
  	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("MiniMail_VoegServerPrefixToe",0,..#Applicatie)
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterAllTests">
-<Implementation><![CDATA[	do ##class(Tools.Test.TestCase.OnAfterAllTests).%New().Exec(..Debug)
+<Implementation><![CDATA[	do ##class(Tools.Test.TestCase.OnAfterAllTests).%New().Exec($this,..Debug)
 ]]></Implementation>
 </Method>
 
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	do ##class(Tools.Test.TestCase.OnBeforeOneTest).%New().Exec(..Debug)
+	do ##class(Tools.Test.TestCase.OnBeforeOneTest).%New().Exec($this,..Debug)
 	do ..Checker.Store()
 	set ..VerwachteExceptie = ""
-	do ..SetRuntimeContext()
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	do ..ResetRuntimeContext()
-	do ##class(Tools.Test.TestCase.OnAfterOneTest).%New().Exec(..Debug)
+	do ##class(Tools.Test.TestCase.OnAfterOneTest).%New().Exec($this,..Debug)
 	do ..Checker.Validate()
 	do ..CheckOpenExceptions()
 	do ..CheckOpenTransactions()
@@ -171,28 +168,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ResetRuntimeContext">
-<Final>1</Final>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim RuntimeContext As TECH.Context.RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
-	do RuntimeContext.ZetApplicatie("")
-	do RuntimeContext.ZetGebruikerID(..GeefTestUserID())
-	do RuntimeContext.ZetTaal("N")
-]]></Implementation>
-</Method>
-
-<Method name="SetRuntimeContext">
-<Final>1</Final>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim RuntimeContext As TECH.Context.RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
-	do RuntimeContext.ZetApplicatie(..#Applicatie)
-	do RuntimeContext.ZetGebruikerID(..GeefTestUserID())
-	do RuntimeContext.ZetPersonalityID(..#PersonalityID)
-]]></Implementation>
-</Method>
-
 <Method name="CheckRuntimeContextGebruikerID">
 <Final>1</Final>
 <Private>1</Private>
@@ -321,13 +296,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefTestUserID">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..Manager.%GetParameter("TestUser")
-]]></Implementation>
-</Method>
-
 <Method name="EmptyIterator">
 <Private>1</Private>
 <ReturnType>TECH.Iterator</ReturnType>
Index: Tools/Test/TestCase/OnAfterAllTests.cls.xml
===================================================================
diff -u -r1495 -r3187
--- Tools/Test/TestCase/OnAfterAllTests.cls.xml	(.../OnAfterAllTests.cls.xml)	(revision 1495)
+++ Tools/Test/TestCase/OnAfterAllTests.cls.xml	(.../OnAfterAllTests.cls.xml)	(revision 3187)
@@ -4,7 +4,7 @@
 <Super>%RegisteredObject</Super>
 
 <Method name="Exec">
-<FormalSpec>Debug:%Boolean</FormalSpec>
+<FormalSpec>TestCase:Tools.Test.TestCase,Debug:%Boolean</FormalSpec>
 <Implementation><![CDATA[	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
 ]]></Implementation>
 </Method>