diff --git a/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php b/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
index 152bcf551b..4b53fd70e7 100644
--- a/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
@@ -27,76 +27,84 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testRouteSlash()
     {
-        $this->authenticate(self::$DI['app']);
+        $app = $this->getApplication();
+        $client = $this->getClient();
+        $this->authenticate($app);
 
-        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, $app);
 
-        $crawler = self::$DI['client']->request('GET', '/lightbox/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $crawler = $client->request('GET', '/lightbox/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
         $this->assertCount(3, $crawler->filter('div.basket_wrapper'));
 
-        $this->set_user_agent(self::USER_AGENT_IE6, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_IE6, $app);
 
-        $crawler = self::$DI['client']->request('GET', '/lightbox/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $crawler = $client->request('GET', '/lightbox/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
         $this->assertCount(3, $crawler->filter('div.basket_wrapper'));
 
-        $this->set_user_agent(self::USER_AGENT_IPHONE, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_IPHONE, $app);
 
-        self::$DI['client']->request('GET', '/lightbox/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $client->request('GET', '/lightbox/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
     }
 
     public function testAuthenticationWithToken()
     {
-        $this->logout(self::$DI['app']);
+        $app = $this->getApplication();
+        $client = $this->getClient();
+        $this->logout($app);
 
-        $Basket = self::$DI['app']['orm.em']->find('Phraseanet:Basket', 1);
-        $token = self::$DI['app']['manipulator.token']->createBasketAccessToken($Basket, self::$DI['user_alt2']);
+        $Basket = $app['orm.em']->find('Phraseanet:Basket', 1);
+        $token = $app['manipulator.token']->createBasketAccessToken($Basket, self::$DI['user_alt2']);
 
-        self::$DI['client']->request('GET', '/lightbox/?LOG='.$token->getValue());
+        $client->request('GET', '/lightbox/?LOG='.$token->getValue());
 
-        $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
-        $this->assertRegExp('/\/lightbox\/validate\/\d+\//', self::$DI['client']->getResponse()->headers->get('location'));
+        $this->assertTrue($client->getResponse()->isRedirect());
+        $this->assertRegExp('/\/lightbox\/validate\/\d+\//', $client->getResponse()->headers->get('location'));
     }
 
     public function testAjaxNoteForm()
     {
-        $basket = self::$DI['app']['orm.em']->find('Phraseanet:Basket', 4);
+        $app = $this->getApplication();
+        $client = $this->getClient();
+        $basket = $app['orm.em']->find('Phraseanet:Basket', 4);
         $basket_element = $basket->getELements()->first();
 
-        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, $app);
 
-        $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/NOTE_FORM/' . $basket_element->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('', trim(self::$DI['client']->getResponse()->getContent()));
+        $client->request('GET', '/lightbox/ajax/NOTE_FORM/' . $basket_element->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('', trim($client->getResponse()->getContent()));
 
-        $this->set_user_agent(self::USER_AGENT_IE6, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_IE6, $app);
 
-        $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/NOTE_FORM/' . $basket_element->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('', trim(self::$DI['client']->getResponse()->getContent()));
+        $client->request('GET', '/lightbox/ajax/NOTE_FORM/' . $basket_element->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('', trim($client->getResponse()->getContent()));
 
-        $this->set_user_agent(self::USER_AGENT_IPHONE, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_IPHONE, $app);
 
-        $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/NOTE_FORM/' . $basket_element->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertNotEquals('', trim(self::$DI['client']->getResponse()->getContent()));
+        $client->request('GET', '/lightbox/ajax/NOTE_FORM/' . $basket_element->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertNotEquals('', trim($client->getResponse()->getContent()));
     }
 
     public function testAjaxElement()
     {
-        $basket_element = self::$DI['app']['orm.em']->find('Phraseanet:BasketElement', 1);
+        $app = $this->getApplication();
+        $client = $this->getClient();
+        $basket_element = $app['orm.em']->find('Phraseanet:BasketElement', 1);
 
-        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, $app);
 
-        $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_BASKET_ELEMENT/' . $basket_element->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type'));
-        $datas = json_decode(self::$DI['client']->getResponse()->getContent());
+        $client->request('GET', '/lightbox/ajax/LOAD_BASKET_ELEMENT/' . $basket_element->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('application/json', $client->getResponse()->headers->get('Content-type'));
+        $datas = json_decode($client->getResponse()->getContent());
 
         $this->assertObjectHasAttribute('number', $datas);
         $this->assertObjectHasAttribute('title', $datas);
@@ -107,12 +115,12 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
         $this->assertObjectHasAttribute('note_html', $datas);
         $this->assertObjectHasAttribute('caption', $datas);
 
-        $this->set_user_agent(self::USER_AGENT_IE6, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_IE6, $app);
 
-        $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_BASKET_ELEMENT/' . $basket_element->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type'));
-        $datas = json_decode(self::$DI['client']->getResponse()->getContent());
+        $client->request('GET', '/lightbox/ajax/LOAD_BASKET_ELEMENT/' . $basket_element->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('application/json', $client->getResponse()->headers->get('Content-type'));
+        $datas = json_decode($client->getResponse()->getContent());
 
         $this->assertObjectHasAttribute('number', $datas);
         $this->assertObjectHasAttribute('title', $datas);
@@ -123,27 +131,30 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
         $this->assertObjectHasAttribute('note_html', $datas);
         $this->assertObjectHasAttribute('caption', $datas);
 
-        $this->set_user_agent(self::USER_AGENT_IPHONE, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_IPHONE, $app);
 
-        $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_BASKET_ELEMENT/' . $basket_element->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertNotEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type'));
+        $client->request('GET', '/lightbox/ajax/LOAD_BASKET_ELEMENT/' . $basket_element->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertNotEquals('application/json', $client->getResponse()->headers->get('Content-type'));
     }
 
     public function testAjaxFeedItem()
     {
         $this->markTestSkipped("Review this test that always fail");
 
-        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
+        $app = $this->getApplication();
+        $client = $this->getClient();
 
-        $feed = self::$DI['app']['orm.em']->find('Phraseanet:Feed', 1);
+        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, $app);
+
+        $feed = $app['orm.em']->find('Phraseanet:Feed', 1);
         $entry = $feed->getEntries()->first();
         $item = $entry->getItems()->first();
 
-        self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_FEED_ITEM/' . $entry->getId() . '/' . $item->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type'));
-        $datas = json_decode(self::$DI['client']->getResponse()->getContent());
+        $client->request('GET', '/lightbox/ajax/LOAD_FEED_ITEM/' . $entry->getId() . '/' . $item->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('application/json', $client->getResponse()->headers->get('Content-type'));
+        $datas = json_decode($client->getResponse()->getContent());
 
         $this->assertObjectHasAttribute('number', $datas);
         $this->assertObjectHasAttribute('title', $datas);
@@ -154,12 +165,12 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
         $this->assertObjectHasAttribute('note_html', $datas);
         $this->assertObjectHasAttribute('caption', $datas);
 
-        $this->set_user_agent(self::USER_AGENT_IE6, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_IE6, $app);
 
-        $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_FEED_ITEM/' . $entry->getId() . '/' . $item->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type'));
-        $datas = json_decode(self::$DI['client']->getResponse()->getContent());
+        $client->request('GET', '/lightbox/ajax/LOAD_FEED_ITEM/' . $entry->getId() . '/' . $item->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('application/json', $client->getResponse()->headers->get('Content-type'));
+        $datas = json_decode($client->getResponse()->getContent());
 
         $this->assertObjectHasAttribute('number', $datas);
         $this->assertObjectHasAttribute('title', $datas);
@@ -170,120 +181,130 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
         $this->assertObjectHasAttribute('note_html', $datas);
         $this->assertObjectHasAttribute('caption', $datas);
 
-        $this->set_user_agent(self::USER_AGENT_IPHONE, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_IPHONE, $app);
 
-        self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_FEED_ITEM/' . $entry->getId() . '/' . $item->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertNotEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type'));
+        $client->request('GET', '/lightbox/ajax/LOAD_FEED_ITEM/' . $entry->getId() . '/' . $item->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertNotEquals('application/json', $client->getResponse()->headers->get('Content-type'));
     }
 
     public function testValidate()
     {
-        $this->authenticate(self::$DI['app']);
-        $basket = self::$DI['app']['orm.em']->find('Phraseanet:Basket', 4);
-        $path = self::$DI['app']['url_generator']->generate('lightbox_validation', [
+        $app = $this->getApplication();
+        $client = $this->getClient();
+        $this->authenticate($app);
+        $basket = $app['orm.em']->find('Phraseanet:Basket', 4);
+        $path = $app['url_generator']->generate('lightbox_validation', [
             'basket' => $basket->getId()
         ]);
 
-        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
-        self::$DI['client']->request('GET', $path);
+        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, $app);
+        $client->request('GET', $path);
 
-        $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $this->assertTrue($client->getResponse()->isOk());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
 
-        $this->set_user_agent(self::USER_AGENT_IE6, self::$DI['app']);
-        self::$DI['client']->request('GET', $path);
+        $this->set_user_agent(self::USER_AGENT_IE6, $app);
+        $client->request('GET', $path);
 
-        $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $this->assertTrue($client->getResponse()->isOk());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
 
-        $this->set_user_agent(self::USER_AGENT_IPHONE, self::$DI['app']);
-        self::$DI['client']->request('GET', $path);
+        $this->set_user_agent(self::USER_AGENT_IPHONE, $app);
+        $client->request('GET', $path);
 
-        $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $this->assertTrue($client->getResponse()->isOk());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
     }
 
     public function testCompare()
     {
-        $this->authenticate(self::$DI['app']);
+        $app = $this->getApplication();
+        $client = $this->getClient();
+        $this->authenticate($app);
 
-        $basket = self::$DI['app']['orm.em']->find('Phraseanet:Basket', 1);
+        $basket = $app['orm.em']->find('Phraseanet:Basket', 1);
 
-        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, $app);
 
-        $crawler = self::$DI['client']->request('GET', '/lightbox/compare/' . $basket->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $client->request('GET', '/lightbox/compare/' . $basket->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
 
-        $this->set_user_agent(self::USER_AGENT_IE6, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_IE6, $app);
 
-        $crawler = self::$DI['client']->request('GET', '/lightbox/compare/' . $basket->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $client->request('GET', '/lightbox/compare/' . $basket->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
 
-        $this->set_user_agent(self::USER_AGENT_IPHONE, self::$DI['app']);
+        $this->set_user_agent(self::USER_AGENT_IPHONE, $app);
 
-        $crawler = self::$DI['client']->request('GET', '/lightbox/compare/' . $basket->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $client->request('GET', '/lightbox/compare/' . $basket->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
     }
 
     public function testFeedEntry()
     {
-        $this->authenticate(self::$DI['app']);
-        $entry = self::$DI['app']['orm.em']->find('Phraseanet:Feed', 1)->getEntries()->first();
-        $path = self::$DI['app']['url_generator']->generate('lightbox_feed_entry', [
+        $app = $this->getApplication();
+        $client = $this->getClient();
+        $this->authenticate($app);
+        $entry = $app['orm.em']->find('Phraseanet:Feed', 1)->getEntries()->first();
+        $path = $app['url_generator']->generate('lightbox_feed_entry', [
             'entry_id' => $entry->getId()
         ]);
 
-        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
-        self::$DI['client']->request('GET', $path);
+        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, $app);
+        $client->request('GET', $path);
 
-        $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $this->assertTrue($client->getResponse()->isOk());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
 
-        $this->set_user_agent(self::USER_AGENT_IE6, self::$DI['app']);
-        self::$DI['client']->request('GET', $path);
+        $this->set_user_agent(self::USER_AGENT_IE6, $app);
+        $client->request('GET', $path);
 
-        $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $this->assertTrue($client->getResponse()->isOk());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
 
-        $this->set_user_agent(self::USER_AGENT_IPHONE, self::$DI['app']);
-        self::$DI['client']->request('GET', $path);
+        $this->set_user_agent(self::USER_AGENT_IPHONE, $app);
+        $client->request('GET', $path);
 
-        $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $this->assertTrue($client->getResponse()->isOk());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
     }
 
     public function testAjaxReport()
     {
-        $validationBasket = self::$DI['app']['orm.em']->find('Phraseanet:Basket', 4);
+        $app = $this->getApplication();
+        $client = $this->getClient();
+        $validationBasket = $app['orm.em']->find('Phraseanet:Basket', 4);
 
-        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
-        self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_REPORT/' . $validationBasket->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset());
+        $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, $app);
+        $client->request('GET', '/lightbox/ajax/LOAD_REPORT/' . $validationBasket->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('UTF-8', $client->getResponse()->getCharset());
     }
 
     public function testAjaxSetNote()
     {
-        $validationBasket = self::$DI['app']['orm.em']->find('Phraseanet:Basket', 4);
+        $app = $this->getApplication();
+        $client = $this->getClient();
+        $validationBasket = $app['orm.em']->find('Phraseanet:Basket', 4);
         $validationBasketElement = $validationBasket->getElements()->first();
 
-        self::$DI['client']->request('POST', '/lightbox/ajax/SET_NOTE/' . $validationBasketElement->getId() . '/');
-        $this->assertEquals(400, self::$DI['client']->getResponse()->getStatusCode());
+        $client->request('POST', '/lightbox/ajax/SET_NOTE/' . $validationBasketElement->getId() . '/');
+        $this->assertEquals(400, $client->getResponse()->getStatusCode());
 
-        $crawler = self::$DI['client']->request(
+        $client->request(
             'POST'
             , '/lightbox/ajax/SET_NOTE/' . $validationBasketElement->getId() . '/'
             , ['note' => 'une jolie note']
         );
 
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode(), sprintf('set note to element %s ', $validationBasketElement->getId()));
-        $this->assertEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type'));
+        $this->assertEquals(200, $client->getResponse()->getStatusCode(), sprintf('set note to element %s ', $validationBasketElement->getId()));
+        $this->assertEquals('application/json', $client->getResponse()->headers->get('Content-type'));
 
-        $datas = json_decode(self::$DI['client']->getResponse()->getContent());
+        $datas = json_decode($client->getResponse()->getContent());
         $this->assertTrue(is_object($datas), 'asserting good json datas');
         $this->assertObjectHasAttribute('datas', $datas);
         $this->assertObjectHasAttribute('error', $datas);
@@ -291,25 +312,27 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAjaxSetAgreement()
     {
-        $validationBasket = self::$DI['app']['orm.em']->find('Phraseanet:Basket', 4);
+        $app = $this->getApplication();
+        $client = $this->getClient();
+        $validationBasket = $app['orm.em']->find('Phraseanet:Basket', 4);
         $validationBasketElement = $validationBasket->getElements()->first();
 
-        $crawler = self::$DI['client']->request(
+        $client->request(
             'POST'
             , '/lightbox/ajax/SET_ELEMENT_AGREEMENT/' . $validationBasketElement->getId() . '/'
         );
-        $this->assertEquals(400, self::$DI['client']->getResponse()->getStatusCode());
+        $this->assertEquals(400, $client->getResponse()->getStatusCode());
 
-        $crawler = self::$DI['client']->request(
+        $client->request(
             'POST'
             , '/lightbox/ajax/SET_ELEMENT_AGREEMENT/' . $validationBasketElement->getId() . '/'
             , ['agreement' => 1]
         );
 
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode(), sprintf('set note to element %s ', $validationBasketElement->getId()));
-        $this->assertEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type'));
+        $this->assertEquals(200, $client->getResponse()->getStatusCode(), sprintf('set note to element %s ', $validationBasketElement->getId()));
+        $this->assertEquals('application/json', $client->getResponse()->headers->get('Content-type'));
 
-        $datas = json_decode(self::$DI['client']->getResponse()->getContent());
+        $datas = json_decode($client->getResponse()->getContent());
         $this->assertTrue(is_object($datas), 'asserting good json datas');
         $this->assertObjectHasAttribute('datas', $datas);
         $this->assertObjectHasAttribute('error', $datas);
@@ -317,19 +340,23 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testAjaxSetReleaseWithRegularBasket()
     {
-        $basket = self::$DI['app']['orm.em']->find('Phraseanet:Basket', 1);
+        $app = $this->getApplication();
+        $client = $this->getClient();
+        $basket = $app['orm.em']->find('Phraseanet:Basket', 1);
 
-        $crawler = self::$DI['client']->request('POST', '/lightbox/ajax/SET_RELEASE/' . $basket->getId() . '/');
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode());
-        $this->assertEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type'));
-        $datas = json_decode(self::$DI['client']->getResponse()->getContent());
+        $client->request('POST', '/lightbox/ajax/SET_RELEASE/' . $basket->getId() . '/');
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertEquals('application/json', $client->getResponse()->headers->get('Content-type'));
+        $datas = json_decode($client->getResponse()->getContent());
         $this->assertTrue(is_object($datas), 'asserting good json datas');
         $this->assertTrue($datas->error);
     }
 
     public function testAjaxSetReleaseWithRegularBasketWithValidation()
     {
-        $validationBasket = self::$DI['app']['orm.em']->find('Phraseanet:Basket', 4);
+        $app = $this->getApplication();
+        $client = $this->getClient();
+        $validationBasket = $app['orm.em']->find('Phraseanet:Basket', 4);
 
         $this->mockNotificationDeliverer('Alchemy\Phrasea\Notification\Mail\MailInfoValidationDone');
         $this->mockUserNotificationSettings('eventsmanager_notify_validationdone');
@@ -339,12 +366,12 @@ class LightboxTest extends \PhraseanetAuthenticatedWebTestCase
             break;
         }
 
-        self::$DI['client']->request('POST', '/lightbox/ajax/SET_RELEASE/' . $validationBasket->getId() . '/');
+        $client->request('POST', '/lightbox/ajax/SET_RELEASE/' . $validationBasket->getId() . '/');
 
-        $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode(), sprintf('set note to element %s ', $validationBasket->getId()));
-        $this->assertEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type'));
+        $this->assertEquals(200, $client->getResponse()->getStatusCode(), sprintf('set note to element %s ', $validationBasket->getId()));
+        $this->assertEquals('application/json', $client->getResponse()->headers->get('Content-type'));
 
-        $datas = json_decode(self::$DI['client']->getResponse()->getContent());
+        $datas = json_decode($client->getResponse()->getContent());
         $this->assertTrue(is_object($datas), 'asserting good json datas');
         $this->assertObjectHasAttribute('datas', $datas);
         $this->assertObjectHasAttribute('error', $datas);