Remove rest of TODOs and add more tests