Index: Tools/Mock/Cleaner.cls.xml
===================================================================
diff -u
--- Tools/Mock/Cleaner.cls.xml	(revision 0)
+++ Tools/Mock/Cleaner.cls.xml	(revision 1034)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Tools.Mock.Cleaner">
+<Super>TECH.RegisteredObject</Super>
+
+<Parameter name="MockClassPrefix">
+<Type>%String</Type>
+<Default>vhTest.Mock</Default>
+</Parameter>
+
+<Property name="svnHelper">
+<Type>svn.Helper</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..svnHelper = ##class(svn.Helper).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="CleanUp">
+<Implementation><![CDATA[
+	#dim MockClassIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GetClassesStartingWith(..#MockClassPrefix))
+	while MockClassIterator.HasNext() {
+		#dim MockClassName As %String = MockClassIterator.Next()
+		#dim ClassName As %String = $extract(MockClassName,$length(..#MockClassPrefix)+2,*)
+		if '##class(%Dictionary.ClassDefinition).%ExistsId(ClassName) {
+			do ..svnHelper.SVNDelete(MockClassName_".CLS")
+		}
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: Tools/impl/MoveHelper.cls.xml
===================================================================
diff -u -r1018 -r1034
--- Tools/impl/MoveHelper.cls.xml	(.../MoveHelper.cls.xml)	(revision 1018)
+++ Tools/impl/MoveHelper.cls.xml	(.../MoveHelper.cls.xml)	(revision 1034)
@@ -27,11 +27,6 @@
 <Parameter name="TRUNCATE" value="1"/>
 </Property>
 
-<Parameter name="MockClassPrefix">
-<Type>%String</Type>
-<Default>vhTest.Mock</Default>
-</Parameter>
-
 <Method name="%OnNew">
 <FormalSpec>ZoekOpPrefix:%Boolean=0</FormalSpec>
 <Private>1</Private>
@@ -266,15 +261,10 @@
 </Method>
 
 <Method name="CleanUpMocks">
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim MockClassIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GetClassesStartingWith(..#MockClassPrefix))
-	while MockClassIterator.HasNext() {
-		#dim MockClassName As %String = MockClassIterator.Next()
-		#dim ClassName As %String = $extract(MockClassName,$length(..#MockClassPrefix)+2,*)
-		if '##class(%Dictionary.ClassDefinition).%ExistsId(ClassName) {
-			do ..svnHelper.SVNDelete(MockClassName_".CLS")
-		}
-	}
+	set MockCleaner = ##class(Tools.Mock.Cleaner).%New()
+	do MockCleaner.CleanUp()
 ]]></Implementation>
 </Method>