Reverted back an old commit since use_pulp is always false in tests