some changes in unit tests.