Index: vhUnitTest/APPS/VisiDot/impl/TestVHossService.cls.xml
===================================================================
diff -u -r58895 -r59077
--- vhUnitTest/APPS/VisiDot/impl/TestVHossService.cls.xml	(.../TestVHossService.cls.xml)	(revision 58895)
+++ vhUnitTest/APPS/VisiDot/impl/TestVHossService.cls.xml	(.../TestVHossService.cls.xml)	(revision 59077)
@@ -12,14 +12,6 @@
 <Default>cat</Default>
 </Parameter>
 
-<Method name="OnAfterAllTests">
-<Implementation><![CDATA[
-	Do ..MagHelper.ExecEWMSQuery("DELETE FROM ewms.dbo.locations WHERE loc_g = 98")
-	Do ..MagHelper.ExecEWMSQuery("DELETE FROM ewms.dbo.locations WHERE loc_g = 97")
-	do ##super()
-]]></Implementation>
-</Method>
-
 <Method name="Test: Flow VHoss">
 <Implementation><![CDATA[
 		#dim KlantID As %String = "K||1000"
@@ -71,45 +63,26 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test VhosService Check Geen Vhoss Op Meerdere Locaties">
+<Method name="Test: Check Vhoss Niet Op Meerdere Locaties">
 <Implementation><![CDATA[
-	Set VhossOpMeerdereLocaties = ##class(APPS.VisiDot.impl.VHossService).%New().CheckVhossOpMeerdereLocaties()
-	Do $$$AssertEquals(VhossOpMeerdereLocaties, $$$False)
-]]></Implementation>
-</Method>
-
-<Method name="Test VhosService Check Wel Vhoss Op Meerdere Locaties">
-<Implementation><![CDATA[
-	Do ..MagHelper.ExecEWMSQuery("INSERT INTO ewms.dbo.locations (loc_id,loc_m,loc_g,loc_x,loc_y,loc_z,insert_time,state) VALUES ('O1000000',4,98,97,98,98,'0000-00-00-00.00.00.000000',2)")	
-	Do ..MagHelper.ExecEWMSQuery("INSERT INTO ewms.dbo.locations (loc_id,loc_m,loc_g,loc_x,loc_y,loc_z,insert_time,state) VALUES ('O1000000',4,98,98,98,98,'0000-00-00-00.00.00.000000',2)")	
-	
-	Set VhossWelOpMeerdereLocaties = ##class(APPS.VisiDot.impl.VHossService).%New().CheckVhossOpMeerdereLocaties("O1")
-	Do $$$AssertEquals(VhossWelOpMeerdereLocaties, $$$True)
-]]></Implementation>
-</Method>
-
-<Method name="Test Mock Check Vhoss Niet Op Meerdere Locaties">
-<Implementation><![CDATA[
-	Set ExpectedFalseResult = $$$False
-	Set DefaultStartsWithVhossLocId = "O1"
+	#dim DefaultStartsWithVhossLocId As %String = "O1"
 	Set EwmsLocationsMock = ##class(vhTest.Mock.BL.EWMS.Locationsservice).%New()
-	Do EwmsLocationsMock.VerwachtMethodCall("HeeftVhossOpMeerdereLocaties", DefaultStartsWithVhossLocId).DanReturn(ExpectedFalseResult)
+	Do EwmsLocationsMock.VerwachtMethodCall("HeeftVhossOpMeerdereLocaties", DefaultStartsWithVhossLocId).DanReturn($$$False)
 	
 	Set VhossNietOpMeerdereLocaties = ##class(APPS.VisiDot.impl.VHossService).%New(EwmsLocationsMock).CheckVhossOpMeerdereLocaties(DefaultStartsWithVhossLocId)
-	Do $$$AssertEquals(VhossNietOpMeerdereLocaties, ExpectedFalseResult)
+	Do $$$AssertFalse(VhossNietOpMeerdereLocaties)
 	Do EwmsLocationsMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test Mock Check Vhoss Wel Op Meerdere Locaties">
+<Method name="Test: Check Vhoss Wel Op Meerdere Locaties">
 <Implementation><![CDATA[
-	Set ExpectedTrueResult = $$$True
-	Set StartsWithVhossLocId = "TT"
+	#dim StartsWithVhossLocId As %String = "TT"
 	Set EwmsLocationsMock = ##class(vhTest.Mock.BL.EWMS.Locationsservice).%New()
-	Do EwmsLocationsMock.VerwachtMethodCall("HeeftVhossOpMeerdereLocaties", StartsWithVhossLocId).DanReturn(ExpectedTrueResult)
+	Do EwmsLocationsMock.VerwachtMethodCall("HeeftVhossOpMeerdereLocaties", StartsWithVhossLocId).DanReturn($$$True)
 
 	Set VhossWelOpMeerdereLocaties = ##class(APPS.VisiDot.impl.VHossService).%New(EwmsLocationsMock).CheckVhossOpMeerdereLocaties(StartsWithVhossLocId)
-	Do $$$AssertEquals(VhossWelOpMeerdereLocaties, ExpectedTrueResult)
+	Do $$$AssertTrue(VhossWelOpMeerdereLocaties)
 	Do EwmsLocationsMock.Verifieer()
 ]]></Implementation>
 </Method>