Index: Tools/Mock/TestDoubleCreator.cls.xml
===================================================================
diff -u -r2988 -r2991
--- Tools/Mock/TestDoubleCreator.cls.xml	(.../TestDoubleCreator.cls.xml)	(revision 2988)
+++ Tools/Mock/TestDoubleCreator.cls.xml	(.../TestDoubleCreator.cls.xml)	(revision 2991)
@@ -60,7 +60,10 @@
 <Implementation><![CDATA[
 	set ConvertedMethods = ##class(%ArrayOfDataTypes).%New()
 	
-	set ClassIterator = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GetSuperClasses(..Class.Name))
+	#dim ClassesToGenerate As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes(..Class.Name)
+	do ##class(TECH.ListUtils).AppendList(ClassesToGenerate,##class(TECH.ClassUtils).GetSuperClasses(..Class.Name))
+	
+	set ClassIterator = ##class(TECH.ListIterator).%New(ClassesToGenerate)
 	while ClassIterator.HasNext() {
 		#dim ClassName As %String = ClassIterator.Next()