Added better cleanup of this test.