Index: vhUnitTest/DOM/TRANSP/impl/DataM/DataMRit.cls.xml
===================================================================
diff -u -r29059 -r40295
--- vhUnitTest/DOM/TRANSP/impl/DataM/DataMRit.cls.xml	(.../DataMRit.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/TRANSP/impl/DataM/DataMRit.cls.xml	(.../DataMRit.cls.xml)	(revision 40295)
@@ -3,6 +3,20 @@
 <Class name="vhUnitTest.DOM.TRANSP.impl.DataM.DataMRit">
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	do ##class(vhUnitTest.DOM.TRANSP.TestData).%New().MaakTestData()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	do ##class(vhUnitTest.DOM.TRANSP.TestData).%New().VerwijderTestData()
+	Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestGeefTransporten">
 <Description>
 do ##class(vhUnitTest.Manager).RunTest("/display=all","DOM.TRANSP.impl.DataM")</Description>
@@ -22,22 +36,6 @@
 	do $$$AssertEquals(Rit.GeefTarraGewicht(),236)
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ##class(vhUnitTest.DOM.TRANSP.TestData).%New().MaakTestData()
- 	Quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ##class(vhUnitTest.DOM.TRANSP.TestData).%New().VerwijderTestData()
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>