Index: Tools/impl/MoveHelper.cls.xml
===================================================================
diff -u -r547 -r1018
--- Tools/impl/MoveHelper.cls.xml	(.../MoveHelper.cls.xml)	(revision 547)
+++ Tools/impl/MoveHelper.cls.xml	(.../MoveHelper.cls.xml)	(revision 1018)
@@ -27,6 +27,11 @@
 <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>
@@ -255,9 +260,24 @@
 		Do ..svnHelper.CompileImportedSourceCode()
 
 	}
+	
+	do ..CleanUpMocks()
 ]]></Implementation>
 </Method>
 
+<Method name="CleanUpMocks">
+<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>
+
 <Method name="ReplaceBetween">
 <FormalSpec>Class:TECH.ClassInfo.ClassDefinition,String:%String,Prefix:%String,Suffix:%String</FormalSpec>
 <Private>1</Private>
Index: TECH/ClassUtils.cls.xml
===================================================================
diff -u -r994 -r1018
--- TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 994)
+++ TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 1018)
@@ -5,6 +5,21 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.RegisteredObject</Super>
 
+<Method name="GetClassesStartingWith">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Value:%String</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	set Classes = ##class(%ListOfDataTypes).%New()
+	#dim rsClasses As TECH.ResultSet = ##class(TECH.ResultSet).Create("SELECT ID FROM %Dictionary.ClassDefinition WHERE ID %STARTSWITH ?",$listbuild(Value))
+	while rsClasses.Next() {
+		do Classes.Insert(rsClasses.GetData(1))
+	}
+	
+	quit Classes
+]]></Implementation>
+</Method>
+
 <Method name="IsEnumeratie">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KlasseNaam:%String</FormalSpec>