Small changes for the test suite.