Added more tests & TODOs