Index: vhUnitTest/APPS/StockBeheer/TestStockBeheerService.cls.xml
===================================================================
diff -u -r29059 -r40159
--- vhUnitTest/APPS/StockBeheer/TestStockBeheerService.cls.xml	(.../TestStockBeheerService.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/StockBeheer/TestStockBeheerService.cls.xml	(.../TestStockBeheerService.cls.xml)	(revision 40159)
@@ -7,37 +7,36 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="TestStockHistoriekPunt">
-<Implementation><![CDATA[
-	Set StockBeheerService = ##class(APPS.StockBeheer.StockBeheerService).%New()
-	Set StockHistoriekPunt = StockBeheerService.GeefStockHistoriekPunt(999,"2011-1-18 12:00:00")
-	Do $$$AssertEquals(StockHistoriekPunt.Aantal,0)
-	Set StockHistoriekPunt = StockBeheerService.GeefStockHistoriekPunt(999,"2011-11-18 12:00:00")
-	Do $$$AssertEquals(StockHistoriekPunt.Aantal,993)
-	Set StockHistoriekPunt = StockBeheerService.GeefStockHistoriekPunt(999,"2011-11-19 12:00:00")
-	Do $$$AssertEquals(StockHistoriekPunt.Aantal,1000)
-	Set StockHistoriekPunt = StockBeheerService.GeefStockHistoriekPunt(999,"2011-11-25 12:00:00")
-	Do $$$AssertEquals(StockHistoriekPunt.Aantal,991)
-]]></Implementation>
-</Method>
-
 <Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
 	Set ^PRHIST(999,1)="62410,25000\12\993\M\M\\\\62403\\unittesten\-90.00\\1111\\\"
 	Set ^PRHIST(999,2)="62414,43100\7\1000\M\M\\\\62403\\unittesten\-90.00\\1111\\\"
 	Set ^PRHIST(999,3)="62414,48146\-9\991\M\M\\\\62403\\unittesten\-90.00\\1111\\\"
- 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Kill ^PRHIST(999)
-	Quit $$$OK
+	Do ##super()
 ]]></Implementation>
 </Method>
+
+<Method name="TestStockHistoriekPunt">
+<Implementation><![CDATA[
+	#dim StockHistoriekPunt As APPS.StockBeheer.dto.StockHistoriekPunt
+	Set StockBeheerService = ##class(APPS.StockBeheer.StockBeheerService).%New()
+	Set StockHistoriekPunt = StockBeheerService.GeefStockHistoriekPunt(999,"2011-1-18 12:00:00")
+	Do $$$AssertEquals(StockHistoriekPunt.Aantal,0)
+	Set StockHistoriekPunt = StockBeheerService.GeefStockHistoriekPunt(999,"2011-11-18 12:00:00")
+	Do $$$AssertEquals(StockHistoriekPunt.Aantal,993)
+	Set StockHistoriekPunt = StockBeheerService.GeefStockHistoriekPunt(999,"2011-11-19 12:00:00")
+	Do $$$AssertEquals(StockHistoriekPunt.Aantal,1000)
+	Set StockHistoriekPunt = StockBeheerService.GeefStockHistoriekPunt(999,"2011-11-25 12:00:00")
+	Do $$$AssertEquals(StockHistoriekPunt.Aantal,991)
+]]></Implementation>
+</Method>
 </Class>