#147 patch for JDK6 java.lang.AssertionError: isSubtype 15 problem, including some test updates