Index: Tools/Test/TestCase/OnAfterAllTests.cls.xml
===================================================================
diff -u
--- Tools/Test/TestCase/OnAfterAllTests.cls.xml	(revision 0)
+++ Tools/Test/TestCase/OnAfterAllTests.cls.xml	(revision 1495)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.Test.TestCase.OnAfterAllTests">
+<Super>%RegisteredObject</Super>
+
+<Method name="Exec">
+<FormalSpec>Debug:%Boolean</FormalSpec>
+<Implementation><![CDATA[	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: Tools/Test/TestCase/OnBeforeOneTest.cls.xml
===================================================================
diff -u
--- Tools/Test/TestCase/OnBeforeOneTest.cls.xml	(revision 0)
+++ Tools/Test/TestCase/OnBeforeOneTest.cls.xml	(revision 1495)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.Test.TestCase.OnBeforeOneTest">
+<Super>%RegisteredObject</Super>
+
+<Method name="Exec">
+<FormalSpec>Debug:%Boolean</FormalSpec>
+<Implementation><![CDATA[	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: Tools/Test/TestCase/OnAfterOneTest.cls.xml
===================================================================
diff -u
--- Tools/Test/TestCase/OnAfterOneTest.cls.xml	(revision 0)
+++ Tools/Test/TestCase/OnAfterOneTest.cls.xml	(revision 1495)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.Test.TestCase.OnAfterOneTest">
+<Super>%RegisteredObject</Super>
+
+<Method name="Exec">
+<FormalSpec>Debug:%Boolean</FormalSpec>
+<Implementation><![CDATA[	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: Tools/Test/TestCase.cls.xml
===================================================================
diff -u -r1349 -r1495
--- Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1349)
+++ Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1495)
@@ -114,13 +114,16 @@
 
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
- 	 set ..StartTime = ##class(TECH.DateTime).CurrentTimeStamp()
- 	 Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("MiniMail_VoegServerPrefixToe",0,..#Applicatie)
+	do ##class(Tools.Test.TestCase.OnBeforeAllTests).%New().Exec(..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 ..SchakelInAlleEvents()
+<Implementation><![CDATA[
+	do ##class(Tools.Test.TestCase.OnAfterAllTests).%New().Exec(..Debug)
+	Do ..SchakelInAlleEvents()
 ]]></Implementation>
 </Method>
 
@@ -129,6 +132,7 @@
 <Implementation><![CDATA[
 	set ..VerwachteExceptie = ""
 	do ..SetRuntimeContext()
+	do ##class(Tools.Test.TestCase.OnBeforeOneTest).%New().Exec(..Debug)
 	do ..VariableChecker.StoreVariabelenInMemory()
 ]]></Implementation>
 </Method>
@@ -137,6 +141,7 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	do ..ResetRuntimeContext()
+	do ##class(Tools.Test.TestCase.OnAfterOneTest).%New().Exec(..Debug)
 	do ..VariableChecker.CheckVariabelenInMemory()
 	do ..CheckOpenExceptions()
 	do ..CheckOpenTransactions()
Index: Tools/Test/TestCase/OnBeforeAllTests.cls.xml
===================================================================
diff -u
--- Tools/Test/TestCase/OnBeforeAllTests.cls.xml	(revision 0)
+++ Tools/Test/TestCase/OnBeforeAllTests.cls.xml	(revision 1495)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.Test.TestCase.OnBeforeAllTests">
+<Super>%RegisteredObject</Super>
+
+<Method name="Exec">
+<FormalSpec>Debug:%Boolean</FormalSpec>
+<Implementation><![CDATA[	Do:('Debug) ##class(vhTest.Fake.TECH.Logging.impl.LoggingAPI).MockInstance()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>