Fix annotation of tests
Add todos