Refactor TODO tests a bit