Remove Location from test_location (lots of test failures)