Adjusted the unit tests.