Fixed the unit test failures