celery, unittests fixes