Merge pull request #36 from gconsidine/coverage-boost

Coverage boost
Update utility test cases