Fixing tests, ensuring that checkbox default is correct, update TODO.txt
Fixing more test expectations