Attempts to fix tests

celery/app/task.py

@@ -471,16 +471,14 @@ class Task(object):
         if self.__self__ is not None:
             args = args if isinstance(args, tuple) else tuple(args or ())
             args = (self.__self__, ) + args
-            shadow = shadow or self.shadow_name(args, kwargs, final_options)
 
-        final_options = self._get_exec_options()
-        if options:
-            final_options = dict(final_options, **options)
+        preopts = self._get_exec_options()
+        options = dict(preopts, **options) if options else preopts
         return app.send_task(
             self.name, args, kwargs, task_id=task_id, producer=producer,
             link=link, link_error=link_error, result_cls=self.AsyncResult,
-            shadow=shadow,
-            **final_options
+            shadow=shadow or self.shadow_name(args, kwargs, options),
+            **options
         )
 
     def shadow_name(self, args, kwargs, options):