Refactors tests

This PR is only to satisfy my personal preferences.  It won't hurt my feelings if it doesn't get merged.