Test enhancements to make your life easier.

In addition to some maintenance/cleanup type changes, the tests should now run a lot faster, making it easier to evaluate other pull requests.