Add note
Remove completed TODO notes
Correct expected failure