Miscellaneous test coverage work

Here are a few tweaks to improve test coverage over a few of our already-well-covered modules. (I tend to write tests when I'm feeling bored or twitchy.)