Index: vhUnitTest/DOM/OV/TestBon.cls.xml
===================================================================
diff -u -r1074 -r1172
--- vhUnitTest/DOM/OV/TestBon.cls.xml	(.../TestBon.cls.xml)	(revision 1074)
+++ vhUnitTest/DOM/OV/TestBon.cls.xml	(.../TestBon.cls.xml)	(revision 1172)
@@ -40,5 +40,21 @@
 	Do $$$AssertFalse(TypedBonIterator.HasNext(),"De bon bevat geen tekstlijnen")
 ]]></Implementation>
 </Method>
+
+<Method name="OnBeforeAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ##class(vhUnitTest.DOM.OV.OrderData).Create()
+ 	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ##class(vhUnitTest.DOM.OV.OrderData).Delete()
+	Quit $$$OK
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: vhUnitTest/Manager.cls.xml
===================================================================
diff -u -r1133 -r1172
--- vhUnitTest/Manager.cls.xml	(.../Manager.cls.xml)	(revision 1133)
+++ vhUnitTest/Manager.cls.xml	(.../Manager.cls.xml)	(revision 1172)
@@ -82,8 +82,8 @@
  if $length(package) set testsuite = package
  
  ;set classQuery=##class(%ResultSet).%New("%Dictionary.ClassDefinition:Summary")
- set classQuery=##class(%ResultSet).%New("%Library.CompiledClass:ClassInfo")
- $$$QuitOnError(classQuery.Execute())
+ set classQuery=##class(%ResultSet).%New("%Dictionary.ClassDefinitionQuery:SubclassOf")
+ $$$QuitOnError(classQuery.Execute("vhUnitTest.TestCase"))
  while (classQuery.Next() ) {
 	set className=classQuery.Get("Name")
 	if className["%" continue
Index: vhUnitTest/DOM/PM/Maatwerk/OLM/TestBuilders.cls.xml
===================================================================
diff -u -r1074 -r1172
--- vhUnitTest/DOM/PM/Maatwerk/OLM/TestBuilders.cls.xml	(.../TestBuilders.cls.xml)	(revision 1074)
+++ vhUnitTest/DOM/PM/Maatwerk/OLM/TestBuilders.cls.xml	(.../TestBuilders.cls.xml)	(revision 1172)
@@ -18,7 +18,7 @@
 	
 	Set KlantID = 1000
 	Set Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
-	Set BerekeningsSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie).%New(1,KlantID,Personality)
+	Set BerekeningsSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie).%New(1,KlantID,Personality,"UnitTest")
 	Set Context=##class(vhUnitTest.DOM.PM.Maatwerk.OLM.impl.UTContext).%New(Familie,Variant,BerekeningsSpecificatie)
 	
 	Set PRNr = 191579 //202630
@@ -83,5 +83,21 @@
 	write !*/
 ]]></Implementation>
 </Method>
+
+<Method name="OnBeforeAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set HalffabSpec = ##class(DOM.PM.Maatwerk.Calc.HF.impl.HalffabSpecInfo).%New(##class(DOM.PM.enu.Familie).Orgalux(),##class(DOM.PM.enu.OrgaluxVariant).OpMaat(),"DOM.PM.Maatwerk.Calc.HF.impl.OLM.SpecOpMaatv001","UnitTest")
+	Quit HalffabSpec.%Save()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	&SQL(DELETE FROM DOM_PM_Maatwerk_Calc_HF_impl.HalffabSpecInfo WHERE Tag = "UnitTest")
+	Quit $$$OK
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: vhUnitTest/DOM/OV/OrderData.cls.xml
===================================================================
diff -u -r1074 -r1172
--- vhUnitTest/DOM/OV/OrderData.cls.xml	(.../OrderData.cls.xml)	(revision 1074)
+++ vhUnitTest/DOM/OV/OrderData.cls.xml	(.../OrderData.cls.xml)	(revision 1172)
@@ -38,6 +38,23 @@
 	Set ^KTO(6332,298104,4)=3
 	Set ^KTO(6332,298104,101)="\614305\1\\\46.16\#\\46.16\46.16\\L\1\\100\46.16\KTRPL\\\\E\EUR\\\11/11\\123346\101\\\\\\\\"
 	Set ^KTO(6332,298104,102)="\620939\1\\\37.42\#\\37.42\37.42\\L\2\\200\37.42\KTRPL\\\\E\EUR\\\11/11\\123346\102\\\\\\\\"
+	
+	Set ^KU1(325216,"F") = "1091\"
+	
+	Set ^KUL(1091,"F",325216,0)=108
+	Set ^KUL(1091,"F",325216,1) = "\05.06.09\\\\1091\OD3 #Door onze diensten 3\\#\\\\14.51##65.4784\\\\\EUR\\\00\1\\###\\\\\\\\\\\\\\\\\\OD3;61517;130152;25243"
+	Set ^KUL(1091,"F",325216,2) = "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+	Set ^KUL(1091,"F",325216,3) = "1\DE JONG KEUKENS\\bvba\IND.TERR. HOGE MOUW 240\2370\ARENDONK\1019\N\\\\\\\\\\.\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+	Set ^KUL(1091,"F",325216,4) = "8"
+	Set ^KUL(1091,"F",325216,101) = "\\\1055#1100#61515,32483\123440 - 03.06.09 - 03.06.09 u/mail NBR/PDJ\\\\\\\\\\100\\KF5\\1055#61515,32484#123440\\\#\\\\"
+	Set ^KUL(1091,"F",325216,102) = "703000 \104752\40\\\0.29\20#\8\11.60\11.60\703000 \L\\\200\11.60\KF6\\\\E1\EUR\\\61514\\\\\\\\\\\\\\\\1\1\\\\0"
+	Set ^KUL(1091,"F",325216,103) = "703000 \90399\20\\\2.45\20#\8\49.00\49.00\703000 \L\\\300\49.00\KF6\\\\E1\EUR\\\61514\\\\\\\\\\\\\\\\1\1\\\\0"
+	Set ^KUL(1091,"F",325216,104) = "703000 \10559\20\\\4.52\20#\8\90.40\90.40\703000 \L\\\400\90.40\KF6\\\\E1\EUR\\\61514\\\\\\\\\\\\\\\\1\1\\\\0"
+	Set ^KUL(1091,"F",325216,105) = "703000 \10560\20\\\4.52\20#\8\90.40\90.40\703000 \L\\\500\90.40\KF6\\\\E1\EUR\\\61514\\\\\\\\\\\\\\\\1\1\\\\0"
+	Set ^KUL(1091,"F",325216,106) = "703000 \175415\20\\\5.55\20#\8\111.00\111.00\703000 \L\\\600\111.00\KF6\\\\E1\EUR\\\61514\\\\\\\\\\\\\\\\1\1\\\\0"
+	Set ^KUL(1091,"F",325216,107) = "703000 \175416\20\\\5.55\20#\8\111.00\111.00\703000 \L\\\700\111.00\KF6\\\\E1\EUR\\\61514\\\\\\\\\\\\\\\\1\1\\\\0"
+	Set ^KUL(1091,"F",325216,"VP",129018) = "2\60031,42441\\\"
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -53,6 +70,9 @@
 	
 	Kill ^KTO1(298104)
 	Kill ^KTO(6332,298104)
+	
+	Kill ^KUL(1091,"F",325216)
+	Kill ^KU1(325216,"F")
 ]]></Implementation>
 </Method>
 </Class>