Remove duplicate methods from test_client