Index: vhUnitTest/EWMS/TestLocation.cls.xml
===================================================================
diff -u -r58871 -r58880
--- vhUnitTest/EWMS/TestLocation.cls.xml	(.../TestLocation.cls.xml)	(revision 58871)
+++ vhUnitTest/EWMS/TestLocation.cls.xml	(.../TestLocation.cls.xml)	(revision 58880)
@@ -18,32 +18,35 @@
 <Implementation><![CDATA[
 	Do ..MagHelper.ExecEWMSQuery("DELETE FROM ewms.dbo.locations WHERE loc_g = 99")
 	Do ..MagHelper.ExecEWMSQuery("DELETE FROM ewms.dbo.transloc WHERE loc_trans = '99D99C99'")
+	
+	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="TestBestaandeLocatie">
+<Method name="Test Bestaande Locatie">
 <Implementation><![CDATA[
 	#dim FeedbackLocatie As %String = ##class(EWMS.Locations).GeefFeedbackLocatie("99D99C99")	
 	Do $$$AssertEquals(FeedbackLocatie,"","De locatie is correct.")
 ]]></Implementation>
 </Method>
 
-<Method name="TestNietBestaandeLocatie">
+<Method name="Test Niet Bestaande Locatie">
 <Implementation><![CDATA[
 	#dim FeedbackLocatie As %String = ##class(EWMS.Locations).GeefFeedbackLocatie("97D97C97")	
 	Do $$$AssertEquals(FeedbackLocatie,"De locatie '97D97C97' bestaat niet.")
 ]]></Implementation>
 </Method>
 
-<Method name="TestLocatie">
+<Method name="Test Locatie">
 <Implementation><![CDATA[
 	#dim FeedbackLocatie As %String = ##class(EWMS.Locations).GeefFeedbackLocatie("124")	
 	Do $$$AssertEquals(FeedbackLocatie,"De locatie '124' heeft geen correct formaat.")
 ]]></Implementation>
 </Method>
 
-<Method name="TestValidateLocations">
+<Method name="Test Validate Locations">
 <Implementation><![CDATA[
 	#dim Locatie As %List = $LB(1,6,2,2)
 	
@@ -87,30 +90,28 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestVhossNietOpMeerdereLocatiesMetParameter">
+<Method name="Test Vhoss Niet Op Meerdere Locaties Met Parameter">
 <Implementation><![CDATA[
-	#dim ResultaatGeenMeerdereLocatiesMetParameter As %Boolean = ##class(EWMS.Locations).VhossOpMeerdereLocaties("XX")	
+	Set AantalVhossOpMeerdereLocaties = "XX"
+	#dim ResultaatGeenMeerdereLocatiesMetParameter As %Boolean = ##class(EWMS.Locations).VhossOpMeerdereLocaties(AantalVhossOpMeerdereLocaties)	
 	Do $$$AssertEquals(ResultaatGeenMeerdereLocatiesMetParameter,$$$False)
 ]]></Implementation>
 </Method>
 
-<Method name="TestVhossNietOpMeerdereLocatiesMetDefaultParameter">
+<Method name="Test Vhoss Niet Op Meerdere Locaties Met Default Parameter">
 <Implementation><![CDATA[
 	#dim ResultaatGeenMeerdereLocatiesMetDefaultParameter As %Boolean = ##class(EWMS.Locations).VhossOpMeerdereLocaties()	
 	Do $$$AssertEquals(ResultaatGeenMeerdereLocatiesMetDefaultParameter,$$$False)
 ]]></Implementation>
 </Method>
 
-<Method name="TestVhossWelOpMeerdereLocaties">
+<Method name="Test Vhoss Wel 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 ('TT000000',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 ('TT000000',4,98,98,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,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)")	
 
-	#dim ResultaatWelMeerdereLocatiesMetParameter As %Boolean = ##class(EWMS.Locations).VhossOpMeerdereLocaties("TT")
+	#dim ResultaatWelMeerdereLocatiesMetParameter As %Boolean = ##class(EWMS.Locations).VhossOpMeerdereLocaties("O1")
 	Do $$$AssertEquals(ResultaatWelMeerdereLocatiesMetParameter,$$$True)
-
-	Do ..MagHelper.ExecEWMSQuery("DELETE FROM ewms.dbo.locations WHERE loc_g = 98")
-	Do ..MagHelper.ExecEWMSQuery("DELETE FROM ewms.dbo.locations WHERE loc_g = 97")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/VisiDot/impl/TestVHossService.cls.xml
===================================================================
diff -u -r58872 -r58880
--- vhUnitTest/APPS/VisiDot/impl/TestVHossService.cls.xml	(.../TestVHossService.cls.xml)	(revision 58872)
+++ vhUnitTest/APPS/VisiDot/impl/TestVHossService.cls.xml	(.../TestVHossService.cls.xml)	(revision 58880)
@@ -12,6 +12,14 @@
 <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"
@@ -63,23 +71,20 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestVhosServiceCheckVhossOpMeerdereLocatiesFalse">
+<Method name="Test VhosService Check Geen Vhoss Op Meerdere Locaties">
 <Implementation><![CDATA[
 	Set VhossOpMeerdereLocaties = ##class(APPS.VisiDot.impl.VHossService).CheckVhossOpMeerdereLocaties()
 	Do $$$AssertEquals(VhossOpMeerdereLocaties, $$$False)
 ]]></Implementation>
 </Method>
 
-<Method name="TestVhosServiceCheckVhossOpMeerdereLocatiesTrue">
+<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 ('TT000000',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 ('TT000000',4,98,98,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,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).CheckVhossOpMeerdereLocaties("TT")
+	Set VhossWelOpMeerdereLocaties = ##class(APPS.VisiDot.impl.VHossService).CheckVhossOpMeerdereLocaties("O1")
 	Do $$$AssertEquals(VhossWelOpMeerdereLocaties, $$$True)
-
-	Do ..MagHelper.ExecEWMSQuery("DELETE FROM ewms.dbo.locations WHERE loc_g = 98")
-	Do ..MagHelper.ExecEWMSQuery("DELETE FROM ewms.dbo.locations WHERE loc_g = 97")
 ]]></Implementation>
 </Method>
 </Class>