Changes per feedback.

I totally should have looked at `test_verbose`...  derp.