diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index f586a4f93a..1e4fcb1764 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -256,6 +256,7 @@ class Application extends SilexApplication
         $this->register(new OrderServiceProvider());
         $this->register(new WebhookServiceProvider());
 
+
         $this['monolog'] = $this->share(
             $this->extend('monolog', function (LoggerInterface $logger, Application $app) {
 
@@ -273,6 +274,7 @@ class Application extends SilexApplication
             })
         );
 
+
         $this['phraseanet.exception_handler'] = $this->share(function ($app) {
             /** @var PhraseaExceptionHandler $handler */
             $handler =  PhraseaExceptionHandler::register($app['debug']);
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/LazaretController.php b/lib/Alchemy/Phrasea/Controller/Prod/LazaretController.php
index 035476d5fb..afb91cb23e 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/LazaretController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/LazaretController.php
@@ -38,7 +38,7 @@ class LazaretController extends Controller
      *
      * @param Request     $request The current request
      *
-     * @return Response
+     * @return String
      */
     public function listElement(Request $request)
     {
diff --git a/lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
index fa816c9ef7..9a887155b7 100644
--- a/lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
@@ -43,7 +43,8 @@ class LocaleServiceProvider implements ServiceProviderInterface
 
                 if (0 === count($enabledLanguages)) {
                     $app['monolog']->error('Wrong language configuration, no language activated');
-
+                    $app['monolog']->error(var_export(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), true));
+                    // throw new \Exception('Wrong language configuration, no language activated');
                     return $availableLanguages;
                 }
 
diff --git a/lib/Alchemy/Phrasea/TaskManager/Notifier.php b/lib/Alchemy/Phrasea/TaskManager/Notifier.php
index d85b9f5f59..101fb79753 100644
--- a/lib/Alchemy/Phrasea/TaskManager/Notifier.php
+++ b/lib/Alchemy/Phrasea/TaskManager/Notifier.php
@@ -25,7 +25,7 @@ class Notifier implements NotifierInterface
     private $logger;
 
     /** @var integer  */
-    private $timeout = 1;
+    private $timeout = 10;
 
     public function __construct(\ZMQSocket $socket, LoggerInterface $logger)
     {
diff --git a/tests/Alchemy/Tests/Phrasea/ApplicationTest.php b/tests/Alchemy/Tests/Phrasea/ApplicationTest.php
index 2046670917..0c45d2c2c4 100644
--- a/tests/Alchemy/Tests/Phrasea/ApplicationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/ApplicationTest.php
@@ -152,6 +152,7 @@ class ApplicationTest extends \PhraseanetTestCase
         $sessionId = null;
         $app->post('/prod/upload/', function (Application $app) use (&$sessionId) {
             $sessionId = $app['session']->getId();
+            return "";
         });
 
         $client = new Client($app);
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php
index 65832cf4dc..7245f53776 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php
@@ -106,6 +106,7 @@ class UploadTest extends \PhraseanetAuthenticatedWebTestCase
 
             $record = new \record_adapter(self::$DI['app'], $id[0], $id[1]);
             $this->assertTrue($record->get_thumbnail()->is_physically_present());
+            $zzz = $record->get_caption()->get_fields();
             $fields = $record->get_caption()->get_fields(['FileName']);
             $field = array_pop($fields);
             $this->assertEquals('KIKOO.JPG', $field->get_serialized_values());
diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml
index 27eb933247..33bd2ddb84 100644
--- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml
+++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml
@@ -6,6 +6,7 @@ main:
     maintenance: false
     key: ''
     api_require_ssl: true
+    delete-account-require-email-confirmation: true
     database:
         host: 'sql-host'
         port: 3306
@@ -212,3 +213,35 @@ embed_bundle:
     document:
         player: flexpaper
         enable-pdfjs: true
+geocoding-providers:
+    -
+        name: 'mapBox'
+        enabled: true
+        public-key: ''
+        default-position:
+            - 2.335062
+            - 48.879162
+        default-zoom: 2
+        marker-default-zoom: 11
+        position-fields:
+            -
+                name: GpsCompositePosition
+                type: latlng
+            # -
+            #    name: Longitude
+            #    type: lng
+            # -
+            #    name: Latitude
+            #    type: lat
+video-editor:
+    vttFieldName: VideoTextTrackChapters
+    seekBackwardStep: 1000 # in ms
+    seekForwardStep: 1000  # in ms
+    playbackRates:
+        - 1
+        - '1.5'
+        - 3
+
+user_account:
+    deleting_policies:
+        email_confirmation: true
diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml
index 27eb933247..33bd2ddb84 100644
--- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml
+++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml
@@ -6,6 +6,7 @@ main:
     maintenance: false
     key: ''
     api_require_ssl: true
+    delete-account-require-email-confirmation: true
     database:
         host: 'sql-host'
         port: 3306
@@ -212,3 +213,35 @@ embed_bundle:
     document:
         player: flexpaper
         enable-pdfjs: true
+geocoding-providers:
+    -
+        name: 'mapBox'
+        enabled: true
+        public-key: ''
+        default-position:
+            - 2.335062
+            - 48.879162
+        default-zoom: 2
+        marker-default-zoom: 11
+        position-fields:
+            -
+                name: GpsCompositePosition
+                type: latlng
+            # -
+            #    name: Longitude
+            #    type: lng
+            # -
+            #    name: Latitude
+            #    type: lat
+video-editor:
+    vttFieldName: VideoTextTrackChapters
+    seekBackwardStep: 1000 # in ms
+    seekForwardStep: 1000  # in ms
+    playbackRates:
+        - 1
+        - '1.5'
+        - 3
+
+user_account:
+    deleting_policies:
+        email_confirmation: true
diff --git a/tests/classes/PhraseanetTestCase.php b/tests/classes/PhraseanetTestCase.php
index 10a121af87..1f03956f86 100644
--- a/tests/classes/PhraseanetTestCase.php
+++ b/tests/classes/PhraseanetTestCase.php
@@ -273,6 +273,7 @@ abstract class PhraseanetTestCase extends WebTestCase
         static $decodedFixtureIds;
 
         if (is_null($decodedFixtureIds)) {
+            $p = sys_get_temp_dir().'/fixtures.json';
             $decodedFixtureIds = json_decode(file_get_contents(sys_get_temp_dir().'/fixtures.json'), true);
         }
         self::$fixtureIds = $decodedFixtureIds;
@@ -379,6 +380,8 @@ abstract class PhraseanetTestCase extends WebTestCase
 
         $app->boot();
 
+        // $app['monolog'] = $this->getMock('Psr\Log\LoggerInterface');
+
         return $app;
     }
 
diff --git a/tests/files/cestlafete.jpg b/tests/files/cestlafete.jpg
index 698ec817b0..c0e8cd7f75 100755
Binary files a/tests/files/cestlafete.jpg and b/tests/files/cestlafete.jpg differ