remove unused method from test, update internal helper class name for clarity