Minor clean up of tests.