Improve coverage in a few high-coverage modules

I wrote some tests last night while I was burned out on other things.