diff --git a/copay.js b/copay.js
index 0966485a4..d68d1cfb1 100644
--- a/copay.js
+++ b/copay.js
@@ -10,7 +10,7 @@ var Insight = module.exports.Insight = require('./js/models/blockchain/Insight')
 var StorageLocalPlain = module.exports.StorageLocalPlain = require('./js/models/storage/LocalPlain');
 var StorageLocalEncrypted = module.exports.StorageLocalEncrypted = require('./js/models/storage/LocalEncrypted');
 
-var WalletFactory = require('soop').load('./js/models/core/WalletFactory.js',{
+var WalletFactory = require('soop').load('./js/models/core/WalletFactory',{
   Network: WebRTC,
   Blockchain: Insight,
   Storage: StorageLocalPlain,
diff --git a/util/build.js b/util/build.js
index eca71fa0a..509c43466 100755
--- a/util/build.js
+++ b/util/build.js
@@ -42,7 +42,14 @@ var createBundle = function(opts) {
   b.require('./copay', {
     expose: 'copay'
   });
-  b.require('./js/models/core/WalletFactory.js');
+  b.require('./js/models/core/WalletFactory');
+  b.require('./js/models/core/Wallet');
+  b.require('./js/models/core/Wallet', {
+    expose: '../js/models/core/Wallet'
+  });
+  b.require('./test/mocks/FakeStorage', {
+    expose: './mocks/FakeStorage'
+  });
 
 
   if (!opts.dontminify) {