diff --git a/js/controllers/home.js b/js/controllers/home.js
index ae8113843..df4c43ab5 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -46,6 +46,8 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
           $scope.error = 'Invalid email or password';
         } else if ((err.toString() || '').match('Connection')) {
           $scope.error = 'Could not connect to Insight Server';
+        } else if ((err.toString() || '').match('Unable')) {
+          $scope.error = 'Unable to read data from the Insight Server';
         } else {
           $scope.error = 'Unknown error';
         }
diff --git a/js/models/PluginManager.js b/js/models/PluginManager.js
index d2d8d57fc..c4082ecbd 100644
--- a/js/models/PluginManager.js
+++ b/js/models/PluginManager.js
@@ -17,7 +17,7 @@ function PluginManager(config) {
     if(config.pluginsPath){
       pluginClass = require(config.pluginsPath + pluginName);
     } else {
-      pluginClass = require('../plugins/' + pluginName);
+      pluginClass = require('../js/plugins/' + pluginName);
     }
     var pluginObj = new pluginClass(config[pluginName]);
     pluginObj.init();
diff --git a/js/plugins/GoogleDrive.js b/js/plugins/GoogleDrive.js
index b786fca4b..08634a279 100644
--- a/js/plugins/GoogleDrive.js
+++ b/js/plugins/GoogleDrive.js
@@ -298,32 +298,4 @@ GoogleDrive.prototype._checkHomeDir = function(cb) {
   });
 };
 
-GoogleDrive.prototype.allKeys = function(cb) {
-  var self = this;
-
-  this._checkHomeDir(function(homeId) {
-    preconditions.checkState(homeId);
-
-    var request = gapi.client.request({
-      'path': '/drive/v2/files',
-      'method': 'GET',
-      'params': {
-        'q': "'" + homeId + "' in parents and trashed = false",
-        'fields': 'items(id,title)'
-      },
-    });
-    request.execute(function(res) {
-      // console.log('[googleDrive.js.152:res:]', res); //TODO
-      if (res.error)
-        throw new Error(res.error.message);
-
-      var ret = [];
-      for (var ii in res.items) {
-        ret.push(res.items[ii].title);
-      }
-      return cb(ret);
-    });
-  });
-};
-
 module.exports = GoogleDrive;
diff --git a/js/plugins/InsightStorage.js b/js/plugins/InsightStorage.js
index 522444c3e..4b78505bd 100644
--- a/js/plugins/InsightStorage.js
+++ b/js/plugins/InsightStorage.js
@@ -118,7 +118,7 @@ InsightStorage.prototype._makeGetRequest = function(passphrase, key, callback) {
         return callback('PNOTFOUND: Profile not found');
       }
       if (response.statusCode !== 200) {
-        return callback('Connection error');
+        return callback('Unable to read item from insight');
       }
       return callback(null, body, InsightStorage.parseResponseHeaders(response.getAllResponseHeaders()));
     }
@@ -217,7 +217,7 @@ InsightStorage.prototype.removeItem = function(key, callback) {
       'Authorization': authHeader
     }
   };
-  log.debug('erase ' +  name);
+  log.debug('Erasing: ' +  key);
   this.request.get(getParams, function(err, response, body) {
     if (err) {
       return callback('Connection error');
@@ -236,14 +236,4 @@ InsightStorage.prototype.clear = function(callback) {
   callback();
 };
 
-InsightStorage.prototype.allKeys = function(callback) {
-  // TODO: compatibility with localStorage
-  return callback(null);
-};
-
-InsightStorage.prototype.getFirst = function(prefix, opts, callback) {
-  // TODO: compatibility with localStorage
-  return callback(null, true, true);
-};
-
 module.exports = InsightStorage;
diff --git a/js/plugins/LocalStorage.js b/js/plugins/LocalStorage.js
index 0692a13ae..8e4ee75e3 100644
--- a/js/plugins/LocalStorage.js
+++ b/js/plugins/LocalStorage.js
@@ -2,82 +2,57 @@
 var _ = require('lodash');
 var preconditions = require('preconditions').singleton();
 
-function LocalStorage() {
+function LocalStorage(opts) {
   this.type = 'DB';
+  opts = opts || {};
+  
 
-  preconditions.checkState(typeof localStorage !== 'undefined',
-                           'localstorage not available, cannot run plugin');
+  this.ls = opts.ls 
+    || ( (typeof localStorage !== 'undefined') ? localStorage : null );
+
+  preconditions.checkState(this.ls,
+    'localstorage not available, cannot run plugin');
 };
 
 LocalStorage.prototype.init = function() {
 };
 
 LocalStorage.prototype.setCredentials = function(email, password, opts) {
-  this.email = email;
-  this.password = password;
+  // NOP
 };
 
 LocalStorage.prototype.getItem = function(k,cb) {
-  return cb(null, localStorage.getItem(k));
+  preconditions.checkArgument(_.isFunction(cb));
+  return cb(null, this.ls.getItem(k));
 };
 
 /**
  * Same as setItem, but fails if an item already exists
  */
 LocalStorage.prototype.createItem = function(name, value, callback) {
-  if (localStorage.getItem(name)) {
+  preconditions.checkArgument(_.isFunction(callback));
+  if (this.ls.getItem(name)) {
     return callback('EEXISTS');
   }
   return this.setItem(name, value, callback);
 };
 
 LocalStorage.prototype.setItem = function(k,v,cb) {
-  localStorage.setItem(k,v);
+  preconditions.checkArgument(_.isFunction(cb));
+  this.ls.setItem(k,v);
   return cb();
 };
 
 LocalStorage.prototype.removeItem = function(k,cb) { 
-  localStorage.removeItem(k);
+  preconditions.checkArgument(_.isFunction(cb));
+  this.ls.removeItem(k);
   return cb();
 };
 
 LocalStorage.prototype.clear = function(cb) { 
-  localStorage.clear();
+  preconditions.checkArgument(_.isFunction(cb));
+  this.ls.clear();
   return cb();
 };
 
-LocalStorage.prototype.allKeys = function(cb) {
-  var l = localStorage.length;
-  var ret = [];
-
-  for(var i=0; i<l; i++)
-    ret.push(localStorage.key(i));
-
-  return cb(null, ret);    
-};
-
-LocalStorage.prototype.getFirst = function(prefix, opts, cb) {
-  opts = opts || {};
-  var that = this;
-
-  this.allKeys(function(err, allKeys) {
-    var keys = _.filter(allKeys, function(k) {
-      if ((k === prefix) || k.indexOf(prefix) === 0) return true;
-    });
-
-    if (keys.length === 0)
-      return cb(new Error('not found'));
-
-    if (opts.onlyKey)
-      return cb(null, null, keys[0]);
-
-    that.getItem(keys[0], function(err, data) {
-      if (err) {
-        return cb(err);
-      }
-      return cb(null, data, keys[0]);
-    });
-  });
-};
-
 module.exports = LocalStorage;
diff --git a/js/services/localstorageService.js b/js/services/localstorageService.js
index 7642775ea..1dc19d04b 100644
--- a/js/services/localstorageService.js
+++ b/js/services/localstorageService.js
@@ -3,7 +3,7 @@
 
 angular.module('copayApp.services')
   .factory('localstorageService', function($rootScope) {
-    var LS = require('../plugins/LocalStorage');
+    var LS = require('../js/plugins/LocalStorage');
     var ls = new LS();
     return ls;
   });
diff --git a/js/util/log.js b/js/util/log.js
index 27a2f02aa..220fc2a02 100644
--- a/js/util/log.js
+++ b/js/util/log.js
@@ -3,7 +3,7 @@ var _ = require('lodash');
 var ls;
 
 try {
-  var LS = require('../plugins/LocalStorage');
+  var LS = require('../js/plugins/LocalStorage');
   ls = new LS();
 } catch(e) {};
 
diff --git a/test/plugin.insight.js b/test/plugin.insight.js
index 1f94ff8bf..d821d4d0d 100644
--- a/test/plugin.insight.js
+++ b/test/plugin.insight.js
@@ -46,41 +46,96 @@ describe('insight storage plugin', function() {
     });
   });
 
-  var setupForRetrieval = function() {
+  var setupForRetrieval = function(code) {
     requestMock.get.onFirstCall().callsArgWith(1, null, {
-      statusCode: 200,
+      statusCode: code || 200,
       getAllResponseHeaders: sinon.stub().returns(headers),
     }, data);
   };
 
-  it('should be able to retrieve data in a namespace', function(done) {
+  describe('#getItem', function() {
+    it('should be able to retrieve data in a namespace', function(done) {
+      setupForRetrieval();
 
-    setupForRetrieval();
+      storage.getItem(namespace, function(err, retrieved) {
+        assert(!err);
+        assert(retrieved === data);
+        var url = requestMock.get.getCall(0).args[0].url;
+        url.should.contain('?key=' + querystring.encode(namespace));
+        return done();
+      });
+    });
 
-    storage.getItem(namespace, function(err, retrieved) {
-      assert(!err);
-      assert(retrieved === data);
-      return done();
+    it('should be able to retrieve headers', function(done) {
+
+      setupForRetrieval();
+
+      storage.getItem(namespace, function(err, retrieved, headers) {
+        assert(!err);
+        headers['X-test'].should.equal('12');
+        headers['X-testb'].should.equal('32');
+        return done();
+      });
+    });
+
+    it('should be able handle 403', function(done) {
+      setupForRetrieval(403);
+      // old profile query
+      requestMock.get.onSecondCall().callsArgWith(1, null, {
+        statusCode: 403,
+        getAllResponseHeaders: sinon.stub().returns(headers),
+      }, data);
+      storage.getItem(namespace, function(err) {
+        err.should.contain('PNOTFOUND');
+        return done();
+      });
+    });
+
+    it('should be able handle other error', function(done) {
+      setupForRetrieval(510);
+      storage.getItem(namespace, function(err) {
+        err.should.contain('Unable');
+        return done();
+      });
     });
   });
 
-  it('should be able to retrieve headers', function(done) {
+  describe('#removeItem', function() {
 
-    setupForRetrieval();
+    it('should be able to delete Items', function(done) {
+      setupForRetrieval();
+      storage.removeItem(namespace, function(err) {
+        should.not.exist(err);
+        var url = requestMock.get.getCall(0).args[0].url;
+        url.should.contain('?key=' + querystring.encode(namespace));
 
-    storage.getItem(namespace, function(err, retrieved, headers) {
-      assert(!err);
-      headers['X-test'].should.equal('12');
-      headers['X-testb'].should.equal('32');
-      return done();
+        return done();
+      });
+    });
+
+    it('should be able handle 406', function(done) {
+      setupForRetrieval(409);
+      storage.removeItem(namespace, function(err) {
+        err.should.contain('BADCREDENTIALS');
+        return done();
+      });
+    });
+
+    it('should be able handle other error', function(done) {
+      setupForRetrieval(510);
+      storage.removeItem(namespace, function(err) {
+        err.should.contain('Unable');
+        return done();
+      });
     });
   });
 
 
 
-  var setupForSave = function() {
+
+  var setupForSave = function(code) {
     requestMock.post.onFirstCall().callsArgWith(1, null, {
-      statusCode: 200
+      statusCode: code || 200
     });
   };
 
@@ -94,6 +149,33 @@ describe('insight storage plugin', function() {
     });
   });
 
+
+  it('should handle 406 (quota)', function(done) {
+    setupForSave(406);
+    storage.setItem(namespace, data, function(err) {
+      err.should.contain('OVERQUOTA');
+      return done();
+    });
+  });
+
+  it('should handle other error ', function(done) {
+    setupForSave(505);
+    storage.setItem(namespace, data, function(err) {
+      err.should.contain('Unable');
+      return done();
+    });
+  });
+
+  it('should handle 409 (unauthorized)', function(done) {
+    setupForSave(409);
+
+    storage.setItem(namespace, data, function(err) {
+      err.should.contain('BADCREDENTIALS');
+      return done();
+    });
+  });
+
+
   it('won\'t make an unnecessary request if old password can\'t work', function(done) {
     storage.setCredentials(email, '!');
     setupForRetrieval();
@@ -152,7 +234,7 @@ describe('insight storage plugin', function() {
         var url = requestMock.post.firstCall.args[0].url;
         var args = querystring.decode(receivedArgs);
         url.indexOf('change_passphrase').should.not.be.equal(-1);
-        requestMock.post.firstCall.args[0].headers.Authorization.should.be.equal( new Buffer(email + ':' + oldSecret).toString('base64'));
+        requestMock.post.firstCall.args[0].headers.Authorization.should.be.equal(new Buffer(email + ':' + oldSecret).toString('base64'));
         args.newPassphrase.should.be.equal(newSecret);
         done();
       });
diff --git a/test/plugin.localstorage.js b/test/plugin.localstorage.js
new file mode 100644
index 000000000..4e58cae3c
--- /dev/null
+++ b/test/plugin.localstorage.js
@@ -0,0 +1,73 @@
+var LocalStorage = require('../js/plugins/LocalStorage');
+var assert = require('assert');
+
+describe('local storage plugin', function() {
+
+  var storage, storageMock, VALUE=123;
+
+  beforeEach(function() {
+    storageMock = {};
+    storageMock.getItem = sinon.stub().returns(VALUE);
+    storageMock.createItem = sinon.stub().returns();
+    storageMock.setItem = sinon.stub().returns();
+    storageMock.removeItem = sinon.stub().returns();
+    storageMock.clear = sinon.stub().returns();
+    storage = new LocalStorage({
+      ls: storageMock
+    });
+  });
+
+  it('#getItem', function(done) {
+    storage.getItem('hola', function(err, value) {
+      assert(!err);
+      storageMock.getItem.getCall(0).args[0].should.equal('hola');
+      value.should.equal(VALUE);
+      return done();
+    });
+  });
+
+  it('#createItem', function(done) {
+    storageMock.getItem = sinon.stub().returns(null);
+    storage.createItem('hola', 'value', function(err) {
+      assert(!err);
+      return done();
+    });
+  });
+
+  it('#createItem (Exists)', function(done) {
+    storage.createItem('hola', 'value', function(err) {
+      err.should.contain('EEXISTS');
+      return done();
+    });
+  });
+
+
+
+  it('#removeItem', function(done) {
+    storage.removeItem('pepe', function(err) {
+      assert(!err);
+      storageMock.removeItem.getCall(0).args[0].should.equal('pepe');
+      return done();
+    });
+  });
+
+  it('#setItem', function(done) {
+    storage.setItem('hola', 'chau', function(err) {
+      assert(!err);
+      storageMock.setItem.getCall(0).args[0].should.equal('hola');
+      storageMock.setItem.getCall(0).args[1].should.equal('chau');
+      return done();
+    });
+  });
+
+  it('#clear', function(done) {
+    storage.clear(function(err) {
+      assert(!err);
+      storageMock.clear.calledOnce.should.equal(true);
+      return done();
+    });
+  });
+
+
+
+});
diff --git a/test/util.log.js b/test/util.log.js
index 899860624..590269533 100644
--- a/test/util.log.js
+++ b/test/util.log.js
@@ -11,7 +11,7 @@ describe('log utils', function() {
     log.setLevel('info');
   });
 
-  it('should log fatal', function() {
+  it('should log .warn', function() {
     if (console.warn.restore)
       console.warn.restore();
 
@@ -26,6 +26,23 @@ describe('log utils', function() {
     console.warn.restore();
   });
 
+
+  it('should log .fatal', function() {
+    if (console.log.restore)
+      console.log.restore();
+
+    sinon.stub(console,'log');
+
+    log.setLevel('debug');
+    log.fatal('hola',"que",'tal');
+
+    var arg = console.log.getCall(0).args[0];
+    //arg.should.contain('util.log.js');        /* Firefox does not include the stack track */
+    arg.should.contain('que');
+    console.log.restore();
+  });
+
+
   it('should not log debug', function() {
     sinon.stub(console,'log');
     log.setLevel('info');
@@ -38,4 +55,6 @@ describe('log utils', function() {
     log.getLevels().debug.should.equal(0);
     log.getLevels().fatal.should.equal(5);
   });
+
+
 });
diff --git a/util/build.js b/util/build.js
index 1d55781ef..1618dfab0 100644
--- a/util/build.js
+++ b/util/build.js
@@ -90,22 +90,22 @@ var createBundle = function(opts) {
  
   if (!opts.disablePlugins) {
     b.require('./js/plugins/GoogleDrive', {
-      expose: '../plugins/GoogleDrive'
+      expose: '../js/plugins/GoogleDrive'
     });
     b.require('./js/plugins/InsightStorage', {
-      expose: '../plugins/InsightStorage'
+      expose: '../js/plugins/InsightStorage'
     });
     b.require('./js/plugins/InsightStorage', {
       expose: '../js/plugins/InsightStorage'
     });
     b.require('./js/plugins/LocalStorage', {
-      expose: '../plugins/LocalStorage'
+      expose: '../js/plugins/LocalStorage'
     });
     b.require('./js/plugins/EncryptedInsightStorage', {
-      expose: '../plugins/EncryptedInsightStorage'
+      expose: '../js/plugins/EncryptedInsightStorage'
     });
     b.require('./js/plugins/EncryptedLocalStorage', {
-      expose: '../plugins/EncryptedLocalStorage'
+      expose: '../js/plugins/EncryptedLocalStorage'
     });
   }