Move more tests over to test_locate.