Finish cleaning up the tests. One ugly test to go.