Some changes in tests.