cleanup and new test.