Fixed the unit tests.