diff --git a/config.js b/config.js
index bb7389bb7..88fe27c82 100644
--- a/config.js
+++ b/config.js
@@ -103,6 +103,7 @@ var defaultConfig = {
     totalCopayers: 3,
     spendUnconfirmed: 1,
     verbose: 1,
+    reconnectDelay: 5000,
   },
 
   // blockchain service API config
diff --git a/css/main.css b/css/main.css
index 74820a339..4a8a810fc 100644
--- a/css/main.css
+++ b/css/main.css
@@ -30,6 +30,11 @@ html, body {height: 100%;}
   box-shadow:         inset 0px 0px 3px 0px rgba(0,0,0,0.10);
 }
 
+.text-gray.active {
+  color: #111 !important;
+  font-weight: 700;
+}
+
 #footer {
   position: fixed;
 	margin-top: -96px; /* negative value of footer height */
@@ -59,7 +64,6 @@ html, body {height: 100%;}
 
 .logo {
   display: block;
-  width: 130px;
   height: 51px;
   margin: 0 auto;
 }
@@ -618,6 +622,7 @@ ul.pagination li.current a:hover, ul.pagination li.current a:focus {
     background-size: 90px 44px !important;
     float: left;
     margin-top: 0.7rem;
+    width: 130px;
   }
 
   .header-content .small-9 {
diff --git a/index.html b/index.html
index 8161deb3a..3b74ebfa3 100644
--- a/index.html
+++ b/index.html
@@ -139,13 +139,13 @@
 
   <div id="footer" data-ng-controller="FooterController" ng-class="{'footer-home': !$root.wallet}">
     <link rel="stylesheet" ng-href="{{theme}}">
-    <div class="row" ng-show="!$root.wallet">
+    <div ng-show="!$root.wallet">
       <div class="large-12 columns text-right">
         Copay
         <small>v{{version}}</small>
       </div>
     </div>
-    <div class="row p10t" ng-show="$root.wallet">
+    <div class="p10t" ng-show="$root.wallet">
       <div class="large-3 medium-3 hide-for-small columns">
         <div>
           <strong>{{$root.wallet.getName()}}</strong>
@@ -301,7 +301,7 @@
                 <div class="small-12 medium-6 large-6 columns">
                   <label>Your Wallet Password <small class="has-tip" tooltip="doesn't need to be shared">Required</small>
                   <input type="password" placeholder="Choose your password" class="form-control"
-                    ng-model="walletPassword" required>
+                    ng-model="$parent.walletPassword" check-strength="passwordStrength" tooltip="Password strength: {{passwordStrength}}" tooltip-trigger="focus" required>
                   </label>
                 </div>
               </div>
@@ -419,11 +419,11 @@
       <div class="transactions" data-ng-controller="TransactionsController">
         <div class="row" ng-show='$root.wallet.publicKeyRing.isComplete()'>
           <div class="large-12 columns">
-            <h4> Transaction proposals <span ng-if="onlyPending">[Pending]</span>  <small>({{txs.length}})</small></h4>
+            <h4> Transaction proposals <small>({{txs.length}})</small></h4>
 
-            <ul class="button-group radius">
-            <li> <button class="secondary" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating"> Pending </button>
-            <li> <button class="secondary" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating"> All </button>
+            <ul class="inline-list">
+              <li> <a class="text-gray size-12" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating" ng-class="{'active' : onlyPending}"> [ Pending ] </a> </li>
+              <li> <a class="text-gray size-12" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating" ng-class="{'active' : !onlyPending}"> [ All ] </a> </li>
             </ul>
             <div class="panel radius pending" ng-repeat="tx in txs | paged">
               <div class="txheader row m10">
@@ -673,7 +673,7 @@
             </a>
           </div>
           <div class="large-6 medium-6 columns">
-            <a class="panel radius box-backup" ng-click="email()">
+            <a class="panel radius box-backup" ng-click="openModal()">
               <i class="fi-mail size-72"></i>
               <p> Backup to email </p>
             </a>
@@ -682,6 +682,15 @@
       </div>
     </script>
 
+    <script type="text/ng-template" id="backupModal.html">
+      <h3>Insert your email</h3>
+      <form name="emailForm" ng-submit="submit(emailForm)">
+        <p><input type="email" ng-model="$parent.email" placeholder="your@email.com" required/></p>
+        <input type="submit" class="button" value="Send" ng-disabled="emailForm.$invalid"/>
+      </form>
+      <a class="close-reveal-modal" ng-click="cancel()">&#215;</a>
+    </script>
+
     <!-- CONFIG -->
     <script type="text/ng-template" id="settings.html">
       <div class="settings" ng-controller="SettingsController">
diff --git a/js/app.js b/js/app.js
index 64e9245b9..2060979fc 100644
--- a/js/app.js
+++ b/js/app.js
@@ -16,46 +16,23 @@ var log = function() {
   if (config.verbose) console.log(arguments);
 }
 
+// From the bundle
 var copay = require('copay');
 
-var copayApp = window.copayApp = angular.module('copay',[
+var copayApp = window.copayApp = angular.module('copayApp',[
   'ngRoute',
   'angularMoment',
   'mm.foundation',
   'monospaced.qrcode',
   'notifications',
-  'copay.filters',
-  'copay.header',
-  'copay.footer',
-  'copay.addresses',
-  'copay.transactions',
-  'copay.send',
-  'copay.backup',
-  'copay.walletFactory',
-  'copay.signin',
-  'copay.socket',
-  'copay.controllerUtils',
-  'copay.setup',
-  'copay.directives',
-  'copay.video',
-  'copay.import',
-  'copay.passphrase',
-  'copay.settings'
+  'copayApp.filters',
+  'copayApp.controllers',
+  'copayApp.directives',
+  'copayApp.services',
 ]);
 
-angular.module('copay.header', []);
-angular.module('copay.footer', []);
-angular.module('copay.addresses', []);
-angular.module('copay.transactions', []);
-angular.module('copay.send', []);
-angular.module('copay.backup', []);
-angular.module('copay.walletFactory', []);
-angular.module('copay.controllerUtils', []);
-angular.module('copay.signin', []);
-angular.module('copay.setup', []);
-angular.module('copay.socket', []);
-angular.module('copay.directives', []);
-angular.module('copay.video', []);
-angular.module('copay.import', []);
-angular.module('copay.passphrase', []);
-angular.module('copay.settings', []);
+angular.module('copayApp.filters', []);
+angular.module('copayApp.controllers', []);
+angular.module('copayApp.directives', []);
+angular.module('copayApp.services', []);
+
diff --git a/js/controllers/addresses.js b/js/controllers/addresses.js
index 943b5a6f4..8e9e0a213 100644
--- a/js/controllers/addresses.js
+++ b/js/controllers/addresses.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.addresses').controller('AddressesController',
+angular.module('copayApp.controllers').controller('AddressesController',
   function($scope, $rootScope, $timeout, controllerUtils) {
     $scope.loading = false;
     var w = $rootScope.wallet;
diff --git a/js/controllers/backup.js b/js/controllers/backup.js
index df0bd5219..f23a44f5d 100644
--- a/js/controllers/backup.js
+++ b/js/controllers/backup.js
@@ -1,7 +1,7 @@
 'use strict';
 
-angular.module('copay.backup').controller('BackupController',
-  function($scope, $rootScope, $location, $window, $timeout) {
+angular.module('copayApp.controllers').controller('BackupController',
+  function($scope, $rootScope, $location, $window, $timeout, $modal) {
     $scope.title = 'Backup';
 
     var _getEncryptedWallet = function() {
@@ -18,29 +18,40 @@ angular.module('copay.backup').controller('BackupController',
       saveAs(blob, filename);
     };
 
-    $scope.email = function() {
-      var email = prompt('Please enter your email addres.');
-      var mailformat = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;
 
-      if (email && email !== '') {
-        if (!email.match(mailformat)) {
-          alert('Enter a valid email address');
-        } else {
-          var body = _getEncryptedWallet();
-          var subject = ($rootScope.wallet.name ? $rootScope.wallet.name + ' - ' : '') + $rootScope.wallet.id; 
-          var href = 'mailto:' + email + '?'
-           + 'subject=[Copay Backup] ' + subject + '&'
-           + 'body=' + body;
+  $scope.openModal = function () {
+    var modalInstance = $modal.open({
+      templateUrl: 'backupModal.html',
+      controller: ModalInstanceCtrl,
+    });
 
-          var newWin = $window.open(href, '_blank', 'scrollbars=yes,resizable=yes,width=10,height=10');
+    modalInstance.result.then(sendEmail);
+  };
 
-          if (newWin) {
-            $timeout(function() {
-              newWin.close();
-            }, 1000);
-          }
-        }
-      }
-    };
-  
-  });
+  var sendEmail = function(email) {
+    var body = _getEncryptedWallet();
+    var subject = ($rootScope.wallet.name ? $rootScope.wallet.name + ' - ' : '') + $rootScope.wallet.id;
+    var href = 'mailto:' + email + '?'
+     + 'subject=[Copay Backup] ' + subject + '&'
+     + 'body=' + body;
+
+    var newWin = $window.open(href, '_blank', 'scrollbars=yes,resizable=yes,width=10,height=10');
+
+    if (newWin) {
+      $timeout(function() {
+        newWin.close();
+      }, 1000);
+    }
+  };
+});
+
+var ModalInstanceCtrl = function ($scope, $modalInstance) {
+
+  $scope.submit = function (form) {
+    $modalInstance.close($scope.email);
+  };
+
+  $scope.cancel = function () {
+    $modalInstance.dismiss('cancel');
+  };
+};
diff --git a/js/controllers/footer.js b/js/controllers/footer.js
index 7fe81808d..280fff354 100644
--- a/js/controllers/footer.js
+++ b/js/controllers/footer.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.footer').controller('FooterController', function($rootScope, $sce, $scope, $http) {
+angular.module('copayApp.controllers').controller('FooterController', function($rootScope, $sce, $scope, $http) {
 
     if (config.themes && Array.isArray(config.themes) && config.themes[0]) {
       $scope.themes = config.themes;
diff --git a/js/controllers/header.js b/js/controllers/header.js
index 30eb00d59..c33362952 100644
--- a/js/controllers/header.js
+++ b/js/controllers/header.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.header').controller('HeaderController',
+angular.module('copayApp.controllers').controller('HeaderController',
   function($scope, $rootScope, $location, $notification, $http, walletFactory, controllerUtils) {
     $scope.menu = [
     {
diff --git a/js/controllers/import.js b/js/controllers/import.js
index c2328e0ae..f58d261bb 100644
--- a/js/controllers/import.js
+++ b/js/controllers/import.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.import').controller('ImportController',
+angular.module('copayApp.controllers').controller('ImportController',
   function($scope, $rootScope, walletFactory, controllerUtils, Passphrase) {
     $scope.title = 'Import a backup';
     var reader = new FileReader();
diff --git a/js/controllers/send.js b/js/controllers/send.js
index cc52b40b2..9bb5d7700 100644
--- a/js/controllers/send.js
+++ b/js/controllers/send.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.send').controller('SendController',
+angular.module('copayApp.controllers').controller('SendController',
   function($scope, $rootScope, $window, $location, $timeout) {
     $scope.title = 'Send';
     $scope.loading = false;
diff --git a/js/controllers/settings.js b/js/controllers/settings.js
index b87237eef..4c1bb13c1 100644
--- a/js/controllers/settings.js
+++ b/js/controllers/settings.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.settings').controller('SettingsController',
+angular.module('copayApp.controllers').controller('SettingsController',
   function($scope, $rootScope, $window, $location) {
     $scope.title = 'Settings';
 
diff --git a/js/controllers/setup.js b/js/controllers/setup.js
index 6020b4acb..4f49dcb96 100644
--- a/js/controllers/setup.js
+++ b/js/controllers/setup.js
@@ -32,7 +32,7 @@ var valid_pairs = {
   '1,12': 489
 };
 
-angular.module('copay.setup').controller('SetupController',
+angular.module('copayApp.controllers').controller('SetupController',
   function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase) {
 
     $rootScope.videoInfo = {};
diff --git a/js/controllers/signin.js b/js/controllers/signin.js
index 213e0a4aa..506c42512 100644
--- a/js/controllers/signin.js
+++ b/js/controllers/signin.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.signin').controller('SigninController',
+angular.module('copayApp.controllers').controller('SigninController',
   function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase) {
     var cmp = function(o1, o2){
       var v1 = o1.show.toLowerCase(), v2 = o2.show.toLowerCase();
@@ -24,10 +24,16 @@ angular.module('copay.signin').controller('SigninController',
       console.log('## Obtaining passphrase...'); 
       Passphrase.getBase64Async(password, function(passphrase){
         console.log('## Passphrase obtained');
-        var w = walletFactory.open($scope.selectedWalletId, { passphrase: passphrase});
+        var w, errMsg;
+        try{
+          var w = walletFactory.open($scope.selectedWalletId, { passphrase: passphrase});
+        } catch (e){
+          errMsg = e.message;
+        };
+
         if (!w) {
           $scope.loading = $scope.failure = false;
-          $rootScope.$flashMessage = { message: 'Wrong password', type: 'error'};
+          $rootScope.$flashMessage = { message: errMsg || 'Wrong password', type: 'error'};
           $rootScope.$digest();
           return;
         }
diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js
index c0d9e9434..f51d1613a 100644
--- a/js/controllers/transactions.js
+++ b/js/controllers/transactions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.transactions').controller('TransactionsController',
+angular.module('copayApp.controllers').controller('TransactionsController',
   function($scope, $rootScope, $timeout, controllerUtils) {
 
     $scope.title = 'Transactions';
diff --git a/js/directives.js b/js/directives.js
index 33fad2040..5e6ad0883 100644
--- a/js/directives.js
+++ b/js/directives.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.directives')
+angular.module('copayApp.directives')
   .directive('validAddress', [
 
     function() {
diff --git a/js/filters.js b/js/filters.js
index 885e88a56..cde5fd209 100644
--- a/js/filters.js
+++ b/js/filters.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.filters', [])
+angular.module('copayApp.filters', [])
 	.filter('amTimeAgo', ['amMoment', function(amMoment) {
     return function(input) {
       return amMoment.preprocessDate(input).fromNow();
diff --git a/js/init.js b/js/init.js
index 4c8f29b30..57a364790 100644
--- a/js/init.js
+++ b/js/init.js
@@ -2,5 +2,5 @@
 
 angular.element(document).ready(function() {
   // Init the app
-  angular.bootstrap(document, ['copay']);
+  angular.bootstrap(document, ['copayApp']);
 });
diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index dab6a6303..ee4da36ec 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -19,7 +19,8 @@ function Wallet(opts) {
   //required params
   ['storage', 'network', 'blockchain',
     'requiredCopayers', 'totalCopayers', 'spendUnconfirmed',
-    'publicKeyRing', 'txProposals', 'privateKey', 'version'
+    'publicKeyRing', 'txProposals', 'privateKey', 'version',
+    'reconnectDelay'
   ].forEach(function(k) {
     if (typeof opts[k] === 'undefined')
       throw new Error('missing required option for Wallet: ' + k);
@@ -64,7 +65,6 @@ Wallet.prototype.seedCopayer = function(pubKey) {
 Wallet.prototype.connectToAll = function() {
 
   var all = this.publicKeyRing.getAllCopayerIds();
-console.log('[Wallet.js.58] connecting'); //TODO
   this.network.connectToCopayers(all);
   if (this.seededCopayerId) {
     this.sendWalletReady(this.seededCopayerId);
@@ -100,7 +100,7 @@ Wallet.prototype._handleTxProposals = function(senderId, data, isInbound) {
   var inTxp = copay.TxProposals.fromObj(data.txProposals);
   var ids = inTxp.getNtxids();
 
-  if (ids.lenght>1) {
+  if (ids.lenght > 1) {
     this.emit('badMessage', senderId);
     this.log('Received BAD TxProposal messsage FROM:', senderId); //TODO
     return;
@@ -164,12 +164,13 @@ Wallet.prototype._optsToObj = function() {
     spendUnconfirmed: this.spendUnconfirmed,
     requiredCopayers: this.requiredCopayers,
     totalCopayers: this.totalCopayers,
+    reconnectDelay: this.reconnectDelay,
     name: this.name,
     netKey: this.netKey,
     version: this.version,
   };
 
-  if (this.token){
+  if (this.token) {
     obj.token = this.token;
     obj.tokenTime = new Date().getTime();
   }
@@ -243,18 +244,26 @@ Wallet.prototype.netStart = function() {
   net.start(startOpts, function() {
     self.emit('ready', net.getPeer());
     self.token = net.peer.options.token;
-    setTimeout(function(){
+    setTimeout(function() {
       console.log('[EMIT publicKeyRingUpdated:]'); //TODO
       self.emit('publicKeyRingUpdated', true);
       console.log('[CONNECT:]'); //TODO
-      self.connectToAll();
+      self.scheduleConnect();
       console.log('[EMIT TxProposal]'); //TODO
       self.emit('txProposalsUpdated');
       self.store();
-    },10);
+    }, 10);
   });
 };
 
+Wallet.prototype.scheduleConnect = function() {
+  var self = this;
+  if (self.network.isOnline()) {
+    self.connectToAll();
+    setTimeout(self.scheduleConnect.bind(self), self.reconnectDelay);
+  }
+}
+
 Wallet.prototype.getOnlinePeerIDs = function() {
   return this.network.getOnlinePeerIDs();
 };
@@ -331,7 +340,7 @@ Wallet.prototype.sendTxProposals = function(recipients, ntxid) {
 
   var last = toSend[toSend];
 
-  for(var i in toSend) {
+  for (var i in toSend) {
     var id = toSend[i];
     var lastInBatch = (i == toSend.length - 1);
     this.network.send(recipients, {
@@ -445,7 +454,7 @@ Wallet.prototype.sign = function(ntxid, cb) {
       ret = true;
     }
     if (cb) return cb(ret);
-  },10);
+  }, 10);
 };
 
 Wallet.prototype.sendTx = function(ntxid, cb) {
@@ -625,7 +634,7 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, utxos, opts) {
     }]);
 
   var selectedUtxos = b.getSelectedUnspent();
-  
+
   var inputChainPaths = selectedUtxos.map(function(utxo) {
     return pkr.pathForAddress(utxo.address);
   });
diff --git a/js/models/core/WalletFactory.js b/js/models/core/WalletFactory.js
index 1912b655d..dfdfe3b96 100644
--- a/js/models/core/WalletFactory.js
+++ b/js/models/core/WalletFactory.js
@@ -115,6 +115,7 @@ WalletFactory.prototype.create = function(opts) {
   opts.verbose = this.verbose;
 
   opts.spendUnconfirmed = opts.spendUnconfirmed || this.walletDefaults.spendUnconfirmed;
+  opts.reconnectDelay = opts.reconnectDelay || this.walletDefaults.reconnectDelay;
   opts.requiredCopayers = requiredCopayers;
   opts.totalCopayers = totalCopayers;
   opts.version       = opts.version || this.version;
@@ -146,7 +147,6 @@ WalletFactory.prototype.open = function(walletId, opts) {
   this.storage._setPassphrase(opts.passphrase);
 
   var w = this.read(walletId);
-
   if (w) {
     this._checkVersion(w.version);
     w.store();
diff --git a/js/models/network/WebRTC.js b/js/models/network/WebRTC.js
index 912f35864..a7cf412c8 100644
--- a/js/models/network/WebRTC.js
+++ b/js/models/network/WebRTC.js
@@ -313,8 +313,8 @@ Network.prototype.setCopayerId = function(copayerId) {
 };
 
 
+// TODO cache this.
 Network.prototype.peerFromCopayer = function(hex) {
-  // TODO cache this.
   var SIN = bitcore.SIN;
   return new SIN(new Buffer(hex,'hex')).toString();
 };
@@ -409,6 +409,10 @@ Network.prototype.send = function(copayerIds, payload, cb) {
 };
 
 
+Network.prototype.isOnline = function() {
+  return !!this.peer;
+};
+
 Network.prototype.connectTo = function(copayerId) {
   var self = this;
 
diff --git a/js/routes.js b/js/routes.js
index 5e44085eb..366b5f29f 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -2,7 +2,7 @@
 
 //Setting up route
 angular
-  .module('copay')
+  .module('copayApp')
   .config(function($routeProvider) {
 
     $routeProvider
@@ -56,7 +56,7 @@ angular
 
 //Setting HTML5 Location Mode
 angular
-  .module('copay')
+  .module('copayApp')
   .config(function($locationProvider) {
     $locationProvider
       .html5Mode(false);
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 25f4bcb11..3581fa682 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.controllerUtils')
+angular.module('copayApp.services')
   .factory('controllerUtils', function($rootScope, $sce, $location, $notification, Socket, video) {
     var root = {};
     var bitcore = require('bitcore');
diff --git a/js/services/passphrase.js b/js/services/passphrase.js
index 21fd495ae..00ff9e2be 100644
--- a/js/services/passphrase.js
+++ b/js/services/passphrase.js
@@ -1,3 +1,4 @@
 'use strict';
 
-angular.module('copay.passphrase').value('Passphrase', new copay.Passphrase(config.passphrase));
+angular.module('copayApp.services')
+  .value('Passphrase', new copay.Passphrase(config.passphrase));
diff --git a/js/services/socket.js b/js/services/socket.js
index f9ac7bb26..1642309c2 100644
--- a/js/services/socket.js
+++ b/js/services/socket.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copay.socket').factory('Socket',
+angular.module('copayApp.services').factory('Socket',
   function($rootScope) {
     var listeners = [];
     var url = 'http://' + config.socket.host + ':' + config.socket.port;
diff --git a/js/services/video.js b/js/services/video.js
index e206f4ed2..af2073589 100644
--- a/js/services/video.js
+++ b/js/services/video.js
@@ -93,4 +93,4 @@ Video.prototype.close = function() {
   this.mediaConnections = {};
 };
 
-angular.module('copay.video').value('video', new Video());
+angular.module('copayApp.services').value('video', new Video());
diff --git a/js/services/walletFactory.js b/js/services/walletFactory.js
index 49af6ef26..3e201b6f1 100644
--- a/js/services/walletFactory.js
+++ b/js/services/walletFactory.js
@@ -1,4 +1,4 @@
 'use strict';
 
-angular.module('copay.walletFactory').value('walletFactory', new copay.WalletFactory(config, copay.version));
+angular.module('copayApp.services').value('walletFactory', new copay.WalletFactory(config, copay.version));
 
diff --git a/karma.conf.js b/karma.conf.js
index 63e9fb1e0..8331b8672 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -47,8 +47,6 @@ module.exports = function(config) {
       //Mocha stuff
       'test/mocha.conf.js',
 
-      //test files
-      'test/unit/**/*.js',
 
       //App-specific Code
       'js/app.js',
@@ -57,7 +55,11 @@ module.exports = function(config) {
       'js/filters.js',
       'js/services/*.js',
       'js/controllers/*.js',
-      'js/init.js'
+      'js/init.js',
+
+
+      //test files
+      'test/unit/**/*.js'
     ],
 
 
diff --git a/test/mocks/FakeNetwork.js b/test/mocks/FakeNetwork.js
index 0245f5429..cfff1875b 100644
--- a/test/mocks/FakeNetwork.js
+++ b/test/mocks/FakeNetwork.js
@@ -7,8 +7,14 @@ function Network(opts) {
 
 Network.parent=EventEmitter;
 
-Network.prototype.start = function(openCallback, opts) {
+Network.prototype.start = function(opts, cb) {
   // start! :D
+  this.peer = {
+    options: {
+      token: "asd"
+    }
+  };
+  if (cb) cb();
 };
 
 Network.prototype.send = function(peerIds, data, cb) {
@@ -24,4 +30,16 @@ Network.prototype.disconnect = function(cb) {
   // disconect :c
 };
 
+Network.prototype.lockIncommingConnections = function() {
+
+};
+
+Network.prototype.getPeer = function() {
+};
+Network.prototype.connectToCopayers = function(cps) {
+};
+Network.prototype.isOnline = function() {
+  return true;
+};
+
 module.exports = require('soop')(Network);
diff --git a/test/test.Wallet.js b/test/test.Wallet.js
index 1bcd60c2a..afec3e43f 100644
--- a/test/test.Wallet.js
+++ b/test/test.Wallet.js
@@ -2,14 +2,15 @@
 
 var chai = chai || require('chai');
 var should = chai.should();
+var sinon = require('sinon');
 var copay = copay || require('../copay');
 var Wallet = require('../js/models/core/Wallet');
-var Storage= require('./mocks/FakeStorage');
-var Network= require('./mocks/FakeNetwork');
-var Blockchain= copay.Insight;
+var Storage = require('./mocks/FakeStorage');
+var Network = require('./mocks/FakeNetwork');
+var Blockchain = copay.Insight;
 
-var addCopayers = function (w) {
-  for(var i=0; i<4; i++) {
+var addCopayers = function(w) {
+  for (var i = 0; i < 4; i++) {
     w.publicKeyRing.addCopayer();
   }
 };
@@ -20,6 +21,7 @@ describe('Wallet model', function() {
     requiredCopayers: 3,
     totalCopayers: 5,
     spendUnconfirmed: 1,
+    reconnectDelay: 100,
     blockchain: {
       host: 'test.insight.is',
       port: 80
@@ -27,15 +29,20 @@ describe('Wallet model', function() {
     networkName: 'testnet',
   };
 
-  it('should fail to create an instance', function () {
-    (function(){new Wallet(config)}).should.throw();
+  it('should fail to create an instance', function() {
+    (function() {
+      new Wallet(config)
+    }).should.
+    throw ();
   });
 
-  var createW = function (netKey) {
+  var createW = function(netKey) {
     var c = JSON.parse(JSON.stringify(config));
-    
+
     if (netKey) c.netKey = netKey;
-    c.privateKey = new copay.PrivateKey({ networkName: c.networkName });
+    c.privateKey = new copay.PrivateKey({
+      networkName: c.networkName
+    });
 
     c.publicKeyRing = new copay.PublicKeyRing({
       networkName: c.networkName,
@@ -48,18 +55,18 @@ describe('Wallet model', function() {
     c.txProposals = new copay.TxProposals({
       networkName: c.networkName,
     });
-    c.storage     = new Storage(config.storage);
-    c.network     = new Network(config.network);
-    c.blockchain  = new Blockchain(config.blockchain);
+    c.storage = new Storage(config.storage);
+    c.network = new Network(config.network);
+    c.blockchain = new Blockchain(config.blockchain);
 
     c.networkName = config.networkName;
-    c.verbose     = config.verbose;
-    c.version     = '0.0.1';
+    c.verbose = config.verbose;
+    c.version = '0.0.1';
 
     return new Wallet(c);
   }
 
-  it('should create an instance', function () {
+  it('should create an instance', function() {
     var w = createW();
     should.exist(w);
     w.publicKeyRing.walletId.should.equal(w.id);
@@ -70,11 +77,11 @@ describe('Wallet model', function() {
     should.exist(w.privateKey);
     should.exist(w.txProposals);
     should.exist(w.netKey);
-    var b = new Buffer(w.netKey,'base64');
+    var b = new Buffer(w.netKey, 'base64');
     b.toString('hex').length.should.equal(16);
   });
 
-  it('should provide some basic features', function () {
+  it('should provide some basic features', function() {
     var opts = {};
     var w = createW();
     addCopayers(w);
@@ -82,28 +89,26 @@ describe('Wallet model', function() {
     w.publicKeyRing.isComplete().should.equal(true);
   });
 
-  var unspentTest = [
-    {
+  var unspentTest = [{
     "address": "dummy",
     "scriptPubKey": "dummy",
     "txid": "2ac165fa7a3a2b535d106a0041c7568d03b531e58aeccdd3199d7289ab12cfc1",
     "vout": 1,
     "amount": 10,
-    "confirmations":7
-  }
-  ];
+    "confirmations": 7
+  }];
 
-  var createW2 = function (privateKeys) {
+  var createW2 = function(privateKeys) {
     var netKey = 'T0FbU2JLby0=';
     var w = createW(netKey);
     should.exist(w);
 
-    var pkr =  w.publicKeyRing;
+    var pkr = w.publicKeyRing;
 
-    for(var i=0; i<4; i++) {
+    for (var i = 0; i < 4; i++) {
       if (privateKeys) {
-        var k=privateKeys[i];
-        pkr.addCopayer(k?k.deriveBIP45Branch().extendedPublicKeyString():null);
+        var k = privateKeys[i];
+        pkr.addCopayer(k ? k.deriveBIP45Branch().extendedPublicKeyString() : null);
       } else {
         pkr.addCopayer();
       }
@@ -119,16 +124,16 @@ describe('Wallet model', function() {
     return w;
   };
 
-  it('#create, 1 sign', function () {
+  it('#create, 1 sign', function() {
 
     var w = createW2();
 
-    unspentTest[0].address        = w.publicKeyRing.getAddress(1, true).toString();
-    unspentTest[0].scriptPubKey   = w.publicKeyRing.getScriptPubKeyHex(1, true);
+    unspentTest[0].address = w.publicKeyRing.getAddress(1, true).toString();
+    unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(1, true);
 
     var ntxid = w.createTxSync(
-      '15q6HKjWHAksHcH91JW23BJEuzZgFwydBt', 
-      '123456789', 
+      '15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
+      '123456789',
       unspentTest
     );
 
@@ -141,30 +146,32 @@ describe('Wallet model', function() {
     Object.keys(txp.signedBy).length.should.equal(1);
   });
 
-  it('#addressIsOwn', function () {
+  it('#addressIsOwn', function() {
     var w = createW2();
     var l = w.getAddressesStr();
-    for (var i=0; i<l.length; i++)
+    for (var i = 0; i < l.length; i++)
       w.addressIsOwn(l[i]).should.equal(true);
 
-    w.addressIsOwn(l[0], {excludeMain:true}).should.equal(false);
+    w.addressIsOwn(l[0], {
+      excludeMain: true
+    }).should.equal(false);
 
     w.addressIsOwn('mmHqhvTVbxgJTnePa7cfweSRjBCy9bQQXJ').should.equal(false);
     w.addressIsOwn('mgtUfP9sTJ6vPLoBxZLPEccGpcjNVryaCX').should.equal(false);
   });
 
-  it('#create. Signing with derivate keys', function () {
+  it('#create. Signing with derivate keys', function() {
 
     var w = createW2();
 
     var ts = Date.now();
-    for (var isChange=0; isChange<2; isChange++) {
-      for (var index=0; index<3; index++) {
-        unspentTest[0].address        = w.publicKeyRing.getAddress(index, isChange).toString();
-        unspentTest[0].scriptPubKey   = w.publicKeyRing.getScriptPubKeyHex(index, isChange);
+    for (var isChange = 0; isChange < 2; isChange++) {
+      for (var index = 0; index < 3; index++) {
+        unspentTest[0].address = w.publicKeyRing.getAddress(index, isChange).toString();
+        unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(index, isChange);
         w.createTxSync(
-          '15q6HKjWHAksHcH91JW23BJEuzZgFwydBt', 
-          '123456789', 
+          '15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
+          '123456789',
           unspentTest
         );
         var t = w.txProposals;
@@ -174,13 +181,13 @@ describe('Wallet model', function() {
         tx.isComplete().should.equal(false);
         tx.countInputMissingSignatures(0).should.equal(2);
 
-        ( t.txps[k].signedBy[w.privateKey.getId()] - ts > 0).should.equal(true);
-        ( t.txps[k].seenBy[w.privateKey.getId()] - ts > 0).should.equal(true);
+        (t.txps[k].signedBy[w.privateKey.getId()] - ts > 0).should.equal(true);
+        (t.txps[k].seenBy[w.privateKey.getId()] - ts > 0).should.equal(true);
       }
     }
   });
 
-  it('#fromObj #toObj round trip', function () {
+  it('#fromObj #toObj round trip', function() {
 
     var w = createW2();
 
@@ -188,9 +195,9 @@ describe('Wallet model', function() {
     o = JSON.parse(JSON.stringify(o));
 
     var w2 = Wallet.fromObj(o,
-       new Storage(config.storage),
-       new Network(config.network),
-       new Blockchain(config.blockchain));
+      new Storage(config.storage),
+      new Network(config.network),
+      new Blockchain(config.blockchain));
     should.exist(w2);
     w2.publicKeyRing.requiredCopayers.should.equal(w.publicKeyRing.requiredCopayers);
     should.exist(w2.publicKeyRing.getCopayerId);
@@ -198,21 +205,39 @@ describe('Wallet model', function() {
     should.exist(w2.privateKey.toObj);
   });
 
-  it('#getSecret decodeSecret', function () {
+  it('#getSecret decodeSecret', function() {
     var w = createW2();
     var id = w.getMyCopayerId();
     var nk = w.netKey;
 
-    var sb= w.getSecret();
+    var sb = w.getSecret();
     should.exist(sb);
     var s = Wallet.decodeSecret(sb);
     s.pubKey.should.equal(id);
     s.netKey.should.equal(nk);
 
   });
-  it('decodeSecret check', function () {
-    (function(){Wallet.decodeSecret('4fp61K187CsYmjoRQC5iAdC5eGmbCRsAAXfwEwetSQgHvZs27eWKaLaNHRoKM');}).should.not.throw();
-    (function(){Wallet.decodeSecret('4fp61K187CsYmjoRQC5iAdC5eGmbCRsAAXfwEwetSQgHvZs27eWKaLaNHRoK');}).should.throw();
-    (function(){Wallet.decodeSecret('12345');}).should.throw();
+  it('decodeSecret check', function() {
+    (function() {
+      Wallet.decodeSecret('4fp61K187CsYmjoRQC5iAdC5eGmbCRsAAXfwEwetSQgHvZs27eWKaLaNHRoKM');
+    }).should.not.
+    throw ();
+    (function() {
+      Wallet.decodeSecret('4fp61K187CsYmjoRQC5iAdC5eGmbCRsAAXfwEwetSQgHvZs27eWKaLaNHRoK');
+    }).should.
+    throw ();
+    (function() {
+      Wallet.decodeSecret('12345');
+    }).should.
+    throw ();
+  });
+  it('call reconnect after interval', function(done) {
+    var w = createW2();
+    var spy = sinon.spy(w, 'scheduleConnect');
+    w.netStart();
+    setTimeout(function() {
+      sinon.assert.callCount(spy, 10);
+      done();
+    }, 1000);
   });
 });
diff --git a/test/test.WalletFactory.js b/test/test.WalletFactory.js
index 8a5648a0e..02431a40f 100644
--- a/test/test.WalletFactory.js
+++ b/test/test.WalletFactory.js
@@ -26,6 +26,7 @@ describe('WalletFactory model', function() {
       requiredCopayers: 3,
       totalCopayers: 5,
       spendUnconfirmed: 1,
+      reconnectDelay: 100,
     },
     blockchain: {
       host: 'test.insight.is',
@@ -60,7 +61,7 @@ describe('WalletFactory model', function() {
   });
 
   it('#fromObj #toObj round trip', function() {
-    var o = '{"opts":{"id":"dbfe10c3fae71cea","spendUnconfirmed":1,"requiredCopayers":3,"totalCopayers":5,"netKey":"LppzFYqlgT0=","version":"0.0.5"},"publicKeyRing":{"walletId":"dbfe10c3fae71cea","networkName":"testnet","requiredCopayers":3,"totalCopayers":5,"changeAddressIndex":3,"addressIndex":3,"copayersExtPubKeys":["tpubD6NzVbkrYhZ4YGK8ZhZ8WVeBXNAAoTYjjpw9twCPiNGrGQYFktP3iVQkKmZNiFnUcAFMJRxJVJF6Nq9MDv2kiRceExJaHFbxUCGUiRhmy97","tpubD6NzVbkrYhZ4YKGDJkzWdQsQV3AcFemaQKiwNhV4RL8FHnBFvinidGdQtP8RKj3h34E65RkdtxjrggZYqsEwJ8RhhN2zz9VrjLnrnwbXYNc","tpubD6NzVbkrYhZ4YkDiewjb32Pp3Sz9WK2jpp37KnL7RCrHAyPpnLfgdfRnTdpn6DTWmPS7niywfgWiT42aJb1J6CjWVNmkgsMCxuw7j9DaGKB","tpubD6NzVbkrYhZ4XEtUAz4UUTWbprewbLTaMhR8NUvSJUEAh4Sidxr6rRPFdqqVRR73btKf13wUjds2i8vVCNo8sbKrAnyoTr3o5Y6QSbboQjk","tpubD6NzVbkrYhZ4Yj9AAt6xUVuGPVd8jXCrEE6V2wp7U3PFh8jYYvVad31b4VUXEYXzSnkco4fktu8r4icBsB2t3pCR3WnhVLedY2hxGcPFLKD"],"nicknameFor":{},"publicKeysCache":{"m/0/1/0":["0314368b8efa07e8c7dad30498d0a7e3aa575db1fef833347c6d381c1a33a17b17","02cfd95f89ab46bd3bd86954dd9f83dbab0cd2e4466dee587e8e4d8d733fc0d748","02568969eb6212fe946450be6c5b3353fc754a40b2cdc4aed501a8976fec371da8","0360f870a088ae0ef1c37035a9b6a462ca8dcdd5da275f4e2dcd19f44b81d3e7e4","0300ad8f1bded838b02e127bb25961fbcee718db2df81f680f889692acdcbdd73d"],"m/0/1/1":["024f97a9adb2fa9306c4e3d9244f5e5355c7e2c6b3dd4122ba804e17dc9729df5d","0214834a5adcbc4ad0f3bbbc1c280b8ac480387fcc9a1fd988c1526ed496d923c4","024e72338bd5e976375d076bd71a9649e9141b4cbfc9e16cb7109b354b3e913a05","0322045ea35c3118aa7ab9f2c9f182b0120956b0aa65cc72b9d093f145327a4b17","030dc2450c72df366c1960739c577a2efd4451070bd78effcb6f71d1bcd7dfc7a8"],"m/0/1/2":["0247de59deb66783b8f9b0c326234a9569d00866c2a73f599e77a4d0cab5cbce8f","0376e49f0ac3647404034aae0dc8dd927c34a634ef24ea36f56a272f75fce9539b","032fbaa2593bd1eea4a46e7ac15f15802cdd1eb65a7d5bc4364ddd9d52f0838234","03a81f2a7e1f7191aa0b0c6e0a4ccefc71edd3564e86014972fe338045f68d5a5a","02eb8a012ea9a709392502cacda6ef5115d6d2319ab470d546d9068ab941621a99"],"m/0/0/0":["036dcbd378b4352120d6b720b6294dd2d0dd02801fcf010bb69dadbec1f3999279","022089eedb85dc45d1efa418e1ea226588deedebc1d85acca15ff72783e33636c0","0388aa5fd432b74c56427396f350d236c3ca8f7b2f62da513ce4c2e6ff04a67e9c","02fc4caa7449db7483d2e1fccdacac6fa2f736278c758af9966402589b5632f13e","02e4a15b885d8b2d586f82fa85d16179644e60a154674bde0ec3004810b1bdab99"],"m/0/0/1":["039afa26b2f341c76c7b3c3d0672438f35ac6ebb67b1ddfefac9cd79b7b24418c1","021acaaf500d431ebc396f50630767b01c91ce98ae48e968775ceaad932b7e3b8e","022a947259c4a9f76d5e95c0849df31d01233df41d0d75d631b89317a48d8cddce","03d38d9f94217da780303d9a8987c86d737ef39683febc0cd6632cddbfa62186fd","0394d2581b307fe2af19721888d922aab58ab198ef88cedf9506177e30d807811e"],"m/0/0/2":["037825ffce15d34f9bd6c02bcda7701826706471a4d6ab5004eb965f98811c2098","023768dd6d3c71b7df5733ccda5b2d8b454d5b4c4179d91a6fda74db8b869a2406","021a79e91f003f308764d43039e9b5d56bc8f33ca2f4d30ec6cc5a37c0d09dc273","02437f1e388b273936319f79a5d22958ef5ebff9c8cd7b6f6f72518445b1e30867","0373b0881cb4fd02baa62589023fdfe9739c6148cf104d907549f2528eb80146f5"]}},"txProposals":{"txps":[],"walletId":"dbfe10c3fae71cea","networkName":"testnet"},"privateKey":{"extendedPrivateKeyString":"tprv8ZgxMBicQKsPeoHLg3tY75z4xLeEe8MqAXLNcRA6J6UTRvHV8VZTXznt9eoTmSk1fwSrwZtMhY3XkNsceJ14h6sCXHSWinRqMSSbY8tfhHi","networkName":"testnet","privateKeyCache":{}}}';
+    var o = '{"opts":{"id":"dbfe10c3fae71cea","spendUnconfirmed":1,"requiredCopayers":3,"totalCopayers":5,"reconnectDelay":100,"netKey":"LppzFYqlgT0=","version":"0.0.5"},"publicKeyRing":{"walletId":"dbfe10c3fae71cea","networkName":"testnet","requiredCopayers":3,"totalCopayers":5,"changeAddressIndex":3,"addressIndex":3,"copayersExtPubKeys":["tpubD6NzVbkrYhZ4YGK8ZhZ8WVeBXNAAoTYjjpw9twCPiNGrGQYFktP3iVQkKmZNiFnUcAFMJRxJVJF6Nq9MDv2kiRceExJaHFbxUCGUiRhmy97","tpubD6NzVbkrYhZ4YKGDJkzWdQsQV3AcFemaQKiwNhV4RL8FHnBFvinidGdQtP8RKj3h34E65RkdtxjrggZYqsEwJ8RhhN2zz9VrjLnrnwbXYNc","tpubD6NzVbkrYhZ4YkDiewjb32Pp3Sz9WK2jpp37KnL7RCrHAyPpnLfgdfRnTdpn6DTWmPS7niywfgWiT42aJb1J6CjWVNmkgsMCxuw7j9DaGKB","tpubD6NzVbkrYhZ4XEtUAz4UUTWbprewbLTaMhR8NUvSJUEAh4Sidxr6rRPFdqqVRR73btKf13wUjds2i8vVCNo8sbKrAnyoTr3o5Y6QSbboQjk","tpubD6NzVbkrYhZ4Yj9AAt6xUVuGPVd8jXCrEE6V2wp7U3PFh8jYYvVad31b4VUXEYXzSnkco4fktu8r4icBsB2t3pCR3WnhVLedY2hxGcPFLKD"],"nicknameFor":{},"publicKeysCache":{"m/0/1/0":["0314368b8efa07e8c7dad30498d0a7e3aa575db1fef833347c6d381c1a33a17b17","02cfd95f89ab46bd3bd86954dd9f83dbab0cd2e4466dee587e8e4d8d733fc0d748","02568969eb6212fe946450be6c5b3353fc754a40b2cdc4aed501a8976fec371da8","0360f870a088ae0ef1c37035a9b6a462ca8dcdd5da275f4e2dcd19f44b81d3e7e4","0300ad8f1bded838b02e127bb25961fbcee718db2df81f680f889692acdcbdd73d"],"m/0/1/1":["024f97a9adb2fa9306c4e3d9244f5e5355c7e2c6b3dd4122ba804e17dc9729df5d","0214834a5adcbc4ad0f3bbbc1c280b8ac480387fcc9a1fd988c1526ed496d923c4","024e72338bd5e976375d076bd71a9649e9141b4cbfc9e16cb7109b354b3e913a05","0322045ea35c3118aa7ab9f2c9f182b0120956b0aa65cc72b9d093f145327a4b17","030dc2450c72df366c1960739c577a2efd4451070bd78effcb6f71d1bcd7dfc7a8"],"m/0/1/2":["0247de59deb66783b8f9b0c326234a9569d00866c2a73f599e77a4d0cab5cbce8f","0376e49f0ac3647404034aae0dc8dd927c34a634ef24ea36f56a272f75fce9539b","032fbaa2593bd1eea4a46e7ac15f15802cdd1eb65a7d5bc4364ddd9d52f0838234","03a81f2a7e1f7191aa0b0c6e0a4ccefc71edd3564e86014972fe338045f68d5a5a","02eb8a012ea9a709392502cacda6ef5115d6d2319ab470d546d9068ab941621a99"],"m/0/0/0":["036dcbd378b4352120d6b720b6294dd2d0dd02801fcf010bb69dadbec1f3999279","022089eedb85dc45d1efa418e1ea226588deedebc1d85acca15ff72783e33636c0","0388aa5fd432b74c56427396f350d236c3ca8f7b2f62da513ce4c2e6ff04a67e9c","02fc4caa7449db7483d2e1fccdacac6fa2f736278c758af9966402589b5632f13e","02e4a15b885d8b2d586f82fa85d16179644e60a154674bde0ec3004810b1bdab99"],"m/0/0/1":["039afa26b2f341c76c7b3c3d0672438f35ac6ebb67b1ddfefac9cd79b7b24418c1","021acaaf500d431ebc396f50630767b01c91ce98ae48e968775ceaad932b7e3b8e","022a947259c4a9f76d5e95c0849df31d01233df41d0d75d631b89317a48d8cddce","03d38d9f94217da780303d9a8987c86d737ef39683febc0cd6632cddbfa62186fd","0394d2581b307fe2af19721888d922aab58ab198ef88cedf9506177e30d807811e"],"m/0/0/2":["037825ffce15d34f9bd6c02bcda7701826706471a4d6ab5004eb965f98811c2098","023768dd6d3c71b7df5733ccda5b2d8b454d5b4c4179d91a6fda74db8b869a2406","021a79e91f003f308764d43039e9b5d56bc8f33ca2f4d30ec6cc5a37c0d09dc273","02437f1e388b273936319f79a5d22958ef5ebff9c8cd7b6f6f72518445b1e30867","0373b0881cb4fd02baa62589023fdfe9739c6148cf104d907549f2528eb80146f5"]}},"txProposals":{"txps":[],"walletId":"dbfe10c3fae71cea","networkName":"testnet"},"privateKey":{"extendedPrivateKeyString":"tprv8ZgxMBicQKsPeoHLg3tY75z4xLeEe8MqAXLNcRA6J6UTRvHV8VZTXznt9eoTmSk1fwSrwZtMhY3XkNsceJ14h6sCXHSWinRqMSSbY8tfhHi","networkName":"testnet","privateKeyCache":{}}}';
 
     var wf = new WalletFactory(config, '0.0.5');
     var w = wf.fromObj(JSON.parse(o));
@@ -75,9 +76,43 @@ describe('WalletFactory model', function() {
 
 
   it('BIP32 length problem', function() {
-    var sconfig = {"networkName":"testnet","network":{"key":"g23ihfh82h35rf","host":"162.242.219.26","port":10009,"path":"/","maxPeers":15,"debug":3},"limits":{"totalCopayers":10,"mPlusN":15},"wallet":{"requiredCopayers":2,"totalCopayers":3,"spendUnconfirmed":1,"verbose":0},"blockchain":{"host":"test.insight.is","port":3001},"socket":{"host":"test.insight.is","port":3001},"verbose":0,"themes":["default"]};
+    var sconfig = {
+      "networkName": "testnet",
+      "network": {
+        "key": "g23ihfh82h35rf",
+        "host": "162.242.219.26",
+        "port": 10009,
+        "path": "/",
+        "maxPeers": 15,
+        "debug": 3
+      },
+      "limits": {
+        "totalCopayers": 10,
+        "mPlusN": 15
+      },
+      "wallet": {
+        "requiredCopayers": 2,
+        "totalCopayers": 3,
+        "reconnectDelay":100,
+        "spendUnconfirmed": 1,
+        "verbose": 0
+      },
+      "blockchain": {
+        "host": "test.insight.is",
+        "port": 3001
+      },
+      "socket": {
+        "host": "test.insight.is",
+        "port": 3001
+      },
+      "verbose": 0,
+      "themes": ["default"]
+    };
     var wf = new WalletFactory(sconfig, '0.0.1');
-    var opts = {'requiredCopayers': 2, 'totalCopayers':3};
+    var opts = {
+      'requiredCopayers': 2,
+      'totalCopayers': 3
+    };
     var w = wf.create(opts);
 
   });
diff --git a/test/unit/controllers/controllersSpec.js b/test/unit/controllers/controllersSpec.js
index 12502bd8a..75d45e881 100644
--- a/test/unit/controllers/controllersSpec.js
+++ b/test/unit/controllers/controllersSpec.js
@@ -3,39 +3,59 @@
 //
 describe("Unit: Testing Controllers", function() {
 
-  beforeEach(angular.mock.module('copay'));
+    beforeEach(module('notifications'));
+    beforeEach(module('copayApp.services'));
+    beforeEach(module('copayApp.controllers'));
 
-  it('should have a AddressesController controller', function() {
-    expect(copayApp.AddressesController).not.to.equal(null);
-  });
+    var scope, addressCtrl;
+//
+    beforeEach(inject(function($controller, $rootScope) {
+      scope = $rootScope.$new();
+      addressCtrl = $controller('AddressesController', {
+        $scope: scope,
+      });
+    }));
+ 
 
-  it('should have a BackupController controller', function() {
-    expect(copayApp.Backupcontroller).not.to.equal(null);
-  });
 
-  it('should have a HeaderController controller', function() {
-    expect(copayApp.HeaderController).not.to.equal(null);
-  });
+   it('should have a AddressesController controller', function() {
+     expect(scope.loading).equal(false);
+   });
 
-  it('should have a SendController controller', function() {
-    expect(copayApp.SendController).not.to.equal(null);
-  });
-
-  it('should have a SetupController controller', function() {
-    expect(copayApp.SetupController).not.to.equal(null);
-  });
-
-  it('should have a SigninController controller', function() {
-    expect(copayApp.SigninController).not.to.equal(null);
-  });
-
-  it('should have a TransactionsController controller', function() {
-    expect(copayApp.TransactionsController).not.to.equal(null);
-  });
-
-  beforeEach(angular.mock.module('copay.walletFactory'));
-  it('should display a link to create a new wallet if no wallets in localStorage', inject(function(walletFactory) {
-    expect(walletFactory.storage.getWalletIds()).to.be.empty;
-  }));
+   it('selectedAddr should modify scope', function() {
+     expect(scope.selectedAddress).equal(undefined);
+     scope.selectAddress('hola');
+     expect(scope.selectedAddr).equal('hola');
+   });
 
+//
+//   it('should have a BackupController controller', function() {
+//     expect(copayApp.Backupcontroller).not.to.equal(null);
+//   });
+//
+//   it('should have a HeaderController controller', function() {
+//     expect(copayApp.HeaderController).not.to.equal(null);
+//   });
+//
+//   it('should have a SendController controller', function() {
+//     expect(copayApp.SendController).not.to.equal(null);
+//   });
+//
+//   it('should have a SetupController controller', function() {
+//     expect(copayApp.SetupController).not.to.equal(null);
+//   });
+//
+//   it('should have a SigninController controller', function() {
+//     expect(copayApp.SigninController).not.to.equal(null);
+// console.log('[controllersSpec.js.30:copayApp:]',copayApp); //TODO
+//   });
+//
+//   it('should have a TransactionsController controller', function() {
+//     expect(copayApp.TransactionsController).not.to.equal(null);
+//   });
+//
+//   beforeEach(angular.mock.module('copay.walletFactory'));
+//   it('should display a link to create a new wallet if no wallets in localStorage', inject(function(walletFactory) {
+//     expect(walletFactory.storage.getWalletIds()).to.be.empty;
+//   }));
 });
diff --git a/test/unit/directives/directivesSpec.js b/test/unit/directives/directivesSpec.js
index 42aa5f521..4f3b76d82 100644
--- a/test/unit/directives/directivesSpec.js
+++ b/test/unit/directives/directivesSpec.js
@@ -6,7 +6,7 @@ describe("Unit: Testing Directives", function() {
 
   var $scope, form;
 
-  beforeEach(module('copay.directives'));
+  beforeEach(module('copayApp.directives'));
 
   describe('Validate Address', function() {
     beforeEach(inject(function($compile, $rootScope) {
diff --git a/test/unit/services/servicesSpec.js b/test/unit/services/servicesSpec.js
index fd3563eee..fbb8f6c2d 100644
--- a/test/unit/services/servicesSpec.js
+++ b/test/unit/services/servicesSpec.js
@@ -3,22 +3,19 @@
 //
 describe("Unit: Testing Services", function() {
 
-  beforeEach(angular.mock.module('copay.socket'));
+  beforeEach(angular.mock.module('copayApp.services'));
 
   it('should contain a Socket service', inject(function(Socket) {
     expect(Socket).not.to.equal(null);
   }));
 
-
-  beforeEach(angular.mock.module('copay.walletFactory'));
-
   it('should contain a walletFactory service', inject(function(walletFactory) {
     expect(walletFactory).not.to.equal(null);
   }));
 
 
   // TODO
-  /*beforeEach(angular.mock.module('copay.controllerUtils'));
+  /*beforeEach(angular.mock.module('copayApp.controllerUtils'));
 
   it('should contain a controllerUtils service', inject(function(controllerUtils) {
     expect(controllerUtils).not.to.equal(null);