diff --git a/e2e-test/java/org/alfresco/rest/auth/AuthTests.java b/e2e-test/java/org/alfresco/rest/auth/AuthTests.java
index e978f6d77..70826fe4c 100644
--- a/e2e-test/java/org/alfresco/rest/auth/AuthTests.java
+++ b/e2e-test/java/org/alfresco/rest/auth/AuthTests.java
@@ -10,7 +10,6 @@ import org.alfresco.utility.model.UserModel;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
 import org.apache.commons.codec.binary.Base64;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/e2e-test/java/org/alfresco/rest/comments/AddCommentTests.java b/e2e-test/java/org/alfresco/rest/comments/AddCommentTests.java
index fbd7cde34..aeaa95869 100644
--- a/e2e-test/java/org/alfresco/rest/comments/AddCommentTests.java
+++ b/e2e-test/java/org/alfresco/rest/comments/AddCommentTests.java
@@ -19,7 +19,7 @@ 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.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/e2e-test/java/org/alfresco/rest/comments/AddCommentsTests.java b/e2e-test/java/org/alfresco/rest/comments/AddCommentsTests.java
index c00ddf436..7f28fd249 100644
--- a/e2e-test/java/org/alfresco/rest/comments/AddCommentsTests.java
+++ b/e2e-test/java/org/alfresco/rest/comments/AddCommentsTests.java
@@ -24,7 +24,7 @@ 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.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
diff --git a/e2e-test/java/org/alfresco/rest/comments/UpdateCommentTests.java b/e2e-test/java/org/alfresco/rest/comments/UpdateCommentTests.java
index f168e14e3..aad251918 100644
--- a/e2e-test/java/org/alfresco/rest/comments/UpdateCommentTests.java
+++ b/e2e-test/java/org/alfresco/rest/comments/UpdateCommentTests.java
@@ -18,7 +18,7 @@ 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.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java b/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java
index 4accab458..9cdc776aa 100644
--- a/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java
+++ b/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java
@@ -9,10 +9,13 @@ import org.alfresco.rest.model.RestSiteModel;
 import org.alfresco.rest.model.RestSiteModelsCollection;
 import org.alfresco.utility.constants.UserRole;
 import org.alfresco.utility.data.DataUser;
-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.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleFullTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleFullTests.java
index 6b2362eaa..a447bd1d5 100644
--- a/e2e-test/java/org/alfresco/rest/people/GetPeopleFullTests.java
+++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleFullTests.java
@@ -2,7 +2,6 @@ package org.alfresco.rest.people;
 
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.core.RestRequest;
-import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestPersonModel;
 import org.alfresco.rest.model.RestPersonModelsCollection;
 import org.alfresco.utility.constants.UserRole;
@@ -11,7 +10,6 @@ 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.apache.commons.lang3.RandomStringUtils;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
diff --git a/e2e-test/java/org/alfresco/rest/ratings/GetRatingTests.java b/e2e-test/java/org/alfresco/rest/ratings/GetRatingTests.java
index 3e7d5c9e4..9cb42f8f7 100644
--- a/e2e-test/java/org/alfresco/rest/ratings/GetRatingTests.java
+++ b/e2e-test/java/org/alfresco/rest/ratings/GetRatingTests.java
@@ -15,7 +15,7 @@ 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.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
diff --git a/e2e-test/java/org/alfresco/rest/ratings/GetRatingsTests.java b/e2e-test/java/org/alfresco/rest/ratings/GetRatingsTests.java
index 70b205162..ca4469a85 100644
--- a/e2e-test/java/org/alfresco/rest/ratings/GetRatingsTests.java
+++ b/e2e-test/java/org/alfresco/rest/ratings/GetRatingsTests.java
@@ -16,7 +16,7 @@ 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.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/e2e-test/java/org/alfresco/rest/renditions/GetRenditionTests.java b/e2e-test/java/org/alfresco/rest/renditions/GetRenditionTests.java
index 5fcad7e79..bbeda974c 100644
--- a/e2e-test/java/org/alfresco/rest/renditions/GetRenditionTests.java
+++ b/e2e-test/java/org/alfresco/rest/renditions/GetRenditionTests.java
@@ -2,7 +2,6 @@ package org.alfresco.rest.renditions;
 
 import static org.alfresco.utility.report.log.Step.STEP;
 
-import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.core.RestResponse;
diff --git a/e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java b/e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java
index a1ff0d517..1ca43bbeb 100644
--- a/e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java
@@ -134,7 +134,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
         bucket.assertThat().field("label").is("[0 - 200)");
         bucket.assertThat().field("filterQuery").is("content.size:[\"0\" TO \"200\">");
         Map<String,String> metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
-        Assert.assertTrue(new Integer(metric.get("count")) >= 4);
+        Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 4);
         Map<String, String> info = (Map<String, String>) bucket.getBucketInfo();
         Assert.assertEquals(info.get("start"),"0");
         Assert.assertEquals(info.get("end"),"200");
@@ -146,7 +146,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
         bucket.assertThat().field("label").is("[200 - 400)");
         bucket.assertThat().field("filterQuery").is("content.size:[\"200\" TO \"400\">");
         metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
-        Integer count = new Integer(metric.get("count"));
+        Integer count = Integer.valueOf(metric.get("count"));
         Assert.assertTrue(count >= 4);
         info = (Map<String, String>) bucket.getBucketInfo();
         Assert.assertEquals(info.get("start"),"200");
@@ -158,7 +158,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
         bucket.assertThat().field("label").is("[400 - 600]");
         bucket.assertThat().field("filterQuery").is("content.size:[\"400\" TO \"600\"]");
         metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
-        Assert.assertTrue(new Integer(metric.get("count")) >= 7);
+        Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 7);
         info = (Map<String, String>) bucket.getBucketInfo();
         Assert.assertEquals(info.get("start"),"400");
         Assert.assertEquals(info.get("end"),"600");
@@ -191,7 +191,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
         bucket.assertThat().field("label").is("[0 - 200)");
         bucket.assertThat().field("filterQuery").is("content.size:[\"0\" TO \"200\">");
         Map<String,String> metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
-        Assert.assertTrue(new Integer(metric.get("count")) >= 4);
+        Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 4);
         Map<String, String> info = (Map<String, String>) bucket.getBucketInfo();
         Assert.assertEquals(info.get("start"),"0");
         Assert.assertEquals(info.get("end"),"200");
@@ -206,7 +206,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
         Assert.assertEquals(info.get("start"),"200");
         Assert.assertEquals(info.get("end"),"400");
         metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
-        Assert.assertTrue(new Integer(metric.get("count")) >= 4);
+        Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 4);
         Assert.assertNull(info.get("count"));
         Assert.assertEquals(info.get("startInclusive"),"true");
         Assert.assertEquals(info.get("endInclusive"),"false");
@@ -215,7 +215,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
         bucket.assertThat().field("label").is("[400 - 500]");
         bucket.assertThat().field("filterQuery").is("content.size:[\"400\" TO \"500\"]");
         metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
-        Assert.assertTrue(new Integer(metric.get("count")) >= 3);
+        Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 3);
         info = (Map<String, String>) bucket.getBucketInfo();
         Assert.assertEquals(info.get("start"),"400");
         Assert.assertEquals(info.get("end"),"500");
@@ -307,7 +307,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
         bucket.assertThat().field("label").is("(0 - 200]");
         bucket.assertThat().field("filterQuery").is("content.size:<\"0\" TO \"200\"]");
         Map<String,String> metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
-        Assert.assertTrue(new Integer(metric.get("count")) >= 4);
+        Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 4);
         Map<String, String> info = (Map<String, String>) bucket.getBucketInfo();
         Assert.assertEquals(info.get("start"),"0");
         Assert.assertEquals(info.get("end"),"200");
@@ -319,7 +319,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
         bucket.assertThat().field("label").is("(200 - 400]");
         bucket.assertThat().field("filterQuery").is("content.size:<\"200\" TO \"400\"]");
         metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
-        Integer count = new Integer(metric.get("count"));
+        Integer count = Integer.valueOf(metric.get("count"));
         Assert.assertTrue(count >= 4);
         info = (Map<String, String>) bucket.getBucketInfo();
         Assert.assertEquals(info.get("start"),"200");
@@ -331,7 +331,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
         bucket.assertThat().field("label").is("(400 - 600]");
         bucket.assertThat().field("filterQuery").is("content.size:<\"400\" TO \"600\"]");
         metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
-        Assert.assertTrue(new Integer(metric.get("count")) >= 7);
+        Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 7);
         info = (Map<String, String>) bucket.getBucketInfo();
         Assert.assertEquals(info.get("start"),"400");
         Assert.assertEquals(info.get("end"),"600");
diff --git a/e2e-test/java/org/alfresco/rest/search/sql/SearchSQLWithQuotedIdentifiers.java b/e2e-test/java/org/alfresco/rest/search/sql/SearchSQLWithQuotedIdentifiers.java
index dca6d1793..30f773d53 100644
--- a/e2e-test/java/org/alfresco/rest/search/sql/SearchSQLWithQuotedIdentifiers.java
+++ b/e2e-test/java/org/alfresco/rest/search/sql/SearchSQLWithQuotedIdentifiers.java
@@ -22,10 +22,13 @@ import java.util.UUID;
 
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.search.AbstractSearchTest;
-import org.alfresco.rest.search.SearchSqlRequest;
 import org.alfresco.utility.constants.UserRole;
 import org.alfresco.utility.data.CustomObjectTypeProperties;
-import org.alfresco.utility.model.*;
+import org.alfresco.utility.model.ContentModel;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FileType;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.TestGroup;
 import org.alfresco.utility.report.Bug;
 import org.hamcrest.Matchers;
 import org.springframework.http.HttpStatus;
diff --git a/e2e-test/java/org/alfresco/rest/tags/UpdateTagTests.java b/e2e-test/java/org/alfresco/rest/tags/UpdateTagTests.java
index 2237314f1..21f506483 100644
--- a/e2e-test/java/org/alfresco/rest/tags/UpdateTagTests.java
+++ b/e2e-test/java/org/alfresco/rest/tags/UpdateTagTests.java
@@ -10,7 +10,7 @@ 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.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
diff --git a/e2e-test/java/org/alfresco/rest/tags/nodes/AddTagTests.java b/e2e-test/java/org/alfresco/rest/tags/nodes/AddTagTests.java
index 2100b3ab3..c0606d3dc 100644
--- a/e2e-test/java/org/alfresco/rest/tags/nodes/AddTagTests.java
+++ b/e2e-test/java/org/alfresco/rest/tags/nodes/AddTagTests.java
@@ -14,7 +14,7 @@ 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.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
diff --git a/e2e-test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java b/e2e-test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java
index 28f42e67a..ec77b8fc7 100644
--- a/e2e-test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java
+++ b/e2e-test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java
@@ -226,7 +226,7 @@ public class DeleteTagTests extends TagsDataPrep
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
     public void userCollaboratorCanDeleteLongTag() throws Exception
     {
-        String longTag = org.apache.commons.lang.RandomStringUtils.randomAlphanumeric(800);
+        String longTag = RandomStringUtils.randomAlphanumeric(800);
 
         tag = restClient.authenticateUser(adminUserModel)
                 .withCoreAPI().usingResource(document).addTag(longTag);
@@ -241,7 +241,7 @@ public class DeleteTagTests extends TagsDataPrep
     @Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
     public void managerCanDeleteShortTag() throws Exception
     {
-        String shortTag = org.apache.commons.lang.RandomStringUtils.randomAlphanumeric(10);
+        String shortTag = RandomStringUtils.randomAlphanumeric(10);
 
         tag = restClient.authenticateUser(adminUserModel)
                 .withCoreAPI().usingResource(document).addTag(shortTag);
diff --git a/e2e-test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java b/e2e-test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java
index 8cfd84379..f38e20d64 100644
--- a/e2e-test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java
+++ b/e2e-test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java
@@ -11,7 +11,7 @@ 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.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 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/GetProcessCoreTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessCoreTests.java
index 9e7076603..418e4b8a0 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessCoreTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessCoreTests.java
@@ -8,7 +8,7 @@ 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.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 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/variables/GetProcessVariablesCoreTests.java b/e2e-test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesCoreTests.java
index 0799d10d4..0b8c721b6 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesCoreTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesCoreTests.java
@@ -13,7 +13,7 @@ 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.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 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/tasks/GetTaskTests.java b/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskTests.java
index b88e1a02a..1aec76b5d 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskTests.java
@@ -16,7 +16,7 @@ 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.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;