diff --git a/apps/remix-ide-e2e/src/tests/editorReferences.test.ts b/apps/remix-ide-e2e/src/tests/editorReferences.test.ts
index c37e598183..86856a9822 100644
--- a/apps/remix-ide-e2e/src/tests/editorReferences.test.ts
+++ b/apps/remix-ide-e2e/src/tests/editorReferences.test.ts
@@ -28,7 +28,17 @@ module.exports = {
             .pause(10000) // wait for the compiler to finish
             .scrollToLine(37)
     },
+    'Should show local references': function (browser: NightwatchBrowser) {
+        browser.scrollToLine(48)
+        const path = "//*[@class='view-line' and contains(.,'length') and contains(.,'proposalNames')]//span//span[contains(.,'proposalNames')]"
+        openReferences(browser, path)
+        browser.waitForElementVisible("//*[@class='monaco-highlighted-label referenceMatch']//span[contains(.,'length; i++')]")
+        .waitForElementVisible("//*[@class='monaco-highlighted-label referenceMatch']//span[contains(.,'name:')]")
+        .waitForElementVisible("//*[@class='monaco-highlighted-label referenceMatch']//span[contains(.,'constructor')]")
+        .keys(browser.Keys.ESCAPE)
+    },
     'Should show references of getOwner': function (browser: NightwatchBrowser) {
+        browser.scrollToLine(39)
         const path = "//*[@class='view-line' and contains(.,'getOwner') and contains(.,'cowner')]//span//span[contains(.,'getOwner')]"
         openReferences(browser, path)
         browser.useXpath()
@@ -36,7 +46,7 @@ module.exports = {
         .waitForElementVisible("//*[@class='monaco-highlighted-label']//span[contains(.,'3_Ballot.sol')]")
         .waitForElementVisible("//*[@class='monaco-highlighted-label referenceMatch']//span[contains(.,'cowner.getOwner')]")
         .waitForElementVisible("//*[contains(@class, 'results-loaded') and contains(., 'References (2)')]")
-        
+        .keys(browser.Keys.ESCAPE)
     }
 }
 
diff --git a/apps/remix-ide-e2e/src/tests/fileExplorer.test.ts b/apps/remix-ide-e2e/src/tests/fileExplorer.test.ts
index c7ab0fd717..0a15009a89 100644
--- a/apps/remix-ide-e2e/src/tests/fileExplorer.test.ts
+++ b/apps/remix-ide-e2e/src/tests/fileExplorer.test.ts
@@ -15,7 +15,7 @@ module.exports = {
     init(browser, done)
   },
 
-  'Should create a new file `5_New_contract.sol` in file explorer': !function (browser: NightwatchBrowser) {
+  'Should create a new file `5_New_contract.sol` in file explorer #group1': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
       .clickLaunchIcon('filePanel')
       .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORER')
@@ -28,7 +28,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItem5_New_contract.sol"]', 7000)
   },
 
-  'Should rename `5_New_contract.sol` to 5_Renamed_Contract.sol': !function (browser: NightwatchBrowser) {
+  'Should rename `5_New_contract.sol` to 5_Renamed_Contract.sol #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="treeViewLitreeViewItem5_New_contract.sol"]')
       .click('*[data-id="treeViewLitreeViewItem5_New_contract.sol"]')
@@ -36,14 +36,14 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItem5_Renamed_Contract.sol"]')
   },
 
-  'Should delete file `5_Renamed_Contract.sol` from file explorer': !function (browser: NightwatchBrowser) {
+  'Should delete file `5_Renamed_Contract.sol` from file explorer #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="treeViewLitreeViewItem5_Renamed_Contract.sol"]')
       .removeFile('5_Renamed_Contract.sol', 'default_workspace')
       .waitForElementNotPresent('*[data-id="treeViewLitreeViewItem5_Renamed_Contract.sol"')
   },
 
-  'Should create a new folder': !function (browser: NightwatchBrowser) {
+  'Should create a new folder #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.txt"]')
       .click('li[data-id="treeViewLitreeViewItemREADME.txt"]') // focus on root directory
@@ -55,7 +55,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemBrowser_Tests"]')
   },
 
-  'Should rename Browser_Tests folder to Browser_E2E_Tests': !function (browser: NightwatchBrowser) {
+  'Should rename Browser_Tests folder to Browser_E2E_Tests #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemBrowser_Tests"]')
       .click('*[data-id="treeViewLitreeViewItemBrowser_Tests"]')
@@ -63,7 +63,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemBrowser_E2E_Tests"]')
   },
 
-  'Should delete Browser_E2E_Tests folder': !function (browser: NightwatchBrowser) {
+  'Should delete Browser_E2E_Tests folder #group1': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemBrowser_E2E_Tests"]')
       .rightClickCustom('[data-path="Browser_E2E_Tests"]')
@@ -99,7 +99,7 @@ module.exports = {
       })
   },
 
-  'Should open local filesystem explorer #group1': function (browser: NightwatchBrowser) {
+  'Should open local filesystem explorer #group2': !function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
       .clickLaunchIcon('filePanel')
       .waitForElementVisible('*[data-id="filePanelFileExplorerTree"]')