diff --git a/test/index.html b/test/index.html
index 46e3a63ce..3ab87d20c 100644
--- a/test/index.html
+++ b/test/index.html
@@ -25,7 +25,13 @@
     <script src="test.Wallet.js"></script>
     <script src="test.WalletFactory.js"></script>
     <script src="test.performance.js"></script>
+    <script src="test.HDParams.js"></script>
+    <script src="test.HDPath.js"></script>
+    <script src="test.Passphrase.js"></script>
+    <script src="test.TxProposal.js"></script>
     <!--
+    Do not try to run test.storage.File.js in browser.
+    It is only applicable to the node environment.
     -->
     <script>
       mocha.run();
diff --git a/test/test.HDParams.js b/test/test.HDParams.js
index c55b3365a..ee7cafd6a 100644
--- a/test/test.HDParams.js
+++ b/test/test.HDParams.js
@@ -2,6 +2,7 @@
 
 var chai = chai || require('chai');
 var should = chai.should();
+
 var bitcore = bitcore || require('bitcore');
 var Address = bitcore.Address;
 var buffertools = bitcore.buffertools;
@@ -14,20 +15,6 @@ var PublicKeyRing = copay.PublicKeyRing;
 var HDParams = copay.HDParams;
 var HDPath = copay.HDPath;
 
-
-var config = {
-  networkName: 'livenet',
-};
-
-var createAI = function() {
-  var i = new HDParams();
-  should.exist(i);
-
-  i.copayerIndex = 1;
-
-  return i;
-};
-
 describe('HDParams model', function() {
 
   it('should create an instance (livenet)', function() {
@@ -60,7 +47,8 @@ describe('HDParams model', function() {
   });
 
   it('show be able to store and read', function() {
-    var i = createAI();
+    var i = new HDParams();
+    i.copayerIndex = 1;
     var changeN = 2;
     var addressN = 2;
     for (var j = 0; j < changeN; j++) {
@@ -81,7 +69,8 @@ describe('HDParams model', function() {
   });
 
   it('should count generation indexes', function() {
-    var j = createAI();
+    var j = new HDParams();
+    j.copayerIndex = 1;
     for (var i = 0; i < 3; i++)
     j.increment(true);
     for (var i = 0; i < 2; i++)
@@ -92,7 +81,8 @@ describe('HDParams model', function() {
   });
 
   it('#merge tests', function() {
-    var j = createAI();
+    var j = new HDParams();
+    j.copayerIndex = 1;
 
     for (var i = 0; i < 15; i++)
     j.increment(true);
@@ -116,4 +106,4 @@ describe('HDParams model', function() {
     merge.should.throw(Error);
   })
 
-});
+});
\ No newline at end of file
diff --git a/test/test.storage.File.js b/test/test.storage.File.js
index 506e27993..ae1c516a2 100644
--- a/test/test.storage.File.js
+++ b/test/test.storage.File.js
@@ -1,9 +1,8 @@
 'use strict';
 
-var chai = require('chai');
+var chai = chai || require('chai');
 var should = chai.should();
-var Storage = require('../js/models/storage/File.js');
-
+var Storage = require('../js/models/storage/File');
 var sinon = require('sinon');
 var CryptoJS = require('node-cryptojs-aes').CryptoJS;
 
diff --git a/util/build.js b/util/build.js
index 4c764fb2b..1a7f0a9c1 100644
--- a/util/build.js
+++ b/util/build.js
@@ -62,6 +62,9 @@ var createBundle = function(opts) {
   b.require('./js/models/core/HDPath', {
     expose: '../js/models/core/HDPath'
   });
+  b.require('./js/models/storage/File', {
+    expose: '../js/models/storage/File'
+  });
   b.require('./config', {
     expose: '../config'
   });