Index: zTryout/PV/TBXZaag/Test.cls.xml
===================================================================
diff -u -r2686 -r2731
--- zTryout/PV/TBXZaag/Test.cls.xml	(.../Test.cls.xml)	(revision 2686)
+++ zTryout/PV/TBXZaag/Test.cls.xml	(.../Test.cls.xml)	(revision 2731)
@@ -32,8 +32,8 @@
 		Set BatchID=$LI(IDs,I)
 		;Do ..Sequence(BatchID)
 		Set bl=##class(APPS.Halux.PPS.TBXZaag.impl.Builder).%New(BatchID)
-		Do bl.RemoveBatches()
-		Do bl.BuildBatchesFromQueue()
+		Do ##class(APPS.Halux.PPS.TBXZaag.impl.VerwijderBatch).VerwijderBatches(BatchID)
+		Do bl.MaakZaagOpdrachten()
 		}	
 		
 	Set rs=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelper:qActieveBatchLijst")
@@ -60,9 +60,8 @@
 		Set Cnt=SeqService.HeeftSequentie(BatchID)
 		Do ..Sequence(BatchID)
 		w "Build batch ",BatchID," ",Cnt,!
-		Set bl=##class(APPS.Halux.PPS.TBXZaag.impl.Builder).%New(BatchID)
-		Do bl.RemoveBatches()
-		Do bl.BuildBatchesFromQueue()
+		Do Batch.RaiseBatchHergeopendEvent()
+		Do Batch.RaiseBatchGeslotenEvent()
 		}
 	Set rs=##class(%ResultSet).%New("APPS.Halux.PPS.TBXZaag.impl.LijstHelper:qActieveBatchLijst")
 	Set sc=rs.Execute() w $$ParseStatus^vhLib(sc)