DRYing out the test suite a lot!