Index: vhUnitTest/DOM/PM/Maatwerk/HF/TestHalffabSelectorResultSet.cls.xml
===================================================================
diff -u -r29059 -r40275
--- vhUnitTest/DOM/PM/Maatwerk/HF/TestHalffabSelectorResultSet.cls.xml	(.../TestHalffabSelectorResultSet.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/PM/Maatwerk/HF/TestHalffabSelectorResultSet.cls.xml	(.../TestHalffabSelectorResultSet.cls.xml)	(revision 40275)
@@ -5,17 +5,9 @@
 do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.PM.Maatwerk.HF.TestHalffabSelectorResultSet")</Description>
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do ##class(vhUnitTest.DOM.PM.Maatwerk.HF.impl.UTHalffab).%DeleteExtent()
- 	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
 	Set Halffab = ##class(vhUnitTest.DOM.PM.Maatwerk.HF.impl.UTHalffab).%New(1000)
 	Set Halffab.GeldigVan = 1
 	Set Halffab.GeldigTot = ##class(TECH.DateTime).MaxDate()
@@ -28,10 +20,16 @@
 	Set Halffab.Klantbeperking = ""
 	Set Halffab.Kenmerk1 = "Waarde"
 	Do Halffab.Save()
-	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Do ##class(vhUnitTest.DOM.PM.Maatwerk.HF.impl.UTHalffab).%DeleteExtent()
+	Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestKlantSelectiePositief">
 <Implementation><![CDATA[
 	Set ResultSet = ##class(DOM.PM.Maatwerk.Calc.HF.HalffabSelectorResultSet).%New("vhUnitTest_DOM_PM_Maatwerk_HF_impl.UTHalffab")