Clean up test superclasses