Need more non-CLI tests

[GlenRSmith]

I've directed substantially more effort toward CLI tests than otherwise.

This should be remedied. The side benefit is that they are a lot easier to debug, e.g. you can actually reliably hit breakpoints outside of the click context.

From now on, any time I break something in a CLI test, I'm going to reproduce it with a failing non-CLI test before attempting to fix it.