diff --git a/copay.js b/copay.js
index a55c4cd9b..67fc11658 100644
--- a/copay.js
+++ b/copay.js
@@ -5,14 +5,14 @@ module.exports.TxProposals = require('./js/models/core/TxProposals');
 module.exports.PrivateKey = require('./js/models/core/PrivateKey');
 
 // components
-var WebRTC = require('./js/models/network/WebRTC');
-var Plain = require('./js/models/storage/Plain');
-var Insight = require('./js/models/blockchain/Insight');
+var WebRTC = module.exports.WebRTC = require('./js/models/network/WebRTC');
+var Insight = module.exports.Insight = require('./js/models/blockchain/Insight');
+var StoragePlain = module.exports.StoragePlain = require('./js/models/storage/Plain');
 
 module.exports.Wallet = require('soop').load('./js/models/core/Wallet',{
   Network: WebRTC,
-  Storage: Plain,
   Blockchain: Insight,
+  Storage: StoragePlain,
 });
 
 
diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index e53696419..3bffa5d99 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -5,9 +5,9 @@ var imports     = require('soop').imports();
 var bitcore     = require('bitcore');
 var http        = require('http');
 
-var Storage     = imports.Storage     || require('FakeStorage');
-var Network     = imports.Network     || require('FakeNetwork');
-var Blockchain  = imports.Blockchain  || require('FakeBlockchain');
+var Storage     = imports.Storage;
+var Network     = imports.Network;
+var Blockchain  = imports.Blockchain;
 
 var copay = copay || require('../../../copay');
 
diff --git a/test/index.html b/test/index.html
index a6139d84f..3c69fd6df 100644
--- a/test/index.html
+++ b/test/index.html
@@ -15,9 +15,9 @@
     <script src="../js/copayBundle.js"></script>
     <script>
 
-var copay = require('copay');
+    var copay = require('copay');
     </script>
-    <script src="test.Storage.js"></script>
+    <script src="test.storage-plain.js"></script>
     <script src="test.Wallet.js"></script>
     <script src="test.PublicKeyRing.js"></script>
     <!--
diff --git a/test/test.storage-plain.js b/test/test.storage-plain.js
index e6e0d38b8..4878b675d 100644
--- a/test/test.storage-plain.js
+++ b/test/test.storage-plain.js
@@ -1,15 +1,16 @@
 'use strict';
 
-if (!process.version)  {
+if (typeof process === 'undefined' || !process.version)  {
+  // browser
   var chai     = chai || require('chai');
   var should   = chai.should();
   var copay    = copay || require('../copay');
-  var Plain    = copay.Storage;
+  var Plain    = copay.StoragePlain;
 
-  describe('Storage model', function() {
+  describe('Storage/Plain model', function() {
 
     it('should create an instance', function () {
-      var s = new Storage();
+      var s = new Plain();
       should.exist(s);
     });
   });
diff --git a/util/build.js b/util/build.js
index af65fd1d6..e7e22e046 100755
--- a/util/build.js
+++ b/util/build.js
@@ -42,6 +42,7 @@ var createBundle = function(opts) {
   b.require('./copay', {
     expose: 'copay'
   });
+  b.require('./js/models/core/Wallet');
 
   if (!opts.dontminify) {
     b.transform({