fixed tests
Merge branch 'master' into celery-warm-shutdown