Clean up the test a bit