Small changes to the test suite.