Removed superclass from tests