diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
index 7c067f7f18..c4f0413a8d 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
@@ -268,10 +268,6 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic
 
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
-
-        $feed = self::$DI['app']['EM']->find('Alchemy\Phrasea\Model\Entities\Feed', $feed->getId());
-        if (null !== $feed) {
-            $this->fail("fail deleting feed");
-        }
+        $this->assertNull($feed->getId());
     }
 }
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
index 1bb53b7f88..398874226d 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
@@ -11,12 +11,12 @@ class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
      */
     public function testRouteSlash()
     {
-        $entry1 = $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user']);
-        $entry2 = $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user_alt1']);
-        $entry3 = $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user']);
-        $entry4 = $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user_alt1']);
-        $entry5 = $this->insertOneUsrListEntry(self::$DI['user_alt1'], self::$DI['user_alt1']);
-        $entry6 = $this->insertOneUsrListEntry(self::$DI['user_alt1'], self::$DI['user_alt2']);
+        $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user']);
+        $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user_alt1']);
+        $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user']);
+        $this->insertOneUsrListEntry(self::$DI['user'], self::$DI['user_alt1']);
+        $this->insertOneUsrListEntry(self::$DI['user_alt1'], self::$DI['user_alt1']);
+        $this->insertOneUsrListEntry(self::$DI['user_alt1'], self::$DI['user_alt2']);
 
         $route = '/prod/lists/all/';
 
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Entities/UserTest.php b/tests/Alchemy/Tests/Phrasea/Model/Entities/UserTest.php
index f64c4ef417..75a01d116d 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Entities/UserTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Entities/UserTest.php
@@ -117,10 +117,10 @@ class UserTest extends \PhraseanetPHPUnitAbstract
 
     public function testSetModelOf()
     {
-        $user1 = $this->insertOneUser('login');
-        $user2 = $this->insertOneUser('login2');
-        $user1->setModelOf($user2);
-        $this->assertEquals('login3', $user1->getModelOf()->getLogin());
+        $template = $this->insertOneUser('login');
+        $user = $this->insertOneUser('login2');
+        $template->setModelOf($user);
+        $this->assertEquals('login2', $template->getModelOf()->getLogin());
     }
 
     public function genderProvider()
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php b/tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php
index ead90b6978..6c7fb772e3 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Repositories/UserRepositoryTest.php
@@ -23,7 +23,7 @@ class UserRepositoryTest extends \PhraseanetPHPUnitAbstract
     public function testFindAdminsWithOneAdminButTemplate()
     {
         $user = $this->insertOneUser('login');
-        $template = $this->insertOneUser('login', null, true);
+        $template = $this->insertOneUser('login2', null, true);
 
         $template->setModelOf($user);
 
diff --git a/tests/classes/PhraseanetPHPUnitAbstract.php b/tests/classes/PhraseanetPHPUnitAbstract.php
index 60b61d1c48..1bc24f00d0 100644
--- a/tests/classes/PhraseanetPHPUnitAbstract.php
+++ b/tests/classes/PhraseanetPHPUnitAbstract.php
@@ -22,6 +22,7 @@ use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
 use Alchemy\Phrasea\Model\Entities\UsrListOwner;
 use Alchemy\Phrasea\Model\Entities\UsrList;
 use Alchemy\Phrasea\Model\Entities\UsrListEntry;
+use Alchemy\Phrasea\Model\Entities\StoryWZ;
 use Silex\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Client;
@@ -521,13 +522,13 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
     }
 
     /**
-     * Inserts one user list.
+     * Inserts one user list owner.
      *
      * @param User_Adapter $user
      *
      * @return UsrListOwner
      */
-    protected function insertOneUsrList(\User_Adapter $user = null)
+    protected function insertOneUsrListOwner(\User_Adapter $user = null)
     {
         $user = $user ?: self::$DI['user'];
 
@@ -541,6 +542,27 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
         return $owner;
     }
 
+    /**
+     * Inserts one user list.
+     *
+     * @param User_Adapter $user
+     *
+     * @return UsrListOwner
+     */
+    protected function insertOneUsrList(\User_Adapter $user = null)
+    {
+        $owner = $this->insertOneUsrListOwner($user);
+        $list = new UsrList();
+        $list->setName('new list');
+        $list->addOwner($owner);
+        $owner->setList($list);
+
+        self::$DI['app']['EM']->persist($list);
+        self::$DI['app']['EM']->flush();
+
+        return $list;
+    }
+
     /**
      * Insert one user list entry.
      *
@@ -551,14 +573,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
      */
     protected function insertOneUsrListEntry(\User_adapter $owner, \User_adapter $user)
     {
-        $listOwner = new UsrListOwner();
-        $listOwner->setRole(UsrListOwner::ROLE_ADMIN);
-        $listOwner->setUser($owner);
-
-        $list = new UsrList();
-        $list->addOwner($listOwner);
-
-        $listOwner->setList($list);
+        $list = $this->insertOneUsrList($owner);
 
         $entry = new UsrListEntry();
         $entry->setUser($user);
@@ -568,7 +583,6 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 
         self::$DI['app']['EM']->persist($entry);
         self::$DI['app']['EM']->persist($list);
-        self::$DI['app']['EM']->persist($listOwner);
         self::$DI['app']['EM']->flush();
 
         return $entry;
@@ -779,7 +793,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
      */
     protected function insertOneUser($login, $email = null, $admin = false)
     {
-        return self::$DI['app']['manipulator.user']->create($login, uniqid('pass'), $email, $admin);
+        return self::$DI['app']['manipulator.user']->createUser($login, uniqid('pass'), $email, $admin);
     }
 
     /**