Code coverage3

Depends on #41.

I believe this should be the final code coverage chunk, minus the few pending TODOs.