Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u -r58857 -r58904
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 58857)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 58904)
@@ -354,19 +354,13 @@
 <Method name="TestGeefProductLijnen voor KVIK limiteert aantal palletten via EWPAL situatie waar ewpal brol teruggeeft en dus fallback naar de standaard">
 <Implementation><![CDATA[
 	Do ..MaakBon(1234,"25868") 
-	Do ..ZetEWPALOp("BROLPALLET")
 	Do ..VerwijderBestaandeReservaties()
 	Do ..UglyPickingService.StartBon(1234)
-	
-	;EWMS setup	
-	#dim PalletID as %String = "UTKVIK01"
-	Do ..MagHelper.MaakEWMSProduct(154599,PalletID,1,2,,,3)
-	Do ##class(EWMS.Locations).CreateEmpty(3,66,1,1,1,PalletID)
-	do ##class(EWMS.TransLoc).Create(3,66,"1","1","66x66x66",1)
 
-
-	#Dim ProductLijnen As APPS.MAG.UGLYPicking.dto.ProductLijnen = ..UglyPickingService.GeefProductLijnen(1234, ##class(APPS.MAG.UGLYPicking.enu.Magazijn).TandemAventos())
+	#dim PalletID as %String = "UTKVIK01"
+	Do ..ZetEWMSEnEWPALDataOp(PalletID,"BROLPALLET")
 	
+	#Dim ProductLijnen As APPS.MAG.UGLYPicking.dto.ProductLijnen = ..UglyPickingService.GeefProductLijnen(1234, ##class(APPS.MAG.UGLYPicking.enu.Magazijn).TandemAventos())	
 	Do $$$AssertEquals(ProductLijnen.Lijst.Count(), 1, "Er is 1 productlijn te picken")
 	
 	#Dim ProductLijn As APPS.MAG.UGLYPicking.dto.ProductLijn = ProductLijnen.Lijst.GetAt(1)
@@ -383,31 +377,19 @@
 
 	Do ..UglyPickingService.StopHuidigeBon()
 	Do ..VerwijderBon(1234)
-	Do ..KuisEWPALOp()
-	Do ##class(EWMS.Locations).DeleteEmpty(3,66,1,1,1)
-	
-	#dim Query as %String = "DELETE EWMS.Inventory WHERE loc_id %STARTSWITH('UTKVIK')" 
-	do ExecDynQuery^vhLib.Query(Query,$listbuild())
-	
-	Set Query = "DELETE EWMS.TransLoc WHERE Loc_Trans = '66x66x66'"
-	do ExecDynQuery^vhLib.Query(Query,$listbuild())
+	Do ..BreekEWMSDataAf()
 ]]></Implementation>
 </Method>
 
 <Method name="TestGeefProductLijnen voor KVIK limiteert aantal palletten via EWPAL situatie waar ewpal één terechte pallet teruggeeft en het is die uit EWPAL">
 <Implementation><![CDATA[
-	#dim PalletID as %String = "UTKVIK01"
-
 	Do ..MaakBon(1234,"25868")
-	Do ..ZetEWPALOp(PalletID)
 	Do ..VerwijderBestaandeReservaties()
 	Do ..UglyPickingService.StartBon(1234)
+
+	#dim PalletID as %String = "UTKVIK01"
+	Do ..ZetEWMSEnEWPALDataOp(PalletID,PalletID)
 	
-	;EWMS setup	
-	Do ..MagHelper.MaakEWMSProduct(154599,PalletID,1,2,,,3)
-	Do ##class(EWMS.Locations).CreateEmpty(3,66,1,1,1,PalletID)
-	do ##class(EWMS.TransLoc).Create(3,66,"1","1","66x66x66",1)
-	
 	#Dim ProductLijnen As APPS.MAG.UGLYPicking.dto.ProductLijnen = ..UglyPickingService.GeefProductLijnen(1234, ##class(APPS.MAG.UGLYPicking.enu.Magazijn).TandemAventos())
 	
 	Do $$$AssertEquals(ProductLijnen.Lijst.Count(), 1, "Er is 1 productlijn te picken")
@@ -416,8 +398,28 @@
 	Do $$$AssertEquals(ProductLijn.PalletID,PalletID,"De palletid is juist")
 		
 	Do ..UglyPickingService.StopHuidigeBon()
-	Do ..VerwijderBon(1234)
-	Do ..KuisEWPALOp()
+	Do ..VerwijderBon(1234)	
+	Do ..BreekEWMSDataAf()
+]]></Implementation>
+</Method>
+
+<Method name="ZetEWMSEnEWPALDataOp">
+<FormalSpec>EWMSPalletID:%String,EWPALPalletId:%String</FormalSpec>
+<Implementation><![CDATA[
+	;EWPAL setup	
+	Do ..ZetEWPALOp(EWPALPalletId)
+
+	;EWMS setup	
+	Do ..MagHelper.MaakEWMSProduct(154599,EWMSPalletID,1,2,,,3)
+	Do ##class(EWMS.Locations).CreateEmpty(3,66,1,1,1,EWMSPalletID)
+	do ##class(EWMS.TransLoc).Create(3,66,"1","1","66x66x66",1)
+]]></Implementation>
+</Method>
+
+<Method name="BreekEWMSDataAf">
+<Implementation><![CDATA[
+	Kill ^EWPAL("D",154599)
+
 	Do ##class(EWMS.Locations).DeleteEmpty(3,66,1,1,1)
 	#dim Query as %String = "DELETE EWMS.Inventory WHERE loc_id %STARTSWITH('UTKVIK')" 
 	do ExecDynQuery^vhLib.Query(Query,$listbuild())