Index: vhUnitTest/DOM/MAG/TestAPI.cls.xml
===================================================================
diff -u -r29059 -r40289
--- vhUnitTest/DOM/MAG/TestAPI.cls.xml	(.../TestAPI.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/MAG/TestAPI.cls.xml	(.../TestAPI.cls.xml)	(revision 40289)
@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.DOM.MAG.TestAPI">
-<Description>
-do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","DOM.MAG.TestAPI")</Description>
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	do ##super()
+	Set $P(^KPR(1001,15),"\",12) = "X"
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Kill ^KPR(1001)
+	do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestDomeinContext">
 <Implementation><![CDATA[	Do $$$AssertTrue($IsObject(##class(DOM.DomeinContext).Instance().GeefMagazijnAPI()))
 ]]></Implementation>
@@ -14,11 +26,10 @@
 <Implementation><![CDATA[
 	#dim Iterator As TECH.Iterator = ##class(DOM.DomeinContext).Instance().GeefMagazijnAPI().GeefMagazijnZonesIterator(##class(DOM.common.enu.Bedrijf).Halux())
 	
-	Do $$$AssertTrue($IsObject(Iterator))
-	
-	While (Iterator.HasNext())
-	{
-		Do $$$AssertTrue($IsObject(Iterator.Next()))
+	if $$$AssertTrue($IsObject(Iterator)) {
+		While (Iterator.HasNext()) {
+			Do $$$AssertTrue($IsObject(Iterator.Next()))
+		}
 	}
 ]]></Implementation>
 </Method>
@@ -42,22 +53,6 @@
 	Do $$$AssertEquals(MagazijnZone.GeefCode(),"<Onbekend>")
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set $P(^KPR(1001,15),"\",12) = "X"
- 	Quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Kill ^KPR(1001)
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>