Fixed unit test failures