Add more tests todo

See #2