Real support for superclasses; and some test cleanup