Fix unit test failures on pulp-2.2