diff --git a/test/method.request.js b/test/method.request.js
deleted file mode 100644
index 00bf52c..0000000
--- a/test/method.request.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var chai = require('chai');
-var assert = chai.assert;
-var web3 = require('../index');
-
-describe('lib/web3/method', function () {
-    describe('request', function () {
-        it('should create proper request', function () {
-            
-            var callback = function (err, result) {};
-            var expected = {
-                method: 'eth_getBalance',
-                callback: callback,
-                params: ['0x0000000000000000000000000000000000000000', 'latest'],
-            };
-
-            var request = web3.eth.getBalance.request('0x0000000000000000000000000000000000000000', 'latest', callback);
-
-            expected.format = request.format;
-            assert.deepEqual(request, expected);
-        });
-    });
-});
-
diff --git a/test/web3.fromICAP.js b/test/web3.fromICAP.js
index 3797b9a..e815849 100644
--- a/test/web3.fromICAP.js
+++ b/test/web3.fromICAP.js
@@ -1,5 +1,6 @@
 var chai = require('chai');
-var web3 = require('../index');
+var Web3 = require('../index');
+var web3 = new Web3();
 var assert = chai.assert;
 
 var tests = [
diff --git a/test/web3.methods.js b/test/web3.methods.js
index d37277f..d47e8c9 100644
--- a/test/web3.methods.js
+++ b/test/web3.methods.js
@@ -1,4 +1,5 @@
-var web3 = require('../index.js');
+var Web3 = require('../index.js');
+var web3 = new Web3();
 var u = require('./helpers/test.utils.js');
 
 describe('web3', function() {
diff --git a/test/shh.hasIdentity.js b/test/web3.shh.hasIdentity.js
similarity index 100%
rename from test/shh.hasIdentity.js
rename to test/web3.shh.hasIdentity.js