Increase code coverage by 53.8%

Boy, I love percentage jokes. :-)