diff --git a/apps/remix-ide-e2e/src/commands/clearEditableContent.ts b/apps/remix-ide-e2e/src/commands/clearEditableContent.ts
index 7bd8f35a9c..89c7f355f5 100644
--- a/apps/remix-ide-e2e/src/commands/clearEditableContent.ts
+++ b/apps/remix-ide-e2e/src/commands/clearEditableContent.ts
@@ -1,5 +1,5 @@
-import { NightwatchBrowser } from "nightwatch"
-import EventEmitter from "events"
+import { NightwatchBrowser } from 'nightwatch'
+import EventEmitter from 'events'
 
 class clearEditablecontent extends EventEmitter {
   command (this: NightwatchBrowser, cssSelector): NightwatchBrowser {
diff --git a/apps/remix-ide-e2e/src/commands/clickElementAtPosition.ts b/apps/remix-ide-e2e/src/commands/clickElementAtPosition.ts
new file mode 100644
index 0000000000..f66315c3b0
--- /dev/null
+++ b/apps/remix-ide-e2e/src/commands/clickElementAtPosition.ts
@@ -0,0 +1,27 @@
+import { NightwatchBrowser } from 'nightwatch'
+import EventEmitter from 'events'
+
+class ClickElement extends EventEmitter {
+  command (this: NightwatchBrowser, cssSelector: string, index = 0): NightwatchBrowser {
+    this.api.perform((done) => {
+      _clickElement(this.api, cssSelector, index, () => {
+        done()
+        this.emit('complete')
+      })
+    })
+    return this
+  }
+}
+
+function _clickElement (browser: NightwatchBrowser, cssSelector: string, index: number, cb: VoidFunction) {
+  browser.waitForElementPresent(cssSelector)
+  .execute(function (cssSelector: string, index: number) {
+    const elem = document.querySelectorAll(cssSelector)[index] as HTMLElement
+    
+    elem.click()
+  }, [cssSelector, index], function () {
+    cb()
+  })
+}
+
+module.exports = ClickElement
diff --git a/apps/remix-ide-e2e/src/commands/notContainsText.ts b/apps/remix-ide-e2e/src/commands/notContainsText.ts
new file mode 100644
index 0000000000..8b3794d61e
--- /dev/null
+++ b/apps/remix-ide-e2e/src/commands/notContainsText.ts
@@ -0,0 +1,19 @@
+import { NightwatchBrowser } from "nightwatch"
+import EventEmitter from "events"
+
+class NotContainsText extends EventEmitter {
+  command (this: NightwatchBrowser, cssSelector: string, text: string): NightwatchBrowser {
+    const browser = this.api
+
+    browser.getText(cssSelector, (result) => {
+      if (typeof result.value === 'string' && result.value.includes(text)) return this.api.assert.fail(`${cssSelector} contains ${text}.`)
+      else this.api.assert.ok(true, `${cssSelector} does not contains ${text}.`)
+    })
+    .perform(() => {
+      this.emit('complete')
+    })
+    return this
+  }
+}
+
+module.exports = NotContainsText
diff --git a/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts b/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
new file mode 100644
index 0000000000..e9e6cf95e7
--- /dev/null
+++ b/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
@@ -0,0 +1,383 @@
+'use strict'
+
+import { NightwatchBrowser } from "nightwatch"
+import init from '../helpers/init'
+import sauce from './sauce'
+
+module.exports = {
+
+  before: function (browser: NightwatchBrowser, done) {
+    init(browser, done)
+  },
+
+  '@sources': function () {
+    return sources
+  },
+
+  'Should launch solidity unit test plugin': function (browser: NightwatchBrowser) {
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    .clickLaunchIcon('fileExplorers')
+    .addFile('simple_storage.sol', sources[0]['browser/simple_storage.sol'])
+    .addFile('ks2a.sol', sources[0]['browser/ks2a.sol'])
+    .clickLaunchIcon('pluginManager')
+    .scrollAndClick('*[data-id="pluginManagerComponentActivateButtonsolidityUnitTesting"]')
+    .click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
+    .waitForElementPresent('*[data-id="sidePanelSwapitTitle"]')
+    .assert.containsText('*[data-id="sidePanelSwapitTitle"]', 'SOLIDITY UNIT TESTING')
+  },
+
+  'Should generate test file': function (browser: NightwatchBrowser) {
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    .clickLaunchIcon('fileExplorers')
+    .openFile('browser/simple_storage.sol')
+    .click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
+    .waitForElementPresent('*[data-id="testTabGenerateTestFile"]')
+    .click('*[data-id="testTabGenerateTestFile"]')
+    .waitForElementPresent('*[title="browser/tests/simple_storage_test.sol"]')
+    .clickLaunchIcon('fileExplorers')
+    .pause(10000)
+    .openFile('browser/tests/simple_storage_test.sol')
+    .removeFile('browser/tests/simple_storage_test.sol')
+  },
+
+  'Should run simple unit test `simple_storage_test.sol` ': function (browser: NightwatchBrowser) {
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    .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"]')
+    .clickElementAtPosition('.singleTestLabel', 1)
+    .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 80000)
+    .pause(5000)
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'MyTest (browser/tests/simple_storage_test.sol)')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✓ Initial value should be100')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✓ Value is set200')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✘ Should fail for wrong value200')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'Passing: 2')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'Failing: 1')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'FAIL MyTest (browser/tests/simple_storage_test.sol)')
+  },
+
+  'Should run advance unit test using natspec and experimental ABIEncoderV2 `ks2b_test.sol` ': function (browser: NightwatchBrowser) {
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    .clickLaunchIcon('fileExplorers')
+    .addFile('tests/ks2b_test.sol', sources[0]['browser/tests/ks2b_test.sol'])
+    .click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
+    .waitForElementPresent('*[data-id="testTabCheckAllTests"]')
+    .click('*[data-id="testTabCheckAllTests"]')
+    .clickElementAtPosition('.singleTestLabel', 2)
+    .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
+    .pause(5000)
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/tests/ks2b_test.sol')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✓ Check project exists')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✘ Check wrong project owner')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✘ Check wrong sender')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✘ Check wrong value')
+    .pause(5000)
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✓ Check project is fundable')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'owner is incorrect')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'wrong sender')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'wrong value')
+  },
+
+  'Should stop unit tests during test execution` ': function (browser: NightwatchBrowser) {
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    .waitForElementPresent('*[data-id="testTabRunTestsTabRunAction"]')
+    .clickElementAtPosition('.singleTestLabel', 0)
+    .clickElementAtPosition('.singleTestLabel', 1)
+    .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
+    .pause(5000)
+    .click('*[data-id="testTabRunTestsTabStopAction"]')
+    .pause(1000)
+    .assert.containsText('*[data-id="testTabRunTestsTabStopAction"]', 'Stopping')
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/tests/ks2b_test.sol')
+    .notContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/tests/4_Ballot_test.sol')
+    .notContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/tests/simple_storage_test.sol')
+    .pause(7000)
+    .assert.containsText('*[data-id="testTabTestsExecutionStopped"]', 'The test execution has been stopped')
+  },
+
+  'Should fail on compilation': function (browser: NightwatchBrowser) {
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    .addFile('tests/compilationError_test.sol', sources[0]['browser/compilationError_test.sol'])
+    .clickLaunchIcon('fileExplorers')
+    .openFile('browser/tests/compilationError_test.sol')
+    .clickLaunchIcon('solidityUnitTesting')
+    .click('*[data-id="testTabCheckAllTests"]')
+    .clickElementAtPosition('.singleTestLabel', 3)
+    .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'SyntaxError: No visibility specified')
+    .assert.containsText('*[data-id="testTabTestsExecutionStoppedError"]', 'The test execution has been stopped because of error(s) in your test file')
+  },
+
+  'Should fail on deploy': function (browser: NightwatchBrowser) {
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    .addFile('tests/deployError_test.sol', sources[0]['browser/tests/deployError_test.sol'])
+    .clickLaunchIcon('fileExplorers')
+    .openFile('browser/tests/deployError_test.sol')
+    .clickLaunchIcon('solidityUnitTesting')
+    .click('*[data-id="testTabCheckAllTests"]')
+    .clickElementAtPosition('.singleTestLabel', 4)
+    .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'contract deployment failed after trying twice')
+  },
+
+  'Should fail when parameters are to method in test contract': function (browser: NightwatchBrowser) {
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    .addFile('tests/methodFailure_test.sol', sources[0]['browser/tests/methodFailure_test.sol'])
+    .clickLaunchIcon('fileExplorers')
+    .openFile('browser/tests/methodFailure_test.sol')
+    .clickLaunchIcon('solidityUnitTesting')
+    .click('*[data-id="testTabCheckAllTests"]')
+    .clickElementAtPosition('.singleTestLabel', 5)
+    .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
+    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', `Method 'add' can not have parameters inside a test contract`)
+  },
+
+  'Changing current path': function (browser: NightwatchBrowser) {
+    browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    .addFile('myTests/simple_storage_test.sol', sources[0]['browser/tests/simple_storage_test.sol'])
+    .clickLaunchIcon('solidityUnitTesting')
+    .setValue('*[data-id="uiPathInput"]', 'browser/myTests')
+    .clickElementAtPosition('.singleTestLabel', 0)
+    .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutput"]')
+    .clearValue('*[data-id="uiPathInput"]')
+    .setValue('*[data-id="uiPathInput"]', 'browser/tests')
+  },
+
+  'Solidity Unittests': function (browser: NightwatchBrowser) {
+    runTests(browser)
+  },
+
+  tearDown: sauce
+}
+
+function runTests (browser: NightwatchBrowser) {
+  browser
+    .waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
+    .clickLaunchIcon('fileExplorers')
+    .openFile('browser/3_Ballot.sol')
+    .clickLaunchIcon('solidityUnitTesting')
+    .pause(500)
+    .scrollAndClick('#runTestsTabRunAction')
+    .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
+    .pause(5000)
+    .waitForElementPresent('#solidityUnittestsOutput div[class^="testPass"]')
+    .assert.containsText('#solidityUnittestsOutput', 'browser/tests/4_Ballot_test.sol')
+    .assert.containsText('#solidityUnittestsOutput', '✓ Check winning proposal')
+    .assert.containsText('#solidityUnittestsOutput', '✓ Check winnin proposal with return value')
+    .end()
+}
+
+const sources = [
+  {
+    'browser/simple_storage.sol': {
+      content: `
+      pragma solidity >=0.4.22 <0.7.0;
+
+      contract SimpleStorage {
+        uint public storedData;
+      
+        constructor() public {
+          storedData = 100;
+        }
+      
+        function set(uint x) public {
+          storedData = x;
+        }
+      
+        function get() public view returns (uint retVal) {
+          return storedData;
+        }
+      }
+        `
+    },
+    'browser/tests/simple_storage_test.sol': {
+      content: `
+      pragma solidity >=0.4.22 <0.7.0;
+      import "remix_tests.sol";
+      import "../simple_storage.sol";
+
+      contract MyTest {
+        SimpleStorage foo;
+
+        function beforeEach() public {
+          foo = new SimpleStorage();
+        }
+
+        function initialValueShouldBe100() public returns (bool) {
+          return Assert.equal(foo.get(), 100, "initial value is not correct");
+        }
+
+        function valueIsSet200() public returns (bool) {
+          foo.set(200);
+          return Assert.equal(foo.get(), 200, "value is not 200");
+        }
+
+        function shouldFailForWrongValue200() public returns (bool) {
+          foo.set(300);
+          return Assert.equal(foo.get(), 200, "value is not 200");
+        }
+      }
+        `
+    },
+    'browser/ks2a.sol': {
+      content: `
+      pragma solidity >=0.4.22 <0.6.0;
+      contract Kickstarter {
+          enum State { Started, Completed }
+      
+          struct Project {
+              address owner;
+              string name;
+              uint goal;
+              uint fundsAvailable; // added
+              uint amountContributed; // added
+              State state;
+              mapping(address => uint) funders; // added
+          }
+      
+          Project[] public projects;
+      
+          constructor() public {
+          }
+      
+          function createProject(string memory name, uint goal) public {
+              projects.length++; // new line
+              Project storage project = projects[projects.length - 1];
+              project.name = name;
+              project.goal = goal;
+              project.owner = msg.sender;
+              project.state = State.Started;
+          }
+          
+          function fundProject(uint projectId) payable public {
+          Project storage project = projects[projectId];
+              // require project exists
+              // PLEASE CHECK / or erase
+              // not this: require(projects[projectId].exists, "the project must exist to be funded");
+      
+              // require for... underflow/overflow protection
+              project.funders[msg.sender] += msg.value;
+              project.amountContributed += msg.value;
+              project.fundsAvailable += msg.value;
+      
+              if (project.amountContributed >= project.goal) {
+                  project.state = State.Completed;
+              }
+          }
+          
+          // this function is here because we can't use web3 when using the VM
+          function getContractBalance() public view returns(uint balance) {
+              return address(this).balance;
+          }
+            
+      }
+        `
+    },
+    'browser/tests/ks2b_test.sol': {
+      content: `
+      pragma solidity >=0.4.22 <0.6.0;
+      pragma experimental ABIEncoderV2;
+
+      import "remix_tests.sol"; // this import is automatically injected by Remix.
+      import "remix_accounts.sol";
+      import "../ks2a.sol";
+
+      contract kickstarterTest {
+          enum State { Started, Completed }
+
+          Kickstarter kickstarter;
+          
+          function beforeAll () public {
+            kickstarter = new Kickstarter();
+            kickstarter.createProject("ProjectA", 123000);
+            kickstarter.createProject("ProjectB", 100);
+          }
+      
+          /// #sender: account-1
+          /// #value: 10000000
+          function checkProjectExists () public payable {
+              (address owner, string memory name, uint goal, uint fundsAvailable, uint amountContributed, Kickstarter.State state) = kickstarter.projects(0);
+              Assert.equal(name, "ProjectA", "project name is incorrect");
+              Assert.equal(goal, 123000, "funding goal is incorrect");
+              Assert.equal(owner, address(this), "owner is incorrect");
+              Assert.equal(msg.sender, TestsAccounts.getAccount(1), "wrong sender");
+              Assert.equal(msg.value, 10000000, "wrong value");
+          }
+
+          /// #sender: account-1
+          /// #value: 10000000
+          function checkWrongProjectOwner () public payable {
+            (address owner,,,,,) = kickstarter.projects(0);
+            Assert.equal(owner, TestsAccounts.getAccount(0), "owner is incorrect"); //failing case
+          }
+
+          /// #sender: account-1
+          /// #value: 10000000
+          function checkWrongSender () public payable {
+            Assert.equal(msg.sender, TestsAccounts.getAccount(0), "wrong sender"); //failing case
+          }
+
+          /// #sender: account-1
+          /// #value: 10000000
+          function checkWrongValue () public payable {
+            Assert.equal(msg.value, 5000000, "wrong value"); //failing case
+          }
+
+          function checkProjectIsFundable () public {
+              kickstarter.fundProject.value(120000)(0);
+              (address owner, string memory name, uint goal, uint fundsAvailable, uint amountContributed, Kickstarter.State state) = kickstarter.projects(0);
+              Assert.equal(amountContributed, 120000, "contributed amount is incorrect");
+          }
+          
+      }
+        `
+    },
+    'browser/compilationError_test.sol': {
+      content: `
+      pragma solidity ^0.6.1;
+      
+      contract failOnCompilation {
+        fallback() {
+
+        }
+      }
+        `
+    },
+    'browser/tests/deployError_test.sol': {
+      content: `
+      pragma solidity ^0.6.0;
+
+      contract failingDeploy {
+          constructor() public {
+              revert('Deploy Failed');
+          }
+      }
+        `
+    },
+    'browser/tests/methodFailure_test.sol': {
+      content: `
+      pragma solidity ^0.6.0;
+
+      contract methodfailure {
+        function add(uint a, uint b) public {
+           uint c = a+b;
+           Assert.equal(a+b, c, "wrong value");
+        }
+      } 
+        `
+    }
+  }
+]
diff --git a/apps/remix-ide-e2e/src/types/index.d.ts b/apps/remix-ide-e2e/src/types/index.d.ts
index 6a7043314b..8fffb227d1 100644
--- a/apps/remix-ide-e2e/src/types/index.d.ts
+++ b/apps/remix-ide-e2e/src/types/index.d.ts
@@ -45,7 +45,9 @@ declare module "nightwatch" {
         switchBrowserWindow(url: string, windowName: string, cb: (browser: NightwatchBrowser, window?: NightwatchCallbackResult<Window>) => void): NightwatchBrowser,
         setupMetamask(passphrase: string, password: string): NightwatchBrowser,
         signMessage(msg: string, callback: (hash: { value: string }, signature: { value: string }) => void): NightwatchBrowser,
-        setSolidityCompilerVersion(version: string): NightwatchBrowser
+        setSolidityCompilerVersion(version: string): NightwatchBrowser,
+        clickElementAtPosition(cssSelector: string, index: number): NightwatchBrowser,
+        notContainsText(cssSelector: string, text: string): NightwatchBrowser
     }
 
     export interface NightwatchBrowser {