Move more tests to better places.