diff --git a/hudson/_GV.php b/hudson/_GV.php
index d879f1ce6b..c4a14423c3 100644
--- a/hudson/_GV.php
+++ b/hudson/_GV.php
@@ -1,3 +1,88 @@
 <?php
 
+$gvSit = md5(mt_rand(100000000, 999999999));
+
 define('GV_ServerName', 'http://local.phrasea/');
+define('GV_sit', $gvSit);
+define('GV_default_lng', 'fr_FR');
+define('GV_message', 'May the force be with you');
+define('GV_message_on', false);
+define('GV_log_errors', false);
+define('GV_google_api', true);
+define('GV_i18n_service', 'http://localization.webservice.alchemyasp.com/');
+define('GV_captchas', false);
+define('GV_captcha_public_key', '');
+define('GV_captcha_private_key', '');
+define('GV_youtube_api', false);
+define('GV_youtube_client_id', '');
+define('GV_youtube_client_secret', '');
+define('GV_youtube_dev_key', '');
+define('GV_flickr_api', false);
+define('GV_flickr_client_id', '');
+define('GV_flickr_client_secret', '');
+define('GV_dailymotion_api', false);
+define('GV_dailymotion_client_id', '');
+define('GV_dailymotion_client_secret', '');
+define('GV_client_navigator', false);
+define('GV_base_datapath_noweb', '/tmp/');
+define('GV_phrasea_sort', '');
+define('GV_modxsendfile', false);
+define('GV_X_Accel_Redirect', '');
+define('GV_X_Accel_Redirect_mount_point', 'noweb');
+define('GV_h264_streaming', false);
+define('GV_mod_auth_token_directory', '');
+define('GV_mod_auth_token_directory_path', '');
+define('GV_mod_auth_token_passphrase', '');
+define('GV_PHP_INI', '');
+define('GV_imagine_driver', '');
+define('GV_ffmpeg_threads', '2');
+define('GV_pdfmaxpages', '5');
+define('GV_filesOwner', '');
+define('GV_filesGroup', '');
+define('GV_adminMail', 'support@alchemy.fr');
+define('GV_view_bas_and_coll', true);
+define('GV_choose_export_title', false);
+define('GV_default_export_title', 'support@alchemy.fr');
+define('GV_social_tools', 'none');
+define('GV_home_publi', 'COOLIRIS');
+define('GV_min_letters_truncation', '1');
+define('GV_defaultQuery', 'all');
+define('GV_defaultQuery_type', '0');
+define('GV_anonymousReport', false);
+define('GV_thesaurus', true);
+define('GV_multiAndReport', true);
+define('GV_seeOngChgDoc', false);
+define('GV_seeNewThumb', false);
+define('GV_defaulmailsenderaddr', 'phraseanet@example.com');
+define('GV_smtp', false);
+define('GV_smtp_auth', false);
+define('GV_smtp_host', '');
+define('GV_smtp_port', '');
+define('GV_smtp_secure', false);
+define('GV_smtp_user', '');
+define('GV_smtp_password', '');
+define('GV_activeFTP', false);
+define('GV_ftp_for_user', false);
+define('GV_download_max', '120');
+define('GV_ong_search', '1');
+define('GV_ong_advsearch', '2');
+define('GV_ong_topics', '0');
+define('GV_ong_actif', '1');
+define('GV_client_render_topics', 'tree');
+define('GV_rollover_reg_preview', true);
+define('GV_rollover_chu', true);
+define('GV_client_coll_ckbox', 'checkbox');
+define('GV_viewSizeBaket', true);
+define('GV_clientAutoShowProposals', true);
+define('GV_needAuth2DL', true);
+define('GV_requireTOUValidationForExport', false);
+define('GV_autoselectDB', true);
+define('GV_autoregister', false);
+define('GV_validation_reminder', '2');
+define('GV_val_expiration', '10');
+define('GV_homeTitle', 'Phraseanet');
+define('GV_metaKeywords', '');
+define('GV_metaDescription', '');
+define('GV_googleAnalytics', '');
+define('GV_allow_search_engine', true);
+define('GV_display_gcf', true);
\ No newline at end of file
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/TOU.php b/lib/Alchemy/Phrasea/Controller/Prod/TOU.php
index aa2c343df0..ce99522cdf 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/TOU.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/TOU.php
@@ -67,7 +67,7 @@ class TOU implements ControllerProviderInterface
                     $data[$databox->get_viewname()] = $cgus[$app['locale']]['value'];
                 }
 
-                return new Response($app['Core']['Twig']->render('/prod/TOU.html.twig', array('TOUs' => $data)));
+                return new Response($app['twig']->render('/prod/TOU.html.twig', array('TOUs' => $data)));
             });
 
         return $controllers;
diff --git a/lib/Alchemy/Phrasea/Core/Configuration/ApplicationSpecification.php b/lib/Alchemy/Phrasea/Core/Configuration/ApplicationSpecification.php
index f823cb2c30..beb278eaa2 100644
--- a/lib/Alchemy/Phrasea/Core/Configuration/ApplicationSpecification.php
+++ b/lib/Alchemy/Phrasea/Core/Configuration/ApplicationSpecification.php
@@ -122,6 +122,8 @@ class ApplicationSpecification implements SpecificationInterface
             , $this->getConfigurationsPathFile()
         );
 
+        $this->setBinaries(array('binaries' => array()));
+
         if (function_exists('chmod')) {
             chmod($this->getConnexionsPathFile(), 0700);
             chmod($this->getConfigurationsPathFile(), 0700);
diff --git a/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration31.php b/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration31.php
index ecea77367c..96fed8388a 100644
--- a/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration31.php
+++ b/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration31.php
@@ -99,7 +99,6 @@ class Migration31 implements MigrationInterface
                 $type = $datas['type'];
                 switch ($datas['type']) {
                     case \registry::TYPE_ENUM_MULTI:
-                    case \registry::TYPE_ENUM:
                         $val = serialize($val);
                         break;
                     case \registry::TYPE_INTEGER:
@@ -112,6 +111,7 @@ class Migration31 implements MigrationInterface
                     case \registry::TYPE_BINARY:
                     case \registry::TYPE_TEXT:
                     case \registry::TYPE_TIMEZONE:
+                    case \registry::TYPE_ENUM:
                         $val = (string) $val;
                         break;
                     default:
@@ -127,6 +127,13 @@ class Migration31 implements MigrationInterface
                 ));
             }
         }
+
+        $stmt->execute(array(
+            ':key'   => 'GV_sit',
+            ':value' => GV_sit,
+            ':type'  => \registry::TYPE_STRING,
+        ));
+
         $stmt->closeCursor();
 
         rename(__DIR__ . '/../../../../../../config/_GV.php', __DIR__ . '/../../../../../../config/_GV.php.old');
diff --git a/lib/classes/patch/373.class.php b/lib/classes/patch/373.class.php
index 41ab8d6857..884ed98b10 100644
--- a/lib/classes/patch/373.class.php
+++ b/lib/classes/patch/373.class.php
@@ -9,8 +9,8 @@
  * file that was distributed with this source code.
  */
 
+use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Core\Configuration;
-use Symfony\Component\Yaml\Dumper;
 
 /**
  *
@@ -57,7 +57,7 @@ class patch_373 implements patchInterface
     /**
      * @param base $databox
      */
-    public function apply(base &$appbox)
+    public function apply(base $appbox, Application $app)
     {
         $sql = 'SELECT * FROM registry WHERE `key` = :key';
         $stmt = $appbox->get_connection()->prepare($sql);
@@ -100,8 +100,7 @@ class patch_373 implements patchInterface
 
         $stmt->closeCursor();
 
-        $configuration = Configuration::build();
-        $configuration->setBinaries(array('binaries' => $binaries));
+        $app['phraseanet.configuration']->setBinaries(array('binaries' => $binaries));
 
         $sql = 'DELETE FROM registry WHERE `key` = :key';
         $stmt = $appbox->get_connection()->prepare($sql);
@@ -112,18 +111,16 @@ class patch_373 implements patchInterface
 
         $stmt->closeCursor();
 
-        $GV_sit = null;
-
         $sql = 'SELECT value FROM registry WHERE `key` = :key';
         $stmt = $appbox->get_connection()->prepare($sql);
         $stmt->execute(array(':key'=>'GV_sit'));
         $row = $stmt->fetch(\PDO::FETCH_ASSOC);
         $stmt->closeCursor();
 
-        $configs = $configuration->getConfigurations();
+        $configs = $app['phraseanet.configuration']->getConfigurations();
         $configs['key'] = $row['value'];
-        $configuration->setConfigurations($configs);
-
+        $app['phraseanet.configuration']->setConfigurations($configs);
+        
         $sql = 'DELETE FROM registry WHERE `key` = :key';
         $stmt = $appbox->get_connection()->prepare($sql);
         $stmt->execute(array(':key'=>'GV_sit'));
diff --git a/tests/Alchemy/Phrasea/Setup/AbstractSetupTester.inc b/tests/Alchemy/Phrasea/Setup/AbstractSetupTester.inc
index 72fb6358b9..490ef9f9d6 100644
--- a/tests/Alchemy/Phrasea/Setup/AbstractSetupTester.inc
+++ b/tests/Alchemy/Phrasea/Setup/AbstractSetupTester.inc
@@ -37,7 +37,10 @@ abstract class AbstractSetupTester extends \PHPUnit_Framework_TestCase
 
         $this->uninstall();
 
-        file_put_contents(__DIR__ . '/../../../../config/_GV.php', "<?php\ndefine('GV_ServerName', 'http://local.phrasea.tester/');\n");
+        copy(__DIR__ . '/../../../../hudson/_GV.php', __DIR__ . '/../../../../config/_GV.php');
+
+        file_put_contents( __DIR__ . '/../../../../config/_GV.php', str_replace('http://local.phrasea/', 'http://local.phrasea.tester/', file_get_contents( __DIR__ . '/../../../../config/_GV.php')));
+
         file_put_contents(__DIR__ . '/../../../../config/connexion.inc', "<?php\n
 \$hostname = '".$credentials['hostname']."';
 \$port = '".$credentials['port']."';
@@ -56,7 +59,7 @@ abstract class AbstractSetupTester extends \PHPUnit_Framework_TestCase
     {
         $app = new Application('test');
         $credentials = $app['phraseanet.appbox']->get_connection()->get_credentials();
-        
+
         $this->uninstall();
 
         file_put_contents(__DIR__ . '/../../../../config/config.inc', "<?php\n\$servername = 'http://local.phrasea';\n");
diff --git a/tests/Alchemy/Phrasea/Setup/TestSpecifications.inc b/tests/Alchemy/Phrasea/Setup/TestSpecifications.inc
index 148a5667cb..889fb1b5e8 100644
--- a/tests/Alchemy/Phrasea/Setup/TestSpecifications.inc
+++ b/tests/Alchemy/Phrasea/Setup/TestSpecifications.inc
@@ -35,4 +35,9 @@ class TestSpecifications extends ApplicationSpecification
     {
         return $this->rootDir . 'services.yml';
     }
+
+    protected function getBinariesPathFile()
+    {
+        return $this->rootDir . 'binaries.yml';
+    }
 }
diff --git a/tests/PhraseanetPHPUnitAbstract.class.inc b/tests/PhraseanetPHPUnitAbstract.class.inc
index 46629b2747..ce6d699f92 100644
--- a/tests/PhraseanetPHPUnitAbstract.class.inc
+++ b/tests/PhraseanetPHPUnitAbstract.class.inc
@@ -136,7 +136,6 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
             return $app;
         });
 
-
         self::$DI['client'] = self::$DI->share(function($DI) {
             return new Client($DI['app'], array());
         });