Updates to increase the coverage of the test suite

This MR increases the coverage of the test suite from 86.5%/94.3% to 90.2%/95.5% (lines/functions) in src/