Update README and remove TODO
More cleanups of tests