diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
index 6e089b6f92..5db93ad555 100755
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
@@ -9,7 +9,7 @@
       <property name="description" value="RM patch executer"/>
       <property name="sinceVersion" value="2.2"/>
       <property name="executeOnceOnly" value="false"/>
-      <property name="moduleSchema" value="1012"/>      
+      <property name="moduleSchema" value="1013"/>
       <property name="attributeService" ref="AttributeService" />   
       <property name="dependsOn">
       	<list>
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 8803399995..30a94269a3 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -79,16 +79,6 @@
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-               <properties>
-                  <property>
-                     <name>usedefaultlisteners</name>
-                     <value>false</value>
-                  </property>
-                  <property>
-                     <name>listener</name>
-                     <value>org.uncommons.reportng.HTMLReporter, org.uncommons.reportng.JUnitXMLReporter</value>
-                  </property>
-               </properties>
                <suiteXmlFiles>
                   <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
                </suiteXmlFiles>
@@ -268,9 +258,9 @@
       </dependency>
       <!-- Dependencies for the test result reports -->
       <dependency>
-         <groupId>org.uncommons</groupId>
-         <artifactId>reportng</artifactId>
-         <version>1.1.4</version>
+         <groupId>org.testng</groupId>
+         <artifactId>testng</artifactId>
+         <version>6.8.8</version>
          <scope>test</scope>
       </dependency>
       <dependency>
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 100cc60e81..8b56d00949 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
@@ -22,6 +22,8 @@ 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;
 
@@ -39,6 +41,8 @@ public class RMv23SavedSearchesPatch extends AbstractModulePatch
     /** node service */
     private NodeService nodeService;
 
+    private static final String RM_SITE_ID = "rm";
+
     /**
      * @param recordsManagementSearchService	records management search service
      */
@@ -61,10 +65,9 @@ public class RMv23SavedSearchesPatch extends AbstractModulePatch
     @Override
     public void applyInternal()
     {
-       for(SavedSearchDetails savedSearchDetails : recordsManagementSearchService.getSavedSearches("rm"))
+       for(SavedSearchDetails savedSearchDetails : recordsManagementSearchService.getSavedSearches(RM_SITE_ID))
         {
             nodeService.addAspect(savedSearchDetails.getNodeRef(),SAVED_SEARCH_ASPECT,null);
         }
     }
-    
 }