Index: Tools/Test/Manager.cls.xml
===================================================================
diff -u -r1717 -r1823
--- Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 1717)
+++ Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 1823)
@@ -5,6 +5,11 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.RegisteredObject</Super>
 
+<Parameter name="TestUser">
+<Type>%String</Type>
+<Default>4682||1000</Default>
+</Parameter>
+
 <Parameter name="TestType">
 <Type>%String</Type>
 </Parameter>
@@ -85,6 +90,7 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>qualifiers:%String,PackagePrefixes:%ListOfDataTypes</FormalSpec>
 <Implementation><![CDATA[
+	Do ##class(TECH.Context.RuntimeContext).Instance().ZetGebruikerID(..#TestUser)
 	Do ##class(vhLib.OldSchool).InitVars()
 	Set manager = ..%New()
 	do manager.SetTestSuite("Test "_PackagePrefixes.Count())
@@ -107,6 +113,7 @@
 <FormalSpec>qualifiers:%String,userparam:%String="",PackagePrefix:%String="",methodPrefix:%String=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+ 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetGebruikerID(..#TestUser)
  	Do ##class(vhLib.OldSchool).InitVars()
  	Set manager=..%New()
  	do manager.SetTestSuite(PackagePrefix)
Index: Tools/Test/TestCase.cls.xml
===================================================================
diff -u -r1496 -r1823
--- Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1496)
+++ Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1823)
@@ -75,11 +75,6 @@
 <Type>%String</Type>
 </Parameter>
 
-<Parameter name="SuperUser">
-<Type>%String</Type>
-<Default>4682||1000</Default>
-</Parameter>
-
 <Parameter name="PersonalityID">
 <Type>%String</Type>
 <Default>1</Default>
@@ -172,7 +167,7 @@
 <Implementation><![CDATA[
 	#dim RuntimeContext As TECH.Context.RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
 	do RuntimeContext.ZetApplicatie("")
-	do RuntimeContext.ZetGebruikerID(..#SuperUser)
+	do RuntimeContext.ZetGebruikerID(..GeefTestUserID())
 	do RuntimeContext.ZetTaal(##class(DOM.enu.Taal).Nederlands())
 ]]></Implementation>
 </Method>
@@ -183,7 +178,7 @@
 <Implementation><![CDATA[
 	#dim RuntimeContext As TECH.Context.RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
 	do RuntimeContext.ZetApplicatie(..#Applicatie)
-	do RuntimeContext.ZetGebruikerID(..#SuperUser)
+	do RuntimeContext.ZetGebruikerID(..GeefTestUserID())
 	do RuntimeContext.ZetPersonalityID(..#PersonalityID)
 ]]></Implementation>
 </Method>
@@ -326,6 +321,13 @@
 <Implementation><![CDATA[	quit 1
 ]]></Implementation>
 </Method>
+
+<Method name="GeefTestUserID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..Manager.%GetParameter("TestUser")
+]]></Implementation>
+</Method>
 </Class>