Fixed UNIT test failures