Index: Tools/Mock/MockCreator.cls.xml
===================================================================
diff -u -r2054 -r2988
--- Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 2054)
+++ Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 2988)
@@ -10,7 +10,6 @@
 	set Description = ##class(%GlobalCharacterStream).%New()
 	do Description.WriteLine("Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.")
 	do Description.WriteLine("Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt")
-	do Description.Write("Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.")	
 	Quit Description.Read()
 ]]></Implementation>
 </Method>
@@ -20,12 +19,12 @@
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim Skip As %Boolean = $$$false
-	if ..Class.Abstract { set Skip = 'Method.Abstract }
-	Set:('Skip) Skip = (##class(TECH.StringUtils).StartsWith(Method.Name,"%"))
-	Set:('Skip) Skip = Method.Final
-	Set:('Skip) Skip = Method.Private
-	Set:('Skip) Skip = Method.ClassMethod
+	#dim Skip As %Boolean = ##super(Method)
+  	Set:($$$Not(Skip) && ( ..Class.Abstract )) Skip = 'Method.Abstract
+	Set:$$$Not(Skip) Skip = (##class(TECH.StringUtils).StartsWith(Method.Name,"%"))
+	Set:$$$Not(Skip) Skip = Method.Final
+	Set:$$$Not(Skip) Skip = Method.Private
+	Set:$$$Not(Skip) Skip = Method.ClassMethod
 	quit Skip
 ]]></Implementation>
 </Method>
@@ -140,6 +139,7 @@
 							( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(ClassDefinition.Name,"TECH.Template") ) ) && 
 		 					( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(ClassDefinition.Name,"%Library.Base") ) )
 	set:('HeeftMockKlasseNodig) HeeftMockKlasseNodig = ClassDefinition.Super [ "TECH.Mockable"		 					
+	Do ##class(Tools.Wlip).%New(195).String("HeeftKlasseNodig "_HeeftMockKlasseNodig)
 	quit HeeftMockKlasseNodig
 ]]></Implementation>
 </Method>
Index: Tools/Mock/FakeCreator.cls.xml
===================================================================
diff -u -r1957 -r2988
--- Tools/Mock/FakeCreator.cls.xml	(.../FakeCreator.cls.xml)	(revision 1957)
+++ Tools/Mock/FakeCreator.cls.xml	(.../FakeCreator.cls.xml)	(revision 2988)
@@ -19,7 +19,8 @@
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim Skip As %Boolean = ##class(TECH.ClassDefinition).Instance().HasMethod(..GeneratedClass.Name, Method.Name)
+	#dim Skip As %Boolean = ##super(Method)
+	set:('Skip) Skip = ##class(TECH.ClassDefinition).Instance().HasMethod(..GeneratedClass.Name, Method.Name)
 	Set:('Skip) Skip = (##class(TECH.StringUtils).StartsWith(Method.Name,"%"))
 	Set:('Skip) Skip = Method.Final
 	Set:('Skip) Skip = Method.Private
Index: Tools/Mock/TestDoubleCreator.cls.xml
===================================================================
diff -u -r2843 -r2988
--- Tools/Mock/TestDoubleCreator.cls.xml	(.../TestDoubleCreator.cls.xml)	(revision 2843)
+++ Tools/Mock/TestDoubleCreator.cls.xml	(.../TestDoubleCreator.cls.xml)	(revision 2988)
@@ -45,15 +45,39 @@
 		Do:..HasToClearMethods() ..GeneratedClass.Methods.Clear()
 		
 		Do ..CreateInstanceMethod()
-		set itMethods = ##class(TECH.ListIterator).%New(..Class.Methods)
+		
+		Do ..GenerateMethods()
+
+		Do ..SaveGeneratedClass()
+		do ..ExportToSVN(..GeneratedClass.Name)
+		do ..svnHelper.CompileImportedSourceCode()
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GenerateMethods">
+<Private>1</Private>
+<Implementation><![CDATA[
+	set ConvertedMethods = ##class(%ArrayOfDataTypes).%New()
+	
+	set ClassIterator = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GetSuperClasses(..Class.Name))
+	while ClassIterator.HasNext() {
+		#dim ClassName As %String = ClassIterator.Next()
+		
+		continue:$$$StartsWith(ClassName,"%")
+		
+		set Class = ##class(%Dictionary.ClassDefinition).%OpenId(ClassName)	
+		set itMethods = ##class(TECH.ListIterator).%New(Class.Methods)
 		while itMethods.HasNext() {
 			#dim Method As %Dictionary.MethodDefinition = itMethods.Next()
+			
+			continue:ConvertedMethods.IsDefined(Method.Name)
 			continue:..SkipMethod(Method)
+			
 			do ..CreateMethod(Method)
+			
+			do ConvertedMethods.SetAt(Method.Name,Method.Name)
 		}
-		Do ..SaveGeneratedClass()
-		do ..ExportToSVN(..GeneratedClass.Name)
-		do ..svnHelper.CompileImportedSourceCode()
 	}
 ]]></Implementation>
 </Method>
@@ -74,7 +98,7 @@
 <FormalSpec>ClassName:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Dictionary.ClassDefinition</ReturnType>
-<Implementation><![CDATA[	Quit ##class(%Dictionary.ClassDefinition).%OpenId(ClassName)
+<Implementation><![CDATA[	Quit ##class(%Dictionary.CompiledClass).%OpenId(ClassName)
 ]]></Implementation>
 </Method>
 
@@ -85,10 +109,11 @@
 </Method>
 
 <Method name="SkipMethod">
-<Abstract>1</Abstract>
 <FormalSpec>Method:%Dictionary.MethodDefinition</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit $$$False
+]]></Implementation>
 </Method>
 
 <Method name="ExportToSVN">
@@ -129,7 +154,7 @@
 	set TestDoubleMethod.parent = ..GeneratedClass
 	set TestDoubleMethod.ReturnType = Method.ReturnType
 	set TestDoubleMethod.FormalSpec = Method.FormalSpec
-	set TestDoubleMethod.SequenceNumber=2
+	set TestDoubleMethod.SequenceNumber = 2
 	#dim Body As %String = ..GetMethodBody(TestDoubleMethod)
 	do TestDoubleMethod.Implementation.WriteLine(Body)
 	do TestDoubleMethod.%Save()