Add coverage to tests and include lines missing in report

Closes #60
Closes #98