Cleanup and one more test.