Index: vhUnitTest/APPS/PM/Maatwerk/TestMaatwerkService.cls.xml
===================================================================
diff -u -r30490 -r40169
--- vhUnitTest/APPS/PM/Maatwerk/TestMaatwerkService.cls.xml	(.../TestMaatwerkService.cls.xml)	(revision 30490)
+++ vhUnitTest/APPS/PM/Maatwerk/TestMaatwerkService.cls.xml	(.../TestMaatwerkService.cls.xml)	(revision 40169)
@@ -10,6 +10,25 @@
 <Default>UT Aanpassing</Default>
 </Parameter>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	Do ..OnAfterAllTests()
+	do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(1001,1001)
+	Set HalffabSpecInfo = ##class(vhUnitTest.DOM.PM.Maatwerk.HF.impl.UTHalffabSpecInfo).%New(##class(vhUnitTest.DOM.PM.Maatwerk.HF.enu.UTFamilie).UTFamilie1(),"UTVariant",##class(vhTest.Dummy.DOM.PM.Maatwerk.Calc.HF.HalffabSpec).%ClassName(1),,1,##class(TECH.DateTime).MaxDate())
+	Do HalffabSpecInfo.%Save()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1001,1001)
+	&SQL(DELETE FROM DOM_PM_Maatwerk_Calc_HF_impl.HalffabSpecInfo WHERE Familie %STARTSWITH 'UT')
+	If (##class(DOM.PM.Maatwerk.Aanpassing.dto.MaatwerkAanpassing).%ExistsId(..#AanpassingNaam)) Do ##class(DOM.PM.Maatwerk.Aanpassing.dto.MaatwerkAanpassing).DeleteId(..#AanpassingNaam)
+	Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestGeefDefaultOmschrijving">
 <Implementation><![CDATA[
 	Set MaatwerkType = ##class(APPS.PM.Maatwerk.dto.MaatwerkType).%New()
@@ -87,27 +106,6 @@
 	Do SpecialsEditorService.VerwijderMaatwerkAanpassing(MaatwerkAanpassing.Naam)
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do ..OnAfterAllTests()
-	do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(1001,1001)
-	Set HalffabSpecInfo = ##class(vhUnitTest.DOM.PM.Maatwerk.HF.impl.UTHalffabSpecInfo).%New(##class(vhUnitTest.DOM.PM.Maatwerk.HF.enu.UTFamilie).UTFamilie1(),"UTVariant",##class(vhTest.Dummy.DOM.PM.Maatwerk.Calc.HF.HalffabSpec).%ClassName(1),,1,##class(TECH.DateTime).MaxDate())
-	#dim Status As %Status = HalffabSpecInfo.%Save()
-	Quit Status
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(1001,1001)
-	&SQL(DELETE FROM DOM_PM_Maatwerk_Calc_HF_impl.HalffabSpecInfo WHERE Familie %STARTSWITH 'UT')
-	If (##class(DOM.PM.Maatwerk.Aanpassing.dto.MaatwerkAanpassing).%ExistsId(..#AanpassingNaam)) Do ##class(DOM.PM.Maatwerk.Aanpassing.dto.MaatwerkAanpassing).DeleteId(..#AanpassingNaam)
- 	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>