diff --git a/remix-solidity/test/decoder/localsTests/int.js b/remix-solidity/test/decoder/localsTests/int.js
index ac40bfd720..c86cf336e7 100644
--- a/remix-solidity/test/decoder/localsTests/int.js
+++ b/remix-solidity/test/decoder/localsTests/int.js
@@ -21,7 +21,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
           st.fail(error)
         } else {
           tx.to = traceHelper.contractCreationToken('0')
-          var traceManager = new TraceManager()
+          var traceManager = new TraceManager({web3: vm.web3})
           var codeManager = new CodeManager(traceManager)
           codeManager.clear()
           var solidityProxy = new SolidityProxy(traceManager, codeManager)
diff --git a/remix-solidity/test/decoder/localsTests/misc.js b/remix-solidity/test/decoder/localsTests/misc.js
index 1db78b16bb..be37d59e49 100644
--- a/remix-solidity/test/decoder/localsTests/misc.js
+++ b/remix-solidity/test/decoder/localsTests/misc.js
@@ -20,7 +20,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
           st.fail(error)
         } else {
           tx.to = traceHelper.contractCreationToken('0')
-          var traceManager = new TraceManager()
+          var traceManager = new TraceManager({web3: vm.web3})
           var codeManager = new CodeManager(traceManager)
           codeManager.clear()
           var solidityProxy = new SolidityProxy(traceManager, codeManager)
diff --git a/remix-solidity/test/decoder/localsTests/misc2.js b/remix-solidity/test/decoder/localsTests/misc2.js
index c7b6c83e61..78cd2745f4 100644
--- a/remix-solidity/test/decoder/localsTests/misc2.js
+++ b/remix-solidity/test/decoder/localsTests/misc2.js
@@ -20,7 +20,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
           st.fail(error)
         } else {
           tx.to = traceHelper.contractCreationToken('0')
-          var traceManager = new TraceManager()
+          var traceManager = new TraceManager({web3: vm.web3})
           var codeManager = new CodeManager(traceManager)
           codeManager.clear()
           var solidityProxy = new SolidityProxy(traceManager, codeManager)
diff --git a/remix-solidity/test/decoder/localsTests/structArray.js b/remix-solidity/test/decoder/localsTests/structArray.js
index e46d5d2956..8e6865e18f 100644
--- a/remix-solidity/test/decoder/localsTests/structArray.js
+++ b/remix-solidity/test/decoder/localsTests/structArray.js
@@ -20,7 +20,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
           st.fail(error)
         } else {
           tx.to = traceHelper.contractCreationToken('0')
-          var traceManager = new TraceManager()
+          var traceManager = new TraceManager({web3: vm.web3})
           var codeManager = new CodeManager(traceManager)
           codeManager.clear()
           var solidityProxy = new SolidityProxy(traceManager, codeManager)
diff --git a/remix-solidity/test/decoder/stateTests/mapping.js b/remix-solidity/test/decoder/stateTests/mapping.js
index 57ef0c8937..9d587f1d74 100644
--- a/remix-solidity/test/decoder/stateTests/mapping.js
+++ b/remix-solidity/test/decoder/stateTests/mapping.js
@@ -41,7 +41,7 @@ function testMapping (st, vm, privateKey, contractAddress, output, cb) {
                 st.end(error)
               } else {
                 var TraceManager = require('remix-core').trace.TraceManager
-                var traceManager = new TraceManager()
+                var traceManager = new TraceManager({web3: vm.web3})
                 traceManager.resolveTrace(tx, () => {
                   var StorageResolver = require('remix-core').storage.StorageResolver
                   var StorageViewer = require('remix-core').storage.StorageViewer
@@ -49,7 +49,7 @@ function testMapping (st, vm, privateKey, contractAddress, output, cb) {
                     stepIndex: 213,
                     tx: tx,
                     address: contractAddress
-                  }, new StorageResolver(), traceManager)
+                  }, new StorageResolver({web3: vm.web3}), traceManager)
                   var stateVars = stateDecoder.extractStateVariables('SimpleMappingState', output.sources)
                   stateDecoder.decodeState(stateVars, storageViewer).then((result) => {
                     console.log('ok', JSON.stringify(result))
diff --git a/remix-solidity/test/decoder/vmCall.js b/remix-solidity/test/decoder/vmCall.js
index 4613ef3040..a57e3114c5 100644
--- a/remix-solidity/test/decoder/vmCall.js
+++ b/remix-solidity/test/decoder/vmCall.js
@@ -51,7 +51,6 @@ function initVM (st, privateKey) {
       console.log(mes)
       st.fail(mes)
     } else {
-      remixLib.global.web3Debug = obj
       vm.web3 = obj
     }
   })