Index: vhUnitTest/APPS/Halux/PPS/ALUFrees/impl/Optimizer/ToolSetValidator/TestBepaalISOHead.cls.xml
===================================================================
diff -u -r29059 -r40211
--- vhUnitTest/APPS/Halux/PPS/ALUFrees/impl/Optimizer/ToolSetValidator/TestBepaalISOHead.cls.xml	(.../TestBepaalISOHead.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/Halux/PPS/ALUFrees/impl/Optimizer/ToolSetValidator/TestBepaalISOHead.cls.xml	(.../TestBepaalISOHead.cls.xml)	(revision 40211)
@@ -8,26 +8,24 @@
 <Private>1</Private>
 </Property>
 
-<Method name="TestBepaalBeschikbareKoppen">
-<Implementation><![CDATA[	set ToolsSetValidator = ##class(APPS.Halux.PPS.ALUFrees.impl.Optimizer.ToolSetValidator).%New(..Machine)
-]]></Implementation>
-</Method>
-
 <Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
- 	 set ..Machine = ##class(vhUnitTest.APPS.Halux.PPS.ALUFrees.TestData.BatchData).MaakMachine()
- 	 Quit $$$OK
+ 	 Do ##super()
+ 	 Set ..Machine = ##class(vhUnitTest.APPS.Halux.PPS.ALUFrees.TestData.BatchData).MaakMachine()
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	do ..Machine.Delete()
-	Quit $$$OK
+	Do ..Machine.Delete()
+	Do ##super()
 ]]></Implementation>
 </Method>
+
+<Method name="TestBepaalBeschikbareKoppen">
+<Implementation><![CDATA[	Set ToolsSetValidator = ##class(APPS.Halux.PPS.ALUFrees.impl.Optimizer.ToolSetValidator).%New(..Machine)
+]]></Implementation>
+</Method>
 </Class>