Merge branch 'master' of https://github.com/fguillot/kanboard

52 files changed, 2226 insertions, 2072 deletions

diff --git a/tests/configs/config.mysql.php b/tests/configs/config.mysql.php
new file mode 100644
index 00000000..27e32744
--- /dev/null
+++ b/tests/configs/config.mysql.php
@@ -0,0 +1,12 @@
+<?php
+
+define('DB_DRIVER', 'mysql');
+define('DB_USERNAME', 'root');
+define('DB_PASSWORD', 'kanboard');
+define('DB_HOSTNAME', 'mysql');
+define('DB_NAME', 'kanboard');
+
+define('DEBUG', true);
+define('LOG_DRIVER', 'stderr');
+
+define('API_AUTHENTICATION_TOKEN', 'test');
diff --git a/tests/configs/config.postgres.php b/tests/configs/config.postgres.php
new file mode 100644
index 00000000..161a2349
--- /dev/null
+++ b/tests/configs/config.postgres.php
@@ -0,0 +1,12 @@
+<?php
+
+define('DB_DRIVER', 'postgres');
+define('DB_USERNAME', 'postgres');
+define('DB_PASSWORD', 'postgres');
+define('DB_HOSTNAME', 'postgres');
+define('DB_NAME', 'kanboard');
+
+define('DEBUG', true);
+define('LOG_DRIVER', 'stderr');
+
+define('API_AUTHENTICATION_TOKEN', 'test');
diff --git a/tests/configs/config.sqlite.php b/tests/configs/config.sqlite.php
new file mode 100644
index 00000000..e969c17c
--- /dev/null
+++ b/tests/configs/config.sqlite.php
@@ -0,0 +1,8 @@
+<?php
+
+define('DB_DRIVER', 'sqlite');
+
+define('DEBUG', true);
+define('LOG_DRIVER', 'file');
+
+define('API_AUTHENTICATION_TOKEN', 'test');
diff --git a/tests/docker/Dockerfile.xenial b/tests/docker/Dockerfile.xenial
new file mode 100644
index 00000000..a48d0525
--- /dev/null
+++ b/tests/docker/Dockerfile.xenial
@@ -0,0 +1,24 @@
+FROM ubuntu:16.04
+
+RUN mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/supervisor
+
+RUN apt-get update -qq && \
+    apt-get install -y apache2 supervisor cron curl unzip \
+    libapache2-mod-php7.0 php7.0-cli php7.0-mbstring php7.0-xml php7.0-mysql php7.0-sqlite3 \
+    php7.0-opcache php7.0-json php7.0-pgsql php7.0-ldap php7.0-gd php7.0-zip && \
+    apt clean && \
+    echo "ServerName localhost" >> /etc/apache2/apache2.conf && \
+    sed -ri 's/AllowOverride None/AllowOverride All/g' /etc/apache2/apache2.conf && \
+    a2enmod rewrite && \
+    curl -sS https://getcomposer.org/installer | php -- --filename=/usr/local/bin/composer
+
+COPY . /var/www/html
+
+RUN chown -R www-data:www-data /var/www/html/data /var/www/html/plugins
+
+COPY tests/docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY tests/configs /configs/
+
+EXPOSE 80
+
+ENTRYPOINT ["/var/www/html/tests/docker/entrypoint.sh"]
diff --git a/tests/docker/compose.integration.mysql.yaml b/tests/docker/compose.integration.mysql.yaml
new file mode 100644
index 00000000..6eda5eec
--- /dev/null
+++ b/tests/docker/compose.integration.mysql.yaml
@@ -0,0 +1,27 @@
+version: '2'
+services:
+  mysql:
+    image: mysql:5.7
+    environment:
+      MYSQL_ROOT_PASSWORD: "kanboard"
+      MYSQL_DATABASE: "kanboard"
+      MYSQL_USER: "kanboard"
+      MYSQL_PASSWORD: "kanboard"
+    ports:
+      - "3306:3306"
+  app:
+    build:
+      context: ../..
+      dockerfile: tests/docker/Dockerfile.xenial
+    ports:
+      - "8000:80"
+    depends_on:
+      - mysql
+    command: config-mysql
+  tests:
+    build:
+      context: ../..
+      dockerfile: tests/docker/Dockerfile.xenial
+    depends_on:
+      - app
+    command: integration-test-mysql
diff --git a/tests/docker/compose.integration.postgres.yaml b/tests/docker/compose.integration.postgres.yaml
new file mode 100644
index 00000000..ed095248
--- /dev/null
+++ b/tests/docker/compose.integration.postgres.yaml
@@ -0,0 +1,26 @@
+version: '2'
+services:
+  postgres:
+    image: postgres:9.5
+    environment:
+        POSTGRES_USER: postgres
+        POSTGRES_PASSWORD: postgres
+        POSTGRES_DB: kanboard
+    ports:
+      - "5432:5432"
+  app:
+    build:
+      context: ../..
+      dockerfile: tests/docker/Dockerfile.xenial
+    ports:
+      - "8000:80"
+    depends_on:
+      - postgres
+    command: config-postgres
+  tests:
+    build:
+      context: ../..
+      dockerfile: tests/docker/Dockerfile.xenial
+    depends_on:
+      - app
+    command: integration-test-postgres
diff --git a/tests/docker/compose.integration.sqlite.yaml b/tests/docker/compose.integration.sqlite.yaml
new file mode 100644
index 00000000..6431484e
--- /dev/null
+++ b/tests/docker/compose.integration.sqlite.yaml
@@ -0,0 +1,16 @@
+version: '2'
+services:
+  app:
+    build:
+      context: ../..
+      dockerfile: tests/docker/Dockerfile.xenial
+    ports:
+      - "8000:80"
+    command: config-sqlite
+  tests:
+    build:
+      context: ../..
+      dockerfile: tests/docker/Dockerfile.xenial
+    depends_on:
+      - app
+    command: integration-test-sqlite
diff --git a/tests/docker/entrypoint.sh b/tests/docker/entrypoint.sh
new file mode 100755
index 00000000..a88c7ed8
--- /dev/null
+++ b/tests/docker/entrypoint.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+function wait_schema_creation() {
+    curl -s http://app/login > /dev/null
+    sleep $1
+}
+
+case "$1" in
+"config-sqlite")
+    cp /configs/config.sqlite.php /var/www/html/config.php
+    /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
+    ;;
+"config-postgres")
+    cp /configs/config.postgres.php /var/www/html/config.php
+    /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
+    ;;
+"config-mysql")
+    cp /configs/config.mysql.php /var/www/html/config.php
+    /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
+    ;;
+"integration-test-sqlite")
+    wait_schema_creation 1
+    /var/www/html/vendor/phpunit/phpunit/phpunit -c /var/www/html/tests/integration.sqlite.xml
+    ;;
+"integration-test-postgres")
+    wait_schema_creation 5
+    /var/www/html/vendor/phpunit/phpunit/phpunit -c /var/www/html/tests/integration.postgres.xml
+    ;;
+"integration-test-mysql")
+    wait_schema_creation 15
+    /var/www/html/vendor/phpunit/phpunit/phpunit -c /var/www/html/tests/integration.mysql.xml
+    ;;
+esac
diff --git a/tests/docker/supervisord.conf b/tests/docker/supervisord.conf
new file mode 100644
index 00000000..4d5ee621
--- /dev/null
+++ b/tests/docker/supervisord.conf
@@ -0,0 +1,6 @@
+[supervisord]
+nodaemon=true
+
+[program:apache2]
+command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"
+autorestart=true
diff --git a/tests/integration.mysql.xml b/tests/integration.mysql.xml
index 9d87f77e..33813187 100644
--- a/tests/integration.mysql.xml
+++ b/tests/integration.mysql.xml
@@ -5,16 +5,8 @@
         </testsuite>
     </testsuites>
     <php>
-        <const name="API_URL" value="http://localhost:8000/jsonrpc.php" />
-        <const name="API_KEY" value="19ffd9709d03ce50675c3a43d1c49c1ac207f4bc45f06c5b2701fbdf8929" />
-        <const name="DB_DRIVER" value="mysql" />
-        <const name="DB_NAME" value="kanboard" />
-        <const name="DB_HOSTNAME" value="localhost" />
-        <const name="DB_USERNAME" value="root" />
-        <const name="DB_PASSWORD" value="" />
-        <const name="DB_PORT" value="" />
-        <const name="DB_SSL_KEY" value="" />
-        <const name="DB_SSL_CA" value="" />
-        <const name="DB_SSL_CERT" value="" />
+        <const name="BASE_URL" value="http://app/" />
+        <const name="API_URL" value="http://app/jsonrpc.php" />
+        <const name="API_KEY" value="test" />
     </php>
 </phpunit>
diff --git a/tests/integration.postgres.xml b/tests/integration.postgres.xml
index ed8a3de3..33813187 100644
--- a/tests/integration.postgres.xml
+++ b/tests/integration.postgres.xml
@@ -5,13 +5,8 @@
         </testsuite>
     </testsuites>
     <php>
-        <const name="API_URL" value="http://localhost:8000/jsonrpc.php" />
-        <const name="API_KEY" value="19ffd9709d03ce50675c3a43d1c49c1ac207f4bc45f06c5b2701fbdf8929" />
-        <const name="DB_DRIVER" value="postgres" />
-        <const name="DB_NAME" value="kanboard" />
-        <const name="DB_HOSTNAME" value="localhost" />
-        <const name="DB_USERNAME" value="postgres" />
-        <const name="DB_PASSWORD" value="postgres" />
-        <const name="DB_PORT" value="" />
+        <const name="BASE_URL" value="http://app/" />
+        <const name="API_URL" value="http://app/jsonrpc.php" />
+        <const name="API_KEY" value="test" />
     </php>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/tests/integration.sqlite.xml b/tests/integration.sqlite.xml
index 1964f822..33813187 100644
--- a/tests/integration.sqlite.xml
+++ b/tests/integration.sqlite.xml
@@ -5,9 +5,8 @@
         </testsuite>
     </testsuites>
     <php>
-        <const name="API_URL" value="http://127.0.0.1:8000/jsonrpc.php" />
-        <const name="API_KEY" value="19ffd9709d03ce50675c3a43d1c49c1ac207f4bc45f06c5b2701fbdf8929" />
-        <const name="DB_DRIVER" value="sqlite" />
-        <const name="DB_FILENAME" value="data/db.sqlite" />
+        <const name="BASE_URL" value="http://app/" />
+        <const name="API_URL" value="http://app/jsonrpc.php" />
+        <const name="API_KEY" value="test" />
     </php>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/tests/integration/ActionProcedureTest.php b/tests/integration/ActionProcedureTest.php
new file mode 100644
index 00000000..432de3d3
--- /dev/null
+++ b/tests/integration/ActionProcedureTest.php
@@ -0,0 +1,66 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class ActionProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My project to test actions';
+
+    public function testGetAvailableActions()
+    {
+        $actions = $this->app->getAvailableActions();
+        $this->assertNotEmpty($actions);
+        $this->assertInternalType('array', $actions);
+        $this->assertArrayHasKey('\Kanboard\Action\TaskCloseColumn', $actions);
+    }
+
+    public function testGetAvailableActionEvents()
+    {
+        $events = $this->app->getAvailableActionEvents();
+        $this->assertNotEmpty($events);
+        $this->assertInternalType('array', $events);
+        $this->assertArrayHasKey('task.move.column', $events);
+    }
+
+    public function testGetCompatibleActionEvents()
+    {
+        $events = $this->app->getCompatibleActionEvents('\Kanboard\Action\TaskCloseColumn');
+        $this->assertNotEmpty($events);
+        $this->assertInternalType('array', $events);
+        $this->assertArrayHasKey('task.move.column', $events);
+    }
+
+    public function testCRUD()
+    {
+        $this->assertCreateTeamProject();
+        $this->assertCreateAction();
+        $this->assertGetActions();
+        $this->assertRemoveAction();
+    }
+
+    public function assertCreateAction()
+    {
+        $actionId = $this->app->createAction($this->projectId, 'task.move.column', '\Kanboard\Action\TaskCloseColumn', array('column_id' => 1));
+        $this->assertNotFalse($actionId);
+        $this->assertTrue($actionId > 0);
+    }
+
+    public function assertGetActions()
+    {
+        $actions = $this->app->getActions($this->projectId);
+        $this->assertNotEmpty($actions);
+        $this->assertInternalType('array', $actions);
+        $this->assertArrayHasKey('id', $actions[0]);
+        $this->assertArrayHasKey('project_id', $actions[0]);
+        $this->assertArrayHasKey('event_name', $actions[0]);
+        $this->assertArrayHasKey('action_name', $actions[0]);
+        $this->assertArrayHasKey('params', $actions[0]);
+        $this->assertArrayHasKey('column_id', $actions[0]['params']);
+    }
+
+    public function assertRemoveAction()
+    {
+        $actionId = $this->app->createAction($this->projectId, 'task.move.column', '\Kanboard\Action\TaskCloseColumn', array('column_id' => 1));
+        $this->assertTrue($this->app->removeAction($actionId));
+    }
+}
diff --git a/tests/integration/ApiTest.php b/tests/integration/ApiTest.php
deleted file mode 100644
index f552bea9..00000000
--- a/tests/integration/ApiTest.php
+++ /dev/null
@@ -1,928 +0,0 @@
-<?php
-
-require_once __DIR__.'/../../vendor/autoload.php';
-
-class Api extends PHPUnit_Framework_TestCase
-{
-    private $client = null;
-
-    public static function setUpBeforeClass()
-    {
-        if (DB_DRIVER === 'sqlite') {
-            @unlink(DB_FILENAME);
-        } elseif (DB_DRIVER === 'mysql') {
-            $pdo = new PDO('mysql:host='.DB_HOSTNAME, DB_USERNAME, DB_PASSWORD);
-            $pdo->exec('DROP DATABASE '.DB_NAME);
-            $pdo->exec('CREATE DATABASE '.DB_NAME);
-            $pdo = null;
-        } elseif (DB_DRIVER === 'postgres') {
-            $pdo = new PDO('pgsql:host='.DB_HOSTNAME, DB_USERNAME, DB_PASSWORD);
-            $pdo->exec('DROP DATABASE '.DB_NAME);
-            $pdo->exec('CREATE DATABASE '.DB_NAME.' WITH OWNER '.DB_USERNAME);
-            $pdo = null;
-        }
-
-        $service = new Kanboard\ServiceProvider\DatabaseProvider;
-
-        $db = $service->getInstance();
-        $db->table('settings')->eq('option', 'api_token')->update(array('value' => API_KEY));
-        $db->table('settings')->eq('option', 'application_timezone')->update(array('value' => 'Europe/Paris'));
-        $db->closeConnection();
-    }
-
-    public function setUp()
-    {
-        $this->client = new JsonRPC\Client(API_URL);
-        $this->client->authentication('jsonrpc', API_KEY);
-        // $this->client->debug = true;
-    }
-
-    private function getTaskId()
-    {
-        $tasks = $this->client->getAllTasks(1, 1);
-        $this->assertNotEmpty($tasks);
-
-        return $tasks[0]['id'];
-    }
-
-    public function testRemoveAll()
-    {
-        $projects = $this->client->getAllProjects();
-
-        if ($projects) {
-            foreach ($projects as $project) {
-                $this->assertEquals('http://127.0.0.1:8000/?controller=BoardViewController&action=show&project_id='.$project['id'], $project['url']['board']);
-                $this->assertEquals('http://127.0.0.1:8000/?controller=CalendarController&action=show&project_id='.$project['id'], $project['url']['calendar']);
-                $this->assertEquals('http://127.0.0.1:8000/?controller=TaskListController&action=show&project_id='.$project['id'], $project['url']['list']);
-                $this->assertTrue($this->client->removeProject($project['id']));
-            }
-        }
-    }
-
-    public function testCreateProject()
-    {
-        $project_id = $this->client->createProject('API test');
-        $this->assertNotFalse($project_id);
-        $this->assertInternalType('int', $project_id);
-    }
-
-    public function testGetProjectById()
-    {
-        $project = $this->client->getProjectById(1);
-        $this->assertNotEmpty($project);
-        $this->assertEquals(1, $project['id']);
-        $this->assertEquals('http://127.0.0.1:8000/?controller=BoardViewController&action=show&project_id='.$project['id'], $project['url']['board']);
-        $this->assertEquals('http://127.0.0.1:8000/?controller=CalendarController&action=show&project_id='.$project['id'], $project['url']['calendar']);
-        $this->assertEquals('http://127.0.0.1:8000/?controller=TaskListController&action=show&project_id='.$project['id'], $project['url']['list']);
-    }
-
-    public function testGetProjectByName()
-    {
-        $project = $this->client->getProjectByName('API test');
-        $this->assertNotEmpty($project);
-        $this->assertEquals(1, $project['id']);
-        $this->assertEquals('http://127.0.0.1:8000/?controller=BoardViewController&action=show&project_id='.$project['id'], $project['url']['board']);
-        $this->assertEquals('http://127.0.0.1:8000/?controller=CalendarController&action=show&project_id='.$project['id'], $project['url']['calendar']);
-        $this->assertEquals('http://127.0.0.1:8000/?controller=TaskListController&action=show&project_id='.$project['id'], $project['url']['list']);
-
-        $project = $this->client->getProjectByName(array('name' => 'API test'));
-        $this->assertNotEmpty($project);
-        $this->assertEquals(1, $project['id']);
-
-        $project = $this->client->getProjectByName('None');
-        $this->assertEmpty($project);
-        $this->assertNull($project);
-    }
-
-    public function testGetAllProjects()
-    {
-        $projects = $this->client->getAllProjects();
-        $this->assertNotEmpty($projects);
-
-        foreach ($projects as $project) {
-            $this->assertEquals('http://127.0.0.1:8000/?controller=BoardViewController&action=show&project_id='.$project['id'], $project['url']['board']);
-            $this->assertEquals('http://127.0.0.1:8000/?controller=CalendarController&action=show&project_id='.$project['id'], $project['url']['calendar']);
-            $this->assertEquals('http://127.0.0.1:8000/?controller=TaskListController&action=show&project_id='.$project['id'], $project['url']['list']);
-        }
-    }
-
-    public function testUpdateProject()
-    {
-        $project = $this->client->getProjectById(1);
-        $this->assertNotEmpty($project);
-        $this->assertTrue($this->client->execute('updateProject', array('id' => 1, 'name' => 'API test 2')));
-
-        $project = $this->client->getProjectById(1);
-        $this->assertEquals('API test 2', $project['name']);
-
-        $this->assertTrue($this->client->execute('updateProject', array('id' => 1, 'name' => 'API test', 'description' => 'test')));
-
-        $project = $this->client->getProjectById(1);
-        $this->assertEquals('API test', $project['name']);
-        $this->assertEquals('test', $project['description']);
-    }
-
-    public function testDisableProject()
-    {
-        $this->assertTrue($this->client->disableProject(1));
-        $project = $this->client->getProjectById(1);
-        $this->assertNotEmpty($project);
-        $this->assertEquals(0, $project['is_active']);
-    }
-
-    public function testEnableProject()
-    {
-        $this->assertTrue($this->client->enableProject(1));
-        $project = $this->client->getProjectById(1);
-        $this->assertNotEmpty($project);
-        $this->assertEquals(1, $project['is_active']);
-    }
-
-    public function testEnableProjectPublicAccess()
-    {
-        $this->assertTrue($this->client->enableProjectPublicAccess(1));
-        $project = $this->client->getProjectById(1);
-        $this->assertNotEmpty($project);
-        $this->assertEquals(1, $project['is_public']);
-        $this->assertNotEmpty($project['token']);
-    }
-
-    public function testDisableProjectPublicAccess()
-    {
-        $this->assertTrue($this->client->disableProjectPublicAccess(1));
-        $project = $this->client->getProjectById(1);
-        $this->assertNotEmpty($project);
-        $this->assertEquals(0, $project['is_public']);
-        $this->assertEmpty($project['token']);
-    }
-
-    public function testgetProjectActivities()
-    {
-        $activities = $this->client->getProjectActivities(array('project_ids' => array(1)));
-        $this->assertInternalType('array', $activities);
-        $this->assertCount(0, $activities);
-    }
-
-    public function testgetProjectActivity()
-    {
-        $activities = $this->client->getProjectActivity(1);
-        $this->assertInternalType('array', $activities);
-        $this->assertCount(0, $activities);
-    }
-
-    public function testCreateTaskWithWrongMember()
-    {
-        $task = array(
-            'title' => 'Task #1',
-            'color_id' => 'blue',
-            'owner_id' => 1,
-            'project_id' => 1,
-            'column_id' => 2,
-        );
-
-        $task_id = $this->client->createTask($task);
-
-        $this->assertFalse($task_id);
-    }
-
-    public function testGetAllowedUsers()
-    {
-        $users = $this->client->getMembers(1);
-        $this->assertNotFalse($users);
-        $this->assertEquals(array(), $users);
-    }
-
-    public function testAddMember()
-    {
-        $this->assertTrue($this->client->allowUser(1, 1));
-    }
-
-    public function testCreateTask()
-    {
-        $task = array(
-            'title' => 'Task #1',
-            'color_id' => 'blue',
-            'owner_id' => 1,
-            'project_id' => 1,
-            'column_id' => 2,
-        );
-
-        $task_id = $this->client->createTask($task);
-
-        $this->assertNotFalse($task_id);
-        $this->assertInternalType('int', $task_id);
-        $this->assertTrue($task_id > 0);
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testCreateTaskWithBadParams()
-    {
-        $task = array(
-            'title' => 'Task #1',
-            'color_id' => 'blue',
-            'owner_id' => 1,
-        );
-
-        $this->client->createTask($task);
-    }
-
-    public function testGetTask()
-    {
-        $task = $this->client->getTask(1);
-
-        $this->assertNotFalse($task);
-        $this->assertTrue(is_array($task));
-        $this->assertEquals('Task #1', $task['title']);
-        $this->assertEquals('http://127.0.0.1:8000/?controller=TaskViewController&action=show&task_id='.$task['id'].'&project_id='.$task['project_id'], $task['url']);
-    }
-
-    public function testGetAllTasks()
-    {
-        $tasks = $this->client->getAllTasks(1, 1);
-
-        $this->assertNotFalse($tasks);
-        $this->assertTrue(is_array($tasks));
-        $this->assertEquals('Task #1', $tasks[0]['title']);
-        $this->assertEquals('http://127.0.0.1:8000/?controller=TaskViewController&action=show&task_id='.$tasks[0]['id'].'&project_id='.$tasks[0]['project_id'], $tasks[0]['url']);
-
-        $tasks = $this->client->getAllTasks(2, 0);
-
-        $this->assertNotFalse($tasks);
-        $this->assertTrue(is_array($tasks));
-        $this->assertEmpty($tasks);
-    }
-
-    public function testMoveTaskSwimlane()
-    {
-        $task_id = $this->getTaskId();
-
-        $task = $this->client->getTask($task_id);
-        $this->assertNotFalse($task);
-        $this->assertTrue(is_array($task));
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(0, $task['swimlane_id']);
-
-        $moved_timestamp = $task['date_moved'];
-        sleep(1);
-        $this->assertTrue($this->client->moveTaskPosition(1, $task_id, 4, 1, 2));
-
-        $task = $this->client->getTask($task_id);
-        $this->assertNotFalse($task);
-        $this->assertTrue(is_array($task));
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(4, $task['column_id']);
-        $this->assertEquals(2, $task['swimlane_id']);
-        $this->assertNotEquals($moved_timestamp, $task['date_moved']);
-    }
-
-    public function testUpdateTask()
-    {
-        $task = $this->client->getTask(1);
-
-        $values = array();
-        $values['id'] = $task['id'];
-        $values['color_id'] = 'green';
-        $values['description'] = 'test';
-        $values['date_due'] = '';
-
-        $this->assertTrue($this->client->execute('updateTask', $values));
-    }
-
-    public function testRemoveTask()
-    {
-        $this->assertTrue($this->client->removeTask(1));
-    }
-
-    public function testRemoveUsers()
-    {
-        $users = $this->client->getAllUsers();
-        $this->assertNotFalse($users);
-        $this->assertNotEmpty($users);
-
-        foreach ($users as $user) {
-            if ($user['id'] > 1) {
-                $this->assertTrue($this->client->removeUser($user['id']));
-            }
-        }
-    }
-
-    public function testCreateUser()
-    {
-        $user = array(
-            'username' => 'toto',
-            'name' => 'Toto',
-            'password' => '123456',
-        );
-
-        $user_id = $this->client->execute('createUser', $user);
-        $this->assertNotFalse($user_id);
-        $this->assertInternalType('int', $user_id);
-        $this->assertTrue($user_id > 0);
-    }
-
-    public function testCreateManagerUser()
-    {
-        $user = array(
-            'username' => 'manager',
-            'name' => 'Manager',
-            'password' => '123456',
-            'role' => 'app-manager'
-        );
-
-        $user_id = $this->client->execute('createUser', $user);
-        $this->assertNotFalse($user_id);
-        $this->assertInternalType('int', $user_id);
-        $this->assertTrue($user_id > 0);
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testCreateUserWithBadParams()
-    {
-        $user = array(
-            'name' => 'Titi',
-            'password' => '123456',
-        );
-
-        $this->assertNull($this->client->execute('createUser', $user));
-    }
-
-    public function testGetUser()
-    {
-        $user = $this->client->getUser(2);
-        $this->assertNotFalse($user);
-        $this->assertTrue(is_array($user));
-        $this->assertEquals('toto', $user['username']);
-
-        $user = $this->client->getUser(3);
-        $this->assertNotEmpty($user);
-        $this->assertEquals('app-manager', $user['role']);
-
-        $this->assertNull($this->client->getUser(2222));
-    }
-
-    public function testGetUserByName()
-    {
-        $user = $this->client->getUserByName('toto');
-        $this->assertNotFalse($user);
-        $this->assertTrue(is_array($user));
-        $this->assertEquals(2, $user['id']);
-
-        $user = $this->client->getUserByName('manager');
-        $this->assertNotEmpty($user);
-        $this->assertEquals('app-manager', $user['role']);
-
-        $this->assertNull($this->client->getUserByName('nonexistantusername'));
-    }
-
-    public function testUpdateUser()
-    {
-        $user = array();
-        $user['id'] = 2;
-        $user['username'] = 'titi';
-        $user['name'] = 'Titi';
-
-        $this->assertTrue($this->client->execute('updateUser', $user));
-
-        $user = $this->client->getUser(2);
-        $this->assertNotFalse($user);
-        $this->assertTrue(is_array($user));
-        $this->assertEquals('titi', $user['username']);
-        $this->assertEquals('Titi', $user['name']);
-
-        $user = array();
-        $user['id'] = 2;
-        $user['email'] = 'titi@localhost';
-
-        $this->assertTrue($this->client->execute('updateUser', $user));
-
-        $user = $this->client->getUser(2);
-        $this->assertNotFalse($user);
-        $this->assertTrue(is_array($user));
-        $this->assertEquals('titi@localhost', $user['email']);
-    }
-
-    public function testAllowedUser()
-    {
-        $this->assertTrue($this->client->allowUser(1, 2));
-
-        $users = $this->client->getMembers(1);
-        $this->assertNotFalse($users);
-        $this->assertEquals(array(1 => 'admin', 2 => 'Titi'), $users);
-    }
-
-    public function testRevokeUser()
-    {
-        $this->assertTrue($this->client->revokeUser(1, 2));
-
-        $users = $this->client->getMembers(1);
-        $this->assertNotFalse($users);
-        $this->assertEquals(array(1 => 'admin'), $users);
-    }
-
-    public function testCreateComment()
-    {
-        $task = array(
-            'title' => 'Task with comment',
-            'color_id' => 'red',
-            'owner_id' => 1,
-            'project_id' => 1,
-            'column_id' => 1,
-        );
-
-        $this->assertNotFalse($this->client->execute('createTask', $task));
-
-        $tasks = $this->client->getAllTasks(1, 1);
-        $this->assertNotEmpty($tasks);
-        $this->assertEquals(1, count($tasks));
-
-        $comment = array(
-            'task_id' => $tasks[0]['id'],
-            'user_id' => 2,
-            'content' => 'boo',
-        );
-
-        $comment_id = $this->client->execute('createComment', $comment);
-
-        $this->assertNotFalse($comment_id);
-        $this->assertInternalType('int', $comment_id);
-        $this->assertTrue($comment_id > 0);
-    }
-
-    public function testGetComment()
-    {
-        $comment = $this->client->getComment(1);
-        $this->assertNotFalse($comment);
-        $this->assertNotEmpty($comment);
-        $this->assertEquals(2, $comment['user_id']);
-        $this->assertEquals('boo', $comment['comment']);
-    }
-
-    public function testUpdateComment()
-    {
-        $comment = array();
-        $comment['id'] = 1;
-        $comment['content'] = 'test';
-
-        $this->assertTrue($this->client->execute('updateComment', $comment));
-
-        $comment = $this->client->getComment(1);
-        $this->assertEquals('test', $comment['comment']);
-    }
-
-    public function testGetAllComments()
-    {
-        $task_id = $this->getTaskId();
-
-        $comment = array(
-            'task_id' => $task_id,
-            'user_id' => 1,
-            'content' => 'blabla',
-        );
-
-        $comment_id = $this->client->createComment($comment);
-
-        $this->assertNotFalse($comment_id);
-        $this->assertInternalType('int', $comment_id);
-        $this->assertTrue($comment_id > 0);
-
-        $comments = $this->client->getAllComments($task_id);
-        $this->assertNotFalse($comments);
-        $this->assertNotEmpty($comments);
-        $this->assertTrue(is_array($comments));
-        $this->assertEquals(2, count($comments));
-    }
-
-    public function testRemoveComment()
-    {
-        $task_id = $this->getTaskId();
-
-        $comments = $this->client->getAllComments($task_id);
-        $this->assertNotFalse($comments);
-        $this->assertNotEmpty($comments);
-        $this->assertTrue(is_array($comments));
-
-        foreach ($comments as $comment) {
-            $this->assertTrue($this->client->removeComment($comment['id']));
-        }
-
-        $comments = $this->client->getAllComments($task_id);
-        $this->assertNotFalse($comments);
-        $this->assertEmpty($comments);
-        $this->assertTrue(is_array($comments));
-    }
-
-    public function testCreateSubtask()
-    {
-        $subtask = array(
-            'task_id' => $this->getTaskId(),
-            'title' => 'subtask #1',
-        );
-
-        $subtask_id = $this->client->createSubtask($subtask);
-
-        $this->assertNotFalse($subtask_id);
-        $this->assertInternalType('int', $subtask_id);
-        $this->assertTrue($subtask_id > 0);
-    }
-
-    public function testGetSubtask()
-    {
-        $subtask = $this->client->getSubtask(1);
-        $this->assertNotFalse($subtask);
-        $this->assertNotEmpty($subtask);
-        $this->assertEquals($this->getTaskId(), $subtask['task_id']);
-        $this->assertEquals(0, $subtask['user_id']);
-        $this->assertEquals('subtask #1', $subtask['title']);
-    }
-
-    public function testUpdateSubtask()
-    {
-        $subtask = array();
-        $subtask['id'] = 1;
-        $subtask['task_id'] = $this->getTaskId();
-        $subtask['title'] = 'test';
-
-        $this->assertTrue($this->client->execute('updateSubtask', $subtask));
-
-        $subtask = $this->client->getSubtask(1);
-        $this->assertEquals('test', $subtask['title']);
-    }
-
-    public function testGetAllSubtasks()
-    {
-        $subtask = array(
-            'task_id' => $this->getTaskId(),
-            'user_id' => 2,
-            'title' => 'Subtask #2',
-        );
-
-        $this->assertNotFalse($this->client->execute('createSubtask', $subtask));
-
-        $subtasks = $this->client->getAllSubtasks($this->getTaskId());
-        $this->assertNotFalse($subtasks);
-        $this->assertNotEmpty($subtasks);
-        $this->assertTrue(is_array($subtasks));
-        $this->assertEquals(2, count($subtasks));
-    }
-
-    public function testRemoveSubtask()
-    {
-        $this->assertTrue($this->client->removeSubtask(1));
-
-        $subtasks = $this->client->getAllSubtasks($this->getTaskId());
-        $this->assertNotFalse($subtasks);
-        $this->assertNotEmpty($subtasks);
-        $this->assertTrue(is_array($subtasks));
-        $this->assertEquals(1, count($subtasks));
-    }
-
-    public function testMoveTaskPosition()
-    {
-        $task_id = $this->getTaskId();
-        $this->assertTrue($this->client->moveTaskPosition(1, $task_id, 3, 1));
-
-        $task = $this->client->getTask($task_id);
-        $this->assertNotFalse($task);
-        $this->assertTrue(is_array($task));
-        $this->assertEquals(1, $task['position']);
-        $this->assertEquals(3, $task['column_id']);
-    }
-
-    public function testCategoryCreation()
-    {
-        $category = array(
-            'name' => 'Category',
-            'project_id' => 1,
-        );
-
-        $cat_id = $this->client->execute('createCategory', $category);
-        $this->assertNotFalse($cat_id);
-        $this->assertInternalType('int', $cat_id);
-        $this->assertTrue($cat_id > 0);
-
-        // Duplicate
-
-        $category = array(
-            'name' => 'Category',
-            'project_id' => 1,
-        );
-
-        $this->assertFalse($this->client->execute('createCategory', $category));
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testCategoryCreationWithBadParams()
-    {
-        // Missing project id
-        $category = array(
-            'name' => 'Category',
-        );
-
-        $this->assertNull($this->client->execute('createCategory', $category));
-    }
-
-    public function testCategoryRead()
-    {
-        $category = $this->client->getCategory(1);
-
-        $this->assertTrue(is_array($category));
-        $this->assertNotEmpty($category);
-        $this->assertEquals(1, $category['id']);
-        $this->assertEquals('Category', $category['name']);
-        $this->assertEquals(1, $category['project_id']);
-    }
-
-    public function testGetAllCategories()
-    {
-        $categories = $this->client->getAllCategories(1);
-
-        $this->assertNotEmpty($categories);
-        $this->assertNotFalse($categories);
-        $this->assertTrue(is_array($categories));
-        $this->assertEquals(1, count($categories));
-        $this->assertEquals(1, $categories[0]['id']);
-        $this->assertEquals('Category', $categories[0]['name']);
-        $this->assertEquals(1, $categories[0]['project_id']);
-    }
-
-    public function testCategoryUpdate()
-    {
-        $category = array(
-            'id' => 1,
-            'name' => 'Renamed category',
-        );
-
-        $this->assertTrue($this->client->execute('updateCategory', $category));
-
-        $category = $this->client->getCategory(1);
-        $this->assertTrue(is_array($category));
-        $this->assertNotEmpty($category);
-        $this->assertEquals(1, $category['id']);
-        $this->assertEquals('Renamed category', $category['name']);
-        $this->assertEquals(1, $category['project_id']);
-    }
-
-    public function testCategoryRemove()
-    {
-        $this->assertTrue($this->client->removeCategory(1));
-        $this->assertFalse($this->client->removeCategory(1));
-        $this->assertFalse($this->client->removeCategory(1111));
-    }
-
-    public function testGetAvailableActions()
-    {
-        $actions = $this->client->getAvailableActions();
-        $this->assertNotEmpty($actions);
-        $this->assertInternalType('array', $actions);
-        $this->assertArrayHasKey('\Kanboard\Action\TaskCloseColumn', $actions);
-    }
-
-    public function testGetAvailableActionEvents()
-    {
-        $events = $this->client->getAvailableActionEvents();
-        $this->assertNotEmpty($events);
-        $this->assertInternalType('array', $events);
-        $this->assertArrayHasKey('task.move.column', $events);
-    }
-
-    public function testGetCompatibleActionEvents()
-    {
-        $events = $this->client->getCompatibleActionEvents('\Kanboard\Action\TaskCloseColumn');
-        $this->assertNotEmpty($events);
-        $this->assertInternalType('array', $events);
-        $this->assertArrayHasKey('task.move.column', $events);
-    }
-
-    public function testCreateAction()
-    {
-        $action_id = $this->client->createAction(1, 'task.move.column', '\Kanboard\Action\TaskCloseColumn', array('column_id' => 1));
-        $this->assertNotFalse($action_id);
-        $this->assertEquals(1, $action_id);
-    }
-
-    public function testGetActions()
-    {
-        $actions = $this->client->getActions(1);
-        $this->assertNotEmpty($actions);
-        $this->assertInternalType('array', $actions);
-        $this->assertCount(1, $actions);
-        $this->assertArrayHasKey('id', $actions[0]);
-        $this->assertArrayHasKey('project_id', $actions[0]);
-        $this->assertArrayHasKey('event_name', $actions[0]);
-        $this->assertArrayHasKey('action_name', $actions[0]);
-        $this->assertArrayHasKey('params', $actions[0]);
-        $this->assertArrayHasKey('column_id', $actions[0]['params']);
-    }
-
-    public function testRemoveAction()
-    {
-        $this->assertTrue($this->client->removeAction(1));
-
-        $actions = $this->client->getActions(1);
-        $this->assertEmpty($actions);
-        $this->assertCount(0, $actions);
-    }
-
-    public function testGetAllLinks()
-    {
-        $links = $this->client->getAllLinks();
-        $this->assertNotEmpty($links);
-        $this->assertArrayHasKey('id', $links[0]);
-        $this->assertArrayHasKey('label', $links[0]);
-        $this->assertArrayHasKey('opposite_id', $links[0]);
-    }
-
-    public function testGetOppositeLink()
-    {
-        $link = $this->client->getOppositeLinkId(1);
-        $this->assertEquals(1, $link);
-
-        $link = $this->client->getOppositeLinkId(2);
-        $this->assertEquals(3, $link);
-    }
-
-    public function testGetLinkByLabel()
-    {
-        $link = $this->client->getLinkByLabel('blocks');
-        $this->assertNotEmpty($link);
-        $this->assertEquals(2, $link['id']);
-        $this->assertEquals(3, $link['opposite_id']);
-    }
-
-    public function testGetLinkById()
-    {
-        $link = $this->client->getLinkById(4);
-        $this->assertNotEmpty($link);
-        $this->assertEquals(4, $link['id']);
-        $this->assertEquals(5, $link['opposite_id']);
-        $this->assertEquals('duplicates', $link['label']);
-    }
-
-    public function testCreateLink()
-    {
-        $link_id = $this->client->createLink(array('label' => 'test'));
-        $this->assertNotFalse($link_id);
-        $this->assertInternalType('int', $link_id);
-
-        $link_id = $this->client->createLink(array('label' => 'foo', 'opposite_label' => 'bar'));
-        $this->assertNotFalse($link_id);
-        $this->assertInternalType('int', $link_id);
-    }
-
-    public function testUpdateLink()
-    {
-        $link1 = $this->client->getLinkByLabel('bar');
-        $this->assertNotEmpty($link1);
-
-        $link2 = $this->client->getLinkByLabel('test');
-        $this->assertNotEmpty($link2);
-
-        $this->assertNotFalse($this->client->updateLink($link1['id'], $link2['id'], 'boo'));
-
-        $link = $this->client->getLinkById($link1['id']);
-        $this->assertNotEmpty($link);
-        $this->assertEquals($link2['id'], $link['opposite_id']);
-        $this->assertEquals('boo', $link['label']);
-
-        $this->assertTrue($this->client->removeLink($link1['id']));
-    }
-
-    public function testCreateTaskLink()
-    {
-        $task_id1 = $this->client->createTask(array('project_id' => 1, 'title' => 'A'));
-        $this->assertNotFalse($task_id1);
-
-        $task_id2 = $this->client->createTask(array('project_id' => 1, 'title' => 'B'));
-        $this->assertNotFalse($task_id2);
-
-        $task_id3 = $this->client->createTask(array('project_id' => 1, 'title' => 'C'));
-        $this->assertNotFalse($task_id3);
-
-        $task_link_id = $this->client->createTaskLink($task_id1, $task_id2, 1);
-        $this->assertNotFalse($task_link_id);
-
-        $task_link = $this->client->getTaskLinkById($task_link_id);
-        $this->assertNotEmpty($task_link);
-        $this->assertEquals($task_id1, $task_link['task_id']);
-        $this->assertEquals($task_id2, $task_link['opposite_task_id']);
-        $this->assertEquals(1, $task_link['link_id']);
-
-        $task_links = $this->client->getAllTaskLinks($task_id1);
-        $this->assertNotEmpty($task_links);
-        $this->assertCount(1, $task_links);
-
-        $this->assertTrue($this->client->updateTaskLink($task_link_id, $task_id1, $task_id3, 2));
-
-        $task_link = $this->client->getTaskLinkById($task_link_id);
-        $this->assertNotEmpty($task_link);
-        $this->assertEquals($task_id1, $task_link['task_id']);
-        $this->assertEquals($task_id3, $task_link['opposite_task_id']);
-        $this->assertEquals(2, $task_link['link_id']);
-
-        $this->assertTrue($this->client->removeTaskLink($task_link_id));
-        $this->assertEmpty($this->client->getAllTaskLinks($task_id1));
-    }
-
-    public function testCreateFile()
-    {
-        $this->assertNotFalse($this->client->createFile(1, $this->getTaskId(), 'My file', base64_encode('plain text file')));
-    }
-
-    public function testGetAllFiles()
-    {
-        $files = $this->client->getAllFiles(array('task_id' => $this->getTaskId()));
-
-        $this->assertNotEmpty($files);
-        $this->assertCount(1, $files);
-        $this->assertEquals('My file', $files[0]['name']);
-
-        $file = $this->client->getFile($files[0]['id']);
-        $this->assertNotEmpty($file);
-        $this->assertEquals('My file', $file['name']);
-
-        $content = $this->client->downloadFile($file['id']);
-        $this->assertNotEmpty($content);
-        $this->assertEquals('plain text file', base64_decode($content));
-
-        $content = $this->client->downloadFile(1234567);
-        $this->assertEmpty($content);
-
-        $this->assertTrue($this->client->removeFile($file['id']));
-        $this->assertEmpty($this->client->getAllFiles(1));
-    }
-
-    public function testRemoveAllFiles()
-    {
-        $this->assertNotFalse($this->client->createFile(1, $this->getTaskId(), 'My file 1', base64_encode('plain text file')));
-        $this->assertNotFalse($this->client->createFile(1, $this->getTaskId(), 'My file 2', base64_encode('plain text file')));
-
-        $files = $this->client->getAllFiles(array('task_id' => $this->getTaskId()));
-        $this->assertNotEmpty($files);
-        $this->assertCount(2, $files);
-
-        $this->assertTrue($this->client->removeAllFiles(array('task_id' => $this->getTaskId())));
-
-        $files = $this->client->getAllFiles(array('task_id' => $this->getTaskId()));
-        $this->assertEmpty($files);
-    }
-
-    public function testCreateTaskWithReference()
-    {
-        $task = array(
-            'title' => 'Task with external ticket number',
-            'reference' => 'TICKET-1234',
-            'project_id' => 1,
-            'description' => '[Link to my ticket](http://my-ticketing-system/1234)',
-        );
-
-        $task_id = $this->client->createTask($task);
-
-        $this->assertNotFalse($task_id);
-        $this->assertInternalType('int', $task_id);
-        $this->assertTrue($task_id > 0);
-    }
-
-    public function testGetTaskByReference()
-    {
-        $task = $this->client->getTaskByReference(array('project_id' => 1, 'reference' => 'TICKET-1234'));
-
-        $this->assertNotEmpty($task);
-        $this->assertEquals('Task with external ticket number', $task['title']);
-        $this->assertEquals('TICKET-1234', $task['reference']);
-        $this->assertEquals('http://127.0.0.1:8000/?controller=TaskViewController&action=show&task_id='.$task['id'].'&project_id='.$task['project_id'], $task['url']);
-    }
-
-    public function testCreateOverdueTask()
-    {
-        $this->assertNotFalse($this->client->createTask(array(
-            'title' => 'overdue task',
-            'project_id' => 1,
-            'date_due' => date('Y-m-d', strtotime('-2days')),
-        )));
-    }
-
-    public function testGetOverdueTasksByProject()
-    {
-        $tasks = $this->client->getOverdueTasksByProject(1);
-        $this->assertNotEmpty($tasks);
-        $this->assertCount(1, $tasks);
-        $this->assertEquals('overdue task', $tasks[0]['title']);
-        $this->assertEquals('API test', $tasks[0]['project_name']);
-    }
-
-    public function testGetOverdueTasks()
-    {
-        $tasks = $this->client->getOverdueTasks();
-        $this->assertNotEmpty($tasks);
-        $this->assertCount(1, $tasks);
-        $this->assertEquals('overdue task', $tasks[0]['title']);
-        $this->assertEquals('API test', $tasks[0]['project_name']);
-    }
-}
diff --git a/tests/integration/AppTest.php b/tests/integration/AppProcedureTest.php
index 6575fbb8..06135dac 100644
--- a/tests/integration/AppTest.php
+++ b/tests/integration/AppProcedureTest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once __DIR__.'/Base.php';
+require_once __DIR__.'/BaseProcedureTest.php';
 
-class AppTest extends Base
+class AppProcedureTest extends BaseProcedureTest
 {
     public function testGetTimezone()
     {
@@ -31,4 +31,24 @@ class AppTest extends Base
         $this->assertEquals('Project Member', $roles['project-member']);
         $this->assertEquals('Project Viewer', $roles['project-viewer']);
     }
+
+    public function testGetDefaultColor()
+    {
+        $this->assertEquals('yellow', $this->user->getDefaultTaskColor());
+    }
+
+    public function testGetDefaultColors()
+    {
+        $colors = $this->user->getDefaultTaskColors();
+        $this->assertNotEmpty($colors);
+        $this->assertArrayHasKey('red', $colors);
+    }
+
+    public function testGetColorList()
+    {
+        $colors = $this->user->getColorList();
+        $this->assertNotEmpty($colors);
+        $this->assertArrayHasKey('red', $colors);
+        $this->assertEquals('Red', $colors['red']);
+    }
 }
diff --git a/tests/integration/Base.php b/tests/integration/Base.php
deleted file mode 100644
index 6f3ae076..00000000
--- a/tests/integration/Base.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-require_once __DIR__.'/../../vendor/autoload.php';
-
-abstract class Base extends PHPUnit_Framework_TestCase
-{
-    protected $app = null;
-    protected $admin = null;
-    protected $user = null;
-
-    public static function setUpBeforeClass()
-    {
-        if (DB_DRIVER === 'sqlite') {
-            @unlink(DB_FILENAME);
-        } elseif (DB_DRIVER === 'mysql') {
-            $pdo = new PDO('mysql:host='.DB_HOSTNAME, DB_USERNAME, DB_PASSWORD);
-            $pdo->exec('DROP DATABASE '.DB_NAME);
-            $pdo->exec('CREATE DATABASE '.DB_NAME);
-            $pdo = null;
-        } elseif (DB_DRIVER === 'postgres') {
-            $pdo = new PDO('pgsql:host='.DB_HOSTNAME, DB_USERNAME, DB_PASSWORD);
-            $pdo->exec('DROP DATABASE '.DB_NAME);
-            $pdo->exec('CREATE DATABASE '.DB_NAME.' WITH OWNER '.DB_USERNAME);
-            $pdo = null;
-        }
-
-        $service = new Kanboard\ServiceProvider\DatabaseProvider;
-
-        $db = $service->getInstance();
-        $db->table('settings')->eq('option', 'api_token')->update(array('value' => API_KEY));
-        $db->closeConnection();
-    }
-
-    public function setUp()
-    {
-        $this->app = new JsonRPC\Client(API_URL);
-        $this->app->authentication('jsonrpc', API_KEY);
-        $this->app->getHttpClient()->withDebug();
-
-        $this->admin = new JsonRPC\Client(API_URL);
-        $this->admin->authentication('admin', 'admin');
-        $this->admin->getHttpClient()->withDebug();
-
-        $this->user = new JsonRPC\Client(API_URL);
-        $this->user->authentication('user', 'password');
-        $this->user->getHttpClient()->withDebug();
-    }
-
-    protected function getProjectId()
-    {
-        $projects = $this->app->getAllProjects();
-        $this->assertNotEmpty($projects);
-        return $projects[0]['id'];
-    }
-
-    protected function getGroupId()
-    {
-        $groups = $this->app->getAllGroups();
-        $this->assertNotEmpty($groups);
-        return $groups[0]['id'];
-    }
-}
diff --git a/tests/integration/BaseProcedureTest.php b/tests/integration/BaseProcedureTest.php
new file mode 100644
index 00000000..e3382e82
--- /dev/null
+++ b/tests/integration/BaseProcedureTest.php
@@ -0,0 +1,122 @@
+<?php
+
+require_once __DIR__.'/../../vendor/autoload.php';
+
+abstract class BaseProcedureTest extends PHPUnit_Framework_TestCase
+{
+    protected $app = null;
+    protected $admin = null;
+    protected $manager = null;
+    protected $user = null;
+
+    protected $adminUserId = 0;
+    protected $managerUserId = 0;
+    protected $userUserId = 0;
+
+    protected $projectName = '';
+    protected $projectId = 0;
+    protected $taskTitle = 'My task';
+    protected $taskId = 0;
+
+    protected $groupName1 = 'My Group A';
+    protected $groupName2 = 'My Group B';
+    protected $groupId1;
+    protected $groupId2;
+
+    protected $username = 'test-user';
+    protected $userId;
+
+    public function setUp()
+    {
+        $this->setUpAppClient();
+        $this->setUpAdminUser();
+        $this->setUpManagerUser();
+        $this->setUpStandardUser();
+    }
+
+    public function setUpAppClient()
+    {
+        $this->app = new JsonRPC\Client(API_URL);
+        $this->app->authentication('jsonrpc', API_KEY);
+        $this->app->getHttpClient()->withDebug()->withTimeout(10);
+    }
+
+    public function setUpAdminUser()
+    {
+        $this->adminUserId = $this->getUserId('superuser');
+
+        if (! $this->adminUserId) {
+            $this->adminUserId = $this->app->createUser('superuser', 'password', 'Admin User', 'user@localhost', 'app-admin');
+            $this->assertNotFalse($this->adminUserId);
+        }
+
+        $this->admin = new JsonRPC\Client(API_URL);
+        $this->admin->authentication('superuser', 'password');
+        $this->admin->getHttpClient()->withDebug();
+    }
+
+    public function setUpManagerUser()
+    {
+        $this->managerUserId = $this->getUserId('manager');
+
+        if (! $this->managerUserId) {
+            $this->managerUserId = $this->app->createUser('manager', 'password', 'Manager User', 'user@localhost', 'app-manager');
+            $this->assertNotFalse($this->managerUserId);
+        }
+
+        $this->manager = new JsonRPC\Client(API_URL);
+        $this->manager->authentication('manager', 'password');
+        $this->manager->getHttpClient()->withDebug();
+    }
+
+    public function setUpStandardUser()
+    {
+        $this->userUserId = $this->getUserId('user');
+
+        if (! $this->userUserId) {
+            $this->userUserId = $this->app->createUser('user', 'password', 'Standard User', 'user@localhost', 'app-user');
+            $this->assertNotFalse($this->userUserId);
+        }
+
+        $this->user = new JsonRPC\Client(API_URL);
+        $this->user->authentication('user', 'password');
+        $this->user->getHttpClient()->withDebug();
+    }
+
+    public function getUserId($username)
+    {
+        $user = $this->app->getUserByName($username);
+
+        if (! empty($user)) {
+            return $user['id'];
+        }
+
+        return 0;
+    }
+
+    public function assertCreateTeamProject()
+    {
+        $this->projectId = $this->app->createProject($this->projectName, 'Description');
+        $this->assertNotFalse($this->projectId);
+    }
+
+    public function assertCreateUser()
+    {
+        $this->userId = $this->app->createUser($this->username, 'password');
+        $this->assertNotFalse($this->userId);
+    }
+
+    public function assertCreateGroups()
+    {
+        $this->groupId1 = $this->app->createGroup($this->groupName1);
+        $this->groupId2 = $this->app->createGroup($this->groupName2, 'External ID');
+        $this->assertNotFalse($this->groupId1);
+        $this->assertNotFalse($this->groupId2);
+    }
+
+    public function assertCreateTask()
+    {
+        $this->taskId = $this->app->createTask(array('title' => $this->taskTitle, 'project_id' => $this->projectId));
+        $this->assertNotFalse($this->taskId);
+    }
+}
diff --git a/tests/integration/BoardProcedureTest.php b/tests/integration/BoardProcedureTest.php
new file mode 100644
index 00000000..273e93c7
--- /dev/null
+++ b/tests/integration/BoardProcedureTest.php
@@ -0,0 +1,25 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class BoardProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My project to test board';
+
+    public function testAll()
+    {
+        $this->assertCreateTeamProject();
+        $this->assertGetBoard();
+    }
+
+    public function assertGetBoard()
+    {
+        $board = $this->app->getBoard($this->projectId);
+        $this->assertNotNull($board);
+        $this->assertCount(1, $board);
+        $this->assertEquals('Default swimlane', $board[0]['name']);
+
+        $this->assertCount(4, $board[0]['columns']);
+        $this->assertEquals('Ready', $board[0]['columns'][1]['title']);
+    }
+}
diff --git a/tests/integration/BoardTest.php b/tests/integration/BoardTest.php
deleted file mode 100644
index bf8d50b9..00000000
--- a/tests/integration/BoardTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-require_once __DIR__.'/Base.php';
-
-class BoardTest extends Base
-{
-    public function testCreateProject()
-    {
-        $this->assertEquals(1, $this->app->createProject('A project'));
-    }
-
-    public function testGetBoard()
-    {
-        $board = $this->app->getBoard(1);
-        $this->assertCount(1, $board);
-        $this->assertEquals('Default swimlane', $board[0]['name']);
-
-        $this->assertCount(4, $board[0]['columns']);
-        $this->assertEquals('Ready', $board[0]['columns'][1]['title']);
-    }
-}
diff --git a/tests/integration/CategoryProcedureTest.php b/tests/integration/CategoryProcedureTest.php
new file mode 100644
index 00000000..2f5294ba
--- /dev/null
+++ b/tests/integration/CategoryProcedureTest.php
@@ -0,0 +1,76 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class CategoryProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My project to test categories';
+    private $categoryId = 0;
+
+    public function testAll()
+    {
+        $this->assertCreateTeamProject();
+        $this->assertCreateCategory();
+        $this->assertThatCategoriesAreUnique();
+        $this->assertGetCategory();
+        $this->assertGetAllCategories();
+        $this->assertCategoryUpdate();
+        $this->assertRemoveCategory();
+    }
+
+    public function assertCreateCategory()
+    {
+        $this->categoryId = $this->app->createCategory(array(
+            'name' => 'Category',
+            'project_id' => $this->projectId,
+        ));
+
+        $this->assertNotFalse($this->categoryId);
+    }
+
+    public function assertThatCategoriesAreUnique()
+    {
+        $this->assertFalse($this->app->execute('createCategory', array(
+            'name' => 'Category',
+            'project_id' => $this->projectId,
+        )));
+    }
+
+    public function assertGetCategory()
+    {
+        $category = $this->app->getCategory($this->categoryId);
+
+        $this->assertInternalType('array', $category);
+        $this->assertEquals($this->categoryId, $category['id']);
+        $this->assertEquals('Category', $category['name']);
+        $this->assertEquals($this->projectId, $category['project_id']);
+    }
+
+    public function assertGetAllCategories()
+    {
+        $categories = $this->app->getAllCategories($this->projectId);
+
+        $this->assertCount(1, $categories);
+        $this->assertEquals($this->categoryId, $categories[0]['id']);
+        $this->assertEquals('Category', $categories[0]['name']);
+        $this->assertEquals($this->projectId, $categories[0]['project_id']);
+    }
+
+    public function assertCategoryUpdate()
+    {
+        $this->assertTrue($this->app->execute('updateCategory', array(
+            'id' => $this->categoryId,
+            'name' => 'Renamed category',
+        )));
+
+        $category = $this->app->getCategory($this->categoryId);
+        $this->assertEquals('Renamed category', $category['name']);
+    }
+
+    public function assertRemoveCategory()
+    {
+        $this->assertTrue($this->app->removeCategory($this->categoryId));
+        $this->assertFalse($this->app->removeCategory($this->categoryId));
+        $this->assertFalse($this->app->removeCategory(1111));
+    }
+}
diff --git a/tests/integration/ColumnProcedureTest.php b/tests/integration/ColumnProcedureTest.php
new file mode 100644
index 00000000..fb6a27c3
--- /dev/null
+++ b/tests/integration/ColumnProcedureTest.php
@@ -0,0 +1,69 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class ColumnProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My project to test columns';
+    private $columns = array();
+
+    public function testAll()
+    {
+        $this->assertCreateTeamProject();
+        $this->assertGetColumns();
+        $this->assertUpdateColumn();
+        $this->assertAddColumn();
+        $this->assertRemoveColumn();
+        $this->assertChangeColumnPosition();
+    }
+
+    public function assertGetColumns()
+    {
+        $this->columns = $this->app->getColumns($this->projectId);
+        $this->assertCount(4, $this->columns);
+        $this->assertEquals('Done', $this->columns[3]['title']);
+    }
+
+    public function assertUpdateColumn()
+    {
+        $this->assertTrue($this->app->updateColumn($this->columns[3]['id'], 'Another column', 2));
+
+        $this->columns = $this->app->getColumns($this->projectId);
+        $this->assertEquals('Another column', $this->columns[3]['title']);
+        $this->assertEquals(2, $this->columns[3]['task_limit']);
+    }
+
+    public function assertAddColumn()
+    {
+        $column_id = $this->app->addColumn($this->projectId, 'New column');
+        $this->assertNotFalse($column_id);
+        $this->assertTrue($column_id > 0);
+
+        $this->columns = $this->app->getColumns($this->projectId);
+        $this->assertCount(5, $this->columns);
+        $this->assertEquals('New column', $this->columns[4]['title']);
+    }
+
+    public function assertRemoveColumn()
+    {
+        $this->assertTrue($this->app->removeColumn($this->columns[3]['id']));
+
+        $this->columns = $this->app->getColumns($this->projectId);
+        $this->assertCount(4, $this->columns);
+    }
+
+    public function assertChangeColumnPosition()
+    {
+        $this->assertTrue($this->app->changeColumnPosition($this->projectId, $this->columns[0]['id'], 3));
+
+        $this->columns = $this->app->getColumns($this->projectId);
+        $this->assertEquals('Ready', $this->columns[0]['title']);
+        $this->assertEquals(1, $this->columns[0]['position']);
+        $this->assertEquals('Work in progress', $this->columns[1]['title']);
+        $this->assertEquals(2, $this->columns[1]['position']);
+        $this->assertEquals('Backlog', $this->columns[2]['title']);
+        $this->assertEquals(3, $this->columns[2]['position']);
+        $this->assertEquals('New column', $this->columns[3]['title']);
+        $this->assertEquals(4, $this->columns[3]['position']);
+    }
+}
diff --git a/tests/integration/ColumnTest.php b/tests/integration/ColumnTest.php
deleted file mode 100644
index 6d02afc0..00000000
--- a/tests/integration/ColumnTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-require_once __DIR__.'/Base.php';
-
-class ColumnTest extends Base
-{
-    public function testCreateProject()
-    {
-        $this->assertEquals(1, $this->app->createProject('A project'));
-    }
-
-    public function testGetColumns()
-    {
-        $columns = $this->app->getColumns($this->getProjectId());
-        $this->assertCount(4, $columns);
-        $this->assertEquals('Done', $columns[3]['title']);
-    }
-
-    public function testUpdateColumn()
-    {
-        $this->assertTrue($this->app->updateColumn(4, 'Boo', 2));
-
-        $columns = $this->app->getColumns($this->getProjectId());
-        $this->assertEquals('Boo', $columns[3]['title']);
-        $this->assertEquals(2, $columns[3]['task_limit']);
-    }
-
-    public function testAddColumn()
-    {
-        $column_id = $this->app->addColumn($this->getProjectId(), 'New column');
-
-        $this->assertNotFalse($column_id);
-        $this->assertInternalType('int', $column_id);
-        $this->assertTrue($column_id > 0);
-
-        $columns = $this->app->getColumns($this->getProjectId());
-        $this->assertCount(5, $columns);
-        $this->assertEquals('New column', $columns[4]['title']);
-    }
-
-    public function testRemoveColumn()
-    {
-        $this->assertTrue($this->app->removeColumn(5));
-
-        $columns = $this->app->getColumns($this->getProjectId());
-        $this->assertCount(4, $columns);
-    }
-
-    public function testChangeColumnPosition()
-    {
-        $this->assertTrue($this->app->changeColumnPosition($this->getProjectId(), 1, 3));
-
-        $columns = $this->app->getColumns($this->getProjectId());
-        $this->assertCount(4, $columns);
-
-        $this->assertEquals('Ready', $columns[0]['title']);
-        $this->assertEquals(1, $columns[0]['position']);
-        $this->assertEquals('Work in progress', $columns[1]['title']);
-        $this->assertEquals(2, $columns[1]['position']);
-        $this->assertEquals('Backlog', $columns[2]['title']);
-        $this->assertEquals(3, $columns[2]['position']);
-        $this->assertEquals('Boo', $columns[3]['title']);
-        $this->assertEquals(4, $columns[3]['position']);
-    }
-}
diff --git a/tests/integration/CommentProcedureTest.php b/tests/integration/CommentProcedureTest.php
new file mode 100644
index 00000000..881d938c
--- /dev/null
+++ b/tests/integration/CommentProcedureTest.php
@@ -0,0 +1,63 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class CommentProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My project to test comments';
+    private $commentId = 0;
+
+    public function testAll()
+    {
+        $this->assertCreateTeamProject();
+        $this->assertCreateTask();
+        $this->assertCreateComment();
+        $this->assertUpdateComment();
+        $this->assertGetAllComments();
+        $this->assertRemoveComment();
+    }
+
+    public function assertCreateComment()
+    {
+        $this->commentId = $this->app->execute('createComment', array(
+            'task_id' => $this->taskId,
+            'user_id' => 1,
+            'content' => 'foobar',
+        ));
+
+        $this->assertNotFalse($this->commentId);
+    }
+
+    public function assertGetComment()
+    {
+        $comment = $this->app->getComment($this->commentId);
+        $this->assertNotFalse($comment);
+        $this->assertNotEmpty($comment);
+        $this->assertEquals(1, $comment['user_id']);
+        $this->assertEquals('foobar', $comment['comment']);
+    }
+
+    public function assertUpdateComment()
+    {
+        $this->assertTrue($this->app->execute('updateComment', array(
+            'id' => $this->commentId,
+            'content' => 'test',
+        )));
+
+        $comment = $this->app->getComment($this->commentId);
+        $this->assertEquals('test', $comment['comment']);
+    }
+
+    public function assertGetAllComments()
+    {
+        $comments = $this->app->getAllComments($this->taskId);
+        $this->assertCount(1, $comments);
+        $this->assertEquals('test', $comments[0]['comment']);
+    }
+
+    public function assertRemoveComment()
+    {
+        $this->assertTrue($this->app->removeComment($this->commentId));
+        $this->assertFalse($this->app->removeComment($this->commentId));
+    }
+}
diff --git a/tests/integration/GroupMemberProcedureTest.php b/tests/integration/GroupMemberProcedureTest.php
new file mode 100644
index 00000000..fe243533
--- /dev/null
+++ b/tests/integration/GroupMemberProcedureTest.php
@@ -0,0 +1,53 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class GroupMemberProcedureTest extends BaseProcedureTest
+{
+    protected $username = 'user-group-member';
+    protected $groupName1 = 'My group member A';
+    protected $groupName2 = 'My group member B';
+
+    public function testAll()
+    {
+        $this->assertCreateGroups();
+        $this->assertCreateUser();
+        $this->assertAddMember();
+        $this->assertGetMembers();
+        $this->assertIsGroupMember();
+        $this->assertGetGroups();
+        $this->assertRemove();
+    }
+
+    public function assertAddMember()
+    {
+        $this->assertTrue($this->app->addGroupMember($this->groupId1, $this->userId));
+    }
+
+    public function assertGetMembers()
+    {
+        $members = $this->app->getGroupMembers($this->groupId1);
+        $this->assertCount(1, $members);
+        $this->assertEquals($this->username, $members[0]['username']);
+    }
+
+    public function assertIsGroupMember()
+    {
+        $this->assertTrue($this->app->isGroupMember($this->groupId1, $this->userId));
+        $this->assertFalse($this->app->isGroupMember($this->groupId1, $this->adminUserId));
+    }
+
+    public function assertGetGroups()
+    {
+        $groups = $this->app->getMemberGroups($this->userId);
+        $this->assertCount(1, $groups);
+        $this->assertEquals($this->groupId1, $groups[0]['id']);
+        $this->assertEquals($this->groupName1, $groups[0]['name']);
+    }
+
+    public function assertRemove()
+    {
+        $this->assertTrue($this->app->removeGroupMember($this->groupId1, $this->userId));
+        $this->assertFalse($this->app->isGroupMember($this->groupId1, $this->userId));
+    }
+}
diff --git a/tests/integration/GroupMemberTest.php b/tests/integration/GroupMemberTest.php
deleted file mode 100644
index d49945b5..00000000
--- a/tests/integration/GroupMemberTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-require_once __DIR__.'/Base.php';
-
-class GroupMemberTest extends Base
-{
-    public function testAddMember()
-    {
-        $this->assertNotFalse($this->app->createGroup('My Group A'));
-        $this->assertNotFalse($this->app->createGroup('My Group B'));
-
-        $groupId = $this->getGroupId();
-        $this->assertTrue($this->app->addGroupMember($groupId, 1));
-    }
-
-    public function testGetMembers()
-    {
-        $groups = $this->app->getAllGroups();
-        $members = $this->app->getGroupMembers($groups[0]['id']);
-        $this->assertCount(1, $members);
-        $this->assertEquals('admin', $members[0]['username']);
-
-        $this->assertSame(array(), $this->app->getGroupMembers($groups[1]['id']));
-    }
-
-    public function testIsGroupMember()
-    {
-        $groupId = $this->getGroupId();
-        $this->assertTrue($this->app->isGroupMember($groupId, 1));
-        $this->assertFalse($this->app->isGroupMember($groupId, 2));
-    }
-
-    public function testGetGroups()
-    {
-        $groups = $this->app->getMemberGroups(1);
-        $this->assertCount(1, $groups);
-        $this->assertEquals(1, $groups[0]['id']);
-        $this->assertEquals('My Group A', $groups[0]['name']);
-    }
-
-    public function testRemove()
-    {
-        $groupId = $this->getGroupId();
-        $this->assertTrue($this->app->removeGroupMember($groupId, 1));
-        $this->assertFalse($this->app->isGroupMember($groupId, 1));
-    }
-}
diff --git a/tests/integration/GroupProcedureTest.php b/tests/integration/GroupProcedureTest.php
new file mode 100644
index 00000000..610c121d
--- /dev/null
+++ b/tests/integration/GroupProcedureTest.php
@@ -0,0 +1,50 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class GroupProcedureTest extends BaseProcedureTest
+{
+    public function testAll()
+    {
+        $this->assertCreateGroups();
+        $this->assertGetAllGroups();
+        $this->assertGetGroup();
+        $this->assertUpdateGroup();
+        $this->assertRemove();
+    }
+
+    public function assertGetAllGroups()
+    {
+        $groups = $this->app->getAllGroups();
+        $this->assertNotEmpty($groups);
+        $this->assertArrayHasKey('name', $groups[0]);
+        $this->assertArrayHasKey('external_id', $groups[0]);
+    }
+
+    public function assertGetGroup()
+    {
+        $group = $this->app->getGroup($this->groupId1);
+        $this->assertNotEmpty($group);
+        $this->assertEquals($this->groupName1, $group['name']);
+        $this->assertEquals('', $group['external_id']);
+    }
+
+    public function assertUpdateGroup()
+    {
+        $this->assertTrue($this->app->updateGroup(array(
+            'group_id' => $this->groupId2,
+            'name' => 'My Group C',
+            'external_id' => 'something else',
+        )));
+
+        $group = $this->app->getGroup($this->groupId2);
+        $this->assertNotEmpty($group);
+        $this->assertEquals('My Group C', $group['name']);
+        $this->assertEquals('something else', $group['external_id']);
+    }
+
+    public function assertRemove()
+    {
+        $this->assertTrue($this->app->removeGroup($this->groupId1));
+    }
+}
diff --git a/tests/integration/GroupTest.php b/tests/integration/GroupTest.php
deleted file mode 100644
index 7a5bccc9..00000000
--- a/tests/integration/GroupTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-require_once __DIR__.'/Base.php';
-
-class GroupTest extends Base
-{
-    public function testCreateGroup()
-    {
-        $this->assertNotFalse($this->app->createGroup('My Group A'));
-        $this->assertNotFalse($this->app->createGroup('My Group B', '1234'));
-    }
-
-    public function testGetter()
-    {
-        $groups = $this->app->getAllGroups();
-        $this->assertCount(2, $groups);
-        $this->assertEquals('My Group A', $groups[0]['name']);
-        $this->assertEquals('', $groups[0]['external_id']);
-        $this->assertEquals('My Group B', $groups[1]['name']);
-        $this->assertEquals('1234', $groups[1]['external_id']);
-
-        $group = $this->app->getGroup($groups[0]['id']);
-        $this->assertNotEmpty($group);
-        $this->assertEquals('My Group A', $group['name']);
-        $this->assertEquals('', $group['external_id']);
-    }
-
-    public function testUpdate()
-    {
-        $groups = $this->app->getAllGroups();
-
-        $this->assertTrue($this->app->updateGroup(array('group_id' => $groups[0]['id'], 'name' => 'ABC', 'external_id' => 'something')));
-        $this->assertTrue($this->app->updateGroup(array('group_id' => $groups[1]['id'], 'external_id' => '')));
-
-        $groups = $this->app->getAllGroups();
-        $this->assertEquals('ABC', $groups[0]['name']);
-        $this->assertEquals('something', $groups[0]['external_id']);
-        $this->assertEquals('', $groups[1]['external_id']);
-    }
-
-    public function testRemove()
-    {
-        $groups = $this->app->getAllGroups();
-        $this->assertTrue($this->app->removeGroup($groups[0]['id']));
-        $this->assertTrue($this->app->removeGroup($groups[1]['id']));
-        $this->assertSame(array(), $this->app->getAllGroups());
-    }
-}
diff --git a/tests/integration/LinkProcedureTest.php b/tests/integration/LinkProcedureTest.php
new file mode 100644
index 00000000..fb07e694
--- /dev/null
+++ b/tests/integration/LinkProcedureTest.php
@@ -0,0 +1,70 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class LinkProcedureTest extends BaseProcedureTest
+{
+    public function testGetAllLinks()
+    {
+        $links = $this->app->getAllLinks();
+        $this->assertNotEmpty($links);
+        $this->assertArrayHasKey('id', $links[0]);
+        $this->assertArrayHasKey('label', $links[0]);
+        $this->assertArrayHasKey('opposite_id', $links[0]);
+    }
+
+    public function testGetOppositeLink()
+    {
+        $link = $this->app->getOppositeLinkId(1);
+        $this->assertEquals(1, $link);
+
+        $link = $this->app->getOppositeLinkId(2);
+        $this->assertEquals(3, $link);
+    }
+
+    public function testGetLinkByLabel()
+    {
+        $link = $this->app->getLinkByLabel('blocks');
+        $this->assertNotEmpty($link);
+        $this->assertEquals(2, $link['id']);
+        $this->assertEquals(3, $link['opposite_id']);
+    }
+
+    public function testGetLinkById()
+    {
+        $link = $this->app->getLinkById(4);
+        $this->assertNotEmpty($link);
+        $this->assertEquals(4, $link['id']);
+        $this->assertEquals(5, $link['opposite_id']);
+        $this->assertEquals('duplicates', $link['label']);
+    }
+
+    public function testCreateLink()
+    {
+        $link_id = $this->app->createLink(array('label' => 'test'));
+        $this->assertNotFalse($link_id);
+        $this->assertInternalType('int', $link_id);
+
+        $link_id = $this->app->createLink(array('label' => 'foo', 'opposite_label' => 'bar'));
+        $this->assertNotFalse($link_id);
+        $this->assertInternalType('int', $link_id);
+    }
+
+    public function testUpdateLink()
+    {
+        $link1 = $this->app->getLinkByLabel('bar');
+        $this->assertNotEmpty($link1);
+
+        $link2 = $this->app->getLinkByLabel('test');
+        $this->assertNotEmpty($link2);
+
+        $this->assertNotFalse($this->app->updateLink($link1['id'], $link2['id'], 'my link'));
+
+        $link = $this->app->getLinkById($link1['id']);
+        $this->assertNotEmpty($link);
+        $this->assertEquals($link2['id'], $link['opposite_id']);
+        $this->assertEquals('my link', $link['label']);
+
+        $this->assertTrue($this->app->removeLink($link1['id']));
+    }
+}
diff --git a/tests/integration/MeProcedureTest.php b/tests/integration/MeProcedureTest.php
new file mode 100644
index 00000000..2106419c
--- /dev/null
+++ b/tests/integration/MeProcedureTest.php
@@ -0,0 +1,68 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class MeProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My private project';
+
+    public function testAll()
+    {
+        $this->assertGetMe();
+        $this->assertCreateMyPrivateProject();
+        $this->assertGetMyProjectsList();
+        $this->assertGetMyProjects();
+        $this->assertCreateTask();
+        $this->assertGetMyDashboard();
+        $this->assertGetMyActivityStream();
+    }
+
+    public function assertGetMe()
+    {
+        $profile = $this->user->getMe();
+        $this->assertEquals('user', $profile['username']);
+        $this->assertEquals('app-user', $profile['role']);
+    }
+
+    public function assertCreateMyPrivateProject()
+    {
+        $this->projectId = $this->user->createMyPrivateProject($this->projectName);
+        $this->assertNotFalse($this->projectId);
+    }
+
+    public function assertGetMyProjectsList()
+    {
+        $projects = $this->user->getMyProjectsList();
+        $this->assertNotEmpty($projects);
+        $this->assertEquals($this->projectName, $projects[$this->projectId]);
+    }
+
+    public function assertGetMyProjects()
+    {
+        $projects = $this->user->getMyProjects();
+        $this->assertNotEmpty($projects);
+    }
+
+    public function assertCreateTask()
+    {
+        $taskId = $this->user->createTask(array('title' => 'My task', 'project_id' => $this->projectId, 'owner_id' => $this->userUserId));
+        $this->assertNotFalse($taskId);
+    }
+
+    public function assertGetMyDashboard()
+    {
+        $dashboard = $this->user->getMyDashboard();
+        $this->assertNotEmpty($dashboard);
+        $this->assertArrayHasKey('projects', $dashboard);
+        $this->assertArrayHasKey('tasks', $dashboard);
+        $this->assertArrayHasKey('subtasks', $dashboard);
+        $this->assertNotEmpty($dashboard['projects']);
+        $this->assertNotEmpty($dashboard['tasks']);
+    }
+
+    public function assertGetMyActivityStream()
+    {
+        $activity = $this->user->getMyActivityStream();
+        $this->assertNotEmpty($activity);
+    }
+}
diff --git a/tests/integration/MeTest.php b/tests/integration/MeTest.php
deleted file mode 100644
index 1b028b84..00000000
--- a/tests/integration/MeTest.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-
-require_once __DIR__.'/Base.php';
-
-class MeTest extends Base
-{
-    public function testCreateProject()
-    {
-        $this->assertEquals(1, $this->app->createProject('team project'));
-    }
-
-    public function testCreateUser()
-    {
-        $this->assertEquals(2, $this->app->createUser('user', 'password'));
-    }
-
-    /**
-     * @expectedException JsonRPC\Exception\AccessDeniedException
-     */
-    public function testNotAllowedAppProcedure()
-    {
-        $this->app->getMe();
-    }
-
-    /**
-     * @expectedException JsonRPC\Exception\AccessDeniedException
-     */
-    public function testNotAllowedUserProcedure()
-    {
-        $this->user->getAllProjects();
-    }
-
-    /**
-     * @expectedException JsonRPC\Exception\AccessDeniedException
-     */
-    public function testNotAllowedProjectForUser()
-    {
-        $this->user->getProjectById(1);
-    }
-
-    public function testAllowedProjectForAdmin()
-    {
-        $this->assertNotEmpty($this->admin->getProjectById(1));
-    }
-
-    public function testGetTimezone()
-    {
-        $this->assertEquals('UTC', $this->user->getTimezone());
-    }
-
-    public function testGetVersion()
-    {
-        $this->assertEquals('master', $this->user->getVersion());
-    }
-
-    public function testGetDefaultColor()
-    {
-        $this->assertEquals('yellow', $this->user->getDefaultTaskColor());
-    }
-
-    public function testGetDefaultColors()
-    {
-        $colors = $this->user->getDefaultTaskColors();
-        $this->assertNotEmpty($colors);
-        $this->assertArrayHasKey('red', $colors);
-    }
-
-    public function testGetColorList()
-    {
-        $colors = $this->user->getColorList();
-        $this->assertNotEmpty($colors);
-        $this->assertArrayHasKey('red', $colors);
-        $this->assertEquals('Red', $colors['red']);
-    }
-
-    public function testGetMe()
-    {
-        $profile = $this->user->getMe();
-        $this->assertNotEmpty($profile);
-        $this->assertEquals(2, $profile['id']);
-        $this->assertEquals('user', $profile['username']);
-    }
-
-    public function testCreateMyPrivateProject()
-    {
-        $this->assertEquals(2, $this->user->createMyPrivateProject('my project'));
-    }
-
-    public function testGetMyProjectsList()
-    {
-        $projects = $this->user->getMyProjectsList();
-        $this->assertNotEmpty($projects);
-        $this->assertArrayNotHasKey(1, $projects);
-        $this->assertArrayHasKey(2, $projects);
-        $this->assertEquals('my project', $projects[2]);
-    }
-
-    public function testGetMyProjects()
-    {
-        $projects = $this->user->getMyProjects();
-        $this->assertNotEmpty($projects);
-        $this->assertCount(1, $projects);
-        $this->assertEquals(2, $projects[0]['id']);
-        $this->assertEquals('my project', $projects[0]['name']);
-        $this->assertNotEmpty($projects[0]['url']['calendar']);
-        $this->assertNotEmpty($projects[0]['url']['board']);
-        $this->assertNotEmpty($projects[0]['url']['list']);
-    }
-
-    public function testGetProjectById()
-    {
-        $project = $this->user->getProjectById(2);
-        $this->assertNotEmpty($project);
-        $this->assertEquals('my project', $project['name']);
-        $this->assertEquals(1, $project['is_private']);
-    }
-
-    public function testCreateTask()
-    {
-        $this->assertEquals(1, $this->user->createTask('my user title', 2));
-        $this->assertEquals(2, $this->admin->createTask('my admin title', 1));
-    }
-
-    public function testCreateTaskWithWrongMember()
-    {
-        $this->assertFalse($this->user->createTask(array('title' => 'something', 'project_id' => 2, 'owner_id' => 1)));
-        $this->assertFalse($this->app->createTask(array('title' => 'something', 'project_id' => 1, 'owner_id' => 2)));
-    }
-
-    public function testGetTask()
-    {
-        $task = $this->user->getTask(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals('my user title', $task['title']);
-        $this->assertEquals('yellow', $task['color_id']);
-        $this->assertArrayHasKey('color', $task);
-        $this->assertArrayHasKey('name', $task['color']);
-        $this->assertArrayHasKey('border', $task['color']);
-        $this->assertArrayHasKey('background', $task['color']);
-    }
-
-    /**
-     * @expectedException JsonRPC\Exception\AccessDeniedException
-     */
-    public function testGetAdminTask()
-    {
-        $this->user->getTask(2);
-    }
-
-    /**
-     * @expectedException JsonRPC\Exception\AccessDeniedException
-     */
-    public function testGetProjectActivityDenied()
-    {
-        $this->user->getProjectActivity(1);
-    }
-
-    public function testGetProjectActivityAllowed()
-    {
-        $activity = $this->user->getProjectActivity(2);
-        $this->assertNotEmpty($activity);
-    }
-
-    public function testGetMyActivityStream()
-    {
-        $activity = $this->user->getMyActivityStream();
-        $this->assertNotEmpty($activity);
-    }
-
-    public function testCloseTask()
-    {
-        $this->assertTrue($this->user->closeTask(1));
-    }
-
-    public function testOpenTask()
-    {
-        $this->assertTrue($this->user->openTask(1));
-    }
-
-    public function testMoveTaskPosition()
-    {
-        $this->assertTrue($this->user->moveTaskPosition(2, 1, 2, 1));
-    }
-
-    public function testUpdateTaskWithWrongMember()
-    {
-        $this->assertFalse($this->user->updateTask(array('id' => 1, 'title' => 'new title', 'reference' => 'test', 'owner_id' => 1)));
-    }
-
-    public function testUpdateTask()
-    {
-        $this->assertTrue($this->user->updateTask(array('id' => 1, 'title' => 'new title', 'reference' => 'test', 'owner_id' => 2)));
-    }
-
-    public function testGetbyReference()
-    {
-        $task = $this->user->getTaskByReference(2, 'test');
-        $this->assertNotEmpty($task);
-        $this->assertEquals('new title', $task['title']);
-        $this->assertEquals(2, $task['column_id']);
-        $this->assertEquals(1, $task['position']);
-    }
-
-    public function testGetMyDashboard()
-    {
-        $dashboard = $this->user->getMyDashboard();
-        $this->assertNotEmpty($dashboard);
-        $this->assertArrayHasKey('projects', $dashboard);
-        $this->assertArrayHasKey('tasks', $dashboard);
-        $this->assertArrayHasKey('subtasks', $dashboard);
-        $this->assertNotEmpty($dashboard['projects']);
-        $this->assertNotEmpty($dashboard['tasks']);
-    }
-
-    public function testGetBoard()
-    {
-        $this->assertNotEmpty($this->user->getBoard(2));
-    }
-
-    public function testCreateOverdueTask()
-    {
-        $this->assertNotFalse($this->user->createTask(array(
-            'title' => 'overdue task',
-            'project_id' => 2,
-            'date_due' => date('Y-m-d', strtotime('-2days')),
-            'owner_id' => 2,
-        )));
-    }
-
-    public function testGetMyOverdueTasks()
-    {
-        $tasks = $this->user->getMyOverdueTasks();
-        $this->assertNotEmpty($tasks);
-        $this->assertCount(1, $tasks);
-        $this->assertEquals('overdue task', $tasks[0]['title']);
-        $this->assertEquals('my project', $tasks[0]['project_name']);
-    }
-
-    public function testGetOverdueTasksByProject()
-    {
-        $tasks = $this->user->getOverdueTasksByProject(2);
-        $this->assertNotEmpty($tasks);
-        $this->assertCount(1, $tasks);
-        $this->assertEquals('overdue task', $tasks[0]['title']);
-        $this->assertEquals('my project', $tasks[0]['project_name']);
-    }
-}
diff --git a/tests/integration/OverdueTaskProcedureTest.php b/tests/integration/OverdueTaskProcedureTest.php
new file mode 100644
index 00000000..65f52301
--- /dev/null
+++ b/tests/integration/OverdueTaskProcedureTest.php
@@ -0,0 +1,43 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class OverdueTaskProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My project to test overdue tasks';
+
+    public function testAll()
+    {
+        $this->assertCreateTeamProject();
+        $this->assertCreateOverdueTask();
+        $this->assertGetOverdueTasksByProject();
+        $this->assertGetOverdueTasks();
+    }
+
+    public function assertCreateOverdueTask()
+    {
+        $this->assertNotFalse($this->app->createTask(array(
+            'title' => 'overdue task',
+            'project_id' => $this->projectId,
+            'date_due' => date('Y-m-d', strtotime('-2days')),
+        )));
+    }
+
+    public function assertGetOverdueTasksByProject()
+    {
+        $tasks = $this->app->getOverdueTasksByProject($this->projectId);
+        $this->assertNotEmpty($tasks);
+        $this->assertCount(1, $tasks);
+        $this->assertEquals('overdue task', $tasks[0]['title']);
+        $this->assertEquals($this->projectName, $tasks[0]['project_name']);
+    }
+
+    public function assertGetOverdueTasks()
+    {
+        $tasks = $this->app->getOverdueTasks();
+        $this->assertNotEmpty($tasks);
+        $this->assertCount(1, $tasks);
+        $this->assertEquals('overdue task', $tasks[0]['title']);
+        $this->assertEquals($this->projectName, $tasks[0]['project_name']);
+    }
+}
diff --git a/tests/integration/ProcedureAuthorizationTest.php b/tests/integration/ProcedureAuthorizationTest.php
new file mode 100644
index 00000000..a63e9d8c
--- /dev/null
+++ b/tests/integration/ProcedureAuthorizationTest.php
@@ -0,0 +1,306 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class ProcedureAuthorizationTest extends BaseProcedureTest
+{
+    public function testApiCredentialDoNotHaveAccessToUserCredentialProcedure()
+    {
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->app->getMe();
+    }
+
+    public function testUserCredentialDoNotHaveAccessToAdminProcedures()
+    {
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->user->getUser(1);
+    }
+
+    public function testManagerCredentialDoNotHaveAccessToAdminProcedures()
+    {
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->user->getAllProjects();
+    }
+
+    public function testUserCredentialDoNotHaveAccessToManagerProcedures()
+    {
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->user->createProject('Team project creation are only for app managers');
+    }
+
+    public function testAppManagerCanCreateTeamProject()
+    {
+        $this->assertNotFalse($this->manager->createProject('Team project created by app manager'));
+    }
+
+    public function testAdminManagerCanCreateTeamProject()
+    {
+        $projectId = $this->admin->createProject('Team project created by admin');
+        $this->assertNotFalse($projectId);
+
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->assertNotNull($this->manager->getProjectById($projectId));
+    }
+
+    public function testProjectManagerCanUpdateHisProject()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Team project can be updated',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+        $this->assertEquals('project-manager', $this->app->getProjectUserRole($projectId, $this->managerUserId));
+        $this->assertNotNull($this->manager->getProjectById($projectId));
+
+        $this->assertTrue($this->manager->updateProject($projectId, 'My team project have been updated'));
+    }
+
+    public function testProjectAuthorizationForbidden()
+    {
+        $projectId = $this->manager->createProject('A team project without members');
+        $this->assertNotFalse($projectId);
+
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->user->getProjectById($projectId);
+    }
+
+    public function testProjectAuthorizationGranted()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'A team project with members',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+
+        $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId));
+        $this->assertNotNull($this->user->getProjectById($projectId));
+    }
+
+    public function testActionAuthorizationForbidden()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+
+        $actionId = $this->manager->createAction($projectId, 'task.move.column', '\Kanboard\Action\TaskCloseColumn', array('column_id' => 1));
+        $this->assertNotFalse($actionId);
+
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->user->removeAction($projectId);
+    }
+
+    public function testActionAuthorizationForbiddenBecauseNotProjectManager()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+
+        $actionId = $this->manager->createAction($projectId, 'task.move.column', '\Kanboard\Action\TaskCloseColumn', array('column_id' => 1));
+        $this->assertNotFalse($actionId);
+
+        $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-member'));
+
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->user->removeAction($actionId);
+    }
+
+    public function testActionAuthorizationGranted()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+
+        $actionId = $this->manager->createAction($projectId, 'task.move.column', '\Kanboard\Action\TaskCloseColumn', array('column_id' => 1));
+        $this->assertNotFalse($actionId);
+
+        $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-manager'));
+        $this->assertTrue($this->user->removeAction($actionId));
+    }
+
+    public function testCategoryAuthorizationForbidden()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+
+        $categoryId = $this->manager->createCategory($projectId, 'Test');
+        $this->assertNotFalse($categoryId);
+
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->user->removeCategory($categoryId);
+    }
+
+    public function testCategoryAuthorizationForbiddenBecauseNotProjectManager()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+
+        $categoryId = $this->manager->createCategory($projectId, 'Test');
+        $this->assertNotFalse($categoryId);
+
+        $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-member'));
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->user->removeCategory($categoryId);
+    }
+
+    public function testCategoryAuthorizationGranted()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+
+        $categoryId = $this->manager->createCategory($projectId, 'Test');
+        $this->assertNotFalse($categoryId);
+
+        $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-manager'));
+        $this->assertTrue($this->user->removeCategory($categoryId));
+    }
+
+    public function testColumnAuthorizationForbidden()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+
+        $columnId = $this->manager->addColumn($projectId, 'Test');
+        $this->assertNotFalse($columnId);
+
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->user->removeColumn($columnId);
+    }
+
+    public function testColumnAuthorizationForbiddenBecauseNotProjectManager()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+
+        $columnId = $this->manager->addColumn($projectId, 'Test');
+        $this->assertNotFalse($columnId);
+
+        $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-member'));
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->user->removeColumn($columnId);
+    }
+
+    public function testColumnAuthorizationGranted()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+
+        $columnId = $this->manager->addColumn($projectId, 'Test');
+        $this->assertNotFalse($columnId);
+
+        $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-manager'));
+        $this->assertTrue($this->user->removeColumn($columnId));
+    }
+
+    public function testCommentAuthorizationForbidden()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+        $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-viewer'));
+
+        $taskId = $this->manager->createTask('My Task', $projectId);
+        $this->assertNotFalse($taskId);
+
+        $commentId = $this->manager->createComment($taskId, $this->userUserId, 'My comment');
+        $this->assertNotFalse($commentId);
+
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->user->updateComment($commentId, 'something else');
+    }
+
+    public function testCommentAuthorizationGranted()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+        $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-member'));
+
+        $taskId = $this->user->createTask('My Task', $projectId);
+        $this->assertNotFalse($taskId);
+
+        $commentId = $this->user->createComment($taskId, $this->userUserId, 'My comment');
+        $this->assertNotFalse($commentId);
+
+        $this->assertTrue($this->user->updateComment($commentId, 'something else'));
+    }
+
+    public function testSubtaskAuthorizationForbidden()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+        $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-viewer'));
+
+        $taskId = $this->manager->createTask('My Task', $projectId);
+        $this->assertNotFalse($taskId);
+
+        $subtaskId = $this->manager->createSubtask($taskId, 'My subtask');
+        $this->assertNotFalse($subtaskId);
+
+        $this->setExpectedException('JsonRPC\Exception\AccessDeniedException');
+        $this->user->removeSubtask($subtaskId);
+    }
+
+    public function testSubtaskAuthorizationGranted()
+    {
+        $projectId = $this->manager->createProject(array(
+            'name' => 'Test Project',
+            'owner_id' => $this->managerUserId,
+        ));
+
+        $this->assertNotFalse($projectId);
+        $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-member'));
+
+        $taskId = $this->user->createTask('My Task', $projectId);
+        $this->assertNotFalse($taskId);
+
+        $subtaskId = $this->manager->createSubtask($taskId, 'My subtask');
+        $this->assertNotFalse($subtaskId);
+
+        $this->assertTrue($this->user->removeSubtask($subtaskId));
+    }
+}
diff --git a/tests/integration/ProjectPermissionProcedureTest.php b/tests/integration/ProjectPermissionProcedureTest.php
new file mode 100644
index 00000000..74313dc4
--- /dev/null
+++ b/tests/integration/ProjectPermissionProcedureTest.php
@@ -0,0 +1,89 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class ProjectPermissionProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'Project with permission';
+    protected $username = 'user-project-permission';
+    protected $groupName1 = 'My group A for project permission';
+    protected $groupName2 = 'My group B for project permission';
+
+    public function testAll()
+    {
+        $this->assertCreateTeamProject();
+        $this->assertCreateGroups();
+        $this->assertCreateUser();
+
+        $this->assertAddProjectUser();
+        $this->assertGetProjectUsers();
+        $this->assertGetAssignableUsers();
+        $this->assertChangeProjectUserRole();
+        $this->assertRemoveProjectUser();
+
+        $this->assertAddProjectGroup();
+        $this->assertGetProjectUsers();
+        $this->assertGetAssignableUsers();
+        $this->assertChangeProjectGroupRole();
+        $this->assertRemoveProjectGroup();
+    }
+
+    public function assertAddProjectUser()
+    {
+        $this->assertTrue($this->app->addProjectUser($this->projectId, $this->userId));
+    }
+
+    public function assertGetProjectUsers()
+    {
+        $members = $this->app->getProjectUsers($this->projectId);
+        $this->assertCount(1, $members);
+        $this->assertArrayHasKey($this->userId, $members);
+        $this->assertEquals($this->username, $members[$this->userId]);
+    }
+
+    public function assertGetAssignableUsers()
+    {
+        $members = $this->app->getAssignableUsers($this->projectId);
+        $this->assertCount(1, $members);
+        $this->assertArrayHasKey($this->userId, $members);
+        $this->assertEquals($this->username, $members[$this->userId]);
+    }
+
+    public function assertChangeProjectUserRole()
+    {
+        $this->assertTrue($this->app->changeProjectUserRole($this->projectId, $this->userId, 'project-viewer'));
+
+        $members = $this->app->getAssignableUsers($this->projectId);
+        $this->assertCount(0, $members);
+    }
+
+    public function assertRemoveProjectUser()
+    {
+        $this->assertTrue($this->app->removeProjectUser($this->projectId, $this->userId));
+
+        $members = $this->app->getProjectUsers($this->projectId);
+        $this->assertCount(0, $members);
+    }
+
+    public function assertAddProjectGroup()
+    {
+        $this->assertTrue($this->app->addGroupMember($this->groupId1, $this->userId));
+        $this->assertTrue($this->app->addProjectGroup($this->projectId, $this->groupId1));
+    }
+
+    public function assertChangeProjectGroupRole()
+    {
+        $this->assertTrue($this->app->changeProjectGroupRole($this->projectId, $this->groupId1, 'project-viewer'));
+
+        $members = $this->app->getAssignableUsers($this->projectId);
+        $this->assertCount(0, $members);
+    }
+
+    public function assertRemoveProjectGroup()
+    {
+        $this->assertTrue($this->app->removeProjectGroup($this->projectId, $this->groupId1));
+
+        $members = $this->app->getProjectUsers($this->projectId);
+        $this->assertCount(0, $members);
+    }
+}
diff --git a/tests/integration/ProjectPermissionTest.php b/tests/integration/ProjectPermissionTest.php
deleted file mode 100644
index b06ad4ad..00000000
--- a/tests/integration/ProjectPermissionTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-require_once __DIR__.'/Base.php';
-
-class ProjectPermissionTest extends Base
-{
-    public function testGetProjectUsers()
-    {
-        $this->assertNotFalse($this->app->createProject('Test'));
-        $this->assertNotFalse($this->app->createGroup('Test'));
-
-        $projectId = $this->getProjectId();
-        $groupId = $this->getGroupId();
-
-        $this->assertTrue($this->app->addGroupMember($projectId, $groupId));
-        $this->assertSame(array(), $this->app->getProjectUsers($projectId));
-    }
-
-    public function testProjectUser()
-    {
-        $projectId = $this->getProjectId();
-        $this->assertTrue($this->app->addProjectUser($projectId, 1));
-
-        $users = $this->app->getProjectUsers($projectId);
-        $this->assertCount(1, $users);
-        $this->assertEquals('admin', $users[1]);
-
-        $users = $this->app->getAssignableUsers($projectId);
-        $this->assertCount(1, $users);
-        $this->assertEquals('admin', $users[1]);
-
-        $this->assertTrue($this->app->changeProjectUserRole($projectId, 1, 'project-viewer'));
-
-        $users = $this->app->getAssignableUsers($projectId);
-        $this->assertCount(0, $users);
-
-        $this->assertTrue($this->app->removeProjectUser($projectId, 1));
-        $this->assertSame(array(), $this->app->getProjectUsers($projectId));
-    }
-
-    public function testProjectGroup()
-    {
-        $projectId = $this->getProjectId();
-        $groupId = $this->getGroupId();
-
-        $this->assertTrue($this->app->addProjectGroup($projectId, $groupId));
-
-        $users = $this->app->getProjectUsers($projectId);
-        $this->assertCount(1, $users);
-        $this->assertEquals('admin', $users[1]);
-
-        $users = $this->app->getAssignableUsers($projectId);
-        $this->assertCount(1, $users);
-        $this->assertEquals('admin', $users[1]);
-
-        $this->assertTrue($this->app->changeProjectGroupRole($projectId, $groupId, 'project-viewer'));
-
-        $users = $this->app->getAssignableUsers($projectId);
-        $this->assertCount(0, $users);
-
-        $this->assertTrue($this->app->removeProjectGroup($projectId, 1));
-        $this->assertSame(array(), $this->app->getProjectUsers($projectId));
-    }
-}
diff --git a/tests/integration/ProjectProcedureTest.php b/tests/integration/ProjectProcedureTest.php
new file mode 100644
index 00000000..69c2464f
--- /dev/null
+++ b/tests/integration/ProjectProcedureTest.php
@@ -0,0 +1,119 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class ProjectProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My team project';
+
+    public function testAll()
+    {
+        $this->assertCreateTeamProject();
+        $this->assertGetProjectById();
+        $this->assertGetProjectByName();
+        $this->assertGetAllProjects();
+        $this->assertUpdateProject();
+        $this->assertUpdateProjectIdentifier();
+        $this->assertCreateProjectWithIdentifier();
+        $this->assertGetProjectActivity();
+        $this->assertGetProjectsActivity();
+        $this->assertEnableDisableProject();
+        $this->assertEnableDisablePublicAccess();
+        $this->assertRemoveProject();
+    }
+
+    public function assertGetProjectById()
+    {
+        $project = $this->app->getProjectById($this->projectId);
+        $this->assertNotNull($project);
+        $this->assertEquals($this->projectName, $project['name']);
+        $this->assertEquals('Description', $project['description']);
+    }
+
+    public function assertGetProjectByName()
+    {
+        $project = $this->app->getProjectByName($this->projectName);
+        $this->assertNotNull($project);
+        $this->assertEquals($this->projectId, $project['id']);
+        $this->assertEquals($this->projectName, $project['name']);
+        $this->assertEquals('Description', $project['description']);
+    }
+
+    public function assertGetAllProjects()
+    {
+        $projects = $this->app->getAllProjects();
+        $this->assertNotEmpty($projects);
+    }
+
+    public function assertGetProjectActivity()
+    {
+        $activities = $this->app->getProjectActivity($this->projectId);
+        $this->assertInternalType('array', $activities);
+        $this->assertCount(0, $activities);
+    }
+
+    public function assertGetProjectsActivity()
+    {
+        $activities = $this->app->getProjectActivities(array('project_ids' => array($this->projectId)));
+        $this->assertInternalType('array', $activities);
+        $this->assertCount(0, $activities);
+    }
+
+    public function assertUpdateProject()
+    {
+        $this->assertTrue($this->app->updateProject(array('project_id' => $this->projectId, 'name' => 'test', 'description' => 'test')));
+
+        $project = $this->app->getProjectById($this->projectId);
+        $this->assertNotNull($project);
+        $this->assertEquals('test', $project['name']);
+        $this->assertEquals('test', $project['description']);
+
+        $this->assertTrue($this->app->updateProject(array('project_id' => $this->projectId, 'name' => $this->projectName)));
+    }
+
+    public function assertUpdateProjectIdentifier()
+    {
+        $this->assertTrue($this->app->updateProject(array(
+            'project_id' => $this->projectId,
+            'identifier' => 'MYPROJECT',
+        )));
+
+        $project = $this->app->getProjectById($this->projectId);
+        $this->assertNotNull($project);
+        $this->assertEquals($this->projectName, $project['name']);
+        $this->assertEquals('MYPROJECT', $project['identifier']);
+    }
+
+    public function assertCreateProjectWithIdentifier()
+    {
+        $projectId = $this->app->createProject(array(
+            'name' => 'My project with an identifier',
+            'identifier' => 'MYPROJECTWITHIDENTIFIER',
+        ));
+
+        $this->assertNotFalse($projectId);
+
+        $project = $this->app->getProjectByIdentifier('MYPROJECTWITHIDENTIFIER');
+        $this->assertEquals($projectId, $project['id']);
+        $this->assertEquals('My project with an identifier', $project['name']);
+        $this->assertEquals('MYPROJECTWITHIDENTIFIER', $project['identifier']);
+    }
+
+    public function assertEnableDisableProject()
+    {
+        $this->assertTrue($this->app->disableProject($this->projectId));
+        $this->assertTrue($this->app->enableProject($this->projectId));
+    }
+
+    public function assertEnableDisablePublicAccess()
+    {
+        $this->assertTrue($this->app->disableProjectPublicAccess($this->projectId));
+        $this->assertTrue($this->app->enableProjectPublicAccess($this->projectId));
+    }
+
+    public function assertRemoveProject()
+    {
+        $this->assertTrue($this->app->removeProject($this->projectId));
+        $this->assertNull($this->app->getProjectById($this->projectId));
+    }
+}
diff --git a/tests/integration/SubtaskProcedureTest.php b/tests/integration/SubtaskProcedureTest.php
new file mode 100644
index 00000000..7ab4ef0b
--- /dev/null
+++ b/tests/integration/SubtaskProcedureTest.php
@@ -0,0 +1,64 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class SubtaskProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My project to test subtasks';
+    private $subtaskId = 0;
+
+    public function testAll()
+    {
+        $this->assertCreateTeamProject();
+        $this->assertCreateTask();
+        $this->assertCreateSubtask();
+        $this->assertGetSubtask();
+        $this->assertUpdateSubtask();
+        $this->assertGetAllSubtasks();
+        $this->assertRemoveSubtask();
+    }
+
+    public function assertCreateSubtask()
+    {
+        $this->subtaskId = $this->app->createSubtask(array(
+            'task_id' => $this->taskId,
+            'title' => 'subtask #1',
+        ));
+
+        $this->assertNotFalse($this->subtaskId);
+    }
+
+    public function assertGetSubtask()
+    {
+        $subtask = $this->app->getSubtask($this->subtaskId);
+        $this->assertEquals($this->taskId, $subtask['task_id']);
+        $this->assertEquals('subtask #1', $subtask['title']);
+    }
+
+    public function assertUpdateSubtask()
+    {
+        $this->assertTrue($this->app->execute('updateSubtask', array(
+            'id' => $this->subtaskId,
+            'task_id' => $this->taskId,
+            'title' => 'test',
+        )));
+
+        $subtask = $this->app->getSubtask($this->subtaskId);
+        $this->assertEquals('test', $subtask['title']);
+    }
+
+    public function assertGetAllSubtasks()
+    {
+        $subtasks = $this->app->getAllSubtasks($this->taskId);
+        $this->assertCount(1, $subtasks);
+        $this->assertEquals('test', $subtasks[0]['title']);
+    }
+
+    public function assertRemoveSubtask()
+    {
+        $this->assertTrue($this->app->removeSubtask($this->subtaskId));
+
+        $subtasks = $this->app->getAllSubtasks($this->taskId);
+        $this->assertCount(0, $subtasks);
+    }
+}
diff --git a/tests/integration/SwimlaneProcedureTest.php b/tests/integration/SwimlaneProcedureTest.php
new file mode 100644
index 00000000..e64342b4
--- /dev/null
+++ b/tests/integration/SwimlaneProcedureTest.php
@@ -0,0 +1,93 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class SwimlaneProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My project to test swimlanes';
+    private $swimlaneId = 0;
+
+    public function testAll()
+    {
+        $this->assertCreateTeamProject();
+    }
+
+    public function assertGetDefaultSwimlane()
+    {
+        $swimlane = $this->app->getDefaultSwimlane($this->projectId);
+        $this->assertNotEmpty($swimlane);
+        $this->assertEquals('Default swimlane', $swimlane['default_swimlane']);
+    }
+
+    public function assertAddSwimlane()
+    {
+        $this->swimlaneId = $this->app->addSwimlane($this->projectId, 'Swimlane 1');
+        $this->assertNotFalse($this->swimlaneId);
+        $this->assertNotFalse($this->app->addSwimlane($this->projectId, 'Swimlane 2'));
+    }
+
+    public function assertGetSwimlane()
+    {
+        $swimlane = $this->app->getSwimlane($this->swimlaneId);
+        $this->assertInternalType('array', $swimlane);
+        $this->assertEquals('Swimlane 1', $swimlane['name']);
+    }
+
+    public function assertUpdateSwimlane()
+    {
+        $this->assertTrue($this->app->updateSwimlane($this->swimlaneId, 'Another swimlane'));
+
+        $swimlane = $this->app->getSwimlaneById($this->swimlaneId);
+        $this->assertEquals('Another swimlane', $swimlane['name']);
+    }
+
+    public function assertDisableSwimlane()
+    {
+        $this->assertTrue($this->app->disableSwimlane($this->projectId, $this->swimlaneId));
+
+        $swimlane = $this->app->getSwimlaneById($this->swimlaneId);
+        $this->assertEquals(0, $swimlane['is_active']);
+    }
+
+    public function assertEnableSwimlane()
+    {
+        $this->assertTrue($this->app->enableSwimlane($this->projectId, $this->swimlaneId));
+
+        $swimlane = $this->app->getSwimlaneById($this->swimlaneId);
+        $this->assertEquals(1, $swimlane['is_active']);
+    }
+
+    public function assertGetAllSwimlanes()
+    {
+        $swimlanes = $this->app->getAllSwimlanes($this->projectId);
+        $this->assertCount(2, $swimlanes);
+        $this->assertEquals('Another swimlane', $swimlanes[0]['name']);
+        $this->assertEquals('Swimlane 2', $swimlanes[1]['name']);
+    }
+
+    public function assertGetActiveSwimlane()
+    {
+        $this->assertTrue($this->app->disableSwimlane($this->projectId, $this->swimlaneId));
+
+        $swimlanes = $this->app->getActiveSwimlanes($this->projectId);
+        $this->assertCount(2, $swimlanes);
+        $this->assertEquals('Default swimlane', $swimlanes[0]['name']);
+        $this->assertEquals('Swimlane 2', $swimlanes[1]['name']);
+    }
+
+    public function assertRemoveSwimlane()
+    {
+        $this->assertTrue($this->app->removeSwimlane($this->projectId, $this->swimlaneId));
+    }
+
+    public function assertChangePosition()
+    {
+        $swimlaneId1 = $this->app->addSwimlane($this->projectId, 'Swimlane A');
+        $this->assertNotFalse($this->app->addSwimlane($this->projectId, 'Swimlane B'));
+
+        $swimlanes = $this->app->getAllSwimlanes($this->projectId);
+        $this->assertCount(3, $swimlanes);
+
+        $this->assertTrue($this->app->changeSwimlanePosition($this->projectId, $swimlaneId1, 3));
+    }
+}
diff --git a/tests/integration/SwimlaneTest.php b/tests/integration/SwimlaneTest.php
deleted file mode 100644
index 88747204..00000000
--- a/tests/integration/SwimlaneTest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-require_once __DIR__.'/Base.php';
-
-class SwimlaneTest extends Base
-{
-    public function testCreateProject()
-    {
-        $this->assertEquals(1, $this->app->createProject('A project'));
-    }
-
-    public function testGetDefaultSwimlane()
-    {
-        $swimlane = $this->app->getDefaultSwimlane(1);
-        $this->assertNotEmpty($swimlane);
-        $this->assertEquals('Default swimlane', $swimlane['default_swimlane']);
-    }
-
-    public function testAddSwimlane()
-    {
-        $swimlane_id = $this->app->addSwimlane(1, 'Swimlane 1');
-        $this->assertNotFalse($swimlane_id);
-        $this->assertInternalType('int', $swimlane_id);
-
-        $swimlane = $this->app->getSwimlaneById($swimlane_id);
-        $this->assertNotEmpty($swimlane);
-        $this->assertInternalType('array', $swimlane);
-        $this->assertEquals('Swimlane 1', $swimlane['name']);
-    }
-
-    public function testGetSwimlane()
-    {
-        $swimlane = $this->app->getSwimlane(1);
-        $this->assertInternalType('array', $swimlane);
-        $this->assertEquals('Swimlane 1', $swimlane['name']);
-    }
-
-    public function testUpdateSwimlane()
-    {
-        $swimlane = $this->app->getSwimlaneByName(1, 'Swimlane 1');
-        $this->assertInternalType('array', $swimlane);
-        $this->assertEquals(1, $swimlane['id']);
-        $this->assertEquals('Swimlane 1', $swimlane['name']);
-
-        $this->assertTrue($this->app->updateSwimlane($swimlane['id'], 'Another swimlane'));
-
-        $swimlane = $this->app->getSwimlaneById($swimlane['id']);
-        $this->assertEquals('Another swimlane', $swimlane['name']);
-    }
-
-    public function testDisableSwimlane()
-    {
-        $this->assertTrue($this->app->disableSwimlane(1, 1));
-
-        $swimlane = $this->app->getSwimlaneById(1);
-        $this->assertEquals(0, $swimlane['is_active']);
-    }
-
-    public function testEnableSwimlane()
-    {
-        $this->assertTrue($this->app->enableSwimlane(1, 1));
-
-        $swimlane = $this->app->getSwimlaneById(1);
-        $this->assertEquals(1, $swimlane['is_active']);
-    }
-
-    public function testGetAllSwimlanes()
-    {
-        $this->assertNotFalse($this->app->addSwimlane(1, 'Swimlane A'));
-
-        $swimlanes = $this->app->getAllSwimlanes(1);
-        $this->assertCount(2, $swimlanes);
-        $this->assertEquals('Another swimlane', $swimlanes[0]['name']);
-        $this->assertEquals('Swimlane A', $swimlanes[1]['name']);
-    }
-
-    public function testGetActiveSwimlane()
-    {
-        $this->assertTrue($this->app->disableSwimlane(1, 1));
-
-        $swimlanes = $this->app->getActiveSwimlanes(1);
-        $this->assertCount(2, $swimlanes);
-        $this->assertEquals('Default swimlane', $swimlanes[0]['name']);
-        $this->assertEquals('Swimlane A', $swimlanes[1]['name']);
-    }
-
-    public function testRemoveSwimlane()
-    {
-        $this->assertTrue($this->app->removeSwimlane(1, 2));
-    }
-
-    public function testChangePosition()
-    {
-        $this->assertNotFalse($this->app->addSwimlane(1, 'Swimlane 1'));
-        $this->assertNotFalse($this->app->addSwimlane(1, 'Swimlane 2'));
-
-        $swimlanes = $this->app->getAllSwimlanes(1);
-        $this->assertCount(3, $swimlanes);
-
-        $this->assertTrue($this->app->changeSwimlanePosition(1, 1, 3));
-        $this->assertFalse($this->app->changeSwimlanePosition(1, 1, 6));
-    }
-}
diff --git a/tests/integration/TaskFileProcedureTest.php b/tests/integration/TaskFileProcedureTest.php
new file mode 100644
index 00000000..61155555
--- /dev/null
+++ b/tests/integration/TaskFileProcedureTest.php
@@ -0,0 +1,67 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class TaskFileProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My project to test task files';
+    protected $fileId;
+
+    public function testAll()
+    {
+        $this->assertCreateTeamProject();
+        $this->assertCreateTask();
+        $this->assertCreateTaskFile();
+        $this->assertGetTaskFile();
+        $this->assertDownloadTaskFile();
+        $this->assertGetAllFiles();
+        $this->assertRemoveTaskFile();
+        $this->assertRemoveAllTaskFiles();
+    }
+
+    public function assertCreateTaskFile()
+    {
+        $this->fileId = $this->app->createTaskFile(1, $this->taskId, 'My file', base64_encode('plain text file'));
+        $this->assertNotFalse($this->fileId);
+    }
+
+    public function assertGetTaskFile()
+    {
+        $file = $this->app->getTaskFile($this->fileId);
+        $this->assertNotEmpty($file);
+        $this->assertEquals('My file', $file['name']);
+    }
+
+    public function assertDownloadTaskFile()
+    {
+        $content = $this->app->downloadTaskFile($this->fileId);
+        $this->assertNotEmpty($content);
+        $this->assertEquals('plain text file', base64_decode($content));
+    }
+
+    public function assertGetAllFiles()
+    {
+        $files = $this->app->getAllTaskFiles(array('task_id' => $this->taskId));
+        $this->assertCount(1, $files);
+        $this->assertEquals('My file', $files[0]['name']);
+    }
+
+    public function assertRemoveTaskFile()
+    {
+        $this->assertTrue($this->app->removeTaskFile($this->fileId));
+
+        $files = $this->app->getAllTaskFiles(array('task_id' => $this->taskId));
+        $this->assertEmpty($files);
+    }
+
+    public function assertRemoveAllTaskFiles()
+    {
+        $this->assertCreateTaskFile();
+        $this->assertCreateTaskFile();
+
+        $this->assertTrue($this->app->removeAllTaskFiles($this->taskId));
+
+        $files = $this->app->getAllTaskFiles(array('task_id' => $this->taskId));
+        $this->assertEmpty($files);
+    }
+}
diff --git a/tests/integration/TaskLinkProcedureTest.php b/tests/integration/TaskLinkProcedureTest.php
new file mode 100644
index 00000000..a25fced5
--- /dev/null
+++ b/tests/integration/TaskLinkProcedureTest.php
@@ -0,0 +1,68 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class TaskLinkProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My project to test task links';
+    protected $taskLinkId;
+    protected $taskId1;
+    protected $taskId2;
+
+    public function testAll()
+    {
+        $this->assertCreateTeamProject();
+
+        $this->taskId1 = $this->app->createTask(array('project_id' => $this->projectId, 'title' => 'Task 1'));
+        $this->taskId2 = $this->app->createTask(array('project_id' => $this->projectId, 'title' => 'Task 2'));
+
+        $this->assertNotFalse($this->taskId1);
+        $this->assertNotFalse($this->taskId2);
+
+        $this->assertCreateTaskLink();
+        $this->assertGetTaskLink();
+        $this->assertGetAllTaskLinks();
+        $this->assertUpdateTaskLink();
+        $this->assertRemoveTaskLink();
+    }
+
+    public function assertCreateTaskLink()
+    {
+        $this->taskLinkId = $this->app->createTaskLink($this->taskId1, $this->taskId2, 1);
+        $this->assertNotFalse($this->taskLinkId);
+    }
+
+    public function assertGetTaskLink()
+    {
+        $link = $this->app->getTaskLinkById($this->taskLinkId);
+        $this->assertNotNull($link);
+        $this->assertEquals($this->taskId1, $link['task_id']);
+        $this->assertEquals($this->taskId2, $link['opposite_task_id']);
+        $this->assertEquals(1, $link['link_id']);
+    }
+
+    public function assertGetAllTaskLinks()
+    {
+        $links = $this->app->getAllTaskLinks($this->taskId2);
+        $this->assertCount(1, $links);
+    }
+
+    public function assertUpdateTaskLink()
+    {
+        $this->assertTrue($this->app->updateTaskLink($this->taskLinkId, $this->taskId1, $this->taskId2, 3));
+
+        $link = $this->app->getTaskLinkById($this->taskLinkId);
+        $this->assertNotNull($link);
+        $this->assertEquals($this->taskId1, $link['task_id']);
+        $this->assertEquals($this->taskId2, $link['opposite_task_id']);
+        $this->assertEquals(3, $link['link_id']);
+    }
+
+    public function assertRemoveTaskLink()
+    {
+        $this->assertTrue($this->app->removeTaskLink($this->taskLinkId));
+
+        $links = $this->app->getAllTaskLinks($this->taskId2);
+        $this->assertCount(0, $links);
+    }
+}
diff --git a/tests/integration/TaskProcedureTest.php b/tests/integration/TaskProcedureTest.php
new file mode 100644
index 00000000..f456ae52
--- /dev/null
+++ b/tests/integration/TaskProcedureTest.php
@@ -0,0 +1,55 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class TaskProcedureTest extends BaseProcedureTest
+{
+    protected $projectName = 'My project to test tasks';
+
+    public function testAll()
+    {
+        $this->assertCreateTeamProject();
+        $this->assertCreateTask();
+        $this->assertUpdateTask();
+        $this->assertGetTaskById();
+        $this->assertGetTaskByReference();
+        $this->assertGetAllTasks();
+        $this->assertOpenCloseTask();
+    }
+
+    public function assertUpdateTask()
+    {
+        $this->assertTrue($this->app->updateTask(array('id' => $this->taskId, 'color_id' => 'red')));
+    }
+
+    public function assertGetTaskById()
+    {
+        $task = $this->app->getTask($this->taskId);
+        $this->assertNotNull($task);
+        $this->assertEquals('red', $task['color_id']);
+        $this->assertEquals($this->taskTitle, $task['title']);
+    }
+
+    public function assertGetTaskByReference()
+    {
+        $taskId = $this->app->createTask(array('title' => 'task with reference', 'project_id' => $this->projectId, 'reference' => 'test'));
+        $this->assertNotFalse($taskId);
+
+        $task = $this->app->getTaskByReference($this->projectId, 'test');
+        $this->assertNotNull($task);
+        $this->assertEquals($taskId, $task['id']);
+    }
+
+    public function assertGetAllTasks()
+    {
+        $tasks = $this->app->getAllTasks($this->projectId);
+        $this->assertInternalType('array', $tasks);
+        $this->assertNotEmpty($tasks);
+    }
+
+    public function assertOpenCloseTask()
+    {
+        $this->assertTrue($this->app->closeTask($this->taskId));
+        $this->assertTrue($this->app->openTask($this->taskId));
+    }
+}
diff --git a/tests/integration/TaskTest.php b/tests/integration/TaskTest.php
deleted file mode 100644
index 0c398761..00000000
--- a/tests/integration/TaskTest.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-require_once __DIR__.'/Base.php';
-
-class TaskTest extends Base
-{
-    public function testSearchTasks()
-    {
-        $project_id1 = $this->app->createProject('My project');
-        $project_id2 = $this->app->createProject('My project');
-        $this->assertNotFalse($project_id1);
-        $this->assertNotFalse($project_id2);
-
-        $this->assertNotFalse($this->app->createTask(array('project_id' => $project_id1, 'title' => 'T1')));
-        $this->assertNotFalse($this->app->createTask(array('project_id' => $project_id1, 'title' => 'T2')));
-        $this->assertNotFalse($this->app->createTask(array('project_id' => $project_id2, 'title' => 'T3')));
-
-        $tasks = $this->app->searchTasks($project_id1, 't2');
-        $this->assertCount(1, $tasks);
-        $this->assertEquals('T2', $tasks[0]['title']);
-
-        $tasks = $this->app->searchTasks(array('project_id' => $project_id2, 'query' => 'assignee:nobody'));
-        $this->assertCount(1, $tasks);
-        $this->assertEquals('T3', $tasks[0]['title']);
-    }
-
-    public function testPriorityAttribute()
-    {
-        $project_id = $this->app->createProject('My project');
-        $this->assertNotFalse($project_id);
-
-        $task_id = $this->app->createTask(array('project_id' => $project_id, 'title' => 'My task', 'priority' => 2));
-
-        $task = $this->app->getTask($task_id);
-        $this->assertEquals(2, $task['priority']);
-
-        $this->assertTrue($this->app->updateTask(array('id' => $task_id, 'project_id' => $project_id, 'priority' => 3)));
-
-        $task = $this->app->getTask($task_id);
-        $this->assertEquals(3, $task['priority']);
-    }
-
-    public function testChangeAssigneeToAssignableUser()
-    {
-        $project_id = $this->app->createProject('My project');
-        $this->assertNotFalse($project_id);
-
-        $user_id = $this->app->createUser('user0', 'password');
-        $this->assertNotFalse($user_id);
-
-        $this->assertTrue($this->app->addProjectUser($project_id, $user_id, 'project-member'));
-
-        $task_id = $this->app->createTask(array('project_id' => $project_id, 'title' => 'My task'));
-        $this->assertNotFalse($task_id);
-
-        $this->assertTrue($this->app->updateTask(array('id' => $task_id, 'project_id' => $project_id, 'owner_id' => $user_id)));
-
-        $task = $this->app->getTask($task_id);
-        $this->assertEquals($user_id, $task['owner_id']);
-    }
-
-    public function testChangeAssigneeToNotAssignableUser()
-    {
-        $project_id = $this->app->createProject('My project');
-        $this->assertNotFalse($project_id);
-
-        $task_id = $this->app->createTask(array('project_id' => $project_id, 'title' => 'My task'));
-        $this->assertNotFalse($task_id);
-
-        $this->assertFalse($this->app->updateTask(array('id' => $task_id, 'project_id' => $project_id, 'owner_id' => 1)));
-
-        $task = $this->app->getTask($task_id);
-        $this->assertEquals(0, $task['owner_id']);
-    }
-
-    public function testChangeAssigneeToNobody()
-    {
-        $project_id = $this->app->createProject('My project');
-        $this->assertNotFalse($project_id);
-
-        $user_id = $this->app->createUser('user1', 'password');
-        $this->assertNotFalse($user_id);
-
-        $this->assertTrue($this->app->addProjectUser($project_id, $user_id, 'project-member'));
-
-        $task_id = $this->app->createTask(array('project_id' => $project_id, 'title' => 'My task', 'owner_id' => $user_id));
-        $this->assertNotFalse($task_id);
-
-        $this->assertTrue($this->app->updateTask(array('id' => $task_id, 'project_id' => $project_id, 'owner_id' => 0)));
-
-        $task = $this->app->getTask($task_id);
-        $this->assertEquals(0, $task['owner_id']);
-    }
-
-    public function testMoveTaskToAnotherProject()
-    {
-        $project_id1 = $this->app->createProject('My project');
-        $this->assertNotFalse($project_id1);
-
-        $project_id2 = $this->app->createProject('My project');
-        $this->assertNotFalse($project_id2);
-
-        $task_id = $this->app->createTask(array('project_id' => $project_id1, 'title' => 'My task'));
-        $this->assertNotFalse($task_id);
-
-        $this->assertTrue($this->app->moveTaskToProject($task_id, $project_id2));
-
-        $task = $this->app->getTask($task_id);
-        $this->assertEquals($project_id2, $task['project_id']);
-    }
-
-    public function testMoveCopyToAnotherProject()
-    {
-        $project_id1 = $this->app->createProject('My project');
-        $this->assertNotFalse($project_id1);
-
-        $project_id2 = $this->app->createProject('My project');
-        $this->assertNotFalse($project_id2);
-
-        $task_id1 = $this->app->createTask(array('project_id' => $project_id1, 'title' => 'My task'));
-        $this->assertNotFalse($task_id1);
-
-        $task_id2 = $this->app->duplicateTaskToProject($task_id1, $project_id2);
-        $this->assertNotFalse($task_id2);
-
-        $task = $this->app->getTask($task_id1);
-        $this->assertEquals($project_id1, $task['project_id']);
-
-        $task = $this->app->getTask($task_id2);
-        $this->assertEquals($project_id2, $task['project_id']);
-    }
-}
diff --git a/tests/integration/UserProcedureTest.php b/tests/integration/UserProcedureTest.php
new file mode 100644
index 00000000..290f87fb
--- /dev/null
+++ b/tests/integration/UserProcedureTest.php
@@ -0,0 +1,63 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class UserProcedureTest extends BaseProcedureTest
+{
+    public function testAll()
+    {
+        $this->assertCreateUser();
+        $this->assertGetUserById();
+        $this->assertGetUserByName();
+        $this->assertGetAllUsers();
+        $this->assertEnableDisableUser();
+        $this->assertUpdateUser();
+        $this->assertRemoveUser();
+    }
+
+    public function assertGetUserById()
+    {
+        $user = $this->app->getUser($this->userId);
+        $this->assertNotNull($user);
+        $this->assertEquals($this->username, $user['username']);
+    }
+
+    public function assertGetUserByName()
+    {
+        $user = $this->app->getUserByName($this->username);
+        $this->assertNotNull($user);
+        $this->assertEquals($this->username, $user['username']);
+    }
+
+    public function assertGetAllUsers()
+    {
+        $users = $this->app->getAllUsers();
+        $this->assertInternalType('array', $users);
+        $this->assertNotEmpty($users);
+    }
+
+    public function assertEnableDisableUser()
+    {
+        $this->assertTrue($this->app->disableUser($this->userId));
+        $this->assertFalse($this->app->isActiveUser($this->userId));
+        $this->assertTrue($this->app->enableUser($this->userId));
+        $this->assertTrue($this->app->isActiveUser($this->userId));
+    }
+
+    public function assertUpdateUser()
+    {
+        $this->assertTrue($this->app->updateUser(array(
+            'id' => $this->userId,
+            'name' => 'My user',
+        )));
+
+        $user = $this->app->getUser($this->userId);
+        $this->assertNotNull($user);
+        $this->assertEquals('My user', $user['name']);
+    }
+
+    public function assertRemoveUser()
+    {
+        $this->assertTrue($this->app->removeUser($this->userId));
+    }
+}
diff --git a/tests/integration/UserTest.php b/tests/integration/UserTest.php
deleted file mode 100644
index 10da051c..00000000
--- a/tests/integration/UserTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require_once __DIR__.'/Base.php';
-
-class UserTest extends Base
-{
-    public function testDisableUser()
-    {
-        $this->assertEquals(2, $this->app->createUser(array('username' => 'someone', 'password' => 'test123')));
-        $this->assertTrue($this->app->isActiveUser(2));
-
-        $this->assertTrue($this->app->disableUser(2));
-        $this->assertFalse($this->app->isActiveUser(2));
-
-        $this->assertTrue($this->app->enableUser(2));
-        $this->assertTrue($this->app->isActiveUser(2));
-    }
-}
diff --git a/tests/units/Model/ActionTest.php b/tests/units/Model/ActionModelTest.php
index 5db18983..4e21a999 100644
--- a/tests/units/Model/ActionTest.php
+++ b/tests/units/Model/ActionModelTest.php
@@ -11,7 +11,7 @@ use Kanboard\Model\CategoryModel;
 use Kanboard\Model\ProjectUserRoleModel;
 use Kanboard\Core\Security\Role;
 
-class ActionTest extends Base
+class ActionModelTest extends Base
 {
     public function testCreate()
     {
@@ -69,6 +69,24 @@ class ActionTest extends Base
         $this->assertEquals(array('column_id' => 1, 'color_id' => 'red'), $action['params']);
     }
 
+    public function testGetProjectId()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $actionModel = new ActionModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+
+        $this->assertEquals(1, $actionModel->create(array(
+            'project_id' => 1,
+            'event_name' => TaskModel::EVENT_CREATE,
+            'action_name' => '\Kanboard\Action\TaskAssignColorColumn',
+            'params' => array('column_id' => 1, 'color_id' => 'red'),
+        )));
+
+        $this->assertEquals(1, $actionModel->getProjectId(1));
+        $this->assertSame(0, $actionModel->getProjectId(42));
+    }
+
     public function testGetAll()
     {
         $projectModel = new ProjectModel($this->container);
diff --git a/tests/units/Model/CategoryTest.php b/tests/units/Model/CategoryModelTest.php
index 1fdc51f6..80a20af6 100644
--- a/tests/units/Model/CategoryTest.php
+++ b/tests/units/Model/CategoryModelTest.php
@@ -8,7 +8,7 @@ use Kanboard\Model\TaskFinderModel;
 use Kanboard\Model\ProjectModel;
 use Kanboard\Model\CategoryModel;
 
-class CategoryTest extends Base
+class CategoryModelTest extends Base
 {
     public function testCreation()
     {
@@ -81,6 +81,18 @@ class CategoryTest extends Base
         $this->assertSame(0, $categoryModel->getIdByName(1, 'Category #2'));
     }
 
+    public function testGetProjectId()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $categoryModel = new CategoryModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
+        $this->assertEquals(1, $categoryModel->create(array('name' => 'Category #1', 'project_id' => 1, 'description' => 'test')));
+
+        $this->assertEquals(1, $categoryModel->getProjectId(1));
+        $this->assertSame(0, $categoryModel->getProjectId(2));
+    }
+
     public function testGetList()
     {
         $projectModel = new ProjectModel($this->container);
diff --git a/tests/units/Model/CommentTest.php b/tests/units/Model/CommentTest.php
index 7250ae0b..574b5a87 100644
--- a/tests/units/Model/CommentTest.php
+++ b/tests/units/Model/CommentTest.php
@@ -10,16 +10,16 @@ class CommentTest extends Base
 {
     public function testCreate()
     {
-        $c = new CommentModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $p = new ProjectModel($this->container);
+        $commentModel = new CommentModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
-        $this->assertEquals(1, $c->create(array('task_id' => 1, 'comment' => 'bla bla', 'user_id' => 1)));
-        $this->assertEquals(2, $c->create(array('task_id' => 1, 'comment' => 'bla bla')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'bla bla', 'user_id' => 1)));
+        $this->assertEquals(2, $commentModel->create(array('task_id' => 1, 'comment' => 'bla bla')));
 
-        $comment = $c->getById(1);
+        $comment = $commentModel->getById(1);
         $this->assertNotEmpty($comment);
         $this->assertEquals('bla bla', $comment['comment']);
         $this->assertEquals(1, $comment['task_id']);
@@ -27,7 +27,7 @@ class CommentTest extends Base
         $this->assertEquals('admin', $comment['username']);
         $this->assertEquals(time(), $comment['date_creation'], '', 3);
 
-        $comment = $c->getById(2);
+        $comment = $commentModel->getById(2);
         $this->assertNotEmpty($comment);
         $this->assertEquals('bla bla', $comment['comment']);
         $this->assertEquals(1, $comment['task_id']);
@@ -38,17 +38,17 @@ class CommentTest extends Base
 
     public function testGetAll()
     {
-        $c = new CommentModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $p = new ProjectModel($this->container);
+        $commentModel = new CommentModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
-        $this->assertNotFalse($c->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
-        $this->assertNotFalse($c->create(array('task_id' => 1, 'comment' => 'c2', 'user_id' => 1)));
-        $this->assertNotFalse($c->create(array('task_id' => 1, 'comment' => 'c3', 'user_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
+        $this->assertEquals(2, $commentModel->create(array('task_id' => 1, 'comment' => 'c2', 'user_id' => 1)));
+        $this->assertEquals(3, $commentModel->create(array('task_id' => 1, 'comment' => 'c3', 'user_id' => 1)));
 
-        $comments = $c->getAll(1);
+        $comments = $commentModel->getAll(1);
 
         $this->assertNotEmpty($comments);
         $this->assertEquals(3, count($comments));
@@ -56,37 +56,51 @@ class CommentTest extends Base
         $this->assertEquals(2, $comments[1]['id']);
         $this->assertEquals(3, $comments[2]['id']);
 
-        $this->assertEquals(3, $c->count(1));
+        $this->assertEquals(3, $commentModel->count(1));
     }
 
     public function testUpdate()
     {
-        $c = new CommentModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $p = new ProjectModel($this->container);
+        $commentModel = new CommentModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
-        $this->assertNotFalse($c->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
-        $this->assertTrue($c->update(array('id' => 1, 'comment' => 'bla')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
+        $this->assertTrue($commentModel->update(array('id' => 1, 'comment' => 'bla')));
 
-        $comment = $c->getById(1);
+        $comment = $commentModel->getById(1);
         $this->assertNotEmpty($comment);
         $this->assertEquals('bla', $comment['comment']);
     }
 
     public function validateRemove()
     {
-        $c = new CommentModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $p = new ProjectModel($this->container);
+        $commentModel = new CommentModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
-        $this->assertTrue($c->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
 
-        $this->assertTrue($c->remove(1));
-        $this->assertFalse($c->remove(1));
-        $this->assertFalse($c->remove(1111));
+        $this->assertTrue($commentModel->remove(1));
+        $this->assertFalse($commentModel->remove(1));
+        $this->assertFalse($commentModel->remove(1111));
+    }
+
+    public function testGetProjectId()
+    {
+        $commentModel = new CommentModel($this->container);
+        $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, 'column_id' => 3, 'owner_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
+
+        $this->assertEquals(1, $commentModel->getProjectId(1));
+        $this->assertSame(0, $commentModel->getProjectId(2));
     }
 }
diff --git a/tests/units/Model/SubtaskTest.php b/tests/units/Model/SubtaskModelTest.php
index b65ee609..6451189d 100644
--- a/tests/units/Model/SubtaskTest.php
+++ b/tests/units/Model/SubtaskModelTest.php
@@ -5,10 +5,9 @@ require_once __DIR__.'/../Base.php';
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\SubtaskModel;
 use Kanboard\Model\ProjectModel;
-use Kanboard\Core\User\UserSession;
 use Kanboard\Model\TaskFinderModel;
 
-class SubtaskTest extends Base
+class SubtaskModelTest extends Base
 {
     public function onSubtaskCreated($event)
     {
@@ -70,18 +69,18 @@ class SubtaskTest extends Base
 
     public function testCreation()
     {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
 
         $this->container['dispatcher']->addListener(SubtaskModel::EVENT_CREATE, array($this, 'onSubtaskCreated'));
 
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
 
-        $subtask = $s->getById(1);
+        $subtask = $subtaskModel->getById(1);
         $this->assertNotEmpty($subtask);
         $this->assertEquals(1, $subtask['id']);
         $this->assertEquals(1, $subtask['task_id']);
@@ -95,19 +94,19 @@ class SubtaskTest extends Base
 
     public function testModification()
     {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
 
         $this->container['dispatcher']->addListener(SubtaskModel::EVENT_UPDATE, array($this, 'onSubtaskUpdated'));
 
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1)));
-        $this->assertTrue($s->update(array('id' => 1, 'user_id' => 1, 'status' => SubtaskModel::STATUS_INPROGRESS)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
+        $this->assertTrue($subtaskModel->update(array('id' => 1, 'user_id' => 1, 'status' => SubtaskModel::STATUS_INPROGRESS)));
 
-        $subtask = $s->getById(1);
+        $subtask = $subtaskModel->getById(1);
         $this->assertNotEmpty($subtask);
         $this->assertEquals(1, $subtask['id']);
         $this->assertEquals(1, $subtask['task_id']);
@@ -121,61 +120,61 @@ class SubtaskTest extends Base
 
     public function testRemove()
     {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1)));
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
 
         $this->container['dispatcher']->addListener(SubtaskModel::EVENT_DELETE, array($this, 'onSubtaskDeleted'));
 
-        $subtask = $s->getById(1);
+        $subtask = $subtaskModel->getById(1);
         $this->assertNotEmpty($subtask);
 
-        $this->assertTrue($s->remove(1));
+        $this->assertTrue($subtaskModel->remove(1));
 
-        $subtask = $s->getById(1);
+        $subtask = $subtaskModel->getById(1);
         $this->assertEmpty($subtask);
     }
 
     public function testToggleStatusWithoutSession()
     {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
 
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
 
-        $subtask = $s->getById(1);
+        $subtask = $subtaskModel->getById(1);
         $this->assertNotEmpty($subtask);
         $this->assertEquals(SubtaskModel::STATUS_TODO, $subtask['status']);
         $this->assertEquals(0, $subtask['user_id']);
         $this->assertEquals(1, $subtask['task_id']);
 
-        $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $s->toggleStatus(1));
+        $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $subtaskModel->toggleStatus(1));
 
-        $subtask = $s->getById(1);
+        $subtask = $subtaskModel->getById(1);
         $this->assertNotEmpty($subtask);
         $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $subtask['status']);
         $this->assertEquals(0, $subtask['user_id']);
         $this->assertEquals(1, $subtask['task_id']);
 
-        $this->assertEquals(SubtaskModel::STATUS_DONE, $s->toggleStatus(1));
+        $this->assertEquals(SubtaskModel::STATUS_DONE, $subtaskModel->toggleStatus(1));
 
-        $subtask = $s->getById(1);
+        $subtask = $subtaskModel->getById(1);
         $this->assertNotEmpty($subtask);
         $this->assertEquals(SubtaskModel::STATUS_DONE, $subtask['status']);
         $this->assertEquals(0, $subtask['user_id']);
         $this->assertEquals(1, $subtask['task_id']);
 
-        $this->assertEquals(SubtaskModel::STATUS_TODO, $s->toggleStatus(1));
+        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtaskModel->toggleStatus(1));
 
-        $subtask = $s->getById(1);
+        $subtask = $subtaskModel->getById(1);
         $this->assertNotEmpty($subtask);
         $this->assertEquals(SubtaskModel::STATUS_TODO, $subtask['status']);
         $this->assertEquals(0, $subtask['user_id']);
@@ -184,17 +183,16 @@ class SubtaskTest extends Base
 
     public function testToggleStatusWithSession()
     {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $p = new ProjectModel($this->container);
-        $us = new UserSession($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
 
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
 
-        $subtask = $s->getById(1);
+        $subtask = $subtaskModel->getById(1);
         $this->assertNotEmpty($subtask);
         $this->assertEquals(SubtaskModel::STATUS_TODO, $subtask['status']);
         $this->assertEquals(0, $subtask['user_id']);
@@ -203,25 +201,25 @@ class SubtaskTest extends Base
         // Set the current logged user
         $this->container['sessionStorage']->user = array('id' => 1);
 
-        $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $s->toggleStatus(1));
+        $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $subtaskModel->toggleStatus(1));
 
-        $subtask = $s->getById(1);
+        $subtask = $subtaskModel->getById(1);
         $this->assertNotEmpty($subtask);
         $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $subtask['status']);
         $this->assertEquals(1, $subtask['user_id']);
         $this->assertEquals(1, $subtask['task_id']);
 
-        $this->assertEquals(SubtaskModel::STATUS_DONE, $s->toggleStatus(1));
+        $this->assertEquals(SubtaskModel::STATUS_DONE, $subtaskModel->toggleStatus(1));
 
-        $subtask = $s->getById(1);
+        $subtask = $subtaskModel->getById(1);
         $this->assertNotEmpty($subtask);
         $this->assertEquals(SubtaskModel::STATUS_DONE, $subtask['status']);
         $this->assertEquals(1, $subtask['user_id']);
         $this->assertEquals(1, $subtask['task_id']);
 
-        $this->assertEquals(SubtaskModel::STATUS_TODO, $s->toggleStatus(1));
+        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtaskModel->toggleStatus(1));
 
-        $subtask = $s->getById(1);
+        $subtask = $subtaskModel->getById(1);
         $this->assertNotEmpty($subtask);
         $this->assertEquals(SubtaskModel::STATUS_TODO, $subtask['status']);
         $this->assertEquals(1, $subtask['user_id']);
@@ -230,19 +228,19 @@ class SubtaskTest extends Base
 
     public function testCloseAll()
     {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
 
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1)));
-        $this->assertEquals(2, $s->create(array('title' => 'subtask #2', 'task_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
+        $this->assertEquals(2, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1)));
 
-        $this->assertTrue($s->closeAll(1));
+        $this->assertTrue($subtaskModel->closeAll(1));
 
-        $subtasks = $s->getAll(1);
+        $subtasks = $subtaskModel->getAll(1);
         $this->assertNotEmpty($subtasks);
 
         foreach ($subtasks as $subtask) {
@@ -252,24 +250,24 @@ class SubtaskTest extends Base
 
     public function testDuplicate()
     {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $p = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $projectModel = new ProjectModel($this->container);
 
         // We create a project
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
 
         // We create 2 tasks
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'test 2', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 0)));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'test 2', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 0)));
 
         // We create many subtasks for the first task
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1, 'time_estimated' => 5, 'time_spent' => 3, 'status' => 1, 'another_subtask' => 'on')));
-        $this->assertEquals(2, $s->create(array('title' => 'subtask #2', 'task_id' => 1, 'time_estimated' => '', 'time_spent' => '', 'status' => 2, 'user_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1, 'time_estimated' => 5, 'time_spent' => 3, 'status' => 1, 'another_subtask' => 'on')));
+        $this->assertEquals(2, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1, 'time_estimated' => '', 'time_spent' => '', 'status' => 2, 'user_id' => 1)));
 
         // We duplicate our subtasks
-        $this->assertTrue($s->duplicate(1, 2));
-        $subtasks = $s->getAll(2);
+        $this->assertTrue($subtaskModel->duplicate(1, 2));
+        $subtasks = $subtaskModel->getAll(2);
 
         $this->assertNotFalse($subtasks);
         $this->assertNotEmpty($subtasks);
@@ -385,4 +383,18 @@ class SubtaskTest extends Base
         $this->assertEquals(2, $task['time_spent']);
         $this->assertEquals(3, $task['time_estimated']);
     }
+    
+    public function testGetProjectId()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($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(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
+        
+        $this->assertEquals(1, $subtaskModel->getProjectId(1));
+        $this->assertEquals(0, $subtaskModel->getProjectId(2));
+    }
 }
diff --git a/tests/units/Model/TaskFileTest.php b/tests/units/Model/TaskFileModelTest.php
index 2faee95c..de12553f 100644
--- a/tests/units/Model/TaskFileTest.php
+++ b/tests/units/Model/TaskFileModelTest.php
@@ -6,7 +6,7 @@ use Kanboard\Model\TaskFileModel;
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\ProjectModel;
 
-class TaskFileTest extends Base
+class TaskFileModelTest extends Base
 {
     public function testCreation()
     {
@@ -442,4 +442,17 @@ class TaskFileTest extends Base
 
         $this->assertTrue($fileModel->removeAll(1));
     }
+
+    public function testGetProjectId()
+    {
+        $projectModel = new ProjectModel($this->container);
+        $fileModel = new TaskFileModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
+        $this->assertEquals(1, $fileModel->create(1, 'test', '/tmp/foobar', 10));
+        $this->assertEquals(1, $fileModel->getProjectId(1));
+        $this->assertEquals(0, $fileModel->getProjectId(2));
+    }
 }
diff --git a/tests/units/Model/TaskLinkModelTest.php b/tests/units/Model/TaskLinkModelTest.php
new file mode 100644
index 00000000..78590891
--- /dev/null
+++ b/tests/units/Model/TaskLinkModelTest.php
@@ -0,0 +1,211 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskLinkModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\ProjectModel;
+
+class TaskLinkModelTest extends Base
+{
+    // Check postgres issue: "Cardinality violation: 7 ERROR:  more than one row returned by a subquery used as an expression"
+    public function testGetTaskWithMultipleMilestoneLink()
+    {
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $taskLinkModel = new TaskLinkModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'A')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'B')));
+        $this->assertEquals(3, $taskCreationModel->create(array('project_id' => 1, 'title' => 'C')));
+
+        $this->assertNotFalse($taskLinkModel->create(1, 2, 9));
+        $this->assertNotFalse($taskLinkModel->create(1, 3, 9));
+
+        $task = $taskFinderModel->getExtendedQuery()->findOne();
+        $this->assertNotEmpty($task);
+    }
+
+    public function testCreateTaskLinkWithNoOpposite()
+    {
+        $taskLinkModel = new TaskLinkModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'A')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'B')));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
+
+        $links = $taskLinkModel->getAll(1);
+        $this->assertNotEmpty($links);
+        $this->assertCount(1, $links);
+        $this->assertEquals('relates to', $links[0]['label']);
+        $this->assertEquals('B', $links[0]['title']);
+        $this->assertEquals(2, $links[0]['task_id']);
+        $this->assertEquals(1, $links[0]['is_active']);
+
+        $links = $taskLinkModel->getAll(2);
+        $this->assertNotEmpty($links);
+        $this->assertCount(1, $links);
+        $this->assertEquals('relates to', $links[0]['label']);
+        $this->assertEquals('A', $links[0]['title']);
+        $this->assertEquals(1, $links[0]['task_id']);
+        $this->assertEquals(1, $links[0]['is_active']);
+
+        $task_link = $taskLinkModel->getById(1);
+        $this->assertNotEmpty($task_link);
+        $this->assertEquals(1, $task_link['id']);
+        $this->assertEquals(1, $task_link['task_id']);
+        $this->assertEquals(2, $task_link['opposite_task_id']);
+        $this->assertEquals(1, $task_link['link_id']);
+
+        $opposite_task_link = $taskLinkModel->getOppositeTaskLink($task_link);
+        $this->assertNotEmpty($opposite_task_link);
+        $this->assertEquals(2, $opposite_task_link['id']);
+        $this->assertEquals(2, $opposite_task_link['task_id']);
+        $this->assertEquals(1, $opposite_task_link['opposite_task_id']);
+        $this->assertEquals(1, $opposite_task_link['link_id']);
+    }
+
+    public function testCreateTaskLinkWithOpposite()
+    {
+        $taskLinkModel = new TaskLinkModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'A')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'B')));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 2));
+
+        $links = $taskLinkModel->getAll(1);
+        $this->assertNotEmpty($links);
+        $this->assertCount(1, $links);
+        $this->assertEquals('blocks', $links[0]['label']);
+        $this->assertEquals('B', $links[0]['title']);
+        $this->assertEquals(2, $links[0]['task_id']);
+        $this->assertEquals(1, $links[0]['is_active']);
+
+        $links = $taskLinkModel->getAll(2);
+        $this->assertNotEmpty($links);
+        $this->assertCount(1, $links);
+        $this->assertEquals('is blocked by', $links[0]['label']);
+        $this->assertEquals('A', $links[0]['title']);
+        $this->assertEquals(1, $links[0]['task_id']);
+        $this->assertEquals(1, $links[0]['is_active']);
+
+        $task_link = $taskLinkModel->getById(1);
+        $this->assertNotEmpty($task_link);
+        $this->assertEquals(1, $task_link['id']);
+        $this->assertEquals(1, $task_link['task_id']);
+        $this->assertEquals(2, $task_link['opposite_task_id']);
+        $this->assertEquals(2, $task_link['link_id']);
+
+        $opposite_task_link = $taskLinkModel->getOppositeTaskLink($task_link);
+        $this->assertNotEmpty($opposite_task_link);
+        $this->assertEquals(2, $opposite_task_link['id']);
+        $this->assertEquals(2, $opposite_task_link['task_id']);
+        $this->assertEquals(1, $opposite_task_link['opposite_task_id']);
+        $this->assertEquals(3, $opposite_task_link['link_id']);
+    }
+
+    public function testGroupByLabel()
+    {
+        $taskLinkModel = new TaskLinkModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'A')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'B')));
+        $this->assertEquals(3, $taskCreationModel->create(array('project_id' => 1, 'title' => 'C')));
+
+        $this->assertNotFalse($taskLinkModel->create(1, 2, 2));
+        $this->assertNotFalse($taskLinkModel->create(1, 3, 2));
+
+        $links = $taskLinkModel->getAllGroupedByLabel(1);
+        $this->assertCount(1, $links);
+        $this->assertArrayHasKey('blocks', $links);
+        $this->assertCount(2, $links['blocks']);
+        $this->assertEquals('test', $links['blocks'][0]['project_name']);
+        $this->assertEquals('Backlog', $links['blocks'][0]['column_title']);
+        $this->assertEquals('blocks', $links['blocks'][0]['label']);
+    }
+
+    public function testUpdate()
+    {
+        $taskLinkModel = new TaskLinkModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+
+        $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' => 'A')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 2, 'title' => 'B')));
+        $this->assertEquals(3, $taskCreationModel->create(array('project_id' => 1, 'title' => 'C')));
+
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 5));
+        $this->assertTrue($taskLinkModel->update(1, 1, 3, 11));
+
+        $links = $taskLinkModel->getAll(1);
+        $this->assertNotEmpty($links);
+        $this->assertCount(1, $links);
+        $this->assertEquals('is fixed by', $links[0]['label']);
+        $this->assertEquals('C', $links[0]['title']);
+        $this->assertEquals(3, $links[0]['task_id']);
+
+        $links = $taskLinkModel->getAll(2);
+        $this->assertEmpty($links);
+
+        $links = $taskLinkModel->getAll(3);
+        $this->assertNotEmpty($links);
+        $this->assertCount(1, $links);
+        $this->assertEquals('fixes', $links[0]['label']);
+        $this->assertEquals('A', $links[0]['title']);
+        $this->assertEquals(1, $links[0]['task_id']);
+    }
+
+    public function testRemove()
+    {
+        $taskLinkModel = new TaskLinkModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'A')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'B')));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 2));
+
+        $links = $taskLinkModel->getAll(1);
+        $this->assertNotEmpty($links);
+        $links = $taskLinkModel->getAll(2);
+        $this->assertNotEmpty($links);
+
+        $this->assertTrue($taskLinkModel->remove($links[0]['id']));
+
+        $links = $taskLinkModel->getAll(1);
+        $this->assertEmpty($links);
+        $links = $taskLinkModel->getAll(2);
+        $this->assertEmpty($links);
+    }
+
+    public function testGetProjectId()
+    {
+        $taskLinkModel = new TaskLinkModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'A')));
+        $this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'B')));
+        $this->assertEquals(1, $taskLinkModel->create(1, 2, 2));
+
+        $this->assertEquals(1, $taskLinkModel->getProjectId(1));
+        $this->assertEquals(0, $taskLinkModel->getProjectId(42));
+    }
+}
diff --git a/tests/units/Model/TaskLinkTest.php b/tests/units/Model/TaskLinkTest.php
deleted file mode 100644
index bc574731..00000000
--- a/tests/units/Model/TaskLinkTest.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-
-require_once __DIR__.'/../Base.php';
-
-use Kanboard\Model\TaskFinderModel;
-use Kanboard\Model\TaskLinkModel;
-use Kanboard\Model\TaskCreationModel;
-use Kanboard\Model\ProjectModel;
-
-class TaskLinkTest extends Base
-{
-    // Check postgres issue: "Cardinality violation: 7 ERROR:  more than one row returned by a subquery used as an expression"
-    public function testGetTaskWithMultipleMilestoneLink()
-    {
-        $tf = new TaskFinderModel($this->container);
-        $tl = new TaskLinkModel($this->container);
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'A')));
-        $this->assertEquals(2, $tc->create(array('project_id' => 1, 'title' => 'B')));
-        $this->assertEquals(3, $tc->create(array('project_id' => 1, 'title' => 'C')));
-
-        $this->assertNotFalse($tl->create(1, 2, 9));
-        $this->assertNotFalse($tl->create(1, 3, 9));
-
-        $task = $tf->getExtendedQuery()->findOne();
-        $this->assertNotEmpty($task);
-    }
-
-    public function testCreateTaskLinkWithNoOpposite()
-    {
-        $tl = new TaskLinkModel($this->container);
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'A')));
-        $this->assertEquals(2, $tc->create(array('project_id' => 1, 'title' => 'B')));
-        $this->assertEquals(1, $tl->create(1, 2, 1));
-
-        $links = $tl->getAll(1);
-        $this->assertNotEmpty($links);
-        $this->assertCount(1, $links);
-        $this->assertEquals('relates to', $links[0]['label']);
-        $this->assertEquals('B', $links[0]['title']);
-        $this->assertEquals(2, $links[0]['task_id']);
-        $this->assertEquals(1, $links[0]['is_active']);
-
-        $links = $tl->getAll(2);
-        $this->assertNotEmpty($links);
-        $this->assertCount(1, $links);
-        $this->assertEquals('relates to', $links[0]['label']);
-        $this->assertEquals('A', $links[0]['title']);
-        $this->assertEquals(1, $links[0]['task_id']);
-        $this->assertEquals(1, $links[0]['is_active']);
-
-        $task_link = $tl->getById(1);
-        $this->assertNotEmpty($task_link);
-        $this->assertEquals(1, $task_link['id']);
-        $this->assertEquals(1, $task_link['task_id']);
-        $this->assertEquals(2, $task_link['opposite_task_id']);
-        $this->assertEquals(1, $task_link['link_id']);
-
-        $opposite_task_link = $tl->getOppositeTaskLink($task_link);
-        $this->assertNotEmpty($opposite_task_link);
-        $this->assertEquals(2, $opposite_task_link['id']);
-        $this->assertEquals(2, $opposite_task_link['task_id']);
-        $this->assertEquals(1, $opposite_task_link['opposite_task_id']);
-        $this->assertEquals(1, $opposite_task_link['link_id']);
-    }
-
-    public function testCreateTaskLinkWithOpposite()
-    {
-        $tl = new TaskLinkModel($this->container);
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'A')));
-        $this->assertEquals(2, $tc->create(array('project_id' => 1, 'title' => 'B')));
-        $this->assertEquals(1, $tl->create(1, 2, 2));
-
-        $links = $tl->getAll(1);
-        $this->assertNotEmpty($links);
-        $this->assertCount(1, $links);
-        $this->assertEquals('blocks', $links[0]['label']);
-        $this->assertEquals('B', $links[0]['title']);
-        $this->assertEquals(2, $links[0]['task_id']);
-        $this->assertEquals(1, $links[0]['is_active']);
-
-        $links = $tl->getAll(2);
-        $this->assertNotEmpty($links);
-        $this->assertCount(1, $links);
-        $this->assertEquals('is blocked by', $links[0]['label']);
-        $this->assertEquals('A', $links[0]['title']);
-        $this->assertEquals(1, $links[0]['task_id']);
-        $this->assertEquals(1, $links[0]['is_active']);
-
-        $task_link = $tl->getById(1);
-        $this->assertNotEmpty($task_link);
-        $this->assertEquals(1, $task_link['id']);
-        $this->assertEquals(1, $task_link['task_id']);
-        $this->assertEquals(2, $task_link['opposite_task_id']);
-        $this->assertEquals(2, $task_link['link_id']);
-
-        $opposite_task_link = $tl->getOppositeTaskLink($task_link);
-        $this->assertNotEmpty($opposite_task_link);
-        $this->assertEquals(2, $opposite_task_link['id']);
-        $this->assertEquals(2, $opposite_task_link['task_id']);
-        $this->assertEquals(1, $opposite_task_link['opposite_task_id']);
-        $this->assertEquals(3, $opposite_task_link['link_id']);
-    }
-
-    public function testGroupByLabel()
-    {
-        $tl = new TaskLinkModel($this->container);
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-
-        $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'A')));
-        $this->assertEquals(2, $tc->create(array('project_id' => 1, 'title' => 'B')));
-        $this->assertEquals(3, $tc->create(array('project_id' => 1, 'title' => 'C')));
-
-        $this->assertNotFalse($tl->create(1, 2, 2));
-        $this->assertNotFalse($tl->create(1, 3, 2));
-
-        $links = $tl->getAllGroupedByLabel(1);
-        $this->assertCount(1, $links);
-        $this->assertArrayHasKey('blocks', $links);
-        $this->assertCount(2, $links['blocks']);
-        $this->assertEquals('test', $links['blocks'][0]['project_name']);
-        $this->assertEquals('Backlog', $links['blocks'][0]['column_title']);
-        $this->assertEquals('blocks', $links['blocks'][0]['label']);
-    }
-
-    public function testUpdate()
-    {
-        $tl = new TaskLinkModel($this->container);
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(2, $p->create(array('name' => 'test2')));
-        $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'A')));
-        $this->assertEquals(2, $tc->create(array('project_id' => 2, 'title' => 'B')));
-        $this->assertEquals(3, $tc->create(array('project_id' => 1, 'title' => 'C')));
-
-        $this->assertEquals(1, $tl->create(1, 2, 5));
-        $this->assertTrue($tl->update(1, 1, 3, 11));
-
-        $links = $tl->getAll(1);
-        $this->assertNotEmpty($links);
-        $this->assertCount(1, $links);
-        $this->assertEquals('is fixed by', $links[0]['label']);
-        $this->assertEquals('C', $links[0]['title']);
-        $this->assertEquals(3, $links[0]['task_id']);
-
-        $links = $tl->getAll(2);
-        $this->assertEmpty($links);
-
-        $links = $tl->getAll(3);
-        $this->assertNotEmpty($links);
-        $this->assertCount(1, $links);
-        $this->assertEquals('fixes', $links[0]['label']);
-        $this->assertEquals('A', $links[0]['title']);
-        $this->assertEquals(1, $links[0]['task_id']);
-    }
-
-    public function testRemove()
-    {
-        $tl = new TaskLinkModel($this->container);
-        $p = new ProjectModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'A')));
-        $this->assertEquals(2, $tc->create(array('project_id' => 1, 'title' => 'B')));
-        $this->assertEquals(1, $tl->create(1, 2, 2));
-
-        $links = $tl->getAll(1);
-        $this->assertNotEmpty($links);
-        $links = $tl->getAll(2);
-        $this->assertNotEmpty($links);
-
-        $this->assertTrue($tl->remove($links[0]['id']));
-
-        $links = $tl->getAll(1);
-        $this->assertEmpty($links);
-        $links = $tl->getAll(2);
-        $this->assertEmpty($links);
-    }
-}
diff --git a/tests/units/Validator/ProjectValidatorTest.php b/tests/units/Validator/ProjectValidatorTest.php
index 07de6c25..e1e2f077 100644
--- a/tests/units/Validator/ProjectValidatorTest.php
+++ b/tests/units/Validator/ProjectValidatorTest.php
@@ -55,13 +55,19 @@ class ProjectValidatorTest extends Base
         $r = $validator->validateModification(array('id' => 1, 'name' => 'test', 'identifier' => 'TEST1'));
         $this->assertTrue($r[0]);
 
-        $r = $validator->validateModification(array('id' => 1, 'name' => 'test', 'identifier' => 'test3'));
+        $r = $validator->validateModification(array('id' => 1, 'identifier' => 'test3'));
         $this->assertTrue($r[0]);
 
-        $r = $validator->validateModification(array('id' => 1, 'name' => 'test', 'identifier' => ''));
+        $r = $validator->validateModification(array('id' => 1, 'identifier' => ''));
         $this->assertTrue($r[0]);
 
-        $r = $validator->validateModification(array('id' => 1, 'name' => 'test', 'identifier' => 'TEST2'));
+        $r = $validator->validateModification(array('id' => 1, 'identifier' => 'TEST2'));
+        $this->assertFalse($r[0]);
+
+        $r = $validator->validateModification(array('id' => 1, 'name' => ''));
+        $this->assertFalse($r[0]);
+
+        $r = $validator->validateModification(array('id' => 1, 'name' => null));
         $this->assertFalse($r[0]);
     }
 }