Feature/coverage testing

Proposed features. No need to merge in yet.