Index: Tools/Test/TestCaseRunner.cls.xml
===================================================================
diff -u -r2356 -r3042
--- Tools/Test/TestCaseRunner.cls.xml	(.../TestCaseRunner.cls.xml)	(revision 2356)
+++ Tools/Test/TestCaseRunner.cls.xml	(.../TestCaseRunner.cls.xml)	(revision 3042)
@@ -3,6 +3,11 @@
 <Class name="Tools.Test.TestCaseRunner">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="MemoryCleaner">
+<Type>Tools.Test.VariabeleCleaner</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Manager">
 <Type>Tools.Test.Manager</Type>
 <Private>1</Private>
@@ -38,6 +43,7 @@
 	set ..ClassName = ClassName
 	set ..MethodPrefix = MethodPrefix
 	set ..SkipTestMethods = SkipTestMethods
+	set ..MemoryCleaner = ##class(Tools.Test.VariabeleCleaner).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -49,9 +55,14 @@
 <Implementation><![CDATA[
 	Do ##class(TECH.ExceptionHandler).Catch()
 
-	set:'..Manager.IsDebugOn() $ztrap = "OnTestInitialisationError"
+	Set:'..Manager.IsDebugOn() $ztrap = "OnTestInitialisationError"
 	
-	set ..TestCase = $classmethod(..ClassName,"%New",..Manager)
+	do ..MemoryCleaner.Clean()
+	
+	set List = ##class(TECH.Process.impl.ProcessAPI).%New().GeefObjectsInMemory()
+	break:List.Count()>2000
+	
+	Set ..TestCase = $classmethod(..ClassName,"%New",..Manager)
 	Set ..TestCase.Debug = ..Manager.Qualifiers.Debug
 	
 	#dim Exception As TECH.Exceptions.Exception
@@ -74,24 +85,29 @@
 	Set ..Manager.TheExecutionTime(..ClassName) = $zh - StartTimeCase
 	if ..Manager.HasToDisplayDuration() write " = "_..Manager.TheExecutionTime(..ClassName)_" sec."
 	
+	set ..TestCase = ""	
+	
 	quit
 
 OnTestInitialisationError
 	set $ztrap = ""
 	set Exception = ##class(TECH.ExceptionHandler).Catch()	
 	do ..Manager.LogException(Exception,"OnTestInitialisation")
+	set ..TestCase = ""
 	quit
 	
 OnBeforeAllTestsError
 	set $ztrap = ""
 	set Exception = ##class(TECH.ExceptionHandler).Catch()	
 	do ..Manager.LogException(Exception,"OnBeforeAllTests")
+	set ..TestCase = ""
 	quit
 	
 OnAfterAllTestsError
 	set $ztrap=""
 	set Exception = ##class(TECH.ExceptionHandler).Catch()
 	do ..Manager.LogException(Exception,"OnAfterAllTests")
+	set ..TestCase = ""
 	quit
 ]]></Implementation>
 </Method>
Index: Tools/Test/TestCase/OnBeforeOneTest.cls.xml
===================================================================
diff -u -r3041 -r3042
--- Tools/Test/TestCase/OnBeforeOneTest.cls.xml	(.../OnBeforeOneTest.cls.xml)	(revision 3041)
+++ Tools/Test/TestCase/OnBeforeOneTest.cls.xml	(.../OnBeforeOneTest.cls.xml)	(revision 3042)
@@ -3,27 +3,9 @@
 <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 ..Cleaner.Clean()
-	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
+<Implementation><![CDATA[	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
 ]]></Implementation>
 </Method>
 </Class>