various minor test suite cleanups

No behavior changes - just cleanups and getting the right requires
in the right order.