Better overall design of the test classes.