Index: Tools/Mock/MockCreator.cls.xml
===================================================================
diff -u -r3491 -r3506
--- Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 3491)
+++ Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 3506)
@@ -21,9 +21,9 @@
 <Implementation><![CDATA[
 	#dim Skip As %Boolean = ##super(Method)
   	Set:($$$Not(Skip) && ( ..Class.Abstract )) Skip = $$$Not(Method.Abstract)
-	Set:$$$Not(Skip) Skip = (##class(TECH.StringUtils).StartsWith(Method.Name,"%"))
+	Set:$$$Not(Skip) Skip = (##class(TECH.StringUtils).StartsWith(Method.Name,"%") && $$$Not(Method.Name="%OnNew"))
 	Set:$$$Not(Skip) Skip = Method.Final
-	Set:$$$Not(Skip) Skip = Method.Private
+	Set:$$$Not(Skip) Skip = (Method.Private && $$$Not(Method.Name="%OnNew"))
 	Set:$$$Not(Skip) Skip = Method.ClassMethod
 	quit Skip
 ]]></Implementation>
@@ -73,6 +73,7 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	Quit:(Method.Name="%OnNew") $Char(9) _ "Quit $$$Ok"
 	#dim CacheCommando As %String = $select($length(Method.ReturnType)>0:"quit",1:"do")
 	
 	set MethodInfo = ##class(TECH.ClassInfo.MethodDefinition).%New(Method,..Class)