Fix of unit test failures