Some changes to tests.