diff --git a/lib/Service/DefaultBoardService.php b/lib/Service/DefaultBoardService.php
index 59192b444..30edf1372 100644
--- a/lib/Service/DefaultBoardService.php
+++ b/lib/Service/DefaultBoardService.php
@@ -39,8 +39,8 @@ class DefaultBoardService {
 
     public function __construct(
 			BoardMapper $boardMapper,
-			BoardService $boardService, 
-			StackService $stackService, 
+			BoardService $boardService,
+			StackService $stackService,
 			CardService $cardService,
 			IConfig $config
 			) {
@@ -78,5 +78,7 @@ class DefaultBoardService {
 		$defaultCards[] = $this->cardService->create('Example Task 3', $defaultStacks[0]->getId(), 'text', 0, $userId);
 		$defaultCards[] = $this->cardService->create('Example Task 2', $defaultStacks[1]->getId(), 'text', 0, $userId);
 		$defaultCards[] = $this->cardService->create('Example Task 1', $defaultStacks[2]->getId(), 'text', 0, $userId);
+
+		return $defaultBoard;
     }    
 }
\ No newline at end of file
diff --git a/tests/unit/Service/DefaultBoardServiceTest.php b/tests/unit/Service/DefaultBoardServiceTest.php
new file mode 100644
index 000000000..21f01d9e3
--- /dev/null
+++ b/tests/unit/Service/DefaultBoardServiceTest.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 Ryan Fletcher <ryan.fletcher@codepassion.ca>
+ *
+ * @author Ryan Fletcher <ryan.fletcher@codepassion.ca>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Deck\Service;
+
+use OCA\Deck\Db\Card;
+use OCA\Deck\Db\Board;
+use OCA\Deck\Db\Stack;
+use OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Service\DefaultBoardService;
+use OCA\Deck\Service\BoardService;
+use OCA\Deck\Service\StackService;
+use OCA\Deck\Service\CardService;
+use OCP\IConfig;
+
+class DefaultBoardServiceTest extends TestCase {
+	
+	/** @var DefaultBoardService */
+	private $service;	
+
+	/** @var BoardService */
+	private $boardService;
+
+	/** @var StackService */
+	private $stackService;
+
+	/** @var CardService */
+	private $cardService;
+
+	/** @var BoardMapper */
+	private $boardMapper;	
+
+	/** @var IConfig */
+	private $config;
+	
+	private $userId = 'admin';	
+
+	public function setUp() {
+		parent::setUp();			
+		$this->boardService = $this->createMock(BoardService::class);
+		$this->stackService = $this->createMock(StackService::class);
+		$this->cardService = $this->createMock(CardService::class);
+		$this->config = $this->createMock(IConfig::class);
+
+		$this->service = new DefaultBoardService(			
+			$this->boardService,
+			$this->stackService,
+			$this->cardService,
+			$this->config
+		);
+
+		$user = $this->createMock(IUser::class);
+		$user->method('getUID')->willReturn('admin');
+	}
+
+	public function testCreateDefaultBoard() {	
+		$title = 'Personal';		
+		$color = '000000';
+		$boardId = 123;
+		
+		$board = new Board();
+		$board->setBoardId($boardId);
+		$board->setTitle($title);
+		$board->setOwner($admin);
+		$board->setColor($color);
+		$this->boardMapper->expects($this->once())
+			 ->method('insert')
+			 ->willReturn($board);
+
+		$stackToDoId = '123';		
+		$stackToDo = $this->assembleTestStack('To do', $stackToDoId, $boardId);
+		$this->stackService->expects($this->once())
+			->method('create')
+			->willReturn($stackToDo);		
+		
+		$stackDoingId = '124';		
+		$stackDone = $this.assembleTestStack('Done', $stackDoingId, $boardId);
+		$this->stackService->expects($this->once())
+			->method('create')
+			->willReturn($stackDoing);
+		
+		$stackDoneId = '125';
+		$stackDone = $this.assembleTestStack('Done', $stackDoneId, $boardId);
+		$this->stackService->expects($this->once())
+			->method('create')
+			->willReturn($stackDone);
+		
+		$cardExampleTask3 = $this.assembleTestCard('Example Task 3', $stackToDoId, $this->userId);
+		$this->cardService->expects($this->once())
+			->method('create')
+			->willReturn($cardExampleTask3);		
+
+		$cardExampleTask2 = $this.assembleTestCard('Example Task 2', $stackDoingId, $this->userId);
+		$this->cardService->expects($this->once())
+			->method('create')
+			->willReturn($cardExampleTask2);
+
+		$cardExampleTask1 = $this.assembleTestCard('Example Task 1', $stackDoneId, $this->userId);
+		$this->cardService->expects($this->once())
+			->method('create')
+			->willReturn($cardExampleTask1);
+
+		$result = $this->service->createDefaultBoard($title, $this->userId, $color);
+
+		$this->assertEquals($result->getTitle(), $title);
+		$this->assertEquals($result->getOwner(), $this->userId);
+		$this->assertEquals($result->getColor(), $color);
+	}
+	
+	private function assembleTestStack($title, $id, $boardId) {		
+		$stack = new Stack();
+		$stack->setId($id);
+		$stack->setTitle($title);
+		$stack->setBoardId($boardId);
+		$stack->setOrder(1);
+
+		return $stack;
+	}
+
+	private function assembleTestCard($title, $stackId, $userId) {
+		$card = new Card();
+		$card->setTitle($title);
+		$card->setStackId($stackId);
+		$card->setType('text');
+		$card->setOrder(0);
+		$card->setUserId($userId);
+
+		return $card;
+	}
+}
\ No newline at end of file