Fix unit test failures on Jenkins