diff --git a/js/models/core/WalletFactory.js b/js/models/core/WalletFactory.js
index ab06d8c49..f40a02e4d 100644
--- a/js/models/core/WalletFactory.js
+++ b/js/models/core/WalletFactory.js
@@ -233,7 +233,6 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
   });
 
   self.network.on('serverError', function() {
-    console.log('[WalletFactory.js.236]'); //TODO
     return cb('joinError');
   });
 
diff --git a/test/test.storage.File.js b/test/test.storage.File.js
index 8d8e0c1f5..edf25b5d5 100644
--- a/test/test.storage.File.js
+++ b/test/test.storage.File.js
@@ -5,7 +5,7 @@ var should = chai.should();
 var Storage = require('../js/models/storage/File.js');
 var sinon = require('sinon');
 var crypto = require('crypto');
-var CryptoJS = require('node-cryptojs-aes').CryptoJS;
+ar CryptoJS = require('node-cryptojs-aes').CryptoJS;
 
 var mock = require('mock-fs');
 
@@ -19,7 +19,6 @@ describe('Storage/File', function() {
     "test": "test"
   };
   var encryptedStr = CryptoJS.AES.encrypt(JSON.stringify(obj), 'password').toString();
-  console.log(encryptedStr);
   mock({
     'myfilename': encryptedStr
   });
diff --git a/test/test.storage.LocalEncrypted.js b/test/test.storage.LocalEncrypted.js
index a25f6cc92..28c272b3e 100644
--- a/test/test.storage.LocalEncrypted.js
+++ b/test/test.storage.LocalEncrypted.js
@@ -1,21 +1,3 @@
-//Crypto Mock
-CryptoJS = {};
-CryptoJS.AES = {};
-CryptoJS.AES.encrypt = function(a) {
-  return a;
-};
-
-CryptoJS.enc = {
-  utf8: ''
-};
-
-CryptoJS.AES.decrypt = function(a) {
-  return a;
-};
-
-
-
-
 'use strict';
 var chai = chai || require('chai');
 var should = chai.should();
@@ -27,6 +9,8 @@ if (is_browser) {
   var copay = require('../copay'); //node
 }
 var LocalEncrypted = copay.StorageLocalEncrypted;
+var CryptoJS = require('node-cryptojs-aes').CryptoJS;
+
 
 var fakeWallet = 'fake-wallet-id';
 var timeStamp = Date.now();