Index: vhUnitTest/TestCase.cls.xml
===================================================================
diff -u -r1969 -r12778
--- vhUnitTest/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1969)
+++ vhUnitTest/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 12778)
@@ -45,25 +45,38 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	set %VarsInMemoryBefore = 0
+	;set %VarsInMemoryBefore = 0
 	/// JBL : om vorige niet opgevangen exceptions niet te krijgen in huidige test, deze leeg maken.
 	Set %Exception = "" 
-	set Var = "%" for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) set %VarsInMemoryBefore=$i(%VarsInMemoryBefore)
+	;set Var = "%" for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) set %VarsInMemoryBefore=$i(%VarsInMemoryBefore)
+	do ..StoreVariabelenInMemory()
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="StoreVariabelenInMemory">
+<Final>1</Final>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set %VarsInMemoryBefore = ##class(%ListOfDataTypes).%New()
+	Set Var = "%"
+	for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) do %VarsInMemoryBefore.Insert(Var)
+]]></Implementation>
+</Method>
+
 <Method name="OnAfterOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 
-	set %VarsInMemoryAfter = 0
-	set Var = "%" for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) set %VarsInMemoryAfter=$i(%VarsInMemoryAfter)
+	;set %VarsInMemoryAfter = 0
+	;set Var = "%" for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) set %VarsInMemoryAfter=$i(%VarsInMemoryAfter)
 	 
 	;if %VarsInMemoryAfter'=%VarsInMemoryBefore do ..Fail("Vars niet mooi opgekuisd")
 	
+	Do ..CheckVariabelenInMemory()
+	
 	While (0 '= $TLevel) {
 		TRollback
 		Do ..Fail("Een openstaande transactie werd niet gesloten!")
@@ -72,6 +85,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="CheckVariabelenInMemory">
+<Final>1</Final>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set %VarsInMemoryAfter = ##class(%ListOfDataTypes).%New()
+	set %VarsInMemoryBefore = $get(%VarsInMemoryBefore,##class(%ListOfDataTypes).%New())
+	
+	Set Var = "%"
+	for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) do %VarsInMemoryAfter.Insert(Var)
+	
+	if %VarsInMemoryAfter.Size '= %VarsInMemoryBefore.Size {
+		set List = ##class(%ListOfDataTypes).%New()
+		set List = ##class(TECH.ListUtils).CopyListOfDataTypes(%VarsInMemoryAfter,List)
+		set List = ##class(TECH.ListUtils).CopyListOfDataTypes(%VarsInMemoryBefore,List)
+		;set List = ##class(TECH.ListUtils).RemoveDuplicateItems(List)
+		do ..Fail( "Variabelen probleem : " _ $$$CRLF _ 
+				   "aantal voor test : "_%VarsInMemoryBefore.Size_" - aantal na test : "_%VarsInMemoryAfter.Size _ $$$CRLF _
+				   ##class(TECH.ListUtils).ListToPieces(List,";") )
+	}
+	Kill %VarsInMemoryAfter
+	Kill %VarsInMemoryBefore
+]]></Implementation>
+</Method>
+
 <Method name="ValidVar">
 <FormalSpec>Var</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
Index: vhUnitTest/BL/ProdHist/TestChangeTrace.cls.xml
===================================================================
diff -u -r12759 -r12778
--- vhUnitTest/BL/ProdHist/TestChangeTrace.cls.xml	(.../TestChangeTrace.cls.xml)	(revision 12759)
+++ vhUnitTest/BL/ProdHist/TestChangeTrace.cls.xml	(.../TestChangeTrace.cls.xml)	(revision 12778)
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="24">
+<Export generator="Cache" version="9">
 <Class name="vhUnitTest.BL.ProdHist.TestChangeTrace">
 <Description>
 d ##class(vhUnitTest.Manager).RunTest("/debug/display=all","BL.ProdHist.TestChangeTrace")</Description>
+<ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="ProductIDMetChargeNr">
 <Type>%String</Type>
@@ -12,20 +14,20 @@
 
 <Method name="TestRegisterORDWChargeTrace">
 <Implementation><![CDATA[
-		#dim Magazijn As APPS.MAG.enu.Magazijn = ##class(APPS.MAG.enu.Magazijn).Ugly()
-		#dim BonID As %String = "1234"
+		Set Magazijn = "UGLY"
+		Set BonID = "1234"
 		Do ..MaakBon(BonID,Magazijn)
 		Set Hoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(BonID,0)
 		
-		#dim Resultaat As %String = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(BonID,Magazijn,..#ProductIDMetChargeNr,1,"BAU12345")
+		Set Resultaat = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(BonID,Magazijn,..#ProductIDMetChargeNr,1,"BAU12345")
 		Do $$$AssertEquals(Resultaat,"")
 		
 		Do ..VerwijderBon(BonID)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakBon">
-<FormalSpec>ID:%Integer,Magazijn:APPS.MAG.enu.Magazijn</FormalSpec>
+<FormalSpec>ID:%Integer,Magazijn:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 		
@@ -64,12 +66,9 @@
 <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>