Cleanup, CHANGES.md, add a test, fix a test.