diff --git a/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc b/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc
index 3c80eb21e1..84106c6c77 100644
--- a/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc
+++ b/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc
@@ -36,11 +36,13 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
    * @var Symfony\Component\HttpKernel\Client 
    */
   protected $client;
- /**
+
+  /**
    *
    * @var record_adapter
    */
   protected static $story_1;
+
   /**
    *
    * @var record_adapter
@@ -352,13 +354,13 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
    * @var \Alchemy\Phrasea\Core 
    */
   protected static $core;
-  
+
   /**
    *
    * @var \Doctrine\ORM\Tools\SchemaTools
    */
   protected $schematTool;
-  
+
   /**
    * Class metadatas
    * @var Array
@@ -371,8 +373,6 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
     if (!self::$time_start)
       self::$time_start = microtime(true);
 
-    if (!setup::is_installed())
-      exit("Phraseanet is not set up\n");
 
     $appbox = appbox::get_instance();
     if (!self::$updated)
@@ -771,7 +771,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
       }
     }
     $appbox->get_session()->logout();
-    
+
     return;
   }
 
@@ -784,6 +784,9 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
    */
   public function __construct()
   {
+    if (!setup::is_installed())
+      exit("Phraseanet is not set up\n");
+
     if (null === self::$core)
     {
       if (is_file(__DIR__ . '/tests.sqlite'))
@@ -792,15 +795,11 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
       }
 
       self::$core = bootstrap::getCore();
-      self::$core["EM"] = self::$core->share(function()
-              {
-                $doctrine = new \Alchemy\Phrasea\Core\Service\DoctrineTestSQLite();
-                return $doctrine->getEntityManager();
-              });
-      
+
+
       $em = self::$core->getEntityManager();
       /* @var $em \Doctrine\ORM\EntityManager */
-      
+
       //create schema
       $this->schematTool = new \Doctrine\ORM\Tools\SchemaTool($em);
       $this->classesMetatdas = array(
@@ -811,7 +810,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
           , $em->getClassMetadata('Entities\ValidationParticipant')
           , $em->getClassMetadata('Entities\ValidationSession')
       );
-      
+
       $this->schematTool->createSchema($this->classesMetatdas);
     }
   }
@@ -1019,7 +1018,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
     $executor = new Doctrine\Common\DataFixtures\Executor\ORMExecutor(self::$core->getEntityManager(), $purger);
     $executor->execute(array());
   }
-  
+
   protected function assertDateAtom($date)
   {
     return $this->assertRegExp('/\d{4}[-]\d{2}[-]\d{2}[T]\d{2}[:]\d{2}[:]\d{2}[+]\d{2}[:]\d{2}/', $date);
@@ -1056,7 +1055,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
       $this->fail('Fail load one Basket : ' . $e->getMessage());
     }
   }
-  
+
   /**
    * Insert five baskets and set current authenticated user as owner
    * 
@@ -1082,7 +1081,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
       $this->fail('Fail load one Basket : ' . $e->getMessage());
     }
   }
-  
+
   /**
    *
    * @return \Entities\BasketElement
@@ -1090,25 +1089,24 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
   protected function insertOneBasketElement()
   {
     $basket = $this->insertOneBasket();
-    
+
     $basketElement = new \Entities\BasketElement();
     $basketElement->setRecord(self::$record_1);
     $basketElement->setBasket($basket);
-    
+
     $basket->addBasketElement($basketElement);
-    
+
     $em = self::$core->getEntityManager();
-    
+
     $em->persist($basketElement);
-    
+
     $em->merge($basket);
-    
+
     $em->flush();
-    
+
     return $basketElement;
   }
-  
-  
+
   /**
    *
    * @return \Entities\Basket
@@ -1116,42 +1114,41 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
   protected function insertOneValidationBasket()
   {
     $em = self::$core->getEntityManager();
-    
+
     $basketElement = $this->insertOneBasketElement();
     $basket = $basketElement->getBasket();
-    
+
     $Validation = new Entities\ValidationSession();
     $Validation->setBasket($basket);
     $Validation->setInitiator(self::$user);
-    
+
     $basket->setValidation($Validation);
-    
+
     $em->persist($Validation);
     $em->merge($basket);
-    
+
     $Participant = new Entities\ValidationParticipant();
     $Participant->setUser(self::$user);
     $Participant->setCanAgree(true);
     $Participant->setCanSeeOthers(true);
-    
+
     $Validation->addValidationParticipant($Participant);
     $Participant->setSession($Validation);
-    
+
     $em->persist($Participant);
     $em->merge($Validation);
-    
+
     $Data = new Entities\ValidationData();
     $Data->setBasketElement($basketElement);
     $Data->setParticipant($Participant);
     $basketElement->addValidationData($Data);
-    
+
     $em->persist($Data);
     $em->merge($basketElement);
-    
+
     $em->flush();
-    
+
     return $basket;
-    
   }
 
   /**