Move the tests around to slightly better locations.