Improve code coverage on a few stupid spots