Index: svn/Repository.cls.xml
===================================================================
diff -u -r1649 -r1652
--- svn/Repository.cls.xml	(.../Repository.cls.xml)	(revision 1649)
+++ svn/Repository.cls.xml	(.../Repository.cls.xml)	(revision 1652)
@@ -95,6 +95,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="SVNMove">
+<FormalSpec>InternalNameFrom:%String,InternalNameTo:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	if ..AllreadyAdded(InternalNameFrom) {
+		set tCmd=##class(svn.Command).%New($lb(..WorkspacePath(..Branch)))
+		set tCmd.File=..ExternalName(InternalNameFrom)_""" """_..ExternalName(InternalNameTo)
+		set tCmd.SubCommand="move"
+		do tCmd.Execute()
+		do ..VerwerkResultaat(tCmd)
+		do ..OnSVNDelete(InternalNameFrom)
+	}
+]]></Implementation>
+</Method>
+
 <Method name="OnSVNDelete">
 <FormalSpec>InternalName:%String</FormalSpec>
 <Implementation><![CDATA[
Index: svn/Helper.cls.xml
===================================================================
diff -u -r1649 -r1652
--- svn/Helper.cls.xml	(.../Helper.cls.xml)	(revision 1649)
+++ svn/Helper.cls.xml	(.../Helper.cls.xml)	(revision 1652)
@@ -418,6 +418,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="SVNMove">
+<FormalSpec>InternalNameFrom:%String,InternalNameTo:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim Repository As svn.Repository = ..GeefRepository(InternalNameFrom)
+	if $isObject(Repository) do Repository.SVNMove(InternalNameFrom,InternalNameTo)
+	quit
+]]></Implementation>
+</Method>
+
 <Method name="SVNSynchronizeChanges">
 <Implementation><![CDATA[
 	set rsRepos = ##class(%ResultSet).%New("svn.Repository:Extent")
Index: svn/StudioHook.cls.xml
===================================================================
diff -u -r1649 -r1652
--- svn/StudioHook.cls.xml	(.../StudioHook.cls.xml)	(revision 1649)
+++ svn/StudioHook.cls.xml	(.../StudioHook.cls.xml)	(revision 1652)
@@ -776,14 +776,26 @@
 <Method name="OpenUnitTest">
 <FormalSpec><![CDATA[&InternalName:%String,&Action:%String,&Target:%String]]></FormalSpec>
 <Implementation><![CDATA[
-	#dim UnitTestName = ..UnitTestHelper.BepaalUnitTestName(InternalName)
-	if ##class(%Dictionary.ClassDefinition).%ExistsId(UnitTestName) {
-		set Action = 5
-		set Target = UnitTestName_".cls"
-		If InternalName = UnitTestName set Target=""
-	} else {
-		write !,"Geen unittest ("_UnitTestName_") voor "_InternalName	
+	#dim UnitTests As %ListOfDataTypes = ..UnitTestHelper.GetUnitTestsForInternalName(InternalName)
+	if UnitTests.Count() {
+		if UnitTests.Count() > 5 {
+			write !,"Unittests voor "_InternalName_" : "
+			write !,##class(TECH.ListUtils).ListToPieces(UnitTests,$char(13,10))
+		} else {
+			set itUnitTests = ##class(TECH.ListIterator).%New(UnitTests)
+			while itUnitTests.HasNext() {
+				#dim UnitTestName As %String = itUnitTests.Next()
+				if ##class(%Dictionary.ClassDefinition).%ExistsId(UnitTestName) {
+					set Action = 5
+					set Target = UnitTestName_".cls"
+					If InternalName = UnitTestName set Target=""
+				}
+			}
+		}
 	}
+	else {
+		write !,"Geen unittest voor "_InternalName_ "!!!!!!!!!!"	
+	}
 ]]></Implementation>
 </Method>
 
@@ -977,8 +989,9 @@
 	do ..svnHelper.SVNDelete(InternalName)
 	
 	if ##class(svn.Setting).MagUnitTestUitvoeren() {
-		set UnitTestAnalyser = ##class(svn.UnitTestAnalyser).%New(##class(TECH.SourceCodeUtils).StripExtension(InternalName))
-		do UnitTestAnalyser.RemoveUnitTestInfo()
+		#dim ClassName As %String = ##class(TECH.SourceCodeUtils).StripExtension(InternalName)
+		set UnitTestAnalyser = ##class(svn.UnitTestAnalyser).%New(ClassName)
+		do UnitTestAnalyser.RemoveUnitTestInfo(ClassName)
 	}
 
 	
@@ -992,18 +1005,20 @@
 <FormalSpec>InternalName:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	if ..Debug write "OnAfterCompile : "_InternalName ,!
-
-	set InternalName = ..svnHelper.NormalizeInternalName(InternalName)
-	do ..svnHelper.SVNExport(InternalName)
+	if $get(%objlasterror)="" {
+		if ..Debug write "OnAfterCompile : "_InternalName ,!
 	
-	do ##class(svn.InterfaceControleur).%New().Controleer($piece(InternalName,".",1,$length(InternalName,".")-1))
+		set InternalName = ..svnHelper.NormalizeInternalName(InternalName)
+		do ..svnHelper.SVNExport(InternalName)
+	
+		do ##class(svn.InterfaceControleur).%New().Controleer($piece(InternalName,".",1,$length(InternalName,".")-1))
 		
-	if ##class(svn.Setting).MagUnitTestUitvoeren()  {
-		set UnitTestAnalyser = ##class(svn.UnitTestAnalyser).%New(##class(TECH.SourceCodeUtils).StripExtension(InternalName))
-		do UnitTestAnalyser.StoreUnitTestInfo()
-		if ##class(svn.Setting).RunUnitsTestOnCompile() {
-			do ..UnitTestHelper.RunUnitTestsForInternalName(InternalName)
+		if ##class(svn.Setting).MagUnitTestUitvoeren()  {
+			set UnitTestAnalyser = ##class(svn.UnitTestAnalyser).%New(##class(TECH.SourceCodeUtils).StripExtension(InternalName))
+			do UnitTestAnalyser.StoreUnitTestInfo()
+			if ##class(svn.Setting).RunUnitsTestOnCompile() {
+				do ..UnitTestHelper.RunUnitTestsForInternalName(InternalName)
+			}
 		}
 	}
 	
@@ -1015,6 +1030,7 @@
 <FormalSpec>InternalName:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	set %objlasterror = ""
 	set Status = ..SourceCodeInfoUpdate(InternalName)
 	quit Status
 ]]></Implementation>
Index: svn/UnitTestAnalyser.cls.xml
===================================================================
diff -u -r1649 -r1652
--- svn/UnitTestAnalyser.cls.xml	(.../UnitTestAnalyser.cls.xml)	(revision 1649)
+++ svn/UnitTestAnalyser.cls.xml	(.../UnitTestAnalyser.cls.xml)	(revision 1652)
@@ -40,15 +40,32 @@
 <Method name="StoreUnitTestInfo">
 <Implementation><![CDATA[
 	if ..IsUnitClass(..ClassName) {
-		do ..RemoveUnitTestInfo()
+		do ..RemoveUnitTestInfo(..ClassName)
 		do ..CollectUsedClassNames()
 		do ..CollectUsedRoutines()
 	}
+	do ..CleanUp()
 ]]></Implementation>
 </Method>
 
+<Method name="CleanUp">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim rsUnitTest As %Result = $$ExecDynQuery^vhLib.Query("SELECT UnitTest FROM svn.UnitTestInfo")
+	while rsUnitTest.Next() {
+		#dim UnitTest As %String = rsUnitTest.GetData(1)
+		if '$length(UnitTest) write !,"CleanUp"
+		if '##class(%Dictionary.ClassDefinition).%ExistsId(UnitTest) {
+			do ..RemoveUnitTestInfo(UnitTest)
+		}
+	}
+]]></Implementation>
+</Method>
+
 <Method name="RemoveUnitTestInfo">
-<Implementation><![CDATA[	do ExecDynQuery^vhLib.Query("DELETE FROM svn.UnitTestInfo where UnitTest = ?",$listbuild(..ClassName))
+<FormalSpec>ClassName:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	do ExecDynQuery^vhLib.Query("DELETE FROM svn.UnitTestInfo where UnitTest = ?",$listbuild(ClassName))
 ]]></Implementation>
 </Method>
 
@@ -74,6 +91,7 @@
 
 <Method name="SaveRoutineInfo">
 <FormalSpec>Routine:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	set Info = ##class(svn.UnitTestInfo).%New(..ClassName)
 	set Info.Routine = Routine
@@ -83,6 +101,7 @@
 
 <Method name="SaveClassInfo">
 <FormalSpec>ClassName:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	set Info = ##class(svn.UnitTestInfo).%New(..ClassName)
 	set Info.ClassName = ClassName