Index: vhUnitTest/DOM/TRANSP/TestTransport.cls.xml
===================================================================
diff -u -r29059 -r40292
--- vhUnitTest/DOM/TRANSP/TestTransport.cls.xml	(.../TestTransport.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/TRANSP/TestTransport.cls.xml	(.../TestTransport.cls.xml)	(revision 40292)
@@ -7,6 +7,27 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="OnBeforeAllTests">
+<Description>
+Test data genomen uit global ^TRANSP("D",6330,</Description>
+<Implementation><![CDATA[
+	Do ##super()
+	do ##class(vhUnitTest.DOM.TRANSP.TestData).%New().MaakTestData()
+	Do ..MaakTRANSP(0)
+	Do ..MaakTRANSP(1)
+ 	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	do ##class(vhUnitTest.DOM.TRANSP.TestData).%New().VerwijderTestData()
+	Kill ^TRANSP("D",0)
+	Kill ^TRANSP("D",1)
+	Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestTransportData">
 <Implementation><![CDATA[
 	#dim TransportAPI As DOM.TRANSP.TransportAPI = ##class(DOM.DomeinContext).Instance().GeefTransportAPI()
@@ -229,18 +250,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnBeforeAllTests">
-<Description>
-Test data genomen uit global ^TRANSP("D",6330,</Description>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ##class(vhUnitTest.DOM.TRANSP.TestData).%New().MaakTestData()
-	Do ..MaakTRANSP(0)
-	Do ..MaakTRANSP(1)
- 	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="MaakTRANSP">
 <FormalSpec>RitID:%String</FormalSpec>
 <Private>1</Private>
@@ -315,17 +324,6 @@
 	Set ^TRANSP("D",RitID,"D",376197,"Q","L")="2\3+4"
 ]]></Implementation>
 </Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-
-	do ##class(vhUnitTest.DOM.TRANSP.TestData).%New().VerwijderTestData()
-	Kill ^TRANSP("D",0)
-	Kill ^TRANSP("D",1)
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>