Some cleanup wr to the tests.