Improve code coverage by including missing tests

(thumbsup)