Index: Tools/Test/VariabeleCleaner.cls.xml
===================================================================
diff -u
--- Tools/Test/VariabeleCleaner.cls.xml	(revision 0)
+++ Tools/Test/VariabeleCleaner.cls.xml	(revision 3041)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.Test.VariabeleCleaner">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="VariabelenTeBehouden">
+<Type>%String</Type>
+<Collection>array</Collection>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	do ..GenereerLijstVariabelenTeBehouden()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Clean">
+<Implementation><![CDATA[
+	#dim Var As %String = "%"
+	for  { set Var = $order(@Var) quit:Var="" 
+		if $$$Not(..VariabelenTeBehouden.IsDefined(Var)) kill @Var
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GenereerLijstVariabelenTeBehouden">
+<Implementation><![CDATA[
+	; DATA-M
+	do ..VariabelenTeBehouden.SetAt("","D")
+	do ..VariabelenTeBehouden.SetAt("","DD")
+	do ..VariabelenTeBehouden.SetAt("","DT")
+	do ..VariabelenTeBehouden.SetAt("","GebruikerID")
+	do ..VariabelenTeBehouden.SetAt("","Q")
+	do ..VariabelenTeBehouden.SetAt("","QT")
+	do ..VariabelenTeBehouden.SetAt("","QU")
+	do ..VariabelenTeBehouden.SetAt("","TD")
+	do ..VariabelenTeBehouden.SetAt("","U")
+	do ..VariabelenTeBehouden.SetAt("","alias")
+	do ..VariabelenTeBehouden.SetAt("","boot")
+	do ..VariabelenTeBehouden.SetAt("","bootrvg")
+	do ..VariabelenTeBehouden.SetAt("","client")
+	do ..VariabelenTeBehouden.SetAt("","cs")
+	do ..VariabelenTeBehouden.SetAt("","master")
+	do ..VariabelenTeBehouden.SetAt("","slave")
+	do ..VariabelenTeBehouden.SetAt("","workst")
+
+	; 
+	do ..VariabelenTeBehouden.SetAt("","r1")
+	do ..VariabelenTeBehouden.SetAt("","r2")
+	do ..VariabelenTeBehouden.SetAt("","runMtd")
+
+	; ISC
+	do ..VariabelenTeBehouden.SetAt("","SQLCODE")
+	do ..VariabelenTeBehouden.SetAt("","ts")
+	do ..VariabelenTeBehouden.SetAt("","sc")
+	do ..VariabelenTeBehouden.SetAt("","oid")
+	do ..VariabelenTeBehouden.SetAt("","columnNbr")
+	do ..VariabelenTeBehouden.SetAt("","qstruct")
+	
+	; ISC - Studio
+	do ..VariabelenTeBehouden.SetAt("","%0CacheEvent")
+	do ..VariabelenTeBehouden.SetAt("","%0CacheEventClass")
+	do ..VariabelenTeBehouden.SetAt("","%SourceControl")
+	do ..VariabelenTeBehouden.SetAt("","%allowNestedCalls")
+	do ..VariabelenTeBehouden.SetAt("","%changedObjs")
+	do ..VariabelenTeBehouden.SetAt("","%clientVersion")
+	do ..VariabelenTeBehouden.SetAt("","%connections")
+	do ..VariabelenTeBehouden.SetAt("","%curqdev")
+	do ..VariabelenTeBehouden.SetAt("","%debug")
+	do ..VariabelenTeBehouden.SetAt("","%err")
+	do ..VariabelenTeBehouden.SetAt("","%javaClient")
+	do ..VariabelenTeBehouden.SetAt("","%jobBufferDefined")
+	do ..VariabelenTeBehouden.SetAt("","%langType")
+	do ..VariabelenTeBehouden.SetAt("","%msg")
+	do ..VariabelenTeBehouden.SetAt("","%msgin")
+	do ..VariabelenTeBehouden.SetAt("","%mtdInfo")
+	do ..VariabelenTeBehouden.SetAt("","%objcn")
+	do ..VariabelenTeBehouden.SetAt("","%objlasterror")
+	do ..VariabelenTeBehouden.SetAt("","%protocol")
+	do ..VariabelenTeBehouden.SetAt("","%qHandle")
+	do ..VariabelenTeBehouden.SetAt("","%qacn")
+	do ..VariabelenTeBehouden.SetAt("","%qdev")
+	do ..VariabelenTeBehouden.SetAt("","%qfun")
+	do ..VariabelenTeBehouden.SetAt("","%qmsgid")
+	do ..VariabelenTeBehouden.SetAt("","%qrc")
+	do ..VariabelenTeBehouden.SetAt("","%qrdr")
+	do ..VariabelenTeBehouden.SetAt("","%qsc")
+	do ..VariabelenTeBehouden.SetAt("","%refCntErrs")
+	do ..VariabelenTeBehouden.SetAt("","%res")
+	do ..VariabelenTeBehouden.SetAt("","%sysOrefs")
+	do ..VariabelenTeBehouden.SetAt("","%sqlcontext")
+	do ..VariabelenTeBehouden.SetAt("","%this")
+	do ..VariabelenTeBehouden.SetAt("","%twofact")
+	do ..VariabelenTeBehouden.SetAt("","%uhash")
+	do ..VariabelenTeBehouden.SetAt("","%useCache")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: Tools/Test/TestCase.cls.xml
===================================================================
diff -u -r3040 -r3041
--- Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 3040)
+++ Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 3041)
@@ -134,10 +134,10 @@
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
+	do ##class(Tools.Test.TestCase.OnBeforeOneTest).%New().Exec(..Debug)
 	do ..Checker.Store()
 	set ..VerwachteExceptie = ""
 	do ..SetRuntimeContext()
-	do ##class(Tools.Test.TestCase.OnBeforeOneTest).%New().Exec(..Debug)
 ]]></Implementation>
 </Method>
 
Index: Tools/Test/TestCase/OnBeforeAllTests.cls.xml
===================================================================
diff -u -r3040 -r3041
--- Tools/Test/TestCase/OnBeforeAllTests.cls.xml	(.../OnBeforeAllTests.cls.xml)	(revision 3040)
+++ Tools/Test/TestCase/OnBeforeAllTests.cls.xml	(.../OnBeforeAllTests.cls.xml)	(revision 3041)
@@ -3,107 +3,11 @@
 <Class name="Tools.Test.TestCase.OnBeforeAllTests">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="VariabelenTeBehouden">
-<Type>%String</Type>
-<Collection>array</Collection>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[
-	do ..GenereerLijstVariabelenTeBehouden()
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="Exec">
 <FormalSpec>Debug:%Boolean</FormalSpec>
-<Implementation><![CDATA[
-	#dim Var As %String = "%"
-	for  { set Var = $order(@Var) quit:Var="" 
-		if $$$Not(..VariabelenTeBehouden.IsDefined(Var)) kill @Var
-	}
-	
-	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
+<Implementation><![CDATA[	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
 ]]></Implementation>
 </Method>
-
-<Method name="GenereerLijstVariabelenTeBehouden">
-<Implementation><![CDATA[
-	; DATA-M
-	do ..VariabelenTeBehouden.SetAt("","D")
-	do ..VariabelenTeBehouden.SetAt("","DD")
-	do ..VariabelenTeBehouden.SetAt("","DT")
-	do ..VariabelenTeBehouden.SetAt("","GebruikerID")
-	do ..VariabelenTeBehouden.SetAt("","Q")
-	do ..VariabelenTeBehouden.SetAt("","QT")
-	do ..VariabelenTeBehouden.SetAt("","QU")
-	do ..VariabelenTeBehouden.SetAt("","TD")
-	do ..VariabelenTeBehouden.SetAt("","U")
-	do ..VariabelenTeBehouden.SetAt("","alias")
-	do ..VariabelenTeBehouden.SetAt("","boot")
-	do ..VariabelenTeBehouden.SetAt("","bootrvg")
-	do ..VariabelenTeBehouden.SetAt("","client")
-	do ..VariabelenTeBehouden.SetAt("","cs")
-	do ..VariabelenTeBehouden.SetAt("","master")
-	do ..VariabelenTeBehouden.SetAt("","slave")
-	do ..VariabelenTeBehouden.SetAt("","workst")
-
-	; 
-	do ..VariabelenTeBehouden.SetAt("","r1")
-	do ..VariabelenTeBehouden.SetAt("","r2")
-	do ..VariabelenTeBehouden.SetAt("","runMtd")
-
-	; ISC
-	do ..VariabelenTeBehouden.SetAt("","SQLCODE")
-	do ..VariabelenTeBehouden.SetAt("","ts")
-	do ..VariabelenTeBehouden.SetAt("","sc")
-	do ..VariabelenTeBehouden.SetAt("","oid")
-	do ..VariabelenTeBehouden.SetAt("","columnNbr")
-	do ..VariabelenTeBehouden.SetAt("","qstruct")
-	
-	; ISC - Studio
-	do ..VariabelenTeBehouden.SetAt("","%0CacheEvent")
-	do ..VariabelenTeBehouden.SetAt("","%0CacheEventClass")
-	do ..VariabelenTeBehouden.SetAt("","%SourceControl")
-	do ..VariabelenTeBehouden.SetAt("","%allowNestedCalls")
-	do ..VariabelenTeBehouden.SetAt("","%changedObjs")
-	do ..VariabelenTeBehouden.SetAt("","%clientVersion")
-	do ..VariabelenTeBehouden.SetAt("","%connections")
-	do ..VariabelenTeBehouden.SetAt("","%curqdev")
-	do ..VariabelenTeBehouden.SetAt("","%debug")
-	do ..VariabelenTeBehouden.SetAt("","%err")
-	do ..VariabelenTeBehouden.SetAt("","%javaClient")
-	do ..VariabelenTeBehouden.SetAt("","%jobBufferDefined")
-	do ..VariabelenTeBehouden.SetAt("","%langType")
-	do ..VariabelenTeBehouden.SetAt("","%msg")
-	do ..VariabelenTeBehouden.SetAt("","%msgin")
-	do ..VariabelenTeBehouden.SetAt("","%mtdInfo")
-	do ..VariabelenTeBehouden.SetAt("","%objcn")
-	do ..VariabelenTeBehouden.SetAt("","%objlasterror")
-	do ..VariabelenTeBehouden.SetAt("","%protocol")
-	do ..VariabelenTeBehouden.SetAt("","%qHandle")
-	do ..VariabelenTeBehouden.SetAt("","%qacn")
-	do ..VariabelenTeBehouden.SetAt("","%qdev")
-	do ..VariabelenTeBehouden.SetAt("","%qfun")
-	do ..VariabelenTeBehouden.SetAt("","%qmsgid")
-	do ..VariabelenTeBehouden.SetAt("","%qrc")
-	do ..VariabelenTeBehouden.SetAt("","%qrdr")
-	do ..VariabelenTeBehouden.SetAt("","%qsc")
-	do ..VariabelenTeBehouden.SetAt("","%refCntErrs")
-	do ..VariabelenTeBehouden.SetAt("","%res")
-	do ..VariabelenTeBehouden.SetAt("","%sysOrefs")
-	do ..VariabelenTeBehouden.SetAt("","%sqlcontext")
-	do ..VariabelenTeBehouden.SetAt("","%this")
-	do ..VariabelenTeBehouden.SetAt("","%twofact")
-	do ..VariabelenTeBehouden.SetAt("","%uhash")
-	do ..VariabelenTeBehouden.SetAt("","%useCache")
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: Tools/Test/TestCase/OnBeforeOneTest.cls.xml
===================================================================
diff -u -r1495 -r3041
--- Tools/Test/TestCase/OnBeforeOneTest.cls.xml	(.../OnBeforeOneTest.cls.xml)	(revision 1495)
+++ Tools/Test/TestCase/OnBeforeOneTest.cls.xml	(.../OnBeforeOneTest.cls.xml)	(revision 3041)
@@ -3,9 +3,27 @@
 <Class name="Tools.Test.TestCase.OnBeforeOneTest">
 <Super>%RegisteredObject</Super>
 
+<Property name="Cleaner">
+<Type>Tools.Test.VariabeleCleaner</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..Cleaner = ##class(Tools.Test.VariabeleCleaner).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Exec">
 <FormalSpec>Debug:%Boolean</FormalSpec>
-<Implementation><![CDATA[	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
+<Implementation><![CDATA[
+	Do ..Cleaner.Clean()
+	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
 ]]></Implementation>
 </Method>
 </Class>