Some changes in unit tests.