Cleanup, more tests.