Changes to the test suite