diff --git a/apps/remix-ide/src/app/tabs/test-tab.js b/apps/remix-ide/src/app/tabs/test-tab.js
index 4e8e32e055..b7abe8d71b 100644
--- a/apps/remix-ide/src/app/tabs/test-tab.js
+++ b/apps/remix-ide/src/app/tabs/test-tab.js
@@ -103,7 +103,7 @@ module.exports = class TestTab extends ViewPlugin {
 
     if (eChecked) {
       checkAll.checked = true
-      if ((this.readyTestsNumber === this.runningTestsNumber || this.hasBeenStopped) && document.getElementById('runTestsTabStopAction').innerText === 'Stop') {
+      if ((this.readyTestsNumber === this.runningTestsNumber || this.hasBeenStopped) && document.getElementById('runTestsTabStopAction').innerText === ' Stop') {
         runBtn.removeAttribute('disabled')
         runBtn.setAttribute('title', 'Run tests')
       }
diff --git a/apps/remix-ide/test-browser/tests/solidityUnittests.test.js b/apps/remix-ide/test-browser/tests/solidityUnittests.test.js
index ed603dc4da..a3dd412ee3 100644
--- a/apps/remix-ide/test-browser/tests/solidityUnittests.test.js
+++ b/apps/remix-ide/test-browser/tests/solidityUnittests.test.js
@@ -43,8 +43,8 @@ module.exports = {
     .addFile('tests/simple_storage_test.sol', sources[0]['browser/tests/simple_storage_test.sol'])
     .click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
     .waitForElementPresent('*[data-id="testTabCheckAllTests"]')
-    // .click('*[data-id="testTabCheckAllTests"]') // unselecting all tests disables run button and it is not activated after single test select (remix-project bug/temp test fix)
-    .clickElementAtPosition('.singleTestLabel', 0)
+    .click('*[data-id="testTabCheckAllTests"]')
+    .clickElementAtPosition('.singleTestLabel', 1)
     .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 80000)
     .pause(5000)
@@ -63,9 +63,8 @@ module.exports = {
     .addFile('tests/ks2b_test.sol', sources[0]['browser/tests/ks2b_test.sol'])
     .click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
     .waitForElementPresent('*[data-id="testTabCheckAllTests"]')
-    // .click('*[data-id="testTabCheckAllTests"]') // unselecting all tests disables run button and it is not activated after single test select (remix-project bug/temp test fix)
-    .clickElementAtPosition('.singleTestLabel', 0)
-    .clickElementAtPosition('.singleTestLabel', 1)
+    .click('*[data-id="testTabCheckAllTests"]')
+    .clickElementAtPosition('.singleTestLabel', 2)
     .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
     .pause(5000)
@@ -105,10 +104,8 @@ module.exports = {
     .clickLaunchIcon('fileExplorers')
     .openFile('browser/tests/compilationError_test.sol')
     .clickLaunchIcon('solidityUnitTesting')
-    // .click('*[data-id="testTabCheckAllTests"]') // unselecting all tests disables run button and it is not activated after single test select (remix-project bug/temp test fix)
-    .clickElementAtPosition('.singleTestLabel', 0)
-    .clickElementAtPosition('.singleTestLabel', 1)
-    .clickElementAtPosition('.singleTestLabel', 2)
+    .click('*[data-id="testTabCheckAllTests"]')
+    .clickElementAtPosition('.singleTestLabel', 3)
     .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
@@ -122,11 +119,8 @@ module.exports = {
     .clickLaunchIcon('fileExplorers')
     .openFile('browser/tests/deployError_test.sol')
     .clickLaunchIcon('solidityUnitTesting')
-    // .click('*[data-id="testTabCheckAllTests"]') // unselecting all tests disables run button and it is not activated after single test select (remix-project bug/temp test fix)
-    .clickElementAtPosition('.singleTestLabel', 0)
-    .clickElementAtPosition('.singleTestLabel', 1)
-    .clickElementAtPosition('.singleTestLabel', 2)
-    .clickElementAtPosition('.singleTestLabel', 3)
+    .click('*[data-id="testTabCheckAllTests"]')
+    .clickElementAtPosition('.singleTestLabel', 4)
     .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
@@ -139,12 +133,8 @@ module.exports = {
     .clickLaunchIcon('fileExplorers')
     .openFile('browser/tests/methodFailure_test.sol')
     .clickLaunchIcon('solidityUnitTesting')
-    // .click('*[data-id="testTabCheckAllTests"]')
-    .clickElementAtPosition('.singleTestLabel', 0)
-    .clickElementAtPosition('.singleTestLabel', 1)
-    .clickElementAtPosition('.singleTestLabel', 2)
-    .clickElementAtPosition('.singleTestLabel', 3)
-    .clickElementAtPosition('.singleTestLabel', 4)
+    .click('*[data-id="testTabCheckAllTests"]')
+    .clickElementAtPosition('.singleTestLabel', 5)
     .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')