diff --git a/test/Identity.js b/test/Identity.js
index 77bf41065..995e28ac5 100644
--- a/test/Identity.js
+++ b/test/Identity.js
@@ -673,8 +673,6 @@ describe('Identity model', function() {
       }).should.deep.equal(w);
     });
 
-
-
     it('should delete wallet', function(done) {
       iden.addWallet(w);
       iden.getWalletById('32').getName().should.equal('treintaydos');
@@ -725,20 +723,15 @@ describe('Identity model', function() {
         close: sinon.stub(),
       };
     });
-
     it('should include wallets', function() {
       iden.addWallet(w);
       var obj = iden.toObj();
       _.indexOf(obj.walletIds, '32').should.be.above(-1);
     });
-
     it('should set version to actual version', function() {
       var obj = iden.toObj();
       obj.version.should.equal(version);
     });
-
-
-
     it('should include 2 wallets', function() {
       iden.addWallet(w);
       iden.addWallet(w2);
@@ -795,6 +788,13 @@ describe('Identity model', function() {
   });
 
   describe('#getLastFocusedWalletId', function() {
+    var clock;
+    before(function() {
+      clock = sinon.useFakeTimers();
+    });
+    after(function() {
+      clock.restore();
+    });
     var iden, w, w2;
     beforeEach(function() {
       var storage = sinon.stub();
@@ -827,14 +827,165 @@ describe('Identity model', function() {
         getName: sinon.stub().returns('treintaytres'),
         close: sinon.stub(),
       };
-      iden.addWallet(w);
-      iden.addWallet(w2);
+
     });
 
-    it.only('should return indefined', function() {
-      var a = iden.getLastFocusedWalletId();
-      console.log('a', a);
+    it('should return indefined', function() {
+      expect(iden.getLastFocusedWalletId()).to.be.undefined;
+    });
+
+    it('should return last focused wallet', function() {
+      iden.addWallet(w);
+      iden.addWallet(w2);
+      iden.updateFocusedTimestamp(w.getId());
+
+      iden.getLastFocusedWalletId().should.be.equal(w.getId());
+
+      clock.tick(1000);
+
+      iden.updateFocusedTimestamp(w2.getId());
+      iden.getLastFocusedWalletId().should.be.equal(w2.getId());
+
+      iden.deleteWallet(w2.getId(), function() {
+        iden.getLastFocusedWalletId().should.be.equal(w.getId());
+      });
+    });
+  });
+
+  describe('importFromFullJson', function() {
+    var opts;
+    beforeEach(function() {
+      var storage = sinon.stub();
+      storage.setCredentials = sinon.stub();
+      storage.removeItem = sinon.stub().yields(null);
+      storage.clear = sinon.stub().yields();
+
+      opts = {
+        email: 'test@test.com',
+        password: '123',
+        network: {
+          testnet: {
+            url: 'https://test-insight.bitpay.com:443'
+          },
+          livenet: {
+            url: 'https://insight.bitpay.com:443'
+          },
+        },
+        storage: storage,
+      };
+    });
+    it('should throw error because json is wrong', function() {
+      Identity.importFromFullJson('asdfg', '1', {}, function(c) {
+        c.should.be.equal('BADSTR: Unable to retrieve json from string');
+      });
+    });
+    it('should throw error because json does not have required fields', function() {
+      Identity.importFromFullJson('{"age":23}', '1', {}, function(c) {
+        c.should.be.equal('BADSTR');
+      });
+    });
+    it('should create a profile', function() {
+      var json = '{"networkOpts":{"livenet":{"url":"https://insight.bitpay.com:443","transports":["polling"]},"testnet":{"url":"https://test-insight.bitpay.com:443","transports":["polling"]}},"blockchainOpts":{"livenet":{"url":"https://insight.bitpay.com:443","transports":["polling"]},"testnet":{"url":"https://test-insight.bitpay.com:443","transports":["polling"]}},"fullName":"l@l","email":"l@l","password":"1","storage":{"type":"DB","storeUrl":"https://insight.bitpay.com:443/api/email","iterations":1000,"salt":"jBbYTj8zTrOt6V","email":"l@l","password":"1","_cachedKey":"y4a352k6sM15gGag+PgQwXRdFjzi0yX6aLEGttWaeP+kbU7JeSPDUfbhhzonnQRUicJu/1IMWgDZbDJjWmrKgA=="},"walletDefaults":{"requiredCopayers":2,"totalCopayers":3,"spendUnconfirmed":true,"reconnectDelay":5000,"idleDurationMin":4,"settings":{"unitName":"bits","unitToSatoshi":100,"unitDecimals":2,"alternativeName":"US Dollar","alternativeIsoCode":"USD"}},"version":"0.8.2","walletIds":["15a3ecd34dfb7000","59220d2110461861","bfd6adad419078d9","893dc0c0a776648b","e8ee7218c6ea7f93"],"wallets":{},"focusedTimestamps":{"15a3ecd34dfb7000":1418916813711,"bfd6adad419078d9":1418835855887,"e8ee7218c6ea7f93":1418775999995,"59220d2110461861":1418835858871,"893dc0c0a776648b":1418835763680},"backupNeeded":true,"_events":{}}';
+      Identity.importFromFullJson(json, '1', opts, function(err, iden) {
+        expect(err).to.be.null;
+        iden.should.not.be.null;
+      });
+
     });
 
   });
+
+  describe('#closeWallet', function() {
+    var iden, w, w2, w3;
+    beforeEach(function() {
+      var storage = sinon.stub();
+      storage.setCredentials = sinon.stub();
+      storage.removeItem = sinon.stub().yields(null);
+      storage.clear = sinon.stub().yields();
+
+      var opts = {
+        email: 'test@test.com',
+        password: '123',
+        network: {
+          testnet: {
+            url: 'https://test-insight.bitpay.com:443'
+          },
+          livenet: {
+            url: 'https://insight.bitpay.com:443'
+          },
+        },
+        storage: storage,
+      };
+      iden = new Identity(opts);
+
+      w = {
+        getId: sinon.stub().returns('32'),
+        getName: sinon.stub().returns('treintaydos'),
+        close: sinon.stub(),
+      };
+      w2 = {
+        getId: sinon.stub().returns('33'),
+        getName: sinon.stub().returns('treintaytres'),
+        close: sinon.stub(),
+      };
+
+      w3 = {
+        getId: sinon.stub().returns('34'),
+        getName: sinon.stub().returns('treintaycuatro'),
+        close: sinon.stub(),
+      };
+
+      iden.addWallet(w);
+      iden.addWallet(w2);
+      //do not add w3
+    });
+
+    it('should close a Wallet', function() {
+      iden.closeWallet(w, function(err) {
+        expect(err).to.be.null;
+      });
+
+      iden.closeWallet(w3, function(err) {
+        expect(err).to.be.not.null;
+      });
+    });
+
+  });
+
+
+
+  describe('#_checkVersion', function() {
+    var iden;
+    beforeEach(function() {
+      var storage = sinon.stub();
+      storage.setCredentials = sinon.stub();
+      storage.removeItem = sinon.stub().yields(null);
+      storage.clear = sinon.stub().yields();
+
+      var opts = {
+        email: 'test@test.com',
+        password: '123',
+        network: {
+          testnet: {
+            url: 'https://test-insight.bitpay.com:443'
+          },
+          livenet: {
+            url: 'https://insight.bitpay.com:443'
+          },
+        },
+        storage: storage,
+      };
+      iden = new Identity(opts);
+    });
+
+    it('should checkVersion', function() {
+
+      expect(iden._checkVersion()).to.be.undefined;
+      expect(iden._checkVersion('0.0.0')).to.be.undefined;
+      (function() {
+        console.log('b', iden._checkVersion('9.9.9'));
+      }).should.throw('Major difference');
+    });
+  });
+
 });