make model classes mapped superclasses
fix tests