Improves test suite performance - this should shed a few minutes off of the test runs.