diff --git a/pom.xml b/pom.xml
index 70593388a6..649a8bbc0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,11 @@
              <artifactId>reflections</artifactId>
              <version>0.9.10</version>
          </dependency>
+         <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.8.8</version>
+         </dependency>
       </dependencies>
    </dependencyManagement>
 
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 02900fdb16..a7861da0f2 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -150,7 +150,7 @@
       <dependency>
          <groupId>org.testng</groupId>
          <artifactId>testng</artifactId>
-         <version>6.8.8</version>
+         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>ru.yandex.qatools.htmlelements</groupId>
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 30a94269a3..7837927177 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -243,6 +243,12 @@
          <classifier>tests</classifier>
          <scope>test</scope>
       </dependency>
+
+      <dependency>
+         <groupId>org.testng</groupId>
+         <artifactId>testng</artifactId>
+         <scope>test</scope>
+      </dependency>
       <!-- Database drivers -->
       <dependency>
          <groupId>postgresql</groupId>
@@ -257,12 +263,6 @@
          <scope>test</scope>
       </dependency>
       <!-- Dependencies for the test result reports -->
-      <dependency>
-         <groupId>org.testng</groupId>
-         <artifactId>testng</artifactId>
-         <version>6.8.8</version>
-         <scope>test</scope>
-      </dependency>
       <dependency>
          <groupId>com.google.inject</groupId>
          <artifactId>guice</artifactId>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
index 5e45514ee0..6c2ad22328 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
@@ -279,5 +279,5 @@ public interface RecordsManagementModel extends RecordsManagementCustomModel
     QName ASPECT_COUNTABLE = QName.createQName(RM_URI, "countable");
     QName PROP_COUNT = QName.createQName(RM_URI, "count");
 
-    QName SAVED_SEARCH_ASPECT = QName.createQName(RM_URI, "savedSearch");
+    QName ASPECT_SAVED_SEARCH = QName.createQName(RM_URI, "savedSearch");
 }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2SavedSearchPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2SavedSearchPatch.java
index 636e6f1c56..b1519b5c3c 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2SavedSearchPatch.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/RMv2SavedSearchPatch.java
@@ -32,6 +32,8 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.site.SiteService;
 import org.springframework.beans.factory.BeanNameAware;
 
+import static org.alfresco.module.org_alfresco_module_rm.model.rma.type.RmSiteType.DEFAULT_SITE_NAME;
+
 /**
  * RM v2.0 Saved Search Patch
  *
@@ -42,9 +44,6 @@ import org.springframework.beans.factory.BeanNameAware;
 public class RMv2SavedSearchPatch extends ModulePatchComponent
                                   implements BeanNameAware, RecordsManagementModel, DOD5015Model
 {
-    /** RM site id */
-    private static final String RM_SITE_ID = "rm";
-
     /** Records management search service */
     private RecordsManagementSearchService recordsManagementSearchService;
 
@@ -84,10 +83,10 @@ public class RMv2SavedSearchPatch extends ModulePatchComponent
     @Override
     protected void executePatch()
     {
-        if (siteService.getSite(RM_SITE_ID) != null)
+        if (siteService.getSite(DEFAULT_SITE_NAME) != null)
         {
             // get the saved searches
-            List<SavedSearchDetails> savedSearches = recordsManagementSearchService.getSavedSearches(RM_SITE_ID);
+            List<SavedSearchDetails> savedSearches = recordsManagementSearchService.getSavedSearches(DEFAULT_SITE_NAME);
 
             if (LOGGER.isDebugEnabled())
             {
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatch.java
index 8b56d00949..099849e9dc 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatch.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatch.java
@@ -18,14 +18,14 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.patch.v23;
 
+import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_SAVED_SEARCH;
+import static org.alfresco.module.org_alfresco_module_rm.model.rma.type.RmSiteType.DEFAULT_SITE_NAME;
+
 import org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch;
 import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
 import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails;
 import org.alfresco.service.cmr.repository.NodeService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
-import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.SAVED_SEARCH_ASPECT;
 
 /**
  * RM v2.3 patch that adds the saved search aspect.
@@ -41,8 +41,6 @@ public class RMv23SavedSearchesPatch extends AbstractModulePatch
     /** node service */
     private NodeService nodeService;
 
-    private static final String RM_SITE_ID = "rm";
-
     /**
      * @param recordsManagementSearchService	records management search service
      */
@@ -60,14 +58,14 @@ public class RMv23SavedSearchesPatch extends AbstractModulePatch
     }
 
     /**
-     * @see AbstractModulePatch#applyInternal()
+     * Retrieves all saved searches for the records management site and adds ASPECT_SAVED_SEARCH
      */
     @Override
     public void applyInternal()
     {
-       for(SavedSearchDetails savedSearchDetails : recordsManagementSearchService.getSavedSearches(RM_SITE_ID))
+       for(SavedSearchDetails savedSearchDetails : recordsManagementSearchService.getSavedSearches(DEFAULT_SITE_NAME))
         {
-            nodeService.addAspect(savedSearchDetails.getNodeRef(),SAVED_SEARCH_ASPECT,null);
+            nodeService.addAspect(savedSearchDetails.getNodeRef(), ASPECT_SAVED_SEARCH,null);
         }
     }
 }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java
index c4204f806b..cde2540590 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java
@@ -18,6 +18,8 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.search;
 
+import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_SAVED_SEARCH;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
@@ -50,7 +52,6 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.springframework.extensions.surf.util.I18NUtil;
 
-import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.SAVED_SEARCH_ASPECT;
 
 /**
  * Records management search service implementation
@@ -534,7 +535,7 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear
                 }
             }, AuthenticationUtil.getSystemUserName());
         }
-        nodeService.addAspect(searchNode, SAVED_SEARCH_ASPECT, null);
+        nodeService.addAspect(searchNode, ASPECT_SAVED_SEARCH, null);
         // Write the JSON content to search node
         final NodeRef writableSearchNode = searchNode;
         AuthenticationUtil.runAs(new RunAsWork<Void>()
diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatchUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatchUnitTest.java
index 2ad10354b7..a73190ab7d 100755
--- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatchUnitTest.java
+++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatchUnitTest.java
@@ -18,11 +18,17 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.patch.v23;
 
+import static java.util.Arrays.asList;
+import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_SAVED_SEARCH;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchServiceImpl;
 import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails;
-import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
-import org.alfresco.repo.version.NodeServiceImpl;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.junit.Test;
@@ -30,22 +36,13 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.SAVED_SEARCH_ASPECT;
-import static org.mockito.Mockito.mockingDetails;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 /**
  * patch.v23 unit test
  *
  * @author Ross Gale
  * @since 2.3
  */
-public class RMv23SavedSearchesPatchUnitTest// extends BaseUnitTest
+public class RMv23SavedSearchesPatchUnitTest
 {
 
     @Mock
@@ -61,9 +58,9 @@ public class RMv23SavedSearchesPatchUnitTest// extends BaseUnitTest
     private RMv23SavedSearchesPatch patch;
 
     /**
-     * Given that I am upgrading an existing repository to v2.2
+     * Given that I am upgrading an existing repository to v2.3
      * When I execute the patch
-     * Then the capabilities are updated
+     * Then any existing rm saved searches will have the saved search aspect applied
      */
     @Test
     public void executePatch()
@@ -71,9 +68,7 @@ public class RMv23SavedSearchesPatchUnitTest// extends BaseUnitTest
         MockitoAnnotations.initMocks(this);
         NodeRef noderef1 = new NodeRef("foo://123/456");
         NodeRef noderef2 = new NodeRef("bar://123/456");
-        List<SavedSearchDetails> searches = new ArrayList<>();
-        searches.add(mockSavedSearchDetails1);
-        searches.add(mockSavedSearchDetails2);
+        List<SavedSearchDetails> searches = asList(mockSavedSearchDetails1, mockSavedSearchDetails2);
         when(mockSavedSearchDetails1.getNodeRef()).thenReturn(noderef1);
         when(mockSavedSearchDetails2.getNodeRef()).thenReturn(noderef2);
         when(recordsManagementSearchService.getSavedSearches("rm")).thenReturn(searches);
@@ -81,8 +76,8 @@ public class RMv23SavedSearchesPatchUnitTest// extends BaseUnitTest
         // execute patch
         patch.applyInternal();
 
-        verify(nodeService, times(1)).addAspect(noderef1,SAVED_SEARCH_ASPECT,null);
-        verify(nodeService, times(1)).addAspect(noderef2, SAVED_SEARCH_ASPECT, null);
+        verify(nodeService, times(1)).addAspect(noderef1, ASPECT_SAVED_SEARCH, null);
+        verify(nodeService, times(1)).addAspect(noderef2, ASPECT_SAVED_SEARCH, null);
     }
 
 }