Some changes in the test suites.