diff --git a/tests/Models/KanbanBoardTest.php b/tests/Models/KanbanBoardTest.php
index b4cdfb7..1f3c0c7 100755
--- a/tests/Models/KanbanBoardTest.php
+++ b/tests/Models/KanbanBoardTest.php
@@ -16,6 +16,7 @@ namespace Modules\Kanban\tests\Models;
 
 use Modules\Kanban\Models\BoardStatus;
 use Modules\Kanban\Models\KanbanBoard;
+use Modules\Kanban\Models\NullKanbanColumn;
 use Modules\Tag\Models\Tag;
 
 /**
@@ -64,8 +65,8 @@ final class KanbanBoardTest extends \PHPUnit\Framework\TestCase
      */
     public function testColumnsInputOutput() : void
     {
-        $this->board->addColumn(2);
-        self::assertEquals([2], $this->board->getColumns());
+        $this->board->addColumn($column = new NullKanbanColumn(2));
+        self::assertEquals([$column], $this->board->getColumns());
     }
 
     /**
@@ -74,7 +75,7 @@ final class KanbanBoardTest extends \PHPUnit\Framework\TestCase
      */
     public function testColumnRemove() : void
     {
-        $this->board->addColumn(2);
+        $this->board->addColumn(new NullKanbanColumn(2));
         self::assertTrue($this->board->removeColumn(0));
         self::assertCount(0, $this->board->getColumns());
         self::assertFalse($this->board->removeColumn(0));
diff --git a/tests/Models/KanbanCardTest.php b/tests/Models/KanbanCardTest.php
index a9e608e..26ea9aa 100755
--- a/tests/Models/KanbanCardTest.php
+++ b/tests/Models/KanbanCardTest.php
@@ -17,6 +17,8 @@ namespace Modules\Kanban\tests\Models;
 use Modules\Kanban\Models\CardStatus;
 use Modules\Kanban\Models\CardType;
 use Modules\Kanban\Models\KanbanCard;
+use Modules\Kanban\Models\NullKanbanCard;
+use Modules\Kanban\Models\NullKanbanCardComment;
 use Modules\Media\Models\NullMedia;
 use Modules\Tag\Models\Tag;
 use Modules\Tasks\Models\Task;
@@ -102,8 +104,8 @@ final class KanbanCardTest extends \PHPUnit\Framework\TestCase
      */
     public function testCommentInputOutput() : void
     {
-        $this->card->addComment(5);
-        self::assertEquals([5], $this->card->getComments());
+        $this->card->addComment($card = new NullKanbanCardComment(5));
+        self::assertEquals([$card], $this->card->getComments());
         self::assertEquals(1, $this->card->getCommentCount());
     }
 
@@ -127,7 +129,7 @@ final class KanbanCardTest extends \PHPUnit\Framework\TestCase
      */
     public function testCommentRemove() : void
     {
-        $this->card->addComment(5);
+        $this->card->addComment($comment = new NullKanbanCardComment(5));
         self::assertCount(1, $this->card->getComments());
         self::assertTrue($this->card->removeComment(0));
         self::assertCount(0, $this->card->getComments());