Most of the behavior tested here is now tested elsewhere. Move the remaining useful tests to better places.