improvements to increase code coverage