drying up the test suite so it's faster to run