Make some changes to improve the test suite.