Index: Tools/Test/Manager.cls.xml
===================================================================
diff -u -r3599 -r3713
--- Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 3599)
+++ Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 3713)
@@ -101,7 +101,9 @@
 <FormalSpec>qualifiers:%String,Substring:%String="",methodPrefix:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	do ##class(svn.Setting).ZetIsUnitTestBezig(1,..%ClassName(1))
+	Do ##class(vhLib.Logger).%New().Debug("UNITTEST GESTART","")
  	Do ..RunTestSuite(.qualifiers,,Substring,methodPrefix)
+	Do ##class(vhLib.Logger).%New().Debug("UNITTEST BEEINDIGD","")
  	do ##class(svn.Setting).ZetIsUnitTestBezig(0,..%ClassName(1))
 ]]></Implementation>
 </Method>
@@ -129,16 +131,12 @@
 			write !,Substring_".cls() -- do ##class("_manager.%ClassName(1)_").RunTest("""","""_Substring_""")"
 			do manager.RunSuite(qualifiers,,Substring)
 		}
+		Do ##class(TECH.Context).Instance().Reset()
 	 	do manager.DumpFails()
 	 	do manager.MailResult()
 	} Catch {
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		
-		Try {
-			do manager.DumpFails()
-		} Catch {}
-		
-		Write !, !, " ===== TEST MANAGER FAILED =====  ", !, Exception.ToString(), !
+		Do ##class(TECH.Context).Instance().Reset()
+		Do ..ErrorHandlingRunSuite(##class(TECH.ExceptionHandler).Catch(), manager)
 	}
 	do ##class(svn.Setting).ZetIsUnitTestBezig(0,..%ClassName(1))
 	quit
@@ -157,22 +155,33 @@
 	 	Set manager=..%New()
 	 	do manager.SetTestSuite(Substring)
 	 	do manager.RunSuite(qualifiers,userparam,Substring,methodPrefix)
+		Do ##class(TECH.Context).Instance().Reset()
 	 	do manager.DumpFails()
 	 	do manager.MailResult()
 	} Catch {
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		
-		Try {
-			do manager.DumpFails()
-		} Catch {}
-		
-		Write !, !, " ===== TEST MANAGER FAILED =====  ", !, Exception.ToString(), !
+		Do ##class(TECH.Context).Instance().Reset()
+		Do ..ErrorHandlingRunSuite(##class(TECH.ExceptionHandler).Catch(), manager)
 	}
- 	
  	quit
 ]]></Implementation>
 </Method>
 
+<Method name="ErrorHandlingRunSuite">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Exception:TECH.Exceptions.Exception,manager:Tools.Test.Manager</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Try {
+		Do manager.DumpFails()
+	} Catch {
+		Do ##class(vhLib.Logger).LogExceptie(##class(TECH.ExceptionHandler).Catch())
+	}
+	
+	Write !, !, " ===== TEST MANAGER FAILED =====  ", !, Exception.ToString(), !
+]]></Implementation>
+</Method>
+
 <Method name="%OnNew">
 <FormalSpec>initvalue:%CacheString</FormalSpec>
 <Private>1</Private>