diff --git a/docs/User_documentation_en.md b/docs/User_documentation_en.md
index 040808f62..5bec5312b 100644
--- a/docs/User_documentation_en.md
+++ b/docs/User_documentation_en.md
@@ -91,8 +91,22 @@ For example the search `project tag:ToDo assigned:alice assigned:bob` will retur
 
 Other text tokens will be used to perform a case-insensitive search on the card title and description
 
-In addition wuotes can be used to pass a query with spaces, e.g. `"Exact match with spaces"` or `title:"My card"`.
+In addition, quotes can be used to pass a query with spaces, e.g. `"Exact match with spaces"` or `title:"My card"`.
 
 ### 8. New owner for the deck entities
 You can transfer ownership of boards, cards, etc to a new user, using `occ` command `deck:transfer-ownership`  
-`$ php occ deck:transfer-ownership owner newOwner`
+
+```bash
+php occ deck:transfer-ownership owner newOwner
+```
+
+The transfer will preserve card details linked to the old owner, which can also be remapped by using the `--remap` option on the occ command.
+```bash
+php occ deck:transfer-ownership --remap owner newOwner
+```
+
+Individual boards can be transferred by adding the id of the board to the command:
+
+```bash
+php occ deck:transfer-ownership owner newOwner 123
+```
diff --git a/tests/unit/Service/AttachmentServiceTest.php b/tests/unit/Service/AttachmentServiceTest.php
index 287c31672..e90692b8a 100644
--- a/tests/unit/Service/AttachmentServiceTest.php
+++ b/tests/unit/Service/AttachmentServiceTest.php
@@ -116,16 +116,10 @@ class AttachmentServiceTest extends TestCase {
 				[FileService::class],
 				[FilesAppService::class]
 			)
-			->willReturnOnConsecutiveCalls($this->attachmentServiceImpl, $this->filesAppServiceImpl);
-
-		/* $this->appContainer->expects($this->at(0))
-			->method('query')
-			->with(FileService::class)
-			->willReturn($this->attachmentServiceImpl);
-		$this->appContainer->expects($this->at(1))
-			->method('query')
-			->with(FilesAppService::class)
-			->willReturn($this->filesAppServiceImpl); */
+			->willReturnOnConsecutiveCalls(
+				$this->attachmentServiceImpl,
+				$this->filesAppServiceImpl
+			);
 
 		$this->application->expects($this->any())
 			->method('getContainer')
@@ -150,20 +144,11 @@ class AttachmentServiceTest extends TestCase {
 				[FilesAppService::class],
 				[MyAttachmentService::class]
 			)
-			->willReturnOnConsecutiveCalls($fileServiceMock, $fileAppServiceMock, new MyAttachmentService());
-
-		/* $appContainer->expects($this->at(0))
-			->method('query')
-			->with(FileService::class)
-			->willReturn($fileServiceMock);
-		$appContainer->expects($this->at(1))
-			->method('query')
-			->with(FilesAppService::class)
-			->willReturn($fileAppServiceMock);
-		$appContainer->expects($this->at(2))
-			->method('query')
-			->with(MyAttachmentService::class)
-			->willReturn(new MyAttachmentService()); */
+			->willReturnOnConsecutiveCalls(
+				$fileServiceMock,
+				$fileAppServiceMock,
+				new MyAttachmentService()
+			);
 
 		$application->expects($this->any())
 			->method('getContainer')
@@ -188,20 +173,12 @@ class AttachmentServiceTest extends TestCase {
 				[FilesAppService::class],
 				[MyAttachmentService::class]
 			)
-			->willReturnOnConsecutiveCalls($fileServiceMock, $fileAppServiceMock, new MyAttachmentService());
+			->willReturnOnConsecutiveCalls(
+				$fileServiceMock,
+				$fileAppServiceMock,
+				new MyAttachmentService()
+			);
 
-		/* $appContainer->expects($this->at(0))
-			->method('query')
-			->with(FileService::class)
-			->willReturn($fileServiceMock);
-		$appContainer->expects($this->at(1))
-			->method('query')
-			->with(FilesAppService::class)
-			->willReturn($fileAppServiceMock);
-		$appContainer->expects($this->at(2))
-			->method('query')
-			->with(MyAttachmentService::class)
-			->willReturn(new MyAttachmentService()); */
 		$application->expects($this->any())
 			->method('getContainer')
 			->willReturn($appContainer);
@@ -241,15 +218,13 @@ class AttachmentServiceTest extends TestCase {
 			->method('extendData')
 			->withConsecutive(
 				[$attachments[0]],
-				[$attachments[1]]
+				[$attachments[1]],
+			)
+			->willReturnOnConsecutiveCalls(
+				$attachments[0],
+				$attachments[1],
 			);
 
-		/* $this->attachmentServiceImpl->expects($this->at(0))
-			->method('extendData')
-			->with($attachments[0]);
-		$this->attachmentServiceImpl->expects($this->at(1))
-			->method('extendData')
-			->with($attachments[1]); */
 		$this->assertEquals($attachments, $this->attachmentService->findAll(123, false));
 	}
 
@@ -283,12 +258,6 @@ class AttachmentServiceTest extends TestCase {
 				[$attachmentsDeleted[1]]
 			);
 
-		/* $this->attachmentServiceImpl->expects($this->at(0))
-			->method('extendData')
-			->with($attachments[0]);
-		$this->attachmentServiceImpl->expects($this->at(1))
-			->method('extendData')
-			->with($attachments[1]); */
 		$this->assertEquals(array_merge($attachments, $attachmentsDeleted), $this->attachmentService->findAll(123, true));
 	}
 
@@ -464,5 +433,6 @@ class AttachmentServiceTest extends TestCase {
 			->method('allowUndo')
 			->willReturn(false);
 		$actual = $this->attachmentService->restore(1, 1);
+		$this->assertEquals($expected, $actual);
 	}
 }