Tidying up code coverage

When I don't run the feature tests there are several areas that are
not being tested. I want to shore that up.
Merge pull request #18 from ndlib/tidying-up-code-coverage

Tidying up code coverage