Fixed Unit test failures