Fix Unit test failures