test helper reorgs and cleanups

This reorganizes the test helper files and cleans up the tests to
get them to our modern conventions.  There are no behavior changes,
just modernizing things in prep for new features.