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.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');