Minor adjustments to code coverage: added some broader testing.