diff --git a/apps/remix-ide-e2e/src/commands/verifyContracts.ts b/apps/remix-ide-e2e/src/commands/verifyContracts.ts
index 31edfc0983..ae4ca93369 100644
--- a/apps/remix-ide-e2e/src/commands/verifyContracts.ts
+++ b/apps/remix-ide-e2e/src/commands/verifyContracts.ts
@@ -28,7 +28,10 @@ function verifyContracts (browser: NightwatchBrowser, compiledContractNames: str
           .waitForElementVisible('*[data-id="treeViewLicompiler/version"]')
           .assert.containsText('*[data-id="treeViewLicompiler/version"]', `version:\n ${opts.version}`)
           .modalFooterCancelClick()
-          .perform(done)
+          .perform(() => {
+            done()
+            callback()
+          })
       } else {
         compiledContractNames.forEach((name) => {
           browser.waitForElementContainsText('[data-id="compiledContracts"]', name, 60000)
diff --git a/apps/remix-ide-e2e/src/tests/pluginManager b/apps/remix-ide-e2e/src/tests/pluginManager.spec.ts
similarity index 96%
rename from apps/remix-ide-e2e/src/tests/pluginManager
rename to apps/remix-ide-e2e/src/tests/pluginManager.spec.ts
index c20ae179a8..bd2884e4e5 100644
--- a/apps/remix-ide-e2e/src/tests/pluginManager
+++ b/apps/remix-ide-e2e/src/tests/pluginManager.spec.ts
@@ -1,7 +1,6 @@
 'use strict'
 import { NightwatchBrowser } from 'nightwatch'
 import init from '../helpers/init'
-import sauce from './sauce'
 
 const testData = {
   pluginName: 'remixIde',
@@ -45,23 +44,23 @@ module.exports = {
       .click('*[data-id="pluginManagerComponentPluginManager"]')
       .scrollAndClick('*[data-id="pluginManagerComponentActivateButtondebugger"]')
       .pause(2000)
-      .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtondebugger"]')
+      .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtondebugger"]', 60000)
       .scrollAndClick('*[data-id="pluginManagerComponentActivateButtonvyper"]')
-      .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonvyper"]')
+      .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonvyper"]', 60000)
       .scrollAndClick('*[data-id="pluginManagerComponentActivateButtonZoKrates"]')
-      .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonZoKrates"]')
+      .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonZoKrates"]', 60000)
   },
 
   'Should deactivate plugins': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="pluginManagerComponentPluginManager"]')
       .click('*[data-id="pluginManagerComponentPluginManager"]')
-      .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtondebugger"]')
+      .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtondebugger"]', 60000)
       .pause(2000)
       .scrollAndClick('*[data-id="pluginManagerComponentDeactivateButtondebugger"]')
-      .waitForElementVisible('*[data-id="pluginManagerComponentActivateButtondebugger"]')
-      .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonvyper"]')
+      .waitForElementVisible('*[data-id="pluginManagerComponentActivateButtondebugger"]', 60000)
+      .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonvyper"]', 60000)
       .scrollAndClick('*[data-id="pluginManagerComponentDeactivateButtonvyper"]')
-      .waitForElementVisible('*[data-id="pluginManagerComponentActivateButtonvyper"]')
+      .waitForElementVisible('*[data-id="pluginManagerComponentActivateButtonvyper"]', 60000)
   },
 
   /*
@@ -115,7 +114,7 @@ module.exports = {
       .click('*[data-id="localPluginRadioButtonsidePanel"]')
       .click('*[data-id="modalDialogModalFooter"]')
       .modalFooterOKClick()
-      .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonremixIde"]')
+      .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonremixIde"]', 60000)
   },
 
   'Should display error message for creating already existing plugin': function (browser: NightwatchBrowser) {
@@ -153,7 +152,5 @@ module.exports = {
           })
       })
       .end()
-  },
-
-  tearDown: sauce
+  }
 }
diff --git a/apps/remix-ide-e2e/src/tests/publishContract b/apps/remix-ide-e2e/src/tests/publishContract.test.ts
similarity index 100%
rename from apps/remix-ide-e2e/src/tests/publishContract
rename to apps/remix-ide-e2e/src/tests/publishContract.test.ts
diff --git a/package.json b/package.json
index 64635a6f47..b01964e284 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "nightwatch_local_ballot": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/ballot.test.js --env=chrome",
     "nightwatch_local_ballot_0_4_11": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/ballot_0_4_11.spec.js --env=chrome",
     "nightwatch_local_usingWorker": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/usingWebWorker.test.js --env=chrome",
-    "nightwatch_local_libraryDeployment": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/libraryDeployment.test.js --env=firefox",
+    "nightwatch_local_libraryDeployment": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/libraryDeployment.test.js --env=chrome",
     "nightwatch_local_solidityImport": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/solidityImport.test.js --env=chrome",
     "nightwatch_local_recorder": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/recorder.test.js --env=chrome",
     "nightwatch_local_transactionExecution": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/transactionExecution.test.js --env=chrome",
@@ -72,7 +72,7 @@
     "nightwatch_local_gist": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/gist.spec.js --env=firefox",
     "nightwatch_local_workspace": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/workspace.test.js --env=chrome",
     "nightwatch_local_defaultLayout": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/defaultLayout.test.js --env=chrome",
-    "nightwatch_local_pluginManager": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/pluginManager.test.js --env=chrome",
+    "nightwatch_local_pluginManager": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/pluginManager.spec.js --env=chrome",
     "nightwatch_local_publishContract": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/publishContract.test.js --env=chrome",
     "nightwatch_local_generalSettings": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/generalSettings.test.js --env=chrome",
     "nightwatch_local_fileExplorer": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/fileExplorer.test.js --env=chrome",