Rationalize updatable and completable (+add todos)
Move tests around

- be more uniform and explicit
- prepare for more detailed coverage reporting