Clean up and new test.