Merge "Separate admin tests from test_routers"