Added todo tests and updated TODO
Fixed todo tests