Review TODOs before v3?

[DimitriPapadopoulos]

Some of the TODOs in code and tests look like they should be reviewed before releasing v3.

$ grep -R TODO src | wc -l
71
$ 
$ grep -R TODO tests | wc -l
8
$