Removed superclass from test helpers