Fix tests and updated TODO.txt