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/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/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/bootstrap.sh b/tests/bootstrap.sh
index d4bcfc5476..658fec4bab 100755
--- a/tests/bootstrap.sh
+++ b/tests/bootstrap.sh
@@ -34,7 +34,7 @@ then
     mv config/configuration.yml{,.backup}
     rm -f config/configuration-compiled.php
 fi
-./bin/setup system:install --email=test@phraseanet.com --password=test --db-user=root --db-template=en --db-password=toor --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y $VERBOSITY
+./bin/setup system:install --email=test@phraseanet.com --password=test --db-user=root --db-template=en-simple --db-password=toor --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y $VERBOSITY
 case "$INSTALL_MODE" in
     update)
         ./bin/developer ini:reset --email=test@phraseanet.com --password=test --run-patches --no-setup-dbs $VERBOSITY
@@ -44,5 +44,6 @@ case "$INSTALL_MODE" in
         ;;
 esac
 ./bin/developer ini:setup-tests-dbs $VERBOSITY
-./bin/console searchengine:index:create $VERBOSITY
+./bin/console searchengine:index -ndcp --force $VERBOSITY
 ./bin/developer phraseanet:regenerate-sqlite $VERBOSITY
+./bin/developer phraseanet:generate-js-fixtures $VERBOSITY
\ No newline at end of file
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