diff --git a/src/app.js b/src/app.js
index 1811ec333a1..b530d31c156 100644
--- a/src/app.js
+++ b/src/app.js
@@ -257,7 +257,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   editor.event.register('requiringToSaveCurrentfile', () => fileManager.saveCurrentFile())
 
   // ----------------- fileManager servive ----------------------------
-  const fileManager = new FileManager(editor)
+  const fileManager = new FileManager(editor, appManager)
   registry.put({api: fileManager, name: 'filemanager'})
 
   const blockchain = new Blockchain(registry.get('config').api)
@@ -396,7 +396,8 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
 
   await appManager.activatePlugin(['contentImport', 'theme', 'editor', 'fileManager', 'compilerMetadata', 'compilerArtefacts', 'network', 'web3Provider', 'offsetToLineColumnConverter'])
   await appManager.activatePlugin(['mainPanel', 'menuicons'])
-  await appManager.activatePlugin(['home', 'sidePanel', 'hiddenPanel', 'pluginManager', 'fileExplorers', 'settings', 'contextualListener', 'scriptRunner', 'terminal', 'fetchAndCompile'])
+  await appManager.activatePlugin(['sidePanel']) // activating  host plugin separately
+  await appManager.activatePlugin(['home', 'hiddenPanel', 'pluginManager', 'fileExplorers', 'settings', 'contextualListener', 'scriptRunner', 'terminal', 'fetchAndCompile'])
 
   const queryParams = new QueryParams()
   const params = queryParams.get()
diff --git a/src/app/editor/example-contracts.js b/src/app/editor/example-contracts.js
index 34c6ea9a647..a01dead068e 100644
--- a/src/app/editor/example-contracts.js
+++ b/src/app/editor/example-contracts.js
@@ -227,7 +227,7 @@ contract Ballot {
 
 var ballotTest = `pragma solidity >=0.4.22 <0.7.0;
 import "remix_tests.sol"; // this import is automatically injected by Remix.
-import "./3_Ballot.sol";
+import "../3_Ballot.sol";
 
 contract BallotTest {
    
@@ -255,6 +255,6 @@ module.exports = {
   storage: { name: '1_Storage.sol', content: storage },
   owner: { name: '2_Owner.sol', content: owner },
   ballot: { name: '3_Ballot.sol', content: ballot },
-  ballot_test: { name: '4_Ballot_test.sol', content: ballotTest },
+  ballot_test: { name: 'tests/4_Ballot_test.sol', content: ballotTest },
   basic: { name: 'basic.sol', content: basic }
 }
diff --git a/src/app/files/file-explorer.js b/src/app/files/file-explorer.js
index 19b678182f2..2d12bd8dce2 100644
--- a/src/app/files/file-explorer.js
+++ b/src/app/files/file-explorer.js
@@ -104,8 +104,8 @@ function fileExplorer (localRegistry, files, menuItems) {
     self.ensureRoot(() => {
       const folderpath = filepath.split('/').slice(0, -1).join('/')
       const currentTree = self.treeView.nodeAt(folderpath)
-
-      if (currentTree && self.treeView.isExpanded(folderpath)) {
+      if (!self.treeView.isExpanded(folderpath)) self.treeView.expand(folderpath)
+      if (currentTree) {
         self.files.resolveDirectory(folderpath, (error, fileTree) => {
           if (error) console.error(error)
           if (!fileTree) return
@@ -136,6 +136,7 @@ function fileExplorer (localRegistry, files, menuItems) {
         if (!fileTree) return
         fileTree = normalize(folderpath, fileTree)
         self.treeView.updateNodeFromJSON(folderpath, fileTree, true)
+        if (!self.treeView.isExpanded(folderpath)) self.treeView.expand(folderpath)
       })
     })
   }
diff --git a/src/app/files/fileManager.js b/src/app/files/fileManager.js
index 6699179c067..5ab6ed33203 100644
--- a/src/app/files/fileManager.js
+++ b/src/app/files/fileManager.js
@@ -38,7 +38,7 @@ const createError = (err) => {
 }
 
 class FileManager extends Plugin {
-  constructor (editor) {
+  constructor (editor, appManager) {
     super(profile)
     this.openedFiles = {} // list all opened files
     this.events = new EventEmitter()
@@ -46,6 +46,7 @@ class FileManager extends Plugin {
     this._components = {}
     this._components.compilerImport = new CompilerImport()
     this._components.registry = globalRegistry
+    this.appManager = appManager
     this.init()
   }
 
@@ -493,6 +494,32 @@ class FileManager extends Plugin {
     return this._deps.filesProviders['browser']
   }
 
+  // returns the list of directories inside path
+  dirList (path) {
+    const dirPaths = []
+    const collectList = (path) => {
+      return new Promise((resolve, reject) => {
+        this.readdir(path).then((ls) => {
+          const promises = Object.keys(ls).map((item, index) => {
+            const root = (path.indexOf('/') === -1) ? path : path.substr(0, path.indexOf('/'))
+            const curPath = `${root}/${item}` // adding 'browser' or 'localhost'
+            if (ls[item].isDirectory && !dirPaths.includes(curPath)) {
+              dirPaths.push(curPath)
+              resolve(dirPaths)
+            }
+            return new Promise((resolve, reject) => { resolve() })
+          })
+          Promise.all(promises).then(() => { resolve(dirPaths) })
+        })
+      })
+    }
+    return collectList(path)
+  }
+
+  isRemixDActive () {
+    return this.appManager.isActive('remixd')
+  }
+
   saveCurrentFile () {
     var currentFile = this._deps.config.get('currentFile')
     if (currentFile && this.editor.current()) {
diff --git a/src/app/files/fileProvider.js b/src/app/files/fileProvider.js
index 1b02dd398bc..ac6d1887b49 100644
--- a/src/app/files/fileProvider.js
+++ b/src/app/files/fileProvider.js
@@ -98,7 +98,8 @@ class FileProvider {
       return true
     }
     if (!exists && unprefixedpath.indexOf('/') !== -1) {
-      this.createDir(path)
+      // the last element is the filename and we should remove it
+      this.createDir(path.substr(0, path.lastIndexOf('/')))
     }
     try {
       window.remixFileSystem.writeFileSync(unprefixedpath, content)
@@ -116,9 +117,8 @@ class FileProvider {
   }
 
   createDir (path, cb) {
-    var unprefixedpath = this.removePrefix(path)
+    const unprefixedpath = this.removePrefix(path)
     const paths = unprefixedpath.split('/')
-    paths.pop() // last element should the filename
     if (paths.length && paths[0] === '') paths.shift()
     let currentCheck = ''
     paths.forEach((value) => {
@@ -226,7 +226,7 @@ class FileProvider {
       if (files) {
         files.forEach(element => {
           const absPath = (path === '/' ? '' : path) + '/' + element
-          ret[absPath.indexOf('/') === 0 ? absPath.replace('/', '') : absPath] = { isDirectory: window.remixFileSystem.statSync(absPath).isDirectory() }
+          ret[absPath.indexOf('/') === 0 ? absPath.substr(1, absPath.length) : absPath] = { isDirectory: window.remixFileSystem.statSync(absPath).isDirectory() }
           // ^ ret does not accept path starting with '/'
         })
       }
diff --git a/src/app/tabs/settings-tab.js b/src/app/tabs/settings-tab.js
index 57bb51f8062..c44a1101d85 100644
--- a/src/app/tabs/settings-tab.js
+++ b/src/app/tabs/settings-tab.js
@@ -69,7 +69,7 @@ module.exports = class SettingsTab extends ViewPlugin {
 
     // Gist settings
     const token = this.config.get('settings/gist-access-token')
-    const gistAccessToken = yo`<input id="gistaccesstoken" data-id="settingsTabGistAccessToken" type="password" class="border form-control-sm mb-2 ${css.inline}" placeholder="Token">`
+    const gistAccessToken = yo`<input id="gistaccesstoken" data-id="settingsTabGistAccessToken" type="password" class="form-control border form-control-sm mb-2 ${css.inline}" placeholder="Token">`
     if (token) gistAccessToken.value = token
     const removeToken = () => { self.config.set('settings/gist-access-token', ''); gistAccessToken.value = ''; tooltip('Access token removed') }
     const saveToken = () => { this.config.set('settings/gist-access-token', gistAccessToken.value); tooltip('Access token saved') }
diff --git a/src/app/tabs/test-tab.js b/src/app/tabs/test-tab.js
index abc9986a1d4..96c24a2b970 100644
--- a/src/app/tabs/test-tab.js
+++ b/src/app/tabs/test-tab.js
@@ -33,11 +33,13 @@ module.exports = class TestTab extends ViewPlugin {
     this.runningTestsNumber = 0
     this.readyTestsNumber = 0
     this.areTestsRunning = false
+    this.defaultPath = 'browser/tests'
+
     appManager.event.on('activate', (name) => {
-      if (name === 'solidity') this.updateRunAction(fileManager.currentFile())
+      if (name === 'solidity') this.updateRunAction()
     })
     appManager.event.on('deactivate', (name) => {
-      if (name === 'solidity') this.updateRunAction(fileManager.currentFile())
+      if (name === 'solidity') this.updateRunAction()
     })
   }
 
@@ -56,9 +58,6 @@ module.exports = class TestTab extends ViewPlugin {
     })
 
     this.fileManager.events.on('noFileSelected', () => {
-      this.updateGenerateFileAction()
-      this.updateRunAction()
-      this.updateTestFileList()
     })
 
     this.fileManager.events.on('currentFileChanged', (file, provider) => this.updateForNewCurrent(file))
@@ -86,6 +85,7 @@ module.exports = class TestTab extends ViewPlugin {
   }
 
   listTests () {
+    if (!this.data.allTests) return []
     return this.data.allTests.map(
       testFile => this.createSingleTest(testFile)
     )
@@ -351,6 +351,13 @@ module.exports = class TestTab extends ViewPlugin {
     })
   }
 
+  updateCurrentPath (e) {
+    const newValue = e.target.value === '' ? this.defaultPath : e.target.value
+    this.testTabLogic.setCurrentPath(newValue)
+    this.updateRunAction()
+    this.updateForNewCurrent()
+  }
+
   runTests () {
     this.areTestsRunning = true
     this.hasBeenStopped = false
@@ -386,21 +393,16 @@ module.exports = class TestTab extends ViewPlugin {
   }
 
   updateGenerateFileAction (currentFile) {
-    let el = yo`<button
-      class="btn border w-50"
-      data-id="testTabGenerateTestFile"
-      title="Generate sample test file."
-      onclick="${this.testTabLogic.generateTestFile.bind(this.testTabLogic)}"
-    >
-      Generate
-    </button>`
-    if (
-      !currentFile ||
-      (currentFile && currentFile.split('.').pop().toLowerCase() !== 'sol')
-    ) {
-      el.setAttribute('disabled', 'disabled')
-      el.setAttribute('title', 'No solidity file selected')
-    }
+    let el = yo`
+      <button
+        class="btn border w-50"
+        data-id="testTabGenerateTestFile"
+        title="Generate sample test file."
+        onclick="${this.testTabLogic.generateTestFile.bind(this.testTabLogic)}"
+      >
+        Generate
+      </button>
+    `
     if (!this.generateFileActionElement) {
       this.generateFileActionElement = el
     } else {
@@ -411,13 +413,13 @@ module.exports = class TestTab extends ViewPlugin {
 
   updateRunAction (currentFile) {
     let el = yo`
-      <button id="runTestsTabRunAction" title="Run tests" data-id="testTabRunTestsTabRunAction" class="w-50 btn btn-primary"  onclick="${() => this.runTests()}">
+      <button id="runTestsTabRunAction" title="Run tests" data-id="testTabRunTestsTabRunAction" class="w-50 btn btn-primary" onclick="${() => this.runTests()}">
         <span class="fas fa-play ml-2"></span>
         <label class="${css.labelOnBtn} btn btn-primary p-1 ml-2 m-0">Run</label>
       </button>
     `
-    const isSolidityActive = this.appManager.actives.includes('solidity')
-    if (!currentFile || !isSolidityActive || (currentFile && currentFile.split('.').pop().toLowerCase() !== 'sol')) {
+    const isSolidityActive = this.appManager.isActive('solidity')
+    if (!isSolidityActive || !this.listTests().length) {
       el.setAttribute('disabled', 'disabled')
       if (!currentFile || (currentFile && currentFile.split('.').pop().toLowerCase() !== 'sol')) {
         el.setAttribute('title', 'No solidity file selected')
@@ -451,6 +453,7 @@ module.exports = class TestTab extends ViewPlugin {
     } else {
       yo.update(this.testFilesListElement, el)
     }
+    this.updateRunAction()
     return this.testFilesListElement
   }
 
@@ -482,11 +485,40 @@ module.exports = class TestTab extends ViewPlugin {
     return yo`<span class='text-info h6'>Progress: ${ready} finished (of ${this.runningTestsNumber})</span>`
   }
 
+  updateDirList () {
+    for (var o of this.uiPathList.querySelectorAll('option')) o.remove()
+    this.uiPathList.appendChild(yo`<option>browser</option>`)
+    if (this.testTabLogic.isRemixDActive()) this.uiPathList.appendChild(yo`<option>localhost</option>`)
+    if (!this._view.el) return
+    this.testTabLogic.dirList(this.inputPath.value).then((options) => {
+      options.forEach((path) => this.uiPathList.appendChild(yo`<option>${path}</option>`))
+    })
+  }
+
   render () {
     this.onActivationInternal()
     this.testsOutput = yo`<div class="mx-3 mb-2 pb-4 border-top border-primary" hidden='true' id="solidityUnittestsOutput" data-id="testTabSolidityUnitTestsOutput"></a>`
     this.testsExecutionStopped = yo`<label class="text-warning h6" data-id="testTabTestsExecutionStopped">The test execution has been stopped</label>`
     this.testsExecutionStoppedError = yo`<label class="text-danger h6" data-id="testTabTestsExecutionStoppedError">The test execution has been stopped because of error(s) in your test file</label>`
+    this.uiPathList = yo`<datalist id="utPathList"></datalist>`
+    this.inputPath = yo`<input
+      placeholder=${this.defaultPath}
+      list="utPathList"
+      class="custom-select"
+      id="utPath"
+      data-id="uiPathInput"
+      name="utPath"
+      style="background-image: var(--primary);"
+      onkeydown=${(e) => { if (e.keyCode === 191) this.updateDirList() }}
+      onchange=${(e) => this.updateCurrentPath(e)}/>`
+
+    const availablePaths = yo`
+      <div>
+          ${this.inputPath}
+          ${this.uiPathList}
+      </div>
+    `
+    this.updateDirList()
     this.testsExecutionStopped.hidden = true
     this.testsExecutionStoppedError.hidden = true
     this.resultStatistics = this.createResultLabel()
@@ -495,7 +527,9 @@ module.exports = class TestTab extends ViewPlugin {
       <div class="${css.testTabView} px-2" id="testView">
         <div class="${css.infoBox}">
           <p class="text-lg"> Test your smart contract in Solidity.</p>
-          <p> Click on "Generate" to generate a sample test file.</p>
+          <p> Select directory to load and generate test files.</p>
+          <label>Test directory:</label>
+          ${availablePaths}
         </div>
         <div class="${css.tests}">          
           <div class="d-flex p-2">
@@ -518,6 +552,7 @@ module.exports = class TestTab extends ViewPlugin {
       </div>
     `
     this._view.el = el
+    this.testTabLogic.setCurrentPath(this.defaultPath)
     this.updateForNewCurrent(this.fileManager.currentFile())
     return el
   }
diff --git a/src/app/tabs/testTab/testTab.js b/src/app/tabs/testTab/testTab.js
index ce95bf52f50..964b431337c 100644
--- a/src/app/tabs/testTab/testTab.js
+++ b/src/app/tabs/testTab/testTab.js
@@ -1,52 +1,71 @@
 const helper = require('../../../lib/helper.js')
 const modalDialogCustom = require('../../ui/modal-dialog-custom')
+const remixPath = require('path')
 
 class TestTabLogic {
 
   constructor (fileManager) {
     this.fileManager = fileManager
+    this.currentPath = 'browser/tests'
+  }
+
+  setCurrentPath (path) {
+    if (path.indexOf('/') === 0) return
+    this.currentPath = path
+    const fileProvider = this.fileManager.fileProviderOf(path.split('/')[0])
+    fileProvider.exists(path, (e, res) => { if (!res) fileProvider.createDir(path) })
   }
 
   generateTestFile () {
-    const path = this.fileManager.currentPath()
-    const fileName = this.fileManager.currentFile()
-    const fileProvider = this.fileManager.fileProviderOf(path)
+    let fileName = this.fileManager.currentFile()
+    const hasCurrent = !!fileName && this.fileManager.currentFile().split('.').pop().toLowerCase() === 'sol'
+    if (!hasCurrent) fileName = this.currentPath + '/newFile.sol'
+    const fileProvider = this.fileManager.fileProviderOf(this.currentPath)
     if (!fileProvider) return
-    helper.createNonClashingNameWithPrefix(fileName, fileProvider, '_test', (error, newFile) => {
+    const splittedFileName = fileName.split('/')
+    let fileNameToImport = (!hasCurrent) ? fileName : this.currentPath + '/' + splittedFileName[splittedFileName.length - 1]
+    helper.createNonClashingNameWithPrefix(fileNameToImport, fileProvider, '_test', (error, newFile) => {
       if (error) return modalDialogCustom.alert('Failed to create file. ' + newFile + ' ' + error)
-      const splittedFileName = fileName.split('/')
-      // This is fine for now because test file is created on same path where file to be tested is.
-      // This should be updated to pass complete path, if test file comes from different directory/path
-      const fileNameToImport = splittedFileName[splittedFileName.length - 1]
-      if (!fileProvider.set(newFile, this.generateTestContractSample(fileNameToImport))) return modalDialogCustom.alert('Failed to create test file ' + newFile)
+      if (!fileProvider.set(newFile, this.generateTestContractSample(hasCurrent, fileName))) return modalDialogCustom.alert('Failed to create test file ' + newFile)
       this.fileManager.open(newFile)
+      this.fileManager.syncEditor(newFile)
     })
   }
 
+  dirList (path) {
+    return this.fileManager.dirList(path)
+  }
+
+  isRemixDActive () {
+    return this.fileManager.isRemixDActive()
+  }
+
   async getTests (cb) {
-    const path = this.fileManager.currentPath()
-    if (!path) return cb(null, [])
-    const provider = this.fileManager.fileProviderOf(path)
+    if (!this.currentPath) return cb(null, [])
+    const provider = this.fileManager.fileProviderOf(this.currentPath)
     if (!provider) return cb(null, [])
     const tests = []
     let files
     try {
-      files = await this.fileManager.readdir(path)
+      files = await this.fileManager.readdir(this.currentPath)
     } catch (e) {
       cb(e.message)
     }
     for (var file in files) {
       if (/.(_test.sol)$/.exec(file)) tests.push(provider.type + '/' + file)
     }
-    cb(null, tests, path)
+    cb(null, tests, this.currentPath)
   }
 
   // @todo(#2758): If currently selected file is compiled and compilation result is available,
   // 'contractName' should be <compiledContractName> + '_testSuite'
-  generateTestContractSample (fileToImport, contractName = 'testSuite') {
+  generateTestContractSample (hasCurrent, fileToImport, contractName = 'testSuite') {
+    let relative = remixPath.relative(this.currentPath, remixPath.dirname(fileToImport))
+    if (relative === '') relative = '.'
+    const comment = hasCurrent ? `import "${relative}/${remixPath.basename(fileToImport)}";` : '// Import here the file to test.'
     return `pragma solidity >=0.4.22 <0.7.0;
 import "remix_tests.sol"; // this import is automatically injected by Remix.
-import "./${fileToImport}";
+${comment}
 
 // File name has to end with '_test.sol', this file can contain more than one testSuite contracts
 contract ${contractName} {
@@ -65,7 +84,7 @@ contract ${contractName} {
         Assert.notEqual(uint(2), uint(3), "2 should not be equal to 3");
     }
 
-    function checkSuccess2() public view returns (bool) {
+    function checkSuccess2() public pure returns (bool) {
         // Use the return value (true or false) to test the contract
         return true;
     }
diff --git a/test-browser/tests/defaultLayout.test.js b/test-browser/tests/defaultLayout.test.js
index f4857c7f86d..3e1a3970050 100644
--- a/test-browser/tests/defaultLayout.test.js
+++ b/test-browser/tests/defaultLayout.test.js
@@ -18,7 +18,7 @@ module.exports = {
     browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
     .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORERS')
     .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
-    .waitForElementVisible('li[key="browser/4_Ballot_test.sol"]')
+    .waitForElementVisible('li[key="browser/3_Ballot.sol"]')
   },
 
   'Loads Main View': function (browser) {
diff --git a/test-browser/tests/fileExplorer.test.js b/test-browser/tests/fileExplorer.test.js
index c39fb9ff047..9647c93d089 100644
--- a/test-browser/tests/fileExplorer.test.js
+++ b/test-browser/tests/fileExplorer.test.js
@@ -22,8 +22,7 @@ module.exports = {
     .waitForElementVisible('*[data-id="modalDialogContainer"]')
     .setValue('*[data-id="modalDialogCustomPromptText"]', '5_New_contract.sol')
     .modalFooterOKClick()
-    .pause(2000)
-    .waitForElementVisible('*[data-id="treeViewLibrowser/5_New_contract.sol"]')
+    .waitForElementVisible('*[data-id="treeViewLibrowser/5_New_contract.sol"]', 7000)
   },
 
   'Should rename `5_New_contract.sol` to 5_Renamed_Contract.sol': function (browser) {
@@ -86,8 +85,7 @@ module.exports = {
     .click('*[data-id="fileExplorerNewFilepublishToGist"]')
     .waitForElementVisible('*[data-id="modalDialogContainer"]')
     .modalFooterOKClick()
-    .pause(10000)
-    .waitForElementVisible('*[data-id="modalDialogContainer"]')
+    .waitForElementVisible('*[data-id="modalDialogContainer"]', 7000)
     .modalFooterOKClick()
     .pause(2000)
     .perform((done) => {
diff --git a/test-browser/tests/generalSettings.test.js b/test-browser/tests/generalSettings.test.js
index ea9ab48c87b..a47484a6729 100644
--- a/test-browser/tests/generalSettings.test.js
+++ b/test-browser/tests/generalSettings.test.js
@@ -37,7 +37,6 @@ module.exports = {
     .click('*[data-id="compilerContainerCompileBtn"]')
     .pause(3000)
     .click('*[data-id="verticalIconsKindfileExplorers"]')
-    .openFile('browser/artifacts')
     .openFile('browser/artifacts/Ballot.json')
   },
 
diff --git a/test-browser/tests/gist.test.js b/test-browser/tests/gist.test.js
index 5c01f6f5a94..a939bcdc176 100644
--- a/test-browser/tests/gist.test.js
+++ b/test-browser/tests/gist.test.js
@@ -45,7 +45,6 @@ module.exports = {
           .modalFooterCancelClick()
           .executeScript(`remix.loadgist('${gistid}')`)
           .perform((done) => { if (runtimeBrowser === 'chrome') { browser.openFile('browser/gists') } done() })
-          .openFile(`browser/gists/${gistid}`)
           .openFile(`browser/gists/${gistid}/1_Storage.sol`)
           .perform(done)
       }
@@ -86,7 +85,6 @@ module.exports = {
     .waitForElementVisible('*[data-id="modalDialogCustomPromptText"]')
     .setValue('*[data-id="modalDialogCustomPromptText"]', testData.validGistId)
     .modalFooterOKClick()
-    .openFile(`browser/gists/${testData.validGistId}`)
     .openFile(`browser/gists/${testData.validGistId}/ApplicationRegistry`)
     .waitForElementVisible(`div[title='browser/gists/${testData.validGistId}/ApplicationRegistry']`)
     .assert.containsText(`div[title='browser/gists/${testData.validGistId}/ApplicationRegistry'] > span`, 'ApplicationRegistry')
diff --git a/test-browser/tests/solidityUnittests.test.js b/test-browser/tests/solidityUnittests.test.js
index cdb99c4e039..a3dd412ee33 100644
--- a/test-browser/tests/solidityUnittests.test.js
+++ b/test-browser/tests/solidityUnittests.test.js
@@ -31,14 +31,16 @@ module.exports = {
     .click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
     .waitForElementPresent('*[data-id="testTabGenerateTestFile"]')
     .click('*[data-id="testTabGenerateTestFile"]')
-    .waitForElementPresent('*[title="browser/simple_storage_test.sol"]')
+    .waitForElementPresent('*[title="browser/tests/simple_storage_test.sol"]')
     .clickLaunchIcon('fileExplorers')
-    .removeFile('browser/simple_storage_test.sol')
+    .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) {
     browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
-    .addFile('simple_storage_test.sol', sources[0]['browser/simple_storage_test.sol'])
+    .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"]')
@@ -46,19 +48,19 @@ module.exports = {
     .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 80000)
     .pause(5000)
-    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'MyTest (browser/simple_storage_test.sol)')
+    .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/simple_storage_test.sol)')
+    .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) {
     browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
     .clickLaunchIcon('fileExplorers')
-    .addFile('ks2b_test.sol', sources[0]['browser/ks2b_test.sol'])
+    .addFile('tests/ks2b_test.sol', sources[0]['browser/tests/ks2b_test.sol'])
     .click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
     .waitForElementPresent('*[data-id="testTabCheckAllTests"]')
     .click('*[data-id="testTabCheckAllTests"]')
@@ -66,7 +68,7 @@ module.exports = {
     .scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
     .pause(5000)
-    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/ks2b_test.sol')
+    .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')
@@ -89,18 +91,18 @@ module.exports = {
     .pause(1000)
     .assert.containsText('*[data-id="testTabRunTestsTabStopAction"]', 'Stopping')
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
-    .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/ks2b_test.sol')
-    .notContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/4_Ballot_test.sol')
-    .notContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'browser/simple_storage_test.sol')
-    .pause(6000)
+    .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) {
     browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
-    .addFile('compilationError_test.sol', sources[0]['browser/compilationError_test.sol'])
+    .addFile('tests/compilationError_test.sol', sources[0]['browser/compilationError_test.sol'])
     .clickLaunchIcon('fileExplorers')
-    .openFile('browser/compilationError_test.sol')
+    .openFile('browser/tests/compilationError_test.sol')
     .clickLaunchIcon('solidityUnitTesting')
     .click('*[data-id="testTabCheckAllTests"]')
     .clickElementAtPosition('.singleTestLabel', 3)
@@ -113,9 +115,9 @@ module.exports = {
 
   'Should fail on deploy': function (browser) {
     browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
-    .addFile('deployError_test.sol', sources[0]['browser/deployError_test.sol'])
+    .addFile('tests/deployError_test.sol', sources[0]['browser/tests/deployError_test.sol'])
     .clickLaunchIcon('fileExplorers')
-    .openFile('browser/deployError_test.sol')
+    .openFile('browser/tests/deployError_test.sol')
     .clickLaunchIcon('solidityUnitTesting')
     .click('*[data-id="testTabCheckAllTests"]')
     .clickElementAtPosition('.singleTestLabel', 4)
@@ -127,9 +129,9 @@ module.exports = {
 
   'Should fail when parameters are to method in test contract': function (browser) {
     browser.waitForElementPresent('*[data-id="verticalIconsKindfileExplorers"]')
-    .addFile('methodFailure_test.sol', sources[0]['browser/methodFailure_test.sol'])
+    .addFile('tests/methodFailure_test.sol', sources[0]['browser/tests/methodFailure_test.sol'])
     .clickLaunchIcon('fileExplorers')
-    .openFile('browser/methodFailure_test.sol')
+    .openFile('browser/tests/methodFailure_test.sol')
     .clickLaunchIcon('solidityUnitTesting')
     .click('*[data-id="testTabCheckAllTests"]')
     .clickElementAtPosition('.singleTestLabel', 5)
@@ -139,6 +141,19 @@ module.exports = {
     .assert.containsText('*[data-id="testTabSolidityUnitTestsOutput"]', `Method 'add' can not have parameters inside a test contract`)
   },
 
+  'Changing current path': function (browser) {
+    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) {
     runTests(browser)
   },
@@ -157,7 +172,7 @@ function runTests (browser) {
     .waitForElementPresent('*[data-id="testTabSolidityUnitTestsOutputheader"]', 40000)
     .pause(5000)
     .waitForElementPresent('#solidityUnittestsOutput div[class^="testPass"]')
-    .assert.containsText('#solidityUnittestsOutput', 'browser/4_Ballot_test.sol')
+    .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()
@@ -186,11 +201,11 @@ var sources = [
       }
         `
     },
-    'browser/simple_storage_test.sol': {
+    'browser/tests/simple_storage_test.sol': {
       content: `
       pragma solidity >=0.4.22 <0.7.0;
       import "remix_tests.sol";
-      import "./simple_storage.sol";
+      import "../simple_storage.sol";
 
       contract MyTest {
         SimpleStorage foo;
@@ -269,14 +284,14 @@ var sources = [
       }
         `
     },
-    'browser/ks2b_test.sol': {
+    '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";
+      import "../ks2a.sol";
 
       contract kickstarterTest {
           enum State { Started, Completed }
@@ -339,7 +354,7 @@ var sources = [
       }
         `
     },
-    'browser/deployError_test.sol': {
+    'browser/tests/deployError_test.sol': {
       content: `
       pragma solidity ^0.6.0;
 
@@ -350,7 +365,7 @@ var sources = [
       }
         `
     },
-    'browser/methodFailure_test.sol': {
+    'browser/tests/methodFailure_test.sol': {
       content: `
       pragma solidity ^0.6.0;