Refactoring of internal task events

27 files changed, 805 insertions, 290 deletions

diff --git a/tests/units/Action/BaseActionTest.php b/tests/units/Action/BaseActionTest.php
index 1d50c70e..feeba3f9 100644
--- a/tests/units/Action/BaseActionTest.php
+++ b/tests/units/Action/BaseActionTest.php
@@ -23,7 +23,7 @@ class DummyAction extends Kanboard\Action\Base
 
     public function getEventRequiredParameters()
     {
-        return array('p1', 'p2');
+        return array('p1', 'p2', 'p3' => array('p4'));
     }
 
     public function doAction(array $data)
@@ -60,7 +60,7 @@ class BaseActionTest extends Base
     public function testGetEventRequiredParameters()
     {
         $dummyAction = new DummyAction($this->container);
-        $this->assertEquals(array('p1', 'p2'), $dummyAction->getEventRequiredParameters());
+        $this->assertEquals(array('p1', 'p2', 'p3' => array('p4')), $dummyAction->getEventRequiredParameters());
     }
 
     public function testGetCompatibleEvents()
@@ -113,7 +113,7 @@ class BaseActionTest extends Base
         $dummyAction = new DummyAction($this->container);
         $dummyAction->setProjectId(1234);
 
-        $this->assertTrue($dummyAction->hasRequiredParameters(array('p1' => 12, 'p2' => 34)));
+        $this->assertTrue($dummyAction->hasRequiredParameters(array('p1' => 12, 'p2' => 34, 'p3' => array('p4' => 'foobar'))));
         $this->assertFalse($dummyAction->hasRequiredParameters(array('p1' => 12)));
         $this->assertFalse($dummyAction->hasRequiredParameters(array()));
     }
@@ -125,7 +125,7 @@ class BaseActionTest extends Base
         $dummyAction->addEvent('my.event', 'My Event Overrided');
 
         $events = $dummyAction->getEvents();
-        $this->assertcount(2, $events);
+        $this->assertCount(2, $events);
         $this->assertEquals(array('my.event', 'foobar'), $events);
     }
 
@@ -136,7 +136,7 @@ class BaseActionTest extends Base
         $dummyAction->setParam('p1', 'something');
         $dummyAction->addEvent('foobar', 'FooBar');
 
-        $event = new GenericEvent(array('project_id' => 1234, 'p1' => 'something', 'p2' => 'abc'));
+        $event = new GenericEvent(array('project_id' => 1234, 'p1' => 'something', 'p2' => 'abc', 'p3' => array('p4' => 'a')));
 
         $this->assertTrue($dummyAction->execute($event, 'foobar'));
         $this->assertFalse($dummyAction->execute($event, 'foobar'));
diff --git a/tests/units/Action/CommentCreationMoveTaskColumnTest.php b/tests/units/Action/CommentCreationMoveTaskColumnTest.php
index 5eaf515e..b3d21287 100644
--- a/tests/units/Action/CommentCreationMoveTaskColumnTest.php
+++ b/tests/units/Action/CommentCreationMoveTaskColumnTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\CommentModel;
@@ -22,7 +22,7 @@ class CommentCreationMoveTaskColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array('task' => array('project_id' => 1, 'column_id' => 2), 'task_id' => 1));
 
         $action = new CommentCreationMoveTaskColumn($this->container);
         $action->setProjectId(1);
@@ -45,7 +45,7 @@ class CommentCreationMoveTaskColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array('task' => array('project_id' => 1, 'column_id' => 3), 'task_id' => 1));
 
         $action = new CommentCreationMoveTaskColumn($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignCategoryColorTest.php b/tests/units/Action/TaskAssignCategoryColorTest.php
index 09c08264..5a0f7d03 100644
--- a/tests/units/Action/TaskAssignCategoryColorTest.php
+++ b/tests/units/Action/TaskAssignCategoryColorTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\CategoryModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
@@ -23,7 +23,13 @@ class TaskAssignCategoryColorTest extends Base
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
         $this->assertEquals(1, $categoryModel->create(array('name' => 'c1', 'project_id' => 1)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'color_id' => 'red'));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'color_id' => 'red',
+            )
+        ));
 
         $action = new TaskAssignCategoryColor($this->container);
         $action->setProjectId(1);
@@ -47,7 +53,13 @@ class TaskAssignCategoryColorTest extends Base
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
         $this->assertEquals(1, $categoryModel->create(array('name' => 'c1', 'project_id' => 1)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'color_id' => 'blue'));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'color_id' => 'blue',
+            )
+        ));
 
         $action = new TaskAssignCategoryColor($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignCategoryLinkTest.php b/tests/units/Action/TaskAssignCategoryLinkTest.php
index 712c3c02..d7e68f72 100644
--- a/tests/units/Action/TaskAssignCategoryLinkTest.php
+++ b/tests/units/Action/TaskAssignCategoryLinkTest.php
@@ -14,19 +14,19 @@ class TaskAssignCategoryLinkTest extends Base
 {
     public function testAssignCategory()
     {
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
 
         $action = new TaskAssignCategoryLink($this->container);
         $action->setProjectId(1);
         $action->setParam('category_id', 1);
         $action->setParam('link_id', 2);
 
-        $this->assertEquals(1, $p->create(array('name' => 'P1')));
-        $this->assertEquals(1, $c->create(array('name' => 'C1', 'project_id' => 1)));
-        $this->assertEquals(1, $tc->create(array('title' => 'T1', 'project_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
+        $this->assertEquals(1, $categoryModel->create(array('name' => 'C1', 'project_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1)));
 
         $event = new TaskLinkEvent(array(
             'project_id' => 1,
@@ -37,25 +37,24 @@ class TaskAssignCategoryLinkTest extends Base
 
         $this->assertTrue($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
 
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['category_id']);
     }
 
     public function testWhenLinkDontMatch()
     {
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
 
         $action = new TaskAssignCategoryLink($this->container);
         $action->setProjectId(1);
         $action->setParam('category_id', 1);
         $action->setParam('link_id', 1);
 
-        $this->assertEquals(1, $p->create(array('name' => 'P1')));
-        $this->assertEquals(1, $c->create(array('name' => 'C1', 'project_id' => 1)));
-        $this->assertEquals(1, $tc->create(array('title' => 'T1', 'project_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
+        $this->assertEquals(1, $categoryModel->create(array('name' => 'C1', 'project_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1)));
 
         $event = new TaskLinkEvent(array(
             'project_id' => 1,
@@ -69,19 +68,19 @@ class TaskAssignCategoryLinkTest extends Base
 
     public function testThatExistingCategoryWillNotChange()
     {
-        $tc = new TaskCreationModel($this->container);
-        $p = new ProjectModel($this->container);
-        $c = new CategoryModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
 
         $action = new TaskAssignCategoryLink($this->container);
         $action->setProjectId(1);
         $action->setParam('category_id', 2);
         $action->setParam('link_id', 2);
 
-        $this->assertEquals(1, $p->create(array('name' => 'P1')));
-        $this->assertEquals(1, $c->create(array('name' => 'C1', 'project_id' => 1)));
-        $this->assertEquals(2, $c->create(array('name' => 'C2', 'project_id' => 1)));
-        $this->assertEquals(1, $tc->create(array('title' => 'T1', 'project_id' => 1, 'category_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
+        $this->assertEquals(1, $categoryModel->create(array('name' => 'C1', 'project_id' => 1)));
+        $this->assertEquals(2, $categoryModel->create(array('name' => 'C2', 'project_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1, 'category_id' => 1)));
 
         $event = new TaskLinkEvent(array(
             'project_id' => 1,
diff --git a/tests/units/Action/TaskAssignColorCategoryTest.php b/tests/units/Action/TaskAssignColorCategoryTest.php
index 6502035f..16ad1290 100644
--- a/tests/units/Action/TaskAssignColorCategoryTest.php
+++ b/tests/units/Action/TaskAssignColorCategoryTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\CategoryModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
@@ -23,7 +23,13 @@ class TaskAssignColorCategoryTest extends Base
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
         $this->assertEquals(1, $categoryModel->create(array('name' => 'c1', 'project_id' => 1)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'category_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'category_id' => 1,
+            )
+        ));
 
         $action = new TaskAssignColorCategory($this->container);
         $action->setProjectId(1);
@@ -45,7 +51,13 @@ class TaskAssignColorCategoryTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'category_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'category_id' => 2,
+            )
+        ));
 
         $action = new TaskAssignColorCategory($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignColorColumnTest.php b/tests/units/Action/TaskAssignColorColumnTest.php
index d4ba8e01..ccfb9e88 100644
--- a/tests/units/Action/TaskAssignColorColumnTest.php
+++ b/tests/units/Action/TaskAssignColorColumnTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -20,7 +20,13 @@ class TaskAssignColorColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskAssignColorColumn($this->container);
         $action->setProjectId(1);
@@ -42,7 +48,13 @@ class TaskAssignColorColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskAssignColorColumn($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignColorPriorityTest.php b/tests/units/Action/TaskAssignColorPriorityTest.php
index 2fce8e66..0ea874cd 100644
--- a/tests/units/Action/TaskAssignColorPriorityTest.php
+++ b/tests/units/Action/TaskAssignColorPriorityTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\CategoryModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
@@ -23,7 +23,13 @@ class TaskAssignColorPriorityTest extends Base
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
         $this->assertEquals(1, $categoryModel->create(array('name' => 'c1', 'project_id' => 1)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'priority' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'priority' => 1,
+            )
+        ));
 
         $action = new TaskAssignColorPriority($this->container);
         $action->setProjectId(1);
@@ -45,7 +51,13 @@ class TaskAssignColorPriorityTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'priority' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'priority' => 2,
+            )
+        ));
 
         $action = new TaskAssignColorPriority($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignColorUserTest.php b/tests/units/Action/TaskAssignColorUserTest.php
index 370f9070..45faa3ff 100644
--- a/tests/units/Action/TaskAssignColorUserTest.php
+++ b/tests/units/Action/TaskAssignColorUserTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -20,7 +20,13 @@ class TaskAssignColorUserTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'owner_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'owner_id' => 1,
+            )
+        ));
 
         $action = new TaskAssignColorUser($this->container);
         $action->setProjectId(1);
@@ -42,7 +48,13 @@ class TaskAssignColorUserTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'owner_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'owner_id' => 2,
+            )
+        ));
 
         $action = new TaskAssignColorUser($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignCurrentUserColumnTest.php b/tests/units/Action/TaskAssignCurrentUserColumnTest.php
index 6fdbda63..3b64d718 100644
--- a/tests/units/Action/TaskAssignCurrentUserColumnTest.php
+++ b/tests/units/Action/TaskAssignCurrentUserColumnTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -22,7 +22,13 @@ class TaskAssignCurrentUserColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskAssignCurrentUserColumn($this->container);
         $action->setProjectId(1);
@@ -45,7 +51,13 @@ class TaskAssignCurrentUserColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskAssignCurrentUserColumn($this->container);
         $action->setProjectId(1);
@@ -62,7 +74,13 @@ class TaskAssignCurrentUserColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskAssignCurrentUserColumn($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskAssignSpecificUserTest.php b/tests/units/Action/TaskAssignSpecificUserTest.php
index 78ec314f..0e63fc13 100644
--- a/tests/units/Action/TaskAssignSpecificUserTest.php
+++ b/tests/units/Action/TaskAssignSpecificUserTest.php
@@ -3,6 +3,7 @@
 require_once __DIR__.'/../Base.php';
 
 use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -20,7 +21,13 @@ class TaskAssignSpecificUserTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'owner_id' => 0)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskAssignSpecificUser($this->container);
         $action->setProjectId(1);
@@ -42,7 +49,13 @@ class TaskAssignSpecificUserTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskAssignSpecificUser($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskCloseColumnTest.php b/tests/units/Action/TaskCloseColumnTest.php
index f9a938f0..7afb0478 100644
--- a/tests/units/Action/TaskCloseColumnTest.php
+++ b/tests/units/Action/TaskCloseColumnTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -20,7 +20,13 @@ class TaskCloseColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskCloseColumn($this->container);
         $action->setProjectId(1);
@@ -41,7 +47,13 @@ class TaskCloseColumnTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskCloseColumn($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskCloseTest.php b/tests/units/Action/TaskCloseTest.php
index 3df10cb8..589ef133 100644
--- a/tests/units/Action/TaskCloseTest.php
+++ b/tests/units/Action/TaskCloseTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -19,7 +19,12 @@ class TaskCloseTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+            )
+        ));
 
         $action = new TaskClose($this->container);
         $action->setProjectId(1);
@@ -40,7 +45,11 @@ class TaskCloseTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1));
+        $event = new TaskEvent(array(
+            'task' => array(
+                'project_id' => 1,
+            )
+        ));
 
         $action = new TaskClose($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskDuplicateAnotherProjectTest.php b/tests/units/Action/TaskDuplicateAnotherProjectTest.php
index 98ff187f..5cd0c977 100644
--- a/tests/units/Action/TaskDuplicateAnotherProjectTest.php
+++ b/tests/units/Action/TaskDuplicateAnotherProjectTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\TaskCreationModel;
@@ -21,7 +21,13 @@ class TaskDuplicateAnotherProjectTest extends Base
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskDuplicateAnotherProject($this->container);
         $action->setProjectId(1);
@@ -43,7 +49,13 @@ class TaskDuplicateAnotherProjectTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskDuplicateAnotherProject($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskEmailTest.php b/tests/units/Action/TaskEmailTest.php
index df71aaf8..421c89ca 100644
--- a/tests/units/Action/TaskEmailTest.php
+++ b/tests/units/Action/TaskEmailTest.php
@@ -2,7 +2,8 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
+use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\ProjectModel;
@@ -16,16 +17,20 @@ class TaskEmailTest extends Base
         $userModel = new UserModel($this->container);
         $projectModel = new ProjectModel($this->container);
         $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
         $this->assertTrue($userModel->update(array('id' => 1, 'email' => 'admin@localhost')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => $taskFinderModel->getDetails(1)
+        ));
 
         $action = new TaskEmail($this->container);
         $action->setProjectId(1);
-        $action->setParam('column_id', 2);
+        $action->setParam('column_id', 1);
         $action->setParam('user_id', 1);
         $action->setParam('subject', 'My email subject');
 
@@ -47,7 +52,13 @@ class TaskEmailTest extends Base
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskEmail($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskMoveAnotherProjectTest.php b/tests/units/Action/TaskMoveAnotherProjectTest.php
index d36df47b..a41fd03f 100644
--- a/tests/units/Action/TaskMoveAnotherProjectTest.php
+++ b/tests/units/Action/TaskMoveAnotherProjectTest.php
@@ -3,6 +3,7 @@
 require_once __DIR__.'/../Base.php';
 
 use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\TaskCreationModel;
@@ -21,7 +22,13 @@ class TaskMoveAnotherProjectTest extends Base
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskMoveAnotherProject($this->container);
         $action->setProjectId(1);
@@ -44,7 +51,13 @@ class TaskMoveAnotherProjectTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskMoveAnotherProject($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskMoveColumnAssignedTest.php b/tests/units/Action/TaskMoveColumnAssignedTest.php
index f8982969..aa9d3592 100644
--- a/tests/units/Action/TaskMoveColumnAssignedTest.php
+++ b/tests/units/Action/TaskMoveColumnAssignedTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\TaskCreationModel;
@@ -19,9 +19,12 @@ class TaskMoveColumnAssignedTest extends Base
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
-        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'owner_id' => 1)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 1, 'owner_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => $taskFinderModel->getDetails(1),
+        ));
 
         $action = new TaskMoveColumnAssigned($this->container);
         $action->setProjectId(1);
@@ -43,7 +46,14 @@ class TaskMoveColumnAssignedTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3, 'owner_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+                'owner_id' => 1,
+            )
+        ));
 
         $action = new TaskMoveColumnAssigned($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskMoveColumnCategoryChangeTest.php b/tests/units/Action/TaskMoveColumnCategoryChangeTest.php
index c42383f8..7e0856df 100644
--- a/tests/units/Action/TaskMoveColumnCategoryChangeTest.php
+++ b/tests/units/Action/TaskMoveColumnCategoryChangeTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\CategoryModel;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskFinderModel;
@@ -24,7 +24,16 @@ class TaskMoveColumnCategoryChangeTest extends Base
         $this->assertEquals(1, $categoryModel->create(array('name' => 'c1', 'project_id' => 1)));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 1, 'category_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 1,
+                'category_id' => 1,
+                'position' => 1,
+                'swimlane_id' => 0,
+            )
+        ));
 
         $action = new TaskMoveColumnCategoryChange($this->container);
         $action->setProjectId(1);
@@ -50,7 +59,14 @@ class TaskMoveColumnCategoryChangeTest extends Base
         $this->assertEquals(1, $categoryModel->create(array('name' => 'c1', 'project_id' => 1)));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2, 'category_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+                'category_id' => 1,
+            )
+        ));
 
         $action = new TaskMoveColumnCategoryChange($this->container);
         $action->setProjectId(1);
@@ -72,7 +88,14 @@ class TaskMoveColumnCategoryChangeTest extends Base
         $this->assertEquals(2, $categoryModel->create(array('name' => 'c2', 'project_id' => 1)));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 1, 'category_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 1,
+                'category_id' => 2,
+            )
+        ));
 
         $action = new TaskMoveColumnCategoryChange($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskMoveColumnUnAssignedTest.php b/tests/units/Action/TaskMoveColumnUnAssignedTest.php
index befae36b..b45dec08 100644
--- a/tests/units/Action/TaskMoveColumnUnAssignedTest.php
+++ b/tests/units/Action/TaskMoveColumnUnAssignedTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\TaskCreationModel;
@@ -21,7 +21,16 @@ class TaskMoveColumnUnAssignedTest extends Base
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 1, 'owner_id' => 0));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 1,
+                'owner_id' => 0,
+                'position' => 1,
+                'swimlane_id' => 0,
+            )
+        ));
 
         $action = new TaskMoveColumnUnAssigned($this->container);
         $action->setProjectId(1);
@@ -43,7 +52,14 @@ class TaskMoveColumnUnAssignedTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2, 'owner_id' => 0));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+                'owner_id' => 0,
+            )
+        ));
 
         $action = new TaskMoveColumnUnAssigned($this->container);
         $action->setProjectId(1);
@@ -60,7 +76,14 @@ class TaskMoveColumnUnAssignedTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 1, 'owner_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 1,
+                'owner_id' => 1,
+            )
+        ));
 
         $action = new TaskMoveColumnUnAssigned($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskOpenTest.php b/tests/units/Action/TaskOpenTest.php
index 1018e2ea..825c6ac9 100644
--- a/tests/units/Action/TaskOpenTest.php
+++ b/tests/units/Action/TaskOpenTest.php
@@ -2,7 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
-use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -19,7 +19,12 @@ class TaskOpenTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'is_active' => 0)));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+            )
+        ));
 
         $action = new TaskOpen($this->container);
         $action->setProjectId(1);
@@ -40,7 +45,11 @@ class TaskOpenTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1));
+        $event = new TaskEvent(array(
+            'task' => array(
+                'project_id' => 1,
+            )
+        ));
 
         $action = new TaskOpen($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/Action/TaskUpdateStartDateTest.php b/tests/units/Action/TaskUpdateStartDateTest.php
index ddd9eafd..8d609b3e 100644
--- a/tests/units/Action/TaskUpdateStartDateTest.php
+++ b/tests/units/Action/TaskUpdateStartDateTest.php
@@ -3,6 +3,7 @@
 require_once __DIR__.'/../Base.php';
 
 use Kanboard\Event\GenericEvent;
+use Kanboard\Event\TaskEvent;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
@@ -20,7 +21,13 @@ class TaskUpdateStartDateTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 2,
+            )
+        ));
 
         $action = new TaskUpdateStartDate($this->container);
         $action->setProjectId(1);
@@ -41,7 +48,13 @@ class TaskUpdateStartDateTest extends Base
         $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
         $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
 
-        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
+        $event = new TaskEvent(array(
+            'task_id' => 1,
+            'task' => array(
+                'project_id' => 1,
+                'column_id' => 3,
+            )
+        ));
 
         $action = new TaskUpdateStartDate($this->container);
         $action->setProjectId(1);
diff --git a/tests/units/EventBuilder/TaskEventBuilderTest.php b/tests/units/EventBuilder/TaskEventBuilderTest.php
new file mode 100644
index 00000000..e6334fe2
--- /dev/null
+++ b/tests/units/EventBuilder/TaskEventBuilderTest.php
@@ -0,0 +1,100 @@
+<?php
+
+use Kanboard\EventBuilder\TaskEventBuilder;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+
+require_once __DIR__.'/../Base.php';
+
+class TaskEventBuilderTest extends Base
+{
+    public function testWithMissingTask()
+    {
+        $taskEventBuilder = new TaskEventBuilder($this->container);
+        $taskEventBuilder->withTaskId(42);
+        $this->assertNull($taskEventBuilder->build());
+    }
+
+    public function testBuildWithTask()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskEventBuilder = new TaskEventBuilder($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'before', 'project_id' => 1)));
+
+        $event = $taskEventBuilder
+            ->withTaskId(1)
+            ->withTask(array('title' => 'before'))
+            ->withChanges(array('title' => 'after'))
+            ->build();
+
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+        $this->assertNotEmpty($event['task']);
+        $this->assertEquals(1, $event['task_id']);
+        $this->assertEquals(array('title' => 'after'), $event['changes']);
+    }
+
+    public function testBuildWithoutChanges()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskEventBuilder = new TaskEventBuilder($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $event = $taskEventBuilder->withTaskId(1)->build();
+
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+        $this->assertNotEmpty($event['task']);
+        $this->assertEquals(1, $event['task_id']);
+        $this->assertArrayNotHasKey('changes', $event);
+    }
+
+    public function testBuildWithChanges()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskEventBuilder = new TaskEventBuilder($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $event = $taskEventBuilder
+            ->withTaskId(1)
+            ->withChanges(array('title' => 'new title'))
+            ->build();
+
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+        $this->assertNotEmpty($event['task']);
+        $this->assertNotEmpty($event['changes']);
+        $this->assertEquals('new title', $event['changes']['title']);
+    }
+
+    public function testBuildWithChangesAndValues()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskEventBuilder = new TaskEventBuilder($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $event = $taskEventBuilder
+            ->withTaskId(1)
+            ->withChanges(array('title' => 'new title', 'project_id' => 1))
+            ->withValues(array('key' => 'value'))
+            ->build();
+
+        $this->assertInstanceOf('Kanboard\Event\TaskEvent', $event);
+        $this->assertNotEmpty($event['task']);
+        $this->assertNotEmpty($event['changes']);
+        $this->assertNotEmpty($event['key']);
+        $this->assertEquals('value', $event['key']);
+
+        $this->assertCount(1, $event['changes']);
+        $this->assertEquals('new title', $event['changes']['title']);
+    }
+}
diff --git a/tests/units/Job/SubtaskEventJobTest.php b/tests/units/Job/SubtaskEventJobTest.php
index 265a8e2d..66c3db05 100644
--- a/tests/units/Job/SubtaskEventJobTest.php
+++ b/tests/units/Job/SubtaskEventJobTest.php
@@ -21,8 +21,8 @@ class SubtaskEventJobTest extends Base
     {
         $this->container['dispatcher']->addListener(SubtaskModel::EVENT_CREATE, function() {});
 
-        $SubtaskEventJob = new SubtaskEventJob($this->container);
-        $SubtaskEventJob->execute(42, SubtaskModel::EVENT_CREATE);
+        $subtaskEventJob = new SubtaskEventJob($this->container);
+        $subtaskEventJob->execute(42, SubtaskModel::EVENT_CREATE);
 
         $called = $this->container['dispatcher']->getCalledListeners();
         $this->assertEmpty($called);
diff --git a/tests/units/Job/TaskEventJobTest.php b/tests/units/Job/TaskEventJobTest.php
new file mode 100644
index 00000000..c399faad
--- /dev/null
+++ b/tests/units/Job/TaskEventJobTest.php
@@ -0,0 +1,189 @@
+<?php
+
+use Kanboard\Job\TaskEventJob;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\SwimlaneModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\TaskModificationModel;
+use Kanboard\Model\TaskPositionModel;
+use Kanboard\Model\TaskProjectMoveModel;
+use Kanboard\Model\TaskStatusModel;
+
+require_once __DIR__.'/../Base.php';
+
+class TaskEventJobTest extends Base
+{
+    public function testJobParams()
+    {
+        $taskEventJob = new TaskEventJob($this->container);
+        $taskEventJob->withParams(123, array('foobar'), array('k' => 'v'), array('k1' => 'v1'), array('k2' => 'v2'));
+
+        $this->assertSame(
+            array(123, array('foobar'), array('k' => 'v'), array('k1' => 'v1'), array('k2' => 'v2')),
+            $taskEventJob->getJobParams()
+        );
+    }
+
+    public function testWithMissingTask()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE, function() {});
+
+        $taskEventJob = new TaskEventJob($this->container);
+        $taskEventJob->execute(42, array(TaskModel::EVENT_CREATE));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertEmpty($called);
+    }
+
+    public function testTriggerCreateEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE, function() {});
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_CREATE.'.closure', $called);
+        $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
+    }
+
+    public function testTriggerUpdateEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_UPDATE, function() {});
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'title' => 'new title')));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_UPDATE.'.closure', $called);
+        $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
+    }
+
+    public function testTriggerAssigneeChangeEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_ASSIGNEE_CHANGE, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskModificationModel = new TaskModificationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'owner_id' => 1)));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_ASSIGNEE_CHANGE.'.closure', $called);
+    }
+
+    public function testTriggerCloseEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_CLOSE, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskStatusModel = new TaskStatusModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertTrue($taskStatusModel->close(1));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_CLOSE.'.closure', $called);
+    }
+
+    public function testTriggerOpenEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_OPEN, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskStatusModel = new TaskStatusModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertTrue($taskStatusModel->close(1));
+        $this->assertTrue($taskStatusModel->open(1));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_OPEN.'.closure', $called);
+    }
+
+    public function testTriggerMovePositionEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_POSITION, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'test 2', 'project_id' => 1)));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 1, 2));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_POSITION.'.closure', $called);
+    }
+
+    public function testTriggerMoveColumnEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_COLUMN, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 2, 2));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_COLUMN.'.closure', $called);
+    }
+
+    public function testTriggerMoveSwimlaneEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_SWIMLANE, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $swimlaneModel->create(array('name' => 'S1', 'project_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 1, 1, 1));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_SWIMLANE.'.closure', $called);
+    }
+
+    public function testTriggerMoveProjectEvent()
+    {
+        $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_PROJECT, function() {});
+
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskProjectMoveModel = new TaskProjectMoveModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(2, $projectModel->create(array('name' => 'test2')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertTrue($taskProjectMoveModel->moveToProject(1, 1));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_PROJECT.'.closure', $called);
+    }
+}
diff --git a/tests/units/Model/TaskCreationModelTest.php b/tests/units/Model/TaskCreationModelTest.php
index f97c61dc..ce9996d9 100644
--- a/tests/units/Model/TaskCreationModelTest.php
+++ b/tests/units/Model/TaskCreationModelTest.php
@@ -17,7 +17,7 @@ class TaskCreationModelTest extends Base
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
         $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('test', $event_data['title']);
+        $this->assertEquals('test', $event_data['task']['title']);
     }
 
     public function testNoTitle()
diff --git a/tests/units/Model/TaskModificationModelTest.php b/tests/units/Model/TaskModificationModelTest.php
index c81f968b..f70561b3 100644
--- a/tests/units/Model/TaskModificationModelTest.php
+++ b/tests/units/Model/TaskModificationModelTest.php
@@ -18,7 +18,8 @@ class TaskModificationModelTest extends Base
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
         $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('Task #1', $event_data['title']);
+        $this->assertEquals('After', $event_data['task']['title']);
+        $this->assertEquals('After', $event_data['changes']['title']);
     }
 
     public function onUpdate($event)
@@ -28,7 +29,7 @@ class TaskModificationModelTest extends Base
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
         $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('Task #1', $event_data['title']);
+        $this->assertEquals('After', $event_data['task']['title']);
     }
 
     public function onAssigneeChange($event)
@@ -38,7 +39,7 @@ class TaskModificationModelTest extends Base
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
         $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals(1, $event_data['owner_id']);
+        $this->assertEquals(1, $event_data['changes']['owner_id']);
     }
 
     public function testThatNoEventAreFiredWhenNoChanges()
@@ -66,19 +67,19 @@ class TaskModificationModelTest extends Base
         $taskFinderModel = new TaskFinderModel($this->container);
 
         $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Before', 'project_id' => 1)));
 
         $this->container['dispatcher']->addListener(TaskModel::EVENT_CREATE_UPDATE, array($this, 'onCreateUpdate'));
         $this->container['dispatcher']->addListener(TaskModel::EVENT_UPDATE, array($this, 'onUpdate'));
 
-        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'title' => 'Task #1')));
+        $this->assertTrue($taskModificationModel->update(array('id' => 1, 'title' => 'After')));
 
         $called = $this->container['dispatcher']->getCalledListeners();
         $this->assertArrayHasKey(TaskModel::EVENT_CREATE_UPDATE.'.TaskModificationModelTest::onCreateUpdate', $called);
         $this->assertArrayHasKey(TaskModel::EVENT_UPDATE.'.TaskModificationModelTest::onUpdate', $called);
 
         $task = $taskFinderModel->getById(1);
-        $this->assertEquals('Task #1', $task['title']);
+        $this->assertEquals('After', $task['title']);
     }
 
     public function testChangeAssignee()
diff --git a/tests/units/Model/TaskPositionTest.php b/tests/units/Model/TaskPositionModelTest.php
index 7ab6950e..03caf7ed 100644
--- a/tests/units/Model/TaskPositionTest.php
+++ b/tests/units/Model/TaskPositionModelTest.php
@@ -11,57 +11,57 @@ use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
 use Kanboard\Model\SwimlaneModel;
 
-class TaskPositionTest extends Base
+class TaskPositionModelTest extends Base
 {
     public function testGetTaskProgression()
     {
-        $t = new TaskModel($this->container);
-        $ts = new TaskStatusModel($this->container);
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskModel = new TaskModel($this->container);
+        $taskStatusModel = new TaskStatusModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
         $columnModel = new ColumnModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(0, $t->getProgress($tf->getById(1), $columnModel->getList(1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(0, $taskModel->getProgress($taskFinderModel->getById(1), $columnModel->getList(1)));
 
-        $this->assertTrue($tp->movePosition(1, 1, 2, 1));
-        $this->assertEquals(25, $t->getProgress($tf->getById(1), $columnModel->getList(1)));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 2, 1));
+        $this->assertEquals(25, $taskModel->getProgress($taskFinderModel->getById(1), $columnModel->getList(1)));
 
-        $this->assertTrue($tp->movePosition(1, 1, 3, 1));
-        $this->assertEquals(50, $t->getProgress($tf->getById(1), $columnModel->getList(1)));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 3, 1));
+        $this->assertEquals(50, $taskModel->getProgress($taskFinderModel->getById(1), $columnModel->getList(1)));
 
-        $this->assertTrue($tp->movePosition(1, 1, 4, 1));
-        $this->assertEquals(75, $t->getProgress($tf->getById(1), $columnModel->getList(1)));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 4, 1));
+        $this->assertEquals(75, $taskModel->getProgress($taskFinderModel->getById(1), $columnModel->getList(1)));
 
-        $this->assertTrue($ts->close(1));
-        $this->assertEquals(100, $t->getProgress($tf->getById(1), $columnModel->getList(1)));
+        $this->assertTrue($taskStatusModel->close(1));
+        $this->assertEquals(100, $taskModel->getProgress($taskFinderModel->getById(1), $columnModel->getList(1)));
     }
 
     public function testMoveTaskToWrongPosition()
     {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
 
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
 
         // We move the task 2 to the position 0
-        $this->assertFalse($tp->movePosition(1, 1, 3, 0));
+        $this->assertFalse($taskPositionModel->movePosition(1, 1, 3, 0));
 
         // Check tasks position
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(1, $task['position']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(2, $task['position']);
@@ -69,26 +69,26 @@ class TaskPositionTest extends Base
 
     public function testMoveTaskToGreaterPosition()
     {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
 
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
 
         // We move the task 2 to the position 42
-        $this->assertTrue($tp->movePosition(1, 1, 1, 42));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 1, 42));
 
         // Check tasks position
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(2, $task['position']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(1, $task['position']);
@@ -96,26 +96,26 @@ class TaskPositionTest extends Base
 
     public function testMoveTaskToEmptyColumn()
     {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
 
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
 
         // We move the task 1 to the column 3
-        $this->assertTrue($tp->movePosition(1, 1, 3, 1));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 3, 1));
 
         // Check tasks position
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(3, $task['column_id']);
         $this->assertEquals(1, $task['position']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(1, $task['position']);
@@ -123,62 +123,62 @@ class TaskPositionTest extends Base
 
     public function testMoveTaskToAnotherColumn()
     {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(3, $tc->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(4, $tc->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 2)));
-        $this->assertEquals(5, $tc->create(array('title' => 'Task #5', 'project_id' => 1, 'column_id' => 2)));
-        $this->assertEquals(6, $tc->create(array('title' => 'Task #6', 'project_id' => 1, 'column_id' => 2)));
-        $this->assertEquals(7, $tc->create(array('title' => 'Task #7', 'project_id' => 1, 'column_id' => 3)));
-        $this->assertEquals(8, $tc->create(array('title' => 'Task #8', 'project_id' => 1, 'column_id' => 1)));
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(3, $taskCreationModel->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(4, $taskCreationModel->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 2)));
+        $this->assertEquals(5, $taskCreationModel->create(array('title' => 'Task #5', 'project_id' => 1, 'column_id' => 2)));
+        $this->assertEquals(6, $taskCreationModel->create(array('title' => 'Task #6', 'project_id' => 1, 'column_id' => 2)));
+        $this->assertEquals(7, $taskCreationModel->create(array('title' => 'Task #7', 'project_id' => 1, 'column_id' => 3)));
+        $this->assertEquals(8, $taskCreationModel->create(array('title' => 'Task #8', 'project_id' => 1, 'column_id' => 1)));
 
         // We move the task 3 to the column 3
-        $this->assertTrue($tp->movePosition(1, 3, 3, 2));
+        $this->assertTrue($taskPositionModel->movePosition(1, 3, 3, 2));
 
         // Check tasks position
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(1, $task['position']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(2, $task['position']);
 
-        $task = $tf->getById(3);
+        $task = $taskFinderModel->getById(3);
         $this->assertEquals(3, $task['id']);
         $this->assertEquals(3, $task['column_id']);
         $this->assertEquals(2, $task['position']);
 
-        $task = $tf->getById(4);
+        $task = $taskFinderModel->getById(4);
         $this->assertEquals(4, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(1, $task['position']);
 
-        $task = $tf->getById(5);
+        $task = $taskFinderModel->getById(5);
         $this->assertEquals(5, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(2, $task['position']);
 
-        $task = $tf->getById(6);
+        $task = $taskFinderModel->getById(6);
         $this->assertEquals(6, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(3, $task['position']);
 
-        $task = $tf->getById(7);
+        $task = $taskFinderModel->getById(7);
         $this->assertEquals(7, $task['id']);
         $this->assertEquals(3, $task['column_id']);
         $this->assertEquals(1, $task['position']);
 
-        $task = $tf->getById(8);
+        $task = $taskFinderModel->getById(8);
         $this->assertEquals(8, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(3, $task['position']);
@@ -186,37 +186,37 @@ class TaskPositionTest extends Base
 
     public function testMoveTaskTop()
     {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(3, $tc->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(4, $tc->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(3, $taskCreationModel->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(4, $taskCreationModel->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 1)));
 
         // Move the last task to the top
-        $this->assertTrue($tp->movePosition(1, 4, 1, 1));
+        $this->assertTrue($taskPositionModel->movePosition(1, 4, 1, 1));
 
         // Check tasks position
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(2, $task['position']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(3, $task['position']);
 
-        $task = $tf->getById(3);
+        $task = $taskFinderModel->getById(3);
         $this->assertEquals(3, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(4, $task['position']);
 
-        $task = $tf->getById(4);
+        $task = $taskFinderModel->getById(4);
         $this->assertEquals(4, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(1, $task['position']);
@@ -224,37 +224,37 @@ class TaskPositionTest extends Base
 
     public function testMoveTaskBottom()
     {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(3, $tc->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(4, $tc->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(3, $taskCreationModel->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(4, $taskCreationModel->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 1)));
 
         // Move the first task to the bottom
-        $this->assertTrue($tp->movePosition(1, 1, 1, 4));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 1, 4));
 
         // Check tasks position
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(4, $task['position']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(1, $task['position']);
 
-        $task = $tf->getById(3);
+        $task = $taskFinderModel->getById(3);
         $this->assertEquals(3, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(2, $task['position']);
 
-        $task = $tf->getById(4);
+        $task = $taskFinderModel->getById(4);
         $this->assertEquals(4, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(3, $task['position']);
@@ -262,12 +262,12 @@ class TaskPositionTest extends Base
 
     public function testMovePosition()
     {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
         $counter = 1;
         $task_per_column = 5;
 
@@ -280,240 +280,240 @@ class TaskPositionTest extends Base
                     'owner_id' => 0,
                 );
 
-                $this->assertEquals($counter, $tc->create($task));
+                $this->assertEquals($counter, $taskCreationModel->create($task));
 
-                $task = $tf->getById($counter);
+                $task = $taskFinderModel->getById($counter);
                 $this->assertNotEmpty($task);
                 $this->assertEquals($i, $task['position']);
             }
         }
 
         // We move task id #4, column 1, position 4 to the column 2, position 3
-        $this->assertTrue($tp->movePosition(1, 4, 2, 3));
+        $this->assertTrue($taskPositionModel->movePosition(1, 4, 2, 3));
 
         // We check the new position of the task
-        $task = $tf->getById(4);
+        $task = $taskFinderModel->getById(4);
         $this->assertEquals(4, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(3, $task['position']);
 
         // The tasks before have the correct position
-        $task = $tf->getById(3);
+        $task = $taskFinderModel->getById(3);
         $this->assertEquals(3, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(3, $task['position']);
 
-        $task = $tf->getById(7);
+        $task = $taskFinderModel->getById(7);
         $this->assertEquals(7, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(2, $task['position']);
 
         // The tasks after have the correct position
-        $task = $tf->getById(5);
+        $task = $taskFinderModel->getById(5);
         $this->assertEquals(5, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(4, $task['position']);
 
-        $task = $tf->getById(8);
+        $task = $taskFinderModel->getById(8);
         $this->assertEquals(8, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(4, $task['position']);
 
         // The number of tasks per column
-        $this->assertEquals($task_per_column - 1, $tf->countByColumnId(1, 1));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 2));
-        $this->assertEquals($task_per_column, $tf->countByColumnId(1, 3));
-        $this->assertEquals($task_per_column, $tf->countByColumnId(1, 4));
+        $this->assertEquals($task_per_column - 1, $taskFinderModel->countByColumnId(1, 1));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 2));
+        $this->assertEquals($task_per_column, $taskFinderModel->countByColumnId(1, 3));
+        $this->assertEquals($task_per_column, $taskFinderModel->countByColumnId(1, 4));
 
         // We move task id #1, column 1, position 1 to the column 4, position 6 (last position)
-        $this->assertTrue($tp->movePosition(1, 1, 4, $task_per_column + 1));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 4, $task_per_column + 1));
 
         // We check the new position of the task
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(4, $task['column_id']);
         $this->assertEquals($task_per_column + 1, $task['position']);
 
         // The tasks before have the correct position
-        $task = $tf->getById(20);
+        $task = $taskFinderModel->getById(20);
         $this->assertEquals(20, $task['id']);
         $this->assertEquals(4, $task['column_id']);
         $this->assertEquals($task_per_column, $task['position']);
 
         // The tasks after have the correct position
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(1, $task['position']);
 
         // The number of tasks per column
-        $this->assertEquals($task_per_column - 2, $tf->countByColumnId(1, 1));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 2));
-        $this->assertEquals($task_per_column, $tf->countByColumnId(1, 3));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 4));
+        $this->assertEquals($task_per_column - 2, $taskFinderModel->countByColumnId(1, 1));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 2));
+        $this->assertEquals($task_per_column, $taskFinderModel->countByColumnId(1, 3));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 4));
 
         // Our previous moved task should stay at the same place
-        $task = $tf->getById(4);
+        $task = $taskFinderModel->getById(4);
         $this->assertEquals(4, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(3, $task['position']);
 
         // Test wrong position number
-        $this->assertFalse($tp->movePosition(1, 2, 3, 0));
-        $this->assertFalse($tp->movePosition(1, 2, 3, -2));
+        $this->assertFalse($taskPositionModel->movePosition(1, 2, 3, 0));
+        $this->assertFalse($taskPositionModel->movePosition(1, 2, 3, -2));
 
         // Wrong column
-        $this->assertFalse($tp->movePosition(1, 2, 22, 2));
+        $this->assertFalse($taskPositionModel->movePosition(1, 2, 22, 2));
 
         // Test position greater than the last position
-        $this->assertTrue($tp->movePosition(1, 11, 1, 22));
+        $this->assertTrue($taskPositionModel->movePosition(1, 11, 1, 22));
 
-        $task = $tf->getById(11);
+        $task = $taskFinderModel->getById(11);
         $this->assertEquals(11, $task['id']);
         $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals($tf->countByColumnId(1, 1), $task['position']);
+        $this->assertEquals($taskFinderModel->countByColumnId(1, 1), $task['position']);
 
-        $task = $tf->getById(5);
+        $task = $taskFinderModel->getById(5);
         $this->assertEquals(5, $task['id']);
         $this->assertEquals(1, $task['column_id']);
-        $this->assertEquals($tf->countByColumnId(1, 1) - 1, $task['position']);
+        $this->assertEquals($taskFinderModel->countByColumnId(1, 1) - 1, $task['position']);
 
-        $task = $tf->getById(4);
+        $task = $taskFinderModel->getById(4);
         $this->assertEquals(4, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(3, $task['position']);
 
-        $this->assertEquals($task_per_column - 1, $tf->countByColumnId(1, 1));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 2));
-        $this->assertEquals($task_per_column - 1, $tf->countByColumnId(1, 3));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 4));
+        $this->assertEquals($task_per_column - 1, $taskFinderModel->countByColumnId(1, 1));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 2));
+        $this->assertEquals($task_per_column - 1, $taskFinderModel->countByColumnId(1, 3));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 4));
 
         // Our previous moved task should stay at the same place
-        $task = $tf->getById(4);
+        $task = $taskFinderModel->getById(4);
         $this->assertEquals(4, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(3, $task['position']);
 
         // Test moving task to position 1
-        $this->assertTrue($tp->movePosition(1, 14, 1, 1));
+        $this->assertTrue($taskPositionModel->movePosition(1, 14, 1, 1));
 
-        $task = $tf->getById(14);
+        $task = $taskFinderModel->getById(14);
         $this->assertEquals(14, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(1, $task['position']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(2, $task['position']);
 
-        $this->assertEquals($task_per_column, $tf->countByColumnId(1, 1));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 2));
-        $this->assertEquals($task_per_column - 2, $tf->countByColumnId(1, 3));
-        $this->assertEquals($task_per_column + 1, $tf->countByColumnId(1, 4));
+        $this->assertEquals($task_per_column, $taskFinderModel->countByColumnId(1, 1));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 2));
+        $this->assertEquals($task_per_column - 2, $taskFinderModel->countByColumnId(1, 3));
+        $this->assertEquals($task_per_column + 1, $taskFinderModel->countByColumnId(1, 4));
     }
 
     public function testMoveTaskSwimlane()
     {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-        $this->assertEquals(1, $s->create(array('project_id' => 1, 'name' => 'test 1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(3, $tc->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(4, $tc->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(5, $tc->create(array('title' => 'Task #5', 'project_id' => 1, 'column_id' => 1)));
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $swimlaneModel->create(array('project_id' => 1, 'name' => 'test 1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(3, $taskCreationModel->create(array('title' => 'Task #3', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(4, $taskCreationModel->create(array('title' => 'Task #4', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(5, $taskCreationModel->create(array('title' => 'Task #5', 'project_id' => 1, 'column_id' => 1)));
 
         // Move the task to the swimlane
-        $this->assertTrue($tp->movePosition(1, 1, 2, 1, 1));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 2, 1, 1));
 
         // Check tasks position
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(1, $task['position']);
         $this->assertEquals(1, $task['swimlane_id']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(1, $task['position']);
         $this->assertEquals(0, $task['swimlane_id']);
 
-        $task = $tf->getById(3);
+        $task = $taskFinderModel->getById(3);
         $this->assertEquals(3, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(2, $task['position']);
         $this->assertEquals(0, $task['swimlane_id']);
 
-        $task = $tf->getById(4);
+        $task = $taskFinderModel->getById(4);
         $this->assertEquals(4, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(3, $task['position']);
         $this->assertEquals(0, $task['swimlane_id']);
 
         // Move the task to the swimlane
-        $this->assertTrue($tp->movePosition(1, 2, 2, 1, 1));
+        $this->assertTrue($taskPositionModel->movePosition(1, 2, 2, 1, 1));
 
         // Check tasks position
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(2, $task['position']);
         $this->assertEquals(1, $task['swimlane_id']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(1, $task['position']);
         $this->assertEquals(1, $task['swimlane_id']);
 
-        $task = $tf->getById(3);
+        $task = $taskFinderModel->getById(3);
         $this->assertEquals(3, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(1, $task['position']);
         $this->assertEquals(0, $task['swimlane_id']);
 
-        $task = $tf->getById(4);
+        $task = $taskFinderModel->getById(4);
         $this->assertEquals(4, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(2, $task['position']);
         $this->assertEquals(0, $task['swimlane_id']);
 
         // Move the task 5 to the last column
-        $this->assertTrue($tp->movePosition(1, 5, 4, 1, 0));
+        $this->assertTrue($taskPositionModel->movePosition(1, 5, 4, 1, 0));
 
         // Check tasks position
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(2, $task['position']);
         $this->assertEquals(1, $task['swimlane_id']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(1, $task['position']);
         $this->assertEquals(1, $task['swimlane_id']);
 
-        $task = $tf->getById(3);
+        $task = $taskFinderModel->getById(3);
         $this->assertEquals(3, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(1, $task['position']);
         $this->assertEquals(0, $task['swimlane_id']);
 
-        $task = $tf->getById(4);
+        $task = $taskFinderModel->getById(4);
         $this->assertEquals(4, $task['id']);
         $this->assertEquals(1, $task['column_id']);
         $this->assertEquals(2, $task['position']);
         $this->assertEquals(0, $task['swimlane_id']);
 
-        $task = $tf->getById(5);
+        $task = $taskFinderModel->getById(5);
         $this->assertEquals(5, $task['id']);
         $this->assertEquals(4, $task['column_id']);
         $this->assertEquals(1, $task['position']);
@@ -522,73 +522,73 @@ class TaskPositionTest extends Base
 
     public function testEvents()
     {
-        $tp = new TaskPositionModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $tf = new TaskFinderModel($this->container);
-        $p = new ProjectModel($this->container);
-        $s = new SwimlaneModel($this->container);
+        $taskPositionModel = new TaskPositionModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $swimlaneModel = new SwimlaneModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'Project #1')));
-        $this->assertEquals(1, $s->create(array('project_id' => 1, 'name' => 'test 1')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $swimlaneModel->create(array('project_id' => 1, 'name' => 'test 1')));
 
-        $this->assertEquals(1, $tc->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 2)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1, 'column_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 2)));
 
         $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_COLUMN, array($this, 'onMoveColumn'));
         $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_POSITION, array($this, 'onMovePosition'));
         $this->container['dispatcher']->addListener(TaskModel::EVENT_MOVE_SWIMLANE, array($this, 'onMoveSwimlane'));
 
         // We move the task 1 to the column 2
-        $this->assertTrue($tp->movePosition(1, 1, 2, 1));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 2, 1));
 
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(1, $task['position']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(2, $task['position']);
 
         $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_COLUMN.'.TaskPositionTest::onMoveColumn', $called);
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_COLUMN.'.TaskPositionModelTest::onMoveColumn', $called);
         $this->assertEquals(1, count($called));
 
         // We move the task 1 to the position 2
-        $this->assertTrue($tp->movePosition(1, 1, 2, 2));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 2, 2));
 
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(2, $task['position']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(1, $task['position']);
 
         $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_POSITION.'.TaskPositionTest::onMovePosition', $called);
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_POSITION.'.TaskPositionModelTest::onMovePosition', $called);
         $this->assertEquals(2, count($called));
 
         // Move to another swimlane
-        $this->assertTrue($tp->movePosition(1, 1, 3, 1, 1));
+        $this->assertTrue($taskPositionModel->movePosition(1, 1, 3, 1, 1));
 
-        $task = $tf->getById(1);
+        $task = $taskFinderModel->getById(1);
         $this->assertEquals(1, $task['id']);
         $this->assertEquals(3, $task['column_id']);
         $this->assertEquals(1, $task['position']);
         $this->assertEquals(1, $task['swimlane_id']);
 
-        $task = $tf->getById(2);
+        $task = $taskFinderModel->getById(2);
         $this->assertEquals(2, $task['id']);
         $this->assertEquals(2, $task['column_id']);
         $this->assertEquals(1, $task['position']);
         $this->assertEquals(0, $task['swimlane_id']);
 
         $called = $this->container['dispatcher']->getCalledListeners();
-        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_SWIMLANE.'.TaskPositionTest::onMoveSwimlane', $called);
+        $this->assertArrayHasKey(TaskModel::EVENT_MOVE_SWIMLANE.'.TaskPositionModelTest::onMoveSwimlane', $called);
         $this->assertEquals(3, count($called));
     }
 
diff --git a/tests/units/Model/TaskProjectMoveModelTest.php b/tests/units/Model/TaskProjectMoveModelTest.php
index c4282638..52f61b28 100644
--- a/tests/units/Model/TaskProjectMoveModelTest.php
+++ b/tests/units/Model/TaskProjectMoveModelTest.php
@@ -24,7 +24,7 @@ class TaskProjectMoveModelTest extends Base
         $event_data = $event->getAll();
         $this->assertNotEmpty($event_data);
         $this->assertEquals(1, $event_data['task_id']);
-        $this->assertEquals('test', $event_data['title']);
+        $this->assertEquals('test', $event_data['task']['title']);
     }
 
     public function testMoveAnotherProject()