Index: vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml
===================================================================
diff -u -r2360 -r2363
--- vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml	(.../TestInventarisService.cls.xml)	(revision 2360)
+++ vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml	(.../TestInventarisService.cls.xml)	(revision 2363)
@@ -370,7 +370,7 @@
 		If BijTeLadenProduct.ProductID = ProductID {
 			Set ProductGevonden = 1	
 			
-			Do $$$AssertEquals(BijTeLadenProduct.AantalTePicken,5000,"Aantal producten te picken is OK.")
+			Do $$$AssertEquals(BijTeLadenProduct.AantalTePicken,600,"Aantal producten te picken is OK.")
 			Do $$$AssertEquals(BijTeLadenProduct.AantalPickbaar,0,"Aantal producten die pickbaar zijn, is OK.")
 		}
 	}
@@ -379,13 +379,14 @@
 	
 	Set ProductLijnen = UglyService.GeefProductLijnen(BonID,##class(APPS.MAG.UGLYPicking.enu.Magazijn).TandemAventos())
 	
-	Do $$$AssertEquals(ProductLijnen.Lijst.Count(),1,"Er is 1 productlijn te picken")
+	Do $$$AssertEquals(ProductLijnen.Lijst.Count(),3,"Er zijn 2 productlijn te picken")
 	
 	Set ProductLijn = ProductLijnen.Lijst.GetAt(1)
 	
-	Do $$$AssertEquals(ProductLijn.Aantal,5000,"Het aantal producten te picken")
+	Do $$$AssertEquals(ProductLijn.Aantal,288,"Het aantal producten te picken")
 	
 	Do UglyService.StopHuidigeBon()
+	Do ..VerwijderBon(BonID)
 ]]></Implementation>
 </Method>
 
@@ -444,8 +445,8 @@
 	
 	Set ^ORDW("D",ID,"S","A") = "" // Markeren dat deze voorkomt in het Avento
 	
-	Set ^ORDW("D",ID,"D",119048,100) = "154598\B\\5000\0\\\A\\200"
-	Set ^ORDW("D",ID,"D",119048,100,100) = "154598\W\5000\0\\62210,53942\\\\00218051\\FVS\A\U"
+	Set ^ORDW("D",ID,"D",119049,100) = "154598\B\\600\0\\\A\\200"
+	Set ^ORDW("D",ID,"D",119049,100,100) = "154598\W\600\0\\62210,53942\\\\00218051\\FVS\A\U"
 	
 	Set Pickbaar = 1
 	Do ##class(EWMS.TransLoc).ZetIsPickbaar("04B25A03",Pickbaar)
@@ -574,5 +575,17 @@
 	quit sc
 ]]></Implementation>
 </Method>
+
+<Method name="VerwijderBon">
+<FormalSpec>ID:%Integer</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Kill ^ORDW("D",ID)
+	Kill ^ORDW("IW",ID)
+	Do ##class(BL.MB.UGLYPicking.OrderReservatie).RollbackReservations(ID,##class(APPS.MAG.UGLYPicking.enu.Magazijn).TandemAventos())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u -r2359 -r2363
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 2359)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 2363)
@@ -156,7 +156,7 @@
 <Method name="TestGeefProductLijnen">
 <Implementation><![CDATA[
 	Do ..MaakBon(1234)
-	
+	Do ..VerwijderBestaandeReservaties()
 	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
 	
 	Do Service.StartBon(1234)
@@ -186,6 +186,7 @@
 
 <Method name="TestWijzigReservatieAantal">
 <Implementation><![CDATA[
+	
 	Do ..MaakBon(1234)
 	
 	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
Index: vhUnitTest/EWMS/TestTransLoc.cls.xml
===================================================================
diff -u -r2312 -r2363
--- vhUnitTest/EWMS/TestTransLoc.cls.xml	(.../TestTransLoc.cls.xml)	(revision 2312)
+++ vhUnitTest/EWMS/TestTransLoc.cls.xml	(.../TestTransLoc.cls.xml)	(revision 2363)
@@ -9,7 +9,7 @@
 
 <Parameter name="TransLoc">
 <Type>%String</Type>
-<Default>01TEST01</Default>
+<Default>01X99X01</Default>
 </Parameter>
 
 <Method name="TestZetIsPickbaar">
@@ -32,6 +32,7 @@
 <Method name="OnBeforeAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	
 	Set InsertResultSet = ##class(%ResultSet).%New()
 	Do InsertResultSet.Prepare("INSERT INTO EWMS.TransLoc (loc_g, loc_m, loc_x, loc_y, loc_trans, loc_ispickbaar) VALUES (0,0,0,0,?,?)")
 	Set TransLoc = ..#TransLoc