Remove a completed TODO
Minor fixes to EXPECTED