Index: Tools/Test/TestCaseRunner.cls.xml
===================================================================
diff -u -r1622 -r2355
--- Tools/Test/TestCaseRunner.cls.xml	(.../TestCaseRunner.cls.xml)	(revision 1622)
+++ Tools/Test/TestCaseRunner.cls.xml	(.../TestCaseRunner.cls.xml)	(revision 2355)
@@ -148,11 +148,12 @@
  	
  	#dim ValidException As %Boolean = 0
  	#dim Message As %String = ""
- 	
- 	if ..TestCase.IsExceptieVerwacht() {
-		set ValidException = ..IsGeldigeExceptie(Exception,.Message)
-	}
-	Do:'ValidException ..Manager.LogException(Exception,Message)
+	
+	If (..TestCase.IsExceptieVerwacht()) {
+        Set ValidException = ..TestCase.GeefVerwachteExceptie().Valideer(Exception, .Message)
+    }
+	
+	Do:$$$Not(ValidException) ..Manager.LogException(Exception, Message)
 	goto AfterOneTest
 	quit
 
@@ -163,17 +164,6 @@
  	quit
 ]]></Implementation>
 </Method>
-
-<Method name="IsGeldigeExceptie">
-<FormalSpec><![CDATA[Exception:TECH.Exceptions.Exception,&Message:%String]]></FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	set Validator = ##class(Tools.Test.ExceptieValidator).%New(Exception , ..TestCase.GeefVerwachteExceptie())
-	set Message = ##class(TECH.ListUtils).ListToPieces(Validator.GeefBezwaren())
-	quit Validator.IsGeldig()
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: Tools/Test/VerwachteExceptie.cls.xml
===================================================================
diff -u -r719 -r2355
--- Tools/Test/VerwachteExceptie.cls.xml	(.../VerwachteExceptie.cls.xml)	(revision 719)
+++ Tools/Test/VerwachteExceptie.cls.xml	(.../VerwachteExceptie.cls.xml)	(revision 2355)
@@ -18,11 +18,24 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..Exceptie = Exceptie
-	set ..OmschrijvingSubStrings = $get(OmschrijvingSubStrings,##class(%ListOfDataTypes).%New())
+	Set ..Exceptie = Exceptie
+	Set ..OmschrijvingSubStrings = $Get(OmschrijvingSubStrings, ##class(%ListOfDataTypes).%New())
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
+
+<Method name="Valideer">
+<FormalSpec>Exceptie:TECH.Exceptions.Exception,Message:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim Validator As Tools.Test.ExceptieValidator = ##class(Tools.Test.ExceptieValidator).%New(Exceptie, ##this)
+	
+	Set Message = ##class(TECH.ListUtils).ListToPieces(Validator.GeefBezwaren())
+	
+	Quit Validator.IsGeldig()
+]]></Implementation>
+</Method>
 </Class>