diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java
index e148f783f7..7d35b5e166 100644
--- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java
+++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java
@@ -54,7 +54,7 @@ public class AutomaticDispositionTest extends BaseRMRestTest
 
     /**
      * Given there is a complete record eligible for cut off
-     * When the correct frequency of time passes
+     * When the correct duration of time passes
      * Then the record will be automatically cut off
      */
     @Test
@@ -71,8 +71,8 @@ public class AutomaticDispositionTest extends BaseRMRestTest
         RecordCategoryChild recordFolder = createRecordFolder(categoryWithRSOnRecords.getId(), getRandomName
                 ("recordFolder"));
 
-        STEP("Complete the record and wait upon to 5 minutes for automatic job to execute");
         Record record = createElectronicRecord(recordFolder.getId(), getRandomName("elRecord"));
+        STEP("Complete the record and wait upon to 5 minutes for automatic job to execute");
         completeRecord(record.getId());
 
         RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementSearchServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementSearchServiceImplTest.java
index e78181a982..a0c68e2a7a 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementSearchServiceImplTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementSearchServiceImplTest.java
@@ -35,8 +35,6 @@ import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearch
 import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails;
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.util.Pair;
 
 /**
  * Search service implementation unit test.
@@ -45,22 +43,12 @@ import org.alfresco.util.Pair;
  */
 public class RecordsManagementSearchServiceImplTest extends BaseRMTestCase
 {
-    @Override
-    protected boolean isMultiHierarchyTest()
-    {
-        return true;
-    }
-
     private static final String SEARCH1 = "search1";
     private static final String SEARCH2 = "search2";
     private static final String SEARCH3 = "search3";
     private static final String SEARCH4 = "search4";
 
     private String user;
-
-    private NodeRef folderLevelRecordFolder;
-    private NodeRef recordLevelRecordFolder;
-
     private int numberOfReports;
 
     /**
@@ -89,34 +77,6 @@ public class RecordsManagementSearchServiceImplTest extends BaseRMTestCase
         }, AuthenticationUtil.getSystemUserName());
     }
 
-    /**
-     * @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#setupMultiHierarchyTestData()
-     */
-    @Override
-    protected void setupMultiHierarchyTestData()
-    {
-        super.setupMultiHierarchyTestData();
-
-        doTestInTransaction(new Test<Void>()
-        {
-            @Override
-            public Void run()
-            {
-                folderLevelRecordFolder = mhRecordFolder42;
-                recordLevelRecordFolder = mhRecordFolder43;
-
-                utils.createRecord(folderLevelRecordFolder, "recordOne.txt", null, "record one - folder level - elephant");
-                utils.createRecord(folderLevelRecordFolder, "recordTwo.txt", null, "record two - folder level - snake");
-                utils.createRecord(folderLevelRecordFolder, "recordThree.txt", null, "record three - folder level - monkey");
-                utils.createRecord(recordLevelRecordFolder, "recordFour.txt", null, "record four - record level - elephant");
-                utils.createRecord(recordLevelRecordFolder, "recordFive.txt", null, "record five - record level - snake");
-                utils.createRecord(recordLevelRecordFolder, "recordSix.txt", null, "record six - record level - monkey");
-
-                return null;
-            }
-        }, AuthenticationUtil.getSystemUserName());
-    }
-
     public void testSaveSearch()
     {
         // Add some saved searches (as admin user)