Some changes to the tests.