diff --git a/e2e-test/java/org/alfresco/rest/v1/RestDemoTest.java b/e2e-test/java/org/alfresco/rest/RestDemoTest.java
similarity index 91%
rename from e2e-test/java/org/alfresco/rest/v1/RestDemoTest.java
rename to e2e-test/java/org/alfresco/rest/RestDemoTest.java
index 6f8a65849..010ebf341 100644
--- a/e2e-test/java/org/alfresco/rest/v1/RestDemoTest.java
+++ b/e2e-test/java/org/alfresco/rest/RestDemoTest.java
@@ -1,13 +1,10 @@
-package org.alfresco.rest.v1;
+package org.alfresco.rest;
 
 import java.io.File;
 
 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.dataprep.ContentService;
-import org.alfresco.rest.RestCommentsApi;
-import org.alfresco.rest.RestSitesApi;
 import org.alfresco.rest.exception.JsonToModelConversionException;
-import org.alfresco.rest.model.Content;
 import org.alfresco.rest.model.RestCommentModel;
 import org.alfresco.rest.model.SiteMember;
 import org.alfresco.utility.data.DataSite;
@@ -44,7 +41,7 @@ public class RestDemoTest extends RestTest
     private SiteModel siteModel;
 
     @BeforeClass
-    public void setUp()
+    public void setUp() throws DataPreparationException
     {
         userModel = dataUser.getAdminUser();
         siteModel = dataSite.createPublicRandomSite();
@@ -89,18 +86,16 @@ public class RestDemoTest extends RestTest
                 userModel.getPassword(), "Shared", DocumentType.TEXT_PLAIN, file, "This is a text file");
 
         // add new comment
-        Content content = new Content("This is a new comment");
-        RestCommentModel commentEntry = commentsAPI.addComment(document.getId(), content);
+        RestCommentModel commentEntry = commentsAPI.addComment(document.getId(), "This is a new comment");
         commentsAPI.getNodeComments(document.getId()).assertThatResponseIsNotEmpty()
                 .assertThatCommentWithIdExists(commentEntry.getId())
-                .assertThatCommentWithContentExists(content);
+                .assertThatCommentWithContentExists("This is a new comment");
 
         // update comment
-        content = new Content("This is the updated comment");
-        commentEntry = commentsAPI.updateComment(document.getId(), commentEntry.getId(), content);
+        commentEntry = commentsAPI.updateComment(document.getId(), commentEntry.getId(), "This is the updated comment");
         commentsAPI.getNodeComments(document.getId()).assertThatResponseIsNotEmpty()
                 .assertThatCommentWithIdExists(commentEntry.getId())
-                .assertThatCommentWithContentExists(content);
+                .assertThatCommentWithContentExists("This is the updated comment");
     }
 
     /**
diff --git a/e2e-test/java/org/alfresco/rest/v1/RestTest.java b/e2e-test/java/org/alfresco/rest/RestTest.java
similarity index 97%
rename from e2e-test/java/org/alfresco/rest/v1/RestTest.java
rename to e2e-test/java/org/alfresco/rest/RestTest.java
index 7e9d131f5..f54d21d73 100644
--- a/e2e-test/java/org/alfresco/rest/v1/RestTest.java
+++ b/e2e-test/java/org/alfresco/rest/RestTest.java
@@ -1,4 +1,4 @@
-package org.alfresco.rest.v1;
+package org.alfresco.rest;
 
 import org.alfresco.rest.core.RestProperties;
 import org.alfresco.rest.core.RestWrapper;
diff --git a/e2e-test/java/org/alfresco/rest/v1/SampleCommentsTest.java b/e2e-test/java/org/alfresco/rest/SampleCommentsTest.java
similarity index 86%
rename from e2e-test/java/org/alfresco/rest/v1/SampleCommentsTest.java
rename to e2e-test/java/org/alfresco/rest/SampleCommentsTest.java
index 38a3d468e..614397783 100644
--- a/e2e-test/java/org/alfresco/rest/v1/SampleCommentsTest.java
+++ b/e2e-test/java/org/alfresco/rest/SampleCommentsTest.java
@@ -1,4 +1,4 @@
-package org.alfresco.rest.v1;
+package org.alfresco.rest;
 
 import java.io.File;
 
@@ -6,7 +6,6 @@ import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.dataprep.ContentService;
 import org.alfresco.rest.RestCommentsApi;
 import org.alfresco.rest.exception.JsonToModelConversionException;
-import org.alfresco.rest.model.Content;
 import org.alfresco.rest.model.RestCommentModel;
 import org.alfresco.utility.data.DataUser;
 import org.alfresco.utility.exception.DataPreparationException;
@@ -49,8 +48,7 @@ public class SampleCommentsTest extends RestTest
     @Test
     public void addComments() throws JsonToModelConversionException
     {
-        Content content = new Content("This is a new comment");
-        commentsAPI.addComment(document.getId(), content);
+        commentsAPI.addComment(document.getId(), "This is a new comment");
         Assert.assertEquals(commentsAPI.usingRestWrapper().getStatusCode(), HttpStatus.CREATED.toString(), "Add comments response status code is not correct");
 
     }
@@ -66,12 +64,10 @@ public class SampleCommentsTest extends RestTest
     public void updateComment() throws JsonToModelConversionException
     {
         // add initial comment
-        Content content = new Content("This is a new comment");
-        String commentId = commentsAPI.addComment(document.getId(), content).getId();
+        String commentId = commentsAPI.addComment(document.getId(), "This is a new comment").getId();
 
         // update comment
-        content = new Content("This is the updated comment");
-        RestCommentModel commentEntry = commentsAPI.updateComment(document.getId(), commentId, content);
+        RestCommentModel commentEntry = commentsAPI.updateComment(document.getId(), commentId, "This is the updated comment");
         Assert.assertEquals(commentEntry.getContent(), "This is the updated comment", "New comment was not updated");
     }
 
diff --git a/e2e-test/java/org/alfresco/rest/v1/SamplePeopleTest.java b/e2e-test/java/org/alfresco/rest/SamplePeopleTest.java
similarity index 98%
rename from e2e-test/java/org/alfresco/rest/v1/SamplePeopleTest.java
rename to e2e-test/java/org/alfresco/rest/SamplePeopleTest.java
index 75a7bbcd9..592daab8b 100644
--- a/e2e-test/java/org/alfresco/rest/v1/SamplePeopleTest.java
+++ b/e2e-test/java/org/alfresco/rest/SamplePeopleTest.java
@@ -1,4 +1,4 @@
-package org.alfresco.rest.v1;
+package org.alfresco.rest;
 
 import org.alfresco.rest.RestPeopleApi;
 import org.alfresco.rest.exception.JsonToModelConversionException;
diff --git a/e2e-test/java/org/alfresco/rest/v1/SampleSitesTest.java b/e2e-test/java/org/alfresco/rest/SampleSitesTest.java
similarity index 97%
rename from e2e-test/java/org/alfresco/rest/v1/SampleSitesTest.java
rename to e2e-test/java/org/alfresco/rest/SampleSitesTest.java
index 65bb0f838..e6c67b12e 100644
--- a/e2e-test/java/org/alfresco/rest/v1/SampleSitesTest.java
+++ b/e2e-test/java/org/alfresco/rest/SampleSitesTest.java
@@ -1,4 +1,4 @@
-package org.alfresco.rest.v1;
+package org.alfresco.rest;
 
 import org.alfresco.dataprep.ContentService;
 import org.alfresco.rest.RestSitesApi;
@@ -71,7 +71,7 @@ public class SampleSitesTest extends RestTest
     @Test
     public void sitesCollectionHasPagination() throws JsonToModelConversionException
     {
-        siteAPI.getSites().assertPagination();
+        siteAPI.getSites().assertResponseHasPagination();
         Assert.assertEquals(siteAPI.getSites().getPagination().getCount(), 100, "Sites collection should have pagination");
     }