diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js
index 494d7becc0..c00791a597 100644
--- a/src/app/tabs/run-tab.js
+++ b/src/app/tabs/run-tab.js
@@ -273,7 +273,7 @@ function makeRecorder (registry, runTabEvent, self) {
           if (txArray.length) {
             var noInstancesText = self._view.noInstancesText
             if (noInstancesText.parentNode) { noInstancesText.parentNode.removeChild(noInstancesText) }
-            recorder.run(txArray, accounts, options, abis, linkReferences, udapp, (abi, address, contractName) => {
+            recorder.run(txArray, accounts, options, abis, linkReferences, self._deps.udapp, (abi, address, contractName) => {
               self._view.instanceContainer.appendChild(udappUI.renderInstanceFromABI(abi, address, contractName))
             })
           }
diff --git a/src/app/tabs/test-tab.js b/src/app/tabs/test-tab.js
index d1e5225836..bdc0789a01 100644
--- a/src/app/tabs/test-tab.js
+++ b/src/app/tabs/test-tab.js
@@ -85,7 +85,7 @@ module.exports = class TestTab {
       container.innerHTML = ''
       var path = this._deps.fileManager.currentPath()
       var tests = []
-      api.filesFromPath(path, (error, files) => {
+      this._deps.fileManager.filesFromPath(path, (error, files) => {
         if (!error) {
           for (var file in files) {
             if (/.(_test.sol)$/.exec(file)) tests.push(path + file)