Index: vhUnitTest/APPS/P2L/Controller/Picking/TestEndToEndPicking.cls.xml
===================================================================
diff -u -r29059 -r40176
--- vhUnitTest/APPS/P2L/Controller/Picking/TestEndToEndPicking.cls.xml	(.../TestEndToEndPicking.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/P2L/Controller/Picking/TestEndToEndPicking.cls.xml	(.../TestEndToEndPicking.cls.xml)	(revision 40176)
@@ -5,6 +5,20 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	Set %PickToLightClient = ##class(vhUnitTest.APPS.P2L.Core.PickToLightClientMock).%New()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Do ##class(vhUnitTest.APPS.P2L.Controller.Picking.PickingVoorBatchScenario1).%KillExtent()
+	Do ##super()
+]]></Implementation>
+</Method>
+
 <UDLText name="T">
 <Content><![CDATA[
 // do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.P2L.Controller.Picking.TestEndToEndPicking")
@@ -38,21 +52,6 @@
 	Do ##class(APPS.P2L.Display.DisplayState).%KillExtent()
 ]]></Implementation>
 </Method>
-
-<Method name="OnAfterAllTests">
-<Implementation><![CDATA[
-	do ##super()
-	do ##class(vhUnitTest.APPS.P2L.Controller.Picking.PickingVoorBatchScenario1).%KillExtent()
-]]></Implementation>
-</Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set %PickToLightClient = ##class(vhUnitTest.APPS.P2L.Core.PickToLightClientMock).%New()
- 	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>