Cleanup and a couple more tests.