Index: vhUnitTest/TECH/Lock/Lock/Test.cls.xml
===================================================================
diff -u -r978 -r2145
--- vhUnitTest/TECH/Lock/Lock/Test.cls.xml	(.../Test.cls.xml)	(revision 978)
+++ vhUnitTest/TECH/Lock/Lock/Test.cls.xml	(.../Test.cls.xml)	(revision 2145)
@@ -8,6 +8,23 @@
 <Private>1</Private>
 </Property>
 
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Set ..Lock = ##class(TECH.Lock).%New("UTLOCKDUMMY")
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ..Lock.UnLock()
+	Do ..Lock.UnLock()
+	Do ##super(aTestName)
+]]></Implementation>
+</Method>
+
 <Method name="Test2ExclusiveLocks">
 <Implementation><![CDATA[
 	Do ..Lock.Lock()
@@ -35,23 +52,6 @@
 	Do ..Lock.Lock(##class(TECH.enu.LockType).Shared())
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	Set ..Lock = ##class(TECH.Lock).%New("UTLOCKDUMMY")
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	Do ..Lock.UnLock()
-	Do ..Lock.UnLock()
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/TECH/Comparator/DecimalComparator/IsKleinerDan/Test.cls.xml
===================================================================
diff -u -r1987 -r2145
--- vhUnitTest/TECH/Comparator/DecimalComparator/IsKleinerDan/Test.cls.xml	(.../Test.cls.xml)	(revision 1987)
+++ vhUnitTest/TECH/Comparator/DecimalComparator/IsKleinerDan/Test.cls.xml	(.../Test.cls.xml)	(revision 2145)
@@ -8,13 +8,11 @@
 <Private>1</Private>
 </Property>
 
-<Parameter name="GebruiktVariabeleControle">
-<Default>0</Default>
-</Parameter>
-
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[	set ..DecimalComparator = ##class(TECH.Comparator.DecimalComparator).%New()
+<Implementation><![CDATA[
+	do ##super(aTestName)
+	set ..DecimalComparator = ##class(TECH.Comparator.DecimalComparator).%New()
 ]]></Implementation>
 </Method>