Some cleanup based on comments on the PR
Merge pull request #1916 from maxlinc/code_coverage

Code coverage (cleanup based on PR comments)