diff --git a/e2e-test/java/org/alfresco/rest/comments/PostCommentsSanityTests.java b/e2e-test/java/org/alfresco/rest/comments/PostCommentsSanityTests.java
index d7e8f85d7..a4a360f24 100644
--- a/e2e-test/java/org/alfresco/rest/comments/PostCommentsSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/comments/PostCommentsSanityTests.java
@@ -87,13 +87,11 @@ public class PostCommentsSanityTests extends RestTest
     }
 
     @TestRail(section = { "rest-api",
-            "comments" }, executionType = ExecutionType.SANITY, description = "Verify Manager user gets status code 401 if authentication call fails")
-    public void managerIsNotAbleToAddCommentIfAuthenticationFails() throws JsonToModelConversionException, Exception
-    {
-        UserModel siteManager = usersWithRoles.getOneUserWithRole(UserRole.SiteManager);
-        siteManager.setPassword("wrongPassword");
-        restClient.authenticateUser(siteManager);
-        commentsAPI.addComment(document, "This is a new comment added by user with role:  " + UserRole.SiteManager);
+            "comments" }, executionType = ExecutionType.SANITY, description = "Verify unauthenticated user gets status code 401 on post comments call")
+    public void unauthenticatedUserIsNotAbleToAddComment() throws JsonToModelConversionException, Exception
+    {        
+        restClient.authenticateUser(new UserModel("random user", "random password"));
+        commentsAPI.addComment(document, "This is a new comment");
         commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.UNAUTHORIZED);
     }
 
diff --git a/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java b/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java
index 3a431ae44..b52dff072 100644
--- a/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/comments/UpdateCommentsSanityTests.java
@@ -2,6 +2,7 @@ package org.alfresco.rest.comments;
 
 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
+import org.alfresco.rest.body.CommentContent;
 import org.alfresco.rest.exception.JsonToModelConversionException;
 import org.alfresco.rest.model.RestCommentModel;
 import org.alfresco.rest.requests.RestCommentsApi;
@@ -12,6 +13,7 @@ import org.alfresco.utility.model.FileModel;
 import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.UserModel;
+import org.alfresco.utility.report.Bug;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,54 +50,68 @@ public class UpdateCommentsSanityTests extends RestTest
     }
 
     @TestRail(section = { "rest-api",
-            "comments" }, executionType = ExecutionType.SANITY, description = "Verify Admin user updates comments with Rest API and status code is 200")
+            "comments" }, executionType = ExecutionType.SANITY, description = "Verify Admin user updates comments and status code is 200")
     public void adminIsAbleToUpdateComments() throws JsonToModelConversionException, Exception
     {
-        commentsAPI.updateComment(document, commentModel, commentModel.getContent());
+        CommentContent commentContent = new CommentContent("This is the updated comment with admin user");
+        
+        commentsAPI.updateComment(document, commentModel, commentContent);
         commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
     }
 
     @TestRail(section = { "rest-api",
-            "comments" }, executionType = ExecutionType.SANITY, description = "Verify Manager user updates comments created by admin user with Rest API and status code is 200")
+            "comments" }, executionType = ExecutionType.SANITY, description = "Verify Manager user updates comments created by admin user and status code is 200")
     public void managerIsAbleToUpdateComment() throws JsonToModelConversionException, Exception
     {
         restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager));
-        commentsAPI.updateComment(document, commentModel, commentModel.getContent());
+        
+        CommentContent commentContent = new CommentContent("This is the updated comment with Manager user");
+        
+        commentsAPI.updateComment(document, commentModel, commentContent);
         commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
     }
 
     @TestRail(section = { "rest-api",
-            "comments" }, executionType = ExecutionType.SANITY, description = "Verify Contributor user updates comments created by admin user with Rest API and status code is 200")
+            "comments" }, executionType = ExecutionType.SANITY, description = "Verify Contributor user updates comments created by admin user and status code is 200")
     public void contributorIsAbleToUpdateComment() throws JsonToModelConversionException, Exception
     {
         restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor));
-        commentsAPI.updateComment(document, commentModel, "This is the updated comment with Contributor user");
+        
+        CommentContent commentContent = new CommentContent("This is the updated comment with Contributor user");
+        
+        commentsAPI.updateComment(document, commentModel, commentContent);
         commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN);
     }
 
     @TestRail(section = { "rest-api",
-            "comments" }, executionType = ExecutionType.SANITY, description = "Verify Consumer user updates comments created by admin user with Rest API and status code is 200")
+            "comments" }, executionType = ExecutionType.SANITY, description = "Verify Consumer user updates comments created by admin user and status code is 200")
     public void consumerIsAbleToUpdateComment() throws JsonToModelConversionException, Exception
     {
         restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer));
-        commentsAPI.updateComment(document, commentModel, commentModel.getContent());
+        
+        CommentContent commentContent = new CommentContent("This is the updated comment with Consumer user");
+        
+        commentsAPI.updateComment(document, commentModel, commentContent);
         commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN);
     }
 
     @TestRail(section = { "rest-api",
-            "comments" }, executionType = ExecutionType.SANITY, description = "Verify Collaborator user updates comments created by admin user with Rest API and status code is 200")
+            "comments" }, executionType = ExecutionType.SANITY, description = "Verify Collaborator user updates comment created by admin user and status code is 200")
+    @Bug(id="REPO-1011")
     public void collaboratorIsAbleToUpdateComment() throws JsonToModelConversionException, Exception
     {
         restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator));
-        RestCommentModel commentEntry = commentsAPI.updateComment(document, commentModel,
-                "This is the updated comment with Collaborator user");
+        
+        CommentContent commentContent = new CommentContent("This is the updated comment with Collaborator user");
+        
+        RestCommentModel commentEntry = commentsAPI.updateComment(document, commentModel, commentContent);
         commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN);
         commentEntry.assertCommentContentIs("This is the updated comment with Collaborator user");
     }
 
     @TestRail(section = { "rest-api",
-            "comments" }, executionType = ExecutionType.SANITY, description = "Verify Manager user gets status code 401 if authentication call fails")
-    public void managerIsNotAbleToUpdateCommentIfAuthenticationFails() throws JsonToModelConversionException, Exception
+            "comments" }, executionType = ExecutionType.SANITY, description = "Verify unauthenticated user gets status code 401 on update comment call")
+    public void unauthenticatedUserIsNotAbleToUpdateComment() throws JsonToModelConversionException, Exception
     {
         UserModel incorrectUserModel = new UserModel("userName", "password");
         restClient.authenticateUser(incorrectUserModel);
@@ -103,11 +119,17 @@ public class UpdateCommentsSanityTests extends RestTest
         commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.UNAUTHORIZED);
     }
 
-    @TestRail(section = { "rest-api", "comments" }, executionType = ExecutionType.SANITY, description = "Verify if nodeId is not set the status code is 404")
+    @TestRail(section = { "rest-api", "comments" }, executionType = ExecutionType.SANITY, description = "Verify update comment with inexistent nodeId returns status code 404")
     public void canNotUpdateCommentIfNodeIdIsNotSet() throws JsonToModelConversionException, Exception
     {
         restClient.authenticateUser(adminUserModel);
-        commentsAPI.updateComment(FolderModel.getRandomFolderModel(), commentModel, commentModel.getContent());
+        
+        FolderModel content = FolderModel.getRandomFolderModel();
+        content.setNodeRef("node ref that does not exist");
+        
+        CommentContent comment = new CommentContent("This is the updated comment.");
+        
+        commentsAPI.updateComment(content, commentModel, comment);
         commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND);
     }
 
@@ -115,8 +137,14 @@ public class UpdateCommentsSanityTests extends RestTest
     public void canNotUpdateCommentIfCommentIdIsNotSet() throws JsonToModelConversionException, Exception
     {
         restClient.authenticateUser(adminUserModel);
-        commentsAPI.updateComment(document, new RestCommentModel(), commentModel.getContent());
+        
+        RestCommentModel comment = new RestCommentModel();
+        comment.setId("comment id that does not exist");
+        
+        CommentContent commentContent = new CommentContent("This is the updated comment.");
+        
+        commentsAPI.updateComment(document, comment, commentContent);
         commentsAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND);
     }
 
-}
+}
\ No newline at end of file
diff --git a/e2e-test/java/org/alfresco/rest/demo/RestDemoTests.java b/e2e-test/java/org/alfresco/rest/demo/RestDemoTests.java
index abc93e8f2..d9bc66df4 100644
--- a/e2e-test/java/org/alfresco/rest/demo/RestDemoTests.java
+++ b/e2e-test/java/org/alfresco/rest/demo/RestDemoTests.java
@@ -2,6 +2,7 @@ package org.alfresco.rest.demo;
 
 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
+import org.alfresco.rest.body.CommentContent;
 import org.alfresco.rest.body.SiteMember;
 import org.alfresco.rest.exception.JsonToModelConversionException;
 import org.alfresco.rest.model.RestCommentModel;
@@ -82,9 +83,8 @@ public class RestDemoTests extends RestTest
             .assertCommentWithIdExists(commentEntry);
 
         // update comment
-        commentEntry = commentsAPI.updateComment(fileModel, 
-                                                    commentEntry, 
-                                                    "This is the updated comment");
+        CommentContent commentContent = new CommentContent("This is the updated comment with Collaborator user");
+        commentEntry = commentsAPI.updateComment(fileModel, commentEntry, commentContent);
 
         commentsAPI.getNodeComments(fileModel)
             .assertResponseIsNotEmpty()
diff --git a/e2e-test/java/org/alfresco/rest/demo/SampleCommentsTests.java b/e2e-test/java/org/alfresco/rest/demo/SampleCommentsTests.java
index ce58f0191..4ae593295 100644
--- a/e2e-test/java/org/alfresco/rest/demo/SampleCommentsTests.java
+++ b/e2e-test/java/org/alfresco/rest/demo/SampleCommentsTests.java
@@ -2,6 +2,7 @@ package org.alfresco.rest.demo;
 
 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
+import org.alfresco.rest.body.CommentContent;
 import org.alfresco.rest.exception.JsonToModelConversionException;
 import org.alfresco.rest.model.RestCommentModel;
 import org.alfresco.rest.requests.RestCommentsApi;
@@ -61,11 +62,10 @@ public class SampleCommentsTests extends RestTest
             description= "Verify admin user updates comments with Rest API")
     public void adminShouldUpdateComment() throws JsonToModelConversionException, Exception
     {
-        // add initial comment
         RestCommentModel commentModel = commentsAPI.addComment(document, "This is a new comment");
 
-        // update comment
-        RestCommentModel commentEntry = commentsAPI.updateComment(document, commentModel, "This is the updated comment");
+        CommentContent commentContent = new CommentContent("This is the updated comment with Collaborator user");
+        RestCommentModel commentEntry = commentsAPI.updateComment(document, commentModel, commentContent);
         commentEntry.assertCommentContentIs("This is the updated comment");
     }
 
diff --git a/e2e-test/java/org/alfresco/rest/demo/SamplePeopleTests.java b/e2e-test/java/org/alfresco/rest/demo/SamplePeopleTests.java
index 479de2cce..2c0c6dd99 100644
--- a/e2e-test/java/org/alfresco/rest/demo/SamplePeopleTests.java
+++ b/e2e-test/java/org/alfresco/rest/demo/SamplePeopleTests.java
@@ -40,11 +40,4 @@ public class SamplePeopleTests extends RestTest
             .assertStatusCodeIs(HttpStatus.OK);
     }
 
-    @TestRail(section={"demo", "sample-section"}, executionType= ExecutionType.SANITY,
-            description = "Admin user gets own person information with Rest Api and assert that name is correct")
-    public void adminShouldRetrieveItself() throws Exception
-    {
-        peopleAPI.getPerson(adminUser).assertPersonHasName(adminUser);
-    }
-
 }
\ No newline at end of file