diff --git a/tests/unit/Db/BoardTest.php b/tests/unit/Db/BoardTest.php
index 99b703976..7e550fb23 100644
--- a/tests/unit/Db/BoardTest.php
+++ b/tests/unit/Db/BoardTest.php
@@ -17,6 +17,7 @@ class BoardTest extends TestCase {
 	}
 	public function testJsonSerialize() {
 		$board = $this->createBoard();
+		$board->setUsers(['user1', 'user2']);
 		$this->assertEquals([
 			'id' => 1,
 			'title' => "My Board",
@@ -26,7 +27,8 @@ class BoardTest extends TestCase {
 			'permissions' => [],
 			'deletedAt' => 0,
 			'acl' => array(),
-			'archived' => false
+			'archived' => false,
+			'users' => ['user1', 'user2'],
 		], $board->jsonSerialize());
 	}
 
@@ -42,7 +44,8 @@ class BoardTest extends TestCase {
 			'permissions' => [],
 			'deletedAt' => 0,
 			'acl' => array(),
-			'archived' => false
+			'archived' => false,
+			'users' => [],
 		], $board->jsonSerialize());
 	}
 	public function testSetAcl() {
@@ -67,6 +70,7 @@ class BoardTest extends TestCase {
 			'acl' => array(),
 			'archived' => false,
 			'shared' => 1,
+			'users' => [],
 		], $board->jsonSerialize());
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/Db/CardTest.php b/tests/unit/Db/CardTest.php
index a81df4c2c..02867167c 100644
--- a/tests/unit/Db/CardTest.php
+++ b/tests/unit/Db/CardTest.php
@@ -77,6 +77,7 @@ class CardTest extends \PHPUnit_Framework_TestCase {
 			'duedate' => null,
 			'overdue' => 0,
 			'archived' => false,
+			'assignedUsers' => null,
 		], $card->jsonSerialize());
 	}
 	public function testJsonSerializeLabels() {
@@ -106,4 +107,27 @@ class CardTest extends \PHPUnit_Framework_TestCase {
 		$card->setDatabaseType('mysql');
 		$this->assertEquals($date->format('Y-m-d H:i:s'), $card->getDuedate(false));
 	}
+
+	public function testJsonSerializeAsignedUsers() {
+		$card = $this->createCard();
+		$card->setAssignedUsers([ 'user1' ]);
+		$card->setLabels(array());
+		$this->assertEquals([
+			'id' => 1,
+			'title' => "My Card",
+			'description' => "a long description",
+			'type' => 'text',
+			'lastModified' => 234,
+			'createdAt' => 123,
+			'owner' => 'admin',
+			'order' => 12,
+			'stackId' => 1,
+			'labels' => array(),
+			'duedate' => null,
+			'overdue' => 0,
+			'archived' => false,
+			'assignedUsers' => ['user1'],
+		], $card->jsonSerialize());
+	}
+
 }
\ No newline at end of file
diff --git a/tests/unit/Service/CardServiceTest.php b/tests/unit/Service/CardServiceTest.php
index 425aabd18..19af7be46 100644
--- a/tests/unit/Service/CardServiceTest.php
+++ b/tests/unit/Service/CardServiceTest.php
@@ -24,6 +24,7 @@
 namespace OCA\Deck\Service;
 
 
+use OCA\Deck\Db\AssignedUsersMapper;
 use OCA\Deck\Db\Card;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\StackMapper;
@@ -40,27 +41,36 @@ class CardServiceTest extends TestCase {
     private $stackMapper;
     /** @var PermissionService|\PHPUnit_Framework_MockObject_MockObject */
     private $permissionService;
+    /** @var AssignedUsersMapper|\PHPUnit_Framework_MockObject_MockObject */
+    private $assignedUsersMapper;
 	/** @var BoardService|\PHPUnit_Framework_MockObject_MockObject */
 	private $boardService;
 
     public function setUp() {
 		parent::setUp();
-        $this->cardMapper = $this->getMockBuilder(CardMapper::class)
-            ->disableOriginalConstructor()->getMock();
-        $this->stackMapper = $this->getMockBuilder(StackMapper::class)
-            ->disableOriginalConstructor()->getMock();
-        $this->permissionService = $this->getMockBuilder(PermissionService::class)
-            ->disableOriginalConstructor()->getMock();
+        $this->cardMapper = $this->createMock(CardMapper::class);
+        $this->stackMapper = $this->createMock(StackMapper::class);
+        $this->permissionService = $this->createMock(PermissionService::class);
         $this->boardService = $this->createMock(BoardService::class);
-        $this->cardService = new CardService($this->cardMapper, $this->stackMapper, $this->permissionService, $this->boardService);
+        $this->assignedUsersMapper = $this->createMock(AssignedUsersMapper::class);
+        $this->cardService = new CardService($this->cardMapper, $this->stackMapper, $this->permissionService, $this->boardService, $this->assignedUsersMapper);
     }
 
     public function testFind() {
+    	$card = new Card();
+    	$card->setId(1337);
         $this->cardMapper->expects($this->once())
             ->method('find')
             ->with(123)
-            ->willReturn(1);
-        $this->assertEquals(1, $this->cardService->find(123));
+            ->willReturn($card);
+        $this->assignedUsersMapper->expects($this->once())
+			->method('find')
+			->with(1337)
+			->willReturn(['user1', 'user2']);
+		$cardExpected = new Card();
+		$cardExpected->setId(1337);
+		$cardExpected->setAssignedUsers(['user1', 'user2']);
+        $this->assertEquals($cardExpected, $this->cardService->find(123));
     }
 
     public function testCreate() {
diff --git a/tests/unit/Service/StackServiceTest.php b/tests/unit/Service/StackServiceTest.php
index f262deced..c7178b02f 100644
--- a/tests/unit/Service/StackServiceTest.php
+++ b/tests/unit/Service/StackServiceTest.php
@@ -25,6 +25,7 @@ namespace OCA\Deck\Service;
 
 
 
+use OCA\Deck\Db\AssignedUsersMapper;
 use OCA\Deck\Db\Card;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\Label;
@@ -51,32 +52,31 @@ class StackServiceTest extends TestCase {
 	private $labelMapper;
     /** @var \PHPUnit_Framework_MockObject_MockObject|PermissionService */
 	private $permissionService;
+	/** @var AssignedUsersMapper|\PHPUnit_Framework_MockObject_MockObject */
+	private $assignedUsersMapper;
 	/** @var BoardService|\PHPUnit_Framework_MockObject_MockObject */
 	private $boardService;
 
 	public function setUp() {
 		parent::setUp();
-		$this->stackMapper = $this->getMockBuilder(StackMapper::class)
-			->disableOriginalConstructor()->getMock();
-		$this->cardMapper = $this->getMockBuilder(CardMapper::class)
-			->disableOriginalConstructor()->getMock();
-		$this->labelMapper = $this->getMockBuilder(LabelMapper::class)
-			->disableOriginalConstructor()->getMock();
-		$this->permissionService = $this->getMockBuilder(PermissionService::class)
-			->disableOriginalConstructor()->getMock();
+		$this->stackMapper = $this->createMock(StackMapper::class);
+		$this->cardMapper = $this->createMock(CardMapper::class);
+		$this->labelMapper = $this->createMock(LabelMapper::class);
+		$this->permissionService = $this->createMock(PermissionService::class);
 		$this->boardService = $this->createMock(BoardService::class);
+		$this->assignedUsersMapper = $this->createMock(AssignedUsersMapper::class);
 
 		$this->stackService = new StackService(
 			$this->stackMapper,
             $this->cardMapper,
             $this->labelMapper,
 			$this->permissionService,
-			$this->boardService
+			$this->boardService,
+			$this->assignedUsersMapper
 		);
 	}
 
 	public function testFindAll() {
-	    // FIXME: FIX ME !!!
         $this->permissionService->expects($this->once())->method('checkPermission');
         $this->stackMapper->expects($this->once())->method('findAll')->willReturn($this->getStacks());
         $this->labelMapper->expects($this->once())->method('getAssignedLabelsForBoard')->willReturn($this->getLabels());