diff --git a/copay.js b/copay.js
index 5b2711dc9..e4cda4988 100644
--- a/copay.js
+++ b/copay.js
@@ -14,5 +14,10 @@ var Insight = module.exports.Insight = require('./js/models/blockchain/Insight')
 var StorageLocalEncrypted = module.exports.StorageLocalEncrypted = require('./js/models/storage/LocalEncrypted');
 
 module.exports.WalletFactory = require('./js/models/core/WalletFactory');
+module.exports.Wallet = require('./js/models/core/Wallet');
 module.exports.version = require('./version');
 module.exports.API = require('./API');
+
+
+// test hack :s, will fix 
+module.exports.FakePayProServer = require('./test/mocks/FakePayProServer');
diff --git a/test/mocks/FakePayProServer.js b/test/mocks/FakePayProServer.js
index e1e507201..3fbc05365 100644
--- a/test/mocks/FakePayProServer.js
+++ b/test/mocks/FakePayProServer.js
@@ -5,7 +5,12 @@ var is_browser = typeof process == 'undefined'
 var bitcore = bitcore || require('bitcore');
 var Buffer = bitcore.Buffer;
 var PayPro = bitcore.PayPro;
-var Wallet = require('../../js/models/core/Wallet');
+try {
+  var copay = require('copay'); //browser
+} catch (e) {
+  var copay = require('../../copay'); //node
+}
+var Wallet = copay.Wallet;
 
 var x509 = {
   priv: ''
diff --git a/test/mocks/FakeWallet.js b/test/mocks/FakeWallet.js
index d5eceef10..d83829e5a 100644
--- a/test/mocks/FakeWallet.js
+++ b/test/mocks/FakeWallet.js
@@ -1,4 +1,10 @@
-var Wallet = require('../../js/models/core/Wallet');
+
+try {
+  var copay = require('copay'); //browser
+} catch (e) {
+  var copay = require('../copay'); //node
+}
+var Wallet = copay.Wallet;
 
 
 var FakeWallet = function() {
diff --git a/test/test.PayPro.js b/test/test.PayPro.js
index 9e50889a6..af6107e35 100644
--- a/test/test.PayPro.js
+++ b/test/test.PayPro.js
@@ -11,7 +11,7 @@ if (is_browser) {
   var copay = require('../copay'); //node
 }
 var copayConfig = require('../config');
-var Wallet = require('../js/models/core/Wallet');
+var Wallet = copay.Wallet;
 var PrivateKey = copay.PrivateKey;
 var Storage = require('./mocks/FakeStorage');
 var Network = require('./mocks/FakeNetwork');
@@ -22,7 +22,7 @@ var Transaction = bitcore.Transaction;
 var Address = bitcore.Address;
 var PayPro = bitcore.PayPro;
 var bignum = bitcore.Bignum;
-var startServer = require('./mocks/FakePayProServer');
+var startServer = copay.FakePayProServer; // TODO should be require('./mocks/FakePayProServer');
 
 var server;
 
diff --git a/test/test.TxProposals.js b/test/test.TxProposals.js
index 94f51964a..a7a25e727 100644
--- a/test/test.TxProposals.js
+++ b/test/test.TxProposals.js
@@ -13,7 +13,11 @@ var TransactionBuilder = bitcore.TransactionBuilder;
 var util = bitcore.util;
 var networks = bitcore.networks;
 var sinon = require('sinon');
-var copay = require('../copay');
+try {
+  var copay = require('copay'); //browser
+} catch (e) {
+  var copay = require('../copay'); //node
+}
 
 var FakeBuilder = require('./mocks/FakeBuilder');
 var TxProposal = copay.TxProposal;
diff --git a/test/test.Wallet.js b/test/test.Wallet.js
index f39287428..75a2d9988 100644
--- a/test/test.Wallet.js
+++ b/test/test.Wallet.js
@@ -10,7 +10,7 @@ if (is_browser) {
   var copay = require('../copay'); //node
 }
 var copayConfig = require('../config');
-var Wallet = require('../js/models/core/Wallet');
+var Wallet = copay.Wallet;
 var PrivateKey = copay.PrivateKey;
 var Storage = require('./mocks/FakeStorage');
 var Network = require('./mocks/FakeNetwork');
diff --git a/test/test.storage.LocalEncrypted.js b/test/test.storage.LocalEncrypted.js
index 8ad081f06..45aad70bd 100644
--- a/test/test.storage.LocalEncrypted.js
+++ b/test/test.storage.LocalEncrypted.js
@@ -19,7 +19,11 @@ CryptoJS.AES.decrypt = function(a) {
 'use strict';
 var chai = chai || require('chai');
 var should = chai.should();
-var copay = copay || require('../copay');
+try {
+  var copay = require('copay'); //browser
+} catch (e) {
+  var copay = require('../copay'); //node
+}
 var LocalEncrypted = copay.StorageLocalEncrypted;
 
 var fakeWallet = 'fake-wallet-id';
diff --git a/util/build.js b/util/build.js
index d8a41e3cf..cf90b861e 100644
--- a/util/build.js
+++ b/util/build.js
@@ -13,7 +13,7 @@ var puts = function(error, stdout, stderr) {
   //sys.puts(stderr);
 };
 
-var pack = function (params) {
+var pack = function(params) {
   var file = require.resolve('soop');
   var dir = file.substr(0, file.length - String('soop.js').length);
   var preludePath = dir + 'example/custom_prelude.js';
@@ -48,9 +48,6 @@ var createBundle = function(opts) {
   b.require('./copay', {
     expose: 'copay'
   });
-  b.require('./copay', {
-    expose: '../copay'
-  });
   b.require('./version');
   //  b.external('bitcore');
   b.require('./js/models/core/WalletFactory', {
@@ -66,20 +63,26 @@ var createBundle = function(opts) {
   b.require('./test/mocks/FakeStorage', {
     expose: './mocks/FakeStorage'
   });
+  b.require('./test/mocks/FakeLocalStorage', {
+    expose: './mocks/FakeLocalStorage'
+  });
+  b.require('./js/models/core/Message', {
+    expose: '../js/models/core/Message'
+  });
+  b.require('./test/mocks/FakeBlockchain', {
+    expose: './mocks/FakeBlockchain'
+  });
+  b.require('./test/mocks/FakeNetwork', {
+    expose: './mocks/FakeNetwork'
+  });
   b.require('./test/mocks/FakePayProServer', {
     expose: './mocks/FakePayProServer'
   });
   b.require('./test/mocks/FakePayProServer', {
     expose: '../../mocks/FakePayProServer'
   });
-  b.require('./test/mocks/FakeBlockchain', {
-    expose: './mocks/FakeBlockchain'
-  });
-  b.require('./test/mocks/FakeLocalStorage', {
-    expose: './mocks/FakeLocalStorage'
-  });
-  b.require('./test/mocks/FakeNetwork', {
-    expose: './mocks/FakeNetwork'
+  b.require('./test/mocks/FakeBuilder', {
+    expose: './mocks/FakeBuilder'
   });
   b.require('./js/models/network/WebRTC', {
     expose: '../js/models/network/WebRTC'
@@ -96,24 +99,21 @@ var createBundle = function(opts) {
   b.require('./js/models/core/Passphrase', {
     expose: '../js/models/core/Passphrase'
   });
-  b.require('./js/models/core/Message', {
-    expose: '../js/models/core/Message'
+  b.require('./js/models/core/HDPath', {
+    expose: '../js/models/core/HDPath'
   });
   b.require('./config', {
     expose: '../config'
   });
-  b.require('./js/models/core/HDPath', {
-    expose: '../js/models/core/HDPath'
-  });
 
-  if (opts.debug) {
+  if (opts.dontminify) {
     //include dev dependencies
     b.require('sinon');
     b.require('blanket');
     b.require('soop');
   }
 
-  if (!opts.debug) {
+  if (!opts.dontminify) {
     b.transform({
       global: true
     }, 'uglifyify');
@@ -128,10 +128,10 @@ if (require.main === module) {
   };
   var program = require('commander');
   program
-  .version('0.0.1')
-  .option('-d, --debug', 'Development. Don\'t minify the codem and include debug packages.')
-  .option('-o, --stdout', 'Specify output as stdout')
-  .parse(process.argv);
+    .version('0.0.1')
+    .option('-d, --dontminify', 'Development. Don\'t minify the code.')
+    .option('-o, --stdout', 'Specify output as stdout')
+    .parse(process.argv);
 
   createVersion();
   var copayBundle = createBundle(program);