Manually tweaked discrepencies with upstream merge branch
Removed integrity test to match upstream merge
Fix test that also relies on celery failure