Update README and TODO
Work in progress on test cases