3 files changed, 31 insertions, 5 deletions
diff --git a/test/unit/actions/config_test.js b/test/unit/actions/config_test.js
index f851e4102..eca2f7c8f 100644
--- a/test/unit/actions/config_test.js
+++ b/test/unit/actions/config_test.js
@@ -11,6 +11,7 @@ describe ('config view actions', function() {
   var initialState = {
     metamask: {
       rpcTarget: 'foo',
+      frequentRpcList: []
     },
     appState: {
       currentView: {
@@ -32,13 +33,38 @@ describe ('config view actions', function() {
     it('sets the state.metamask.rpcTarget property of the state to the action.value', function() {
       const action = {
         type: actions.SET_RPC_TARGET,
-        value: 'bar',
+        value: 'foo',
+      }
+
+      const secondAction = {
+        type: actions.SET_RPC_LIST,
+        value: ['foo'],
       }
 
       var result = reducers(initialState, action)
+      result = reducers(result, secondAction)
       assert.equal(result.metamask.provider.type, 'rpc')
-      assert.equal(result.metamask.provider.rpcTarget, action.value)
+      assert.equal(result.metamask.provider.rpcTarget, 'foo')
+      assert.equal(result.metamask.frequentRpcList[0], 'foo')
+    })
+
+    it('should handle multiple requests to change the rpc gracefully', function() {
+      const action = {
+        type: actions.SET_RPC_TARGET,
+        value: 'foo',
+      }
+
+      const secondAction = {
+        type: actions.SET_RPC_LIST,
+        value: ['foo'],
+      }
+
+      var result = reducers(initialState, action)
+      var secondResult = reducers(result, secondAction)
+      var thirdResult = reducers(secondResult, action)
+      var fourthResult = reducers(thirdResult, secondAction)
+      assert.equal(fourthResult.metamask.frequentRpcList.length, 1)
     })
   })
-})
 
+})
diff --git a/test/unit/currency-controller-test.js b/test/unit/currency-controller-test.js
index c57b522c7..dd7fa91e0 100644
--- a/test/unit/currency-controller-test.js
+++ b/test/unit/currency-controller-test.js
@@ -5,7 +5,7 @@ const assert = require('assert')
 const extend = require('xtend')
 const rp = require('request-promise')
 const nock = require('nock')
-const CurrencyController = require('../../app/scripts/lib/controllers/currency')
+const CurrencyController = require('../../app/scripts/controllers/currency')
 
 describe('config-manager', function() {
   var currencyController
diff --git a/test/unit/notice-controller-test.js b/test/unit/notice-controller-test.js
index cf00daeba..73fdb2f2e 100644
--- a/test/unit/notice-controller-test.js
+++ b/test/unit/notice-controller-test.js
@@ -4,7 +4,7 @@ const rp = require('request-promise')
 const nock = require('nock')
 const configManagerGen = require('../lib/mock-config-manager')
 const NoticeController = require('../../app/scripts/notice-controller')
-const STORAGE_KEY = 'metamask-persistance-key'
+const STORAGE_KEY = 'metamask-persistence-key'
 
 describe('notice-controller', function() {
   var noticeController