Much better testing. Fixed MappedSuperclass