diff --git a/lib/Db/Circle.php b/lib/Db/Circle.php
index 194cae86b..a8808c102 100644
--- a/lib/Db/Circle.php
+++ b/lib/Db/Circle.php
@@ -23,8 +23,6 @@
 
 namespace OCA\Deck\Db;
 
-use OCP\Share\IShare;
-
 class Circle extends RelationalObject {
 
 	/** @var \OCA\Circles\Model\Circle */
diff --git a/lib/Db/Group.php b/lib/Db/Group.php
index 516afb323..c06e3f461 100644
--- a/lib/Db/Group.php
+++ b/lib/Db/Group.php
@@ -24,7 +24,6 @@
 namespace OCA\Deck\Db;
 
 use OCP\IGroup;
-use OCP\Share\IShare;
 
 class Group extends RelationalObject {
 	public function __construct(IGroup $group) {
diff --git a/lib/Db/User.php b/lib/Db/User.php
index 0a1334a35..d595ece75 100644
--- a/lib/Db/User.php
+++ b/lib/Db/User.php
@@ -24,7 +24,6 @@
 namespace OCA\Deck\Db;
 
 use OCP\IUser;
-use OCP\Share\IShare;
 
 class User extends RelationalObject {
 	public function __construct(IUser $user) {
diff --git a/tests/unit/Db/GroupTest.php b/tests/unit/Db/GroupTest.php
index 195c9268d..f57bccb47 100644
--- a/tests/unit/Db/GroupTest.php
+++ b/tests/unit/Db/GroupTest.php
@@ -38,7 +38,8 @@ class GroupTest extends \Test\TestCase {
 		$groupRelationalObject = new Group($group);
 		$expected = [
 			'uid' => 'mygroup',
-			'displayname' => 'My Group'
+			'displayname' => 'My Group',
+			'type' => 1
 		];
 		$this->assertEquals($expected, $groupRelationalObject->getObjectSerialization());
 	}
@@ -56,7 +57,8 @@ class GroupTest extends \Test\TestCase {
 		$expected = [
 			'uid' => 'mygroup',
 			'displayname' => 'My Group',
-			'primaryKey' => '1:mygroup'
+			'primaryKey' => 'mygroup',
+			'type' => 1
 		];
 
 		$actual = $groupRelationalObject->jsonSerialize();
diff --git a/tests/unit/Db/UserTest.php b/tests/unit/Db/UserTest.php
index 6004deda4..8f7e84816 100644
--- a/tests/unit/Db/UserTest.php
+++ b/tests/unit/Db/UserTest.php
@@ -38,7 +38,8 @@ class UserTest extends \Test\TestCase {
 		$userRelationalObject = new User($user);
 		$expected = [
 			'uid' => 'myuser',
-			'displayname' => 'myuser displayname'
+			'displayname' => 'myuser displayname',
+			'type' => 0
 		];
 		$this->assertEquals($expected, $userRelationalObject->getObjectSerialization());
 	}
@@ -56,7 +57,8 @@ class UserTest extends \Test\TestCase {
 		$expected = [
 			'uid' => 'myuser',
 			'displayname' => 'myuser displayname',
-			'primaryKey' => '0:myuser'
+			'primaryKey' => 'myuser',
+			'type' => 0,
 		];
 		$this->assertEquals($expected, $userRelationalObject->jsonSerialize());
 	}
diff --git a/tests/unit/controller/LabelApiControllerTest.php b/tests/unit/controller/LabelApiControllerTest.php
index a4de3aad4..86dec24f6 100644
--- a/tests/unit/controller/LabelApiControllerTest.php
+++ b/tests/unit/controller/LabelApiControllerTest.php
@@ -34,7 +34,9 @@ class LabelApiControllerTest extends \Test\TestCase {
 	private $request;
 	private $labelService;
 	private $userId = 'admin';
-	private $exampleLabel;
+	private $exampleLabel = [
+		'id' => 123
+	];
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/unit/controller/StackApiControllerTest.php b/tests/unit/controller/StackApiControllerTest.php
index 64b4ec7e9..5878e560f 100644
--- a/tests/unit/controller/StackApiControllerTest.php
+++ b/tests/unit/controller/StackApiControllerTest.php
@@ -36,8 +36,8 @@ class StackApiControllerTest extends \Test\TestCase {
 	private $controller;
 	private $boardService;
 	private $stackService;
-	private $exampleStack;
-	private $exampleBoard;
+	private $exampleStack = [];
+	private $exampleBoard = [];
 
 	public function setUp(): void {
 		parent::setUp();
@@ -45,13 +45,13 @@ class StackApiControllerTest extends \Test\TestCase {
 		$this->boardService = $this->createMock(BoardService::class);
 		$this->stackService = $this->createMock(StackService::class);
 
+		$this->exampleBoard['boardId'] = '89';
+
 		$this->exampleStack['id'] = 345;
 		$this->exampleStack['boardId'] = $this->exampleBoard['boardId'];
 		$this->exampleStack['order'] = 0;
 		$this->exampleStack['title'] = 'Example Stack From API';
 
-		$this->exampleBoard['boardId'] = '89';
-
 		$this->controller = new StackApiController(
 			$this->appName,
 			$this->request,