Update test coverage and minor style changes
Merge pull request #39 from gconsidine/coverage-boost

Update test coverage and minor style changes