diff --git a/e2e-test/java/org/alfresco/rest/RestTest.java b/e2e-test/java/org/alfresco/rest/RestTest.java
index 09ecbe5e0..749b80d92 100644
--- a/e2e-test/java/org/alfresco/rest/RestTest.java
+++ b/e2e-test/java/org/alfresco/rest/RestTest.java
@@ -7,7 +7,13 @@ import org.alfresco.rest.core.RestProperties;
 import org.alfresco.rest.core.RestWrapper;
 import org.alfresco.utility.LogFactory;
 import org.alfresco.utility.TasProperties;
-import org.alfresco.utility.data.*;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.data.DataDiscussion;
+import org.alfresco.utility.data.DataGroup;
+import org.alfresco.utility.data.DataLink;
+import org.alfresco.utility.data.DataSite;
+import org.alfresco.utility.data.DataUser;
+import org.alfresco.utility.data.DataWorkflow;
 import org.alfresco.utility.network.ServerHealth;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/e2e-test/java/org/alfresco/rest/networks/RestGetNetworkForPersonFullTests.java b/e2e-test/java/org/alfresco/rest/networks/RestGetNetworkForPersonFullTests.java
index e5a5e344d..3ce6393f9 100644
--- a/e2e-test/java/org/alfresco/rest/networks/RestGetNetworkForPersonFullTests.java
+++ b/e2e-test/java/org/alfresco/rest/networks/RestGetNetworkForPersonFullTests.java
@@ -1,5 +1,7 @@
 package org.alfresco.rest.networks;
 
+import java.util.ArrayList;
+
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestNetworkModel;
 import org.alfresco.rest.model.RestNetworkQuotaModel;
@@ -11,8 +13,6 @@ import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.util.ArrayList;
-
 /**
  * Tests for /people/{personId}/networks
  */
diff --git a/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestSanityTests.java b/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestSanityTests.java
index 6908f60cd..a0eb8abed 100644
--- a/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/people/UpdateSiteMembershipRequestSanityTests.java
@@ -4,18 +4,14 @@ import org.alfresco.rest.RestTest;
 import org.alfresco.rest.exception.JsonToModelConversionException;
 import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.data.DataSite;
-import org.alfresco.utility.data.DataUser;
 import org.alfresco.utility.data.DataUser.ListUserWithRoles;
 import org.alfresco.utility.data.RandomData;
 import org.alfresco.utility.exception.DataPreparationException;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.TestGroup;
 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;
 import org.springframework.http.HttpStatus;
 import org.springframework.social.alfresco.api.entities.Site.Visibility;
 import org.testng.annotations.BeforeClass;
diff --git a/e2e-test/java/org/alfresco/rest/ratings/AddRatingFullTests.java b/e2e-test/java/org/alfresco/rest/ratings/AddRatingFullTests.java
index 97c94e6a0..6207473b7 100644
--- a/e2e-test/java/org/alfresco/rest/ratings/AddRatingFullTests.java
+++ b/e2e-test/java/org/alfresco/rest/ratings/AddRatingFullTests.java
@@ -13,7 +13,6 @@ import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.TestGroup;
 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.apache.commons.lang3.RandomStringUtils;
diff --git a/e2e-test/java/org/alfresco/rest/ratings/DeleteRatingFullTests.java b/e2e-test/java/org/alfresco/rest/ratings/DeleteRatingFullTests.java
index b2dfd66d6..b3c68262f 100644
--- a/e2e-test/java/org/alfresco/rest/ratings/DeleteRatingFullTests.java
+++ b/e2e-test/java/org/alfresco/rest/ratings/DeleteRatingFullTests.java
@@ -8,7 +8,11 @@ import org.alfresco.rest.model.RestRatingModelsCollection;
 import org.alfresco.utility.constants.UserRole;
 import org.alfresco.utility.data.DataUser;
 import org.alfresco.utility.exception.DataPreparationException;
-import org.alfresco.utility.model.*;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.TestGroup;
+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;
diff --git a/e2e-test/java/org/alfresco/rest/tags/GetNodeTagsFullTests.java b/e2e-test/java/org/alfresco/rest/tags/GetNodeTagsFullTests.java
index 9de001f0e..0da991ef8 100644
--- a/e2e-test/java/org/alfresco/rest/tags/GetNodeTagsFullTests.java
+++ b/e2e-test/java/org/alfresco/rest/tags/GetNodeTagsFullTests.java
@@ -7,8 +7,8 @@ import org.alfresco.rest.exception.JsonToModelConversionException;
 import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestTagModelsCollection;
 import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.data.RandomData;
 import org.alfresco.utility.data.DataUser.ListUserWithRoles;
+import org.alfresco.utility.data.RandomData;
 import org.alfresco.utility.model.FileModel;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.TestGroup;
diff --git a/e2e-test/java/org/alfresco/rest/workflow/deployments/DeleteDeploymentSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/deployments/DeleteDeploymentSanityTests.java
index 7fcd6da35..254d40c00 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/deployments/DeleteDeploymentSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/deployments/DeleteDeploymentSanityTests.java
@@ -1,8 +1,15 @@
 package org.alfresco.rest.workflow.deployments;
 
+import java.util.List;
+
 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.*;
+import org.alfresco.rest.model.RestDeploymentModel;
+import org.alfresco.rest.model.RestDeploymentModelsCollection;
+import org.alfresco.rest.model.RestErrorModel;
+import org.alfresco.rest.model.RestProcessDefinitionModel;
+import org.alfresco.rest.model.RestProcessModel;
+import org.alfresco.rest.model.RestTaskModel;
 import org.alfresco.utility.model.TestGroup;
 import org.alfresco.utility.model.UserModel;
 import org.alfresco.utility.report.Bug;
@@ -12,8 +19,6 @@ import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.util.List;
-
 /**
  * Tests for REST API call DELETE "/deployments/{deploymentId}"
  * Class has priority 100 in order to be executed last in the list of tests classes
diff --git a/e2e-test/java/org/alfresco/rest/workflow/deployments/GetDeploymentFullTests.java b/e2e-test/java/org/alfresco/rest/workflow/deployments/GetDeploymentFullTests.java
index 335e0f3ad..a13c4a50f 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/deployments/GetDeploymentFullTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/deployments/GetDeploymentFullTests.java
@@ -7,7 +7,6 @@ import org.alfresco.rest.model.RestDeploymentModelsCollection;
 import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.utility.model.TestGroup;
 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.http.HttpMethod;
diff --git a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelFullTests.java b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelFullTests.java
index c80a5b704..27e146a38 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelFullTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionStartFormModelFullTests.java
@@ -1,5 +1,7 @@
 package org.alfresco.rest.workflow.processDefinitions;
 
+import java.util.Arrays;
+
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestFormModelsCollection;
@@ -12,8 +14,6 @@ import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.util.Arrays;
-
 /**
  * Created by Claudia Agache on 1/31/2017.
  */
diff --git a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsSanityTests.java
index 8a719a929..9925ebd93 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsSanityTests.java
@@ -1,12 +1,10 @@
 package org.alfresco.rest.workflow.processDefinitions;
 
 import org.alfresco.rest.RestTest;
-import org.alfresco.utility.data.DataUser;
 import org.alfresco.utility.model.TestGroup;
 import org.alfresco.utility.model.UserModel;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksCoreTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksCoreTests.java
index 2528a0e88..fcd3c9718 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksCoreTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksCoreTests.java
@@ -4,7 +4,12 @@ import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestTaskModel;
-import org.alfresco.utility.model.*;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.GroupModel;
+import org.alfresco.utility.model.ProcessModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.TestGroup;
+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;
diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksSanityTests.java
index d9e161119..b899780f5 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksSanityTests.java
@@ -4,7 +4,11 @@ import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.exception.JsonToModelConversionException;
 import org.alfresco.rest.model.RestTaskModelsCollection;
-import org.alfresco.utility.model.*;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.ProcessModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.TestGroup;
+import org.alfresco.utility.model.UserModel;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
 import org.springframework.http.HttpStatus;
diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java
index 2e756b033..ffdf90930 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java
@@ -3,7 +3,11 @@ package org.alfresco.rest.workflow.processes;
 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestProcessModelsCollection;
-import org.alfresco.utility.model.*;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.TaskModel;
+import org.alfresco.utility.model.TestGroup;
+import org.alfresco.utility.model.UserModel;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
 import org.springframework.http.HttpStatus;
diff --git a/e2e-test/java/org/alfresco/rest/workflow/processes/UpdateProcessVariableSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/UpdateProcessVariableSanityTests.java
index 165c11b7c..e84f3f45c 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/processes/UpdateProcessVariableSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/processes/UpdateProcessVariableSanityTests.java
@@ -7,7 +7,10 @@ import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestProcessModel;
 import org.alfresco.rest.model.RestProcessVariableCollection;
 import org.alfresco.rest.model.RestProcessVariableModel;
-import org.alfresco.utility.model.*;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.TestGroup;
+import org.alfresco.utility.model.UserModel;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
 import org.springframework.http.HttpStatus;
diff --git a/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskItemsCoreTests.java b/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskItemsCoreTests.java
index 916c52283..63b469f2d 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskItemsCoreTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskItemsCoreTests.java
@@ -1,9 +1,18 @@
 package org.alfresco.rest.workflow.tasks;
 
-import org.alfresco.dataprep.CMISUtil.*;
+import org.alfresco.dataprep.CMISUtil.DocumentType;
+import org.alfresco.dataprep.CMISUtil.Priority;
 import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.*;
-import org.alfresco.utility.model.*;
+import org.alfresco.rest.model.RestErrorModel;
+import org.alfresco.rest.model.RestItemModel;
+import org.alfresco.rest.model.RestItemModelsCollection;
+import org.alfresco.rest.model.RestProcessModel;
+import org.alfresco.rest.model.RestTaskModel;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.TaskModel;
+import org.alfresco.utility.model.TestGroup;
+import org.alfresco.utility.model.UserModel;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
 import org.springframework.http.HttpStatus;
diff --git a/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskVariablesCoreTests.java b/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskVariablesCoreTests.java
index a3c76115e..ed14bcf3f 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskVariablesCoreTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskVariablesCoreTests.java
@@ -6,7 +6,11 @@ import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestProcessModel;
 import org.alfresco.rest.model.RestTaskModel;
 import org.alfresco.rest.model.RestVariableModelsCollection;
-import org.alfresco.utility.model.*;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.TaskModel;
+import org.alfresco.utility.model.TestGroup;
+import org.alfresco.utility.model.UserModel;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
 import org.springframework.http.HttpStatus;
diff --git a/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTasksCoreTests.java b/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTasksCoreTests.java
index 1c5a51e30..f60f151ee 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTasksCoreTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTasksCoreTests.java
@@ -3,7 +3,6 @@ package org.alfresco.rest.workflow.tasks;
 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.dataprep.CMISUtil.Priority;
 import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestTaskModelsCollection;
 import org.alfresco.utility.model.FileModel;
 import org.alfresco.utility.model.SiteModel;