Added some tests according to TODOs
Test Updated
TODO updates