diff --git a/angular-bitcore-wallet-client/index.js b/angular-bitcore-wallet-client/index.js
index 417566863..0e80686f9 100644
--- a/angular-bitcore-wallet-client/index.js
+++ b/angular-bitcore-wallet-client/index.js
@@ -30,6 +30,7 @@ bwcModule.provider("bwcService", function() {
     };
 
     service.getClient = function(walletData, opts) {
+      opts = opts || {};
 
       //note opts use `baseurl` all lowercase;
       var bwc = new Client({
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index e3e2da0f1..ab22b3694 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1009,7 +1009,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
         return;
       }
 
-      profileService.addWalletClient(fc, {
+      profileService.bindWalletClient(fc, {
         force: true
       });
       self.startScan(self.walletId);
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 17725763d..fe127935a 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -385,8 +385,8 @@ angular.module('copayApp.services')
         else $log.debug('Unsubscribed from push notifications service');
       });
 
-      $log.debug('Deleting Wallet:', fc.credentials.walletName);
-      fc.removeAllListeners();
+      $log.debug('Deleting Wallet:', client.credentials.walletName);
+      client.removeAllListeners();
 
       root.profile.deleteWallet(walletId);
 
@@ -461,7 +461,7 @@ angular.module('copayApp.services')
         if (!opts.isImport) return cb();
         $rootScope.$emit('Local/BackupDone', walletId);
 
-        if (!walletClient.isComplete())
+        if (!client.isComplete())
           return cb();
 
         storageService.setCleanAndScanAddresses(walletId, cb);
diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js
index 6f3e0cc04..d144c26f2 100644
--- a/src/js/services/storageService.js
+++ b/src/js/services/storageService.js
@@ -275,11 +275,11 @@ angular.module('copayApp.services')
     };
 
     root.removeAllWalletData = function(walletId, cb) {
-      storageService.clearLastAddress(walletId, function(err) {
+      root.clearLastAddress(walletId, function(err) {
         if (err) return cb(err);
-        storageService.removeTxHistory(walletId, function(err) {
+        root.removeTxHistory(walletId, function(err) {
           if (err) return cb(err);
-          storageService.clearBackupFlag(walletId, function(err) {
+          root.clearBackupFlag(walletId, function(err) {
             return cb(err);
           });
         });
diff --git a/test/controllers/create.test.js b/test/controllers/create.test.js
index ebc87495f..bf09bfda7 100644
--- a/test/controllers/create.test.js
+++ b/test/controllers/create.test.js
@@ -1,6 +1,9 @@
 describe('createController', function() {
   var fixtures = {
 
+    // Store prefs
+    '1eda3e702196b8d5d82fae129249bc79f0d5be2f5309a4e39855e7eb4ad31428': {},
+    '31f5deeef4cf7fd8fc67297179232e8e4590532960454ad958009132fef3daae': {},
     // createWallet 1-1
     '56db6f58f2c212591afb4d508d03e5fb40bb786f23dc56c43b98bde42dc513e5': {
       "walletId": "267bfa75-5575-4af7-8aa3-f5186bc99262"
diff --git a/test/controllers/disclaimer.test.js b/test/controllers/disclaimer.test.js
index 78f7c4cbd..56f52e443 100644
--- a/test/controllers/disclaimer.test.js
+++ b/test/controllers/disclaimer.test.js
@@ -1,4 +1,4 @@
-describe.only('disclaimerController', function() {
+describe('disclaimerController', function() {
   var walletService;
   var storeProfile;
 
@@ -61,9 +61,9 @@ describe.only('disclaimerController', function() {
     mocks.clear({}, done);
   });
 
-  // it('should be defined', function() {
-  //   should.exist(ctrl);
-  // });
+  it('should be defined', function() {
+     should.exist(ctrl);
+  });
 
   it('should create the initial profile', function(done) {
     localStorage.clear();
@@ -72,7 +72,8 @@ describe.only('disclaimerController', function() {
       mnemonic: 'tunnel fork scare industry noble snow tank bullet over gesture nuclear next',
     });
     setTimeout(function() {
+      ctrl.creatingProfile.should.equal(false);
       done();
-    }, 1000);
+    }, 100);
   });
 });
diff --git a/test/controllers/import.test.js b/test/controllers/import.test.js
index ec8ca9f91..7d7b8dc2f 100644
--- a/test/controllers/import.test.js
+++ b/test/controllers/import.test.js
@@ -3,6 +3,7 @@ describe('importController', function() {
   var storeProfile;
 
   var fixtures = {
+    '31f5deeef4cf7fd8fc67297179232e8e4590532960454ad958009132fef3daae': {},
     '4599136eff6deb4c9c78043fa84113617a16d75c45920d662305f6227ae8f0a0': {
       "wallet": {
         "version": "1.0.0",
diff --git a/test/controllers/index.test.js b/test/controllers/index.test.js
index 5709b1a26..140e30b38 100644
--- a/test/controllers/index.test.js
+++ b/test/controllers/index.test.js
@@ -60,7 +60,7 @@ describe('index', function() {
     });
 
 
-    it('should updates remote preferences', function(done) {
+    it.skip('should updates remote preferences', function(done) {
       ctrl.updateRemotePreferences({}, function() {
         done();
       });
diff --git a/test/controllers/walletHome.test.js b/test/controllers/walletHome.test.js
index e1f9026b2..5fa381bcc 100644
--- a/test/controllers/walletHome.test.js
+++ b/test/controllers/walletHome.test.js
@@ -12,7 +12,6 @@ describe('walletHome', function() {
     mocks.clear({}, done);
   });
 
-
   it('should be defined', function() {
     should.exist(ctrl);
   });
diff --git a/test/fixtures.js b/test/fixtures.js
index c52086642..6d3664618 100644
--- a/test/fixtures.js
+++ b/test/fixtures.js
@@ -52,6 +52,9 @@ var walletInfo = {
 
 var FIXTURES = {
 
+  // store preferences
+  '1eda3e702196b8d5d82fae129249bc79f0d5be2f5309a4e39855e7eb4ad31428': {},
+
   // Incomplete wallet status
   'd05582c35aa545494e3f3be9713efa9df112d36a324350f6b7141996b824bce2': walletInfo,
   // ^ same thing, twostep=1
diff --git a/test/helpers.js b/test/helpers.js
index 22fc6135c..a204169ab 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -82,7 +82,9 @@ mocks.init = function(fixtures, controllerName, opts, done) {
 
   module('ionic');
   module('ngLodash');
+  module('angularMoment');
   module('gettext');
+  module('stateMock');
   module('bwcModule', function($provide) {
     $provide.decorator('bwcService', function($delegate, lodash) {
       var getClient = $delegate.getClient;
@@ -154,8 +156,6 @@ mocks.init = function(fixtures, controllerName, opts, done) {
     });
   });
 
-  module('angularMoment');
-  module('stateMock');
   module('copayApp.services', {
     $modal: mocks.modal,
     $timeout: mocks.$timeout,
diff --git a/test/walletService.test.js b/test/walletService.test.js
index 8e592770f..9dd11f549 100644
--- a/test/walletService.test.js
+++ b/test/walletService.test.js
@@ -7,6 +7,7 @@ describe('walletService', function() {
   beforeEach(function() {
     module('ngLodash');
     module('gettext');
+    module('angularMoment');
     module('bwcModule');
     module('copayApp.services');
   });