diff --git a/src/lib/modules/contracts_manager/index.js b/src/lib/modules/contracts_manager/index.js
index d2f1fa275..898fa03e9 100644
--- a/src/lib/modules/contracts_manager/index.js
+++ b/src/lib/modules/contracts_manager/index.js
@@ -291,9 +291,21 @@ class ContractsManager {
           callback();
         });
       },
-      function compileContracts(callback) {
+      function allContractsCompiled(callback) {
+        const allContractsCompiled = 
+          self.compiledContracts && 
+          self.contractsFiles && 
+          self.contractsFiles.every(contractFile => 
+            Object.values(self.compiledContracts).find(contract => 
+              contract.originalFilename === contractFile.filename
+            )
+          );
+        callback(null, allContractsCompiled);
+      },
+      function compileContracts(allContractsCompiled, callback) {
         self.events.emit("status", __("Compiling..."));
-        if (self.compileOnceOnly && self.compiledContracts && Object.keys(self.compiledContracts).length) {
+        const hasCompiledContracts = self.compiledContracts && Object.keys(self.compiledContracts).length;
+        if (self.compileOnceOnly && hasCompiledContracts && allContractsCompiled) {
           return callback();
         }
         self.events.request("compiler:contracts", self.contractsFiles, compilerOptions, function (err, compiledObject) {
diff --git a/src/lib/modules/solidity/index.js b/src/lib/modules/solidity/index.js
index 97f6c3704..c78094203 100644
--- a/src/lib/modules/solidity/index.js
+++ b/src/lib/modules/solidity/index.js
@@ -143,6 +143,7 @@ class Solidity {
             compiled_object[className].gasEstimates = contract.evm.gasEstimates;
             compiled_object[className].functionHashes = contract.evm.methodIdentifiers;
             compiled_object[className].abiDefinition = contract.abi;
+            compiled_object[className].userdoc = contract.userdoc;
             compiled_object[className].filename = filename;
             compiled_object[className].originalFilename = originalFilepaths[filename];
           }
diff --git a/src/lib/modules/tests/solc_test.js b/src/lib/modules/tests/solc_test.js
index f3fb2255c..c0e2463bf 100644
--- a/src/lib/modules/tests/solc_test.js
+++ b/src/lib/modules/tests/solc_test.js
@@ -66,6 +66,11 @@ class SolcTest extends Test {
           fns.push(fn);
         });
         async.series(fns, next);
+      },
+      function resetEmbarkJs(file, next) {
+        self.resetEmbarkJS((err) => {
+          next(err, file);
+        });
       }
     ], cb);
   }
@@ -97,13 +102,25 @@ class SolcTest extends Test {
           next(null, contracts, web3);
         });
       },
-      function run(contracts, web3, next) {
+      function getAccounts(contracts, web3, next) {
+        self.events.request('blockchain:getAccounts', (err, accounts) => {
+          if (err) return next(err);
+          next(null, contracts, web3, accounts);
+        });
+      },
+      function run(contracts, web3, accounts, next) {
         let fns = [];
         contracts.forEach((contract) => {
           let fn = (_callback) => {
             // TODO: web3 is not injected into the function. Issue has been raised on remixTests.
             // To fix once web3 has been made injectable.
-            remixTests.runTest(contract.className, Test.getWeb3Contract(contract, web3),
+            const contractDetails = { 
+              userdoc: (contract.userdoc || { methods: [] }), 
+              evm: { 
+                methodIdentifiers: contract.functionHashes 
+              }
+            };
+            remixTests.runTest(contract.className, Test.getWeb3Contract(contract, web3), contractDetails, {accounts},
               self._prettyPrint.bind(self), _callback);
           };
           fns.push(fn);
diff --git a/src/lib/modules/tests/test.js b/src/lib/modules/tests/test.js
index 2db2b86d1..b1aff7c03 100644
--- a/src/lib/modules/tests/test.js
+++ b/src/lib/modules/tests/test.js
@@ -219,26 +219,8 @@ class Test {
         });
       },
       function changeGlobalWeb3(accounts, next) {
-        self.events.request('blockchain:get', (web3) => {
-          global.web3 = web3;
-          self.vm = new VM({
-            sandbox: {
-              EmbarkJS,
-              web3: web3,
-              Web3: Web3,
-              IpfsApi
-            }
-          });
-          self.events.request("code-generator:embarkjs:provider-code", (code) => {
-            self.vm.doEval(code, false, (err, _result) => {
-              if(err) return next(err);
-              self.events.request("code-generator:embarkjs:init-provider-code", (code) => {
-                self.vm.doEval(code, false, (err, _result) => {
-                  next(err, accounts);
-                });
-              });
-            });
-          });
+        self.resetEmbarkJS((err) => {
+          next(err, accounts);
         });
       }
     ], (err, accounts) => {
@@ -250,6 +232,30 @@ class Test {
     });
   }
 
+  resetEmbarkJS(cb) {
+    this.events.request('blockchain:get', (web3) => {
+      global.web3 = web3;
+      this.vm = new VM({
+        sandbox: {
+          EmbarkJS,
+          web3: web3,
+          Web3: Web3,
+          IpfsApi
+        }
+      });
+      this.events.request("code-generator:embarkjs:provider-code", (code) => {
+        this.vm.doEval(code, false, (err, _result) => {
+          if(err) return cb(err);
+          this.events.request("code-generator:embarkjs:init-provider-code", (code) => {
+            this.vm.doEval(code, false, (err, _result) => {
+              cb(err);
+            });
+          });
+        });
+      });
+    });
+  }
+
   async deploy(contract, deployArgs = {}, sendArgs = {}) {
     const instance = await contract.deploy(deployArgs).send(sendArgs);
     this.events.emit("tests:manualDeploy", instance);