Updated TODO (Unit Test) and Changelog (0.5.1)