test suite cleanups

A pass to make sure the tests are up to our latest conventions.  This
is mostly naming contexts to convention and using convention based
context descriptions.

There are no new or updated test behaviors here - only cleanups.