From 13ebb0b455bc775a53b6bb30e675a39d02d8f6f5 Mon Sep 17 00:00:00 2001
From: tmashuang <thomas.b.huang@gmail.com>
Date: Mon, 21 May 2018 05:59:26 -0700
Subject: [PATCH] Moved loose some loose test files to sub folders

---
 .../{ => app}/ComposableObservableStore.js    |  2 +-
 .../account-import-strategies.spec.js         |  3 +-
 test/unit/app/buy-eth-url.spec.js             | 48 +++++++++++++++++++
 .../controllers}/address-book-controller.js   |  2 +-
 .../controllers}/blacklist-controller-test.js |  2 +-
 .../controllers}/currency-controller-test.js  |  2 +-
 .../controllers}/infura-controller-test.js    |  2 +-
 .../controllers}/metamask-controller-test.js  |  6 +--
 .../controllers}/network-contoller-test.js    |  6 +--
 .../controllers}/notice-controller-test.js    |  4 +-
 .../preferences-controller-test.js            |  2 +-
 .../controllers}/token-rates-controller.js    |  2 +-
 .../transactions}/nonce-tracker-test.js       |  4 +-
 .../transactions}/pending-tx-test.js          |  6 +--
 .../transactions}/tx-controller-test.js       |  6 +--
 .../transactions}/tx-gas-util-test.js         |  4 +-
 .../transactions}/tx-helper-test.js           |  2 +-
 .../tx-state-history-helper-test.js           |  4 +-
 .../transactions}/tx-state-manager-test.js    |  4 +-
 .../transactions}/tx-utils-test.js            |  2 +-
 test/unit/{ => app}/edge-encryptor-test.js    |  2 +-
 test/unit/{ => app}/message-manager-test.js   |  2 +-
 test/unit/{ => app}/nodeify-test.js           |  2 +-
 test/unit/{ => app}/pending-balance-test.js   |  4 +-
 .../personal-message-manager-test.js          |  2 +-
 .../{ => app}/seed-phrase-verifier-test.js    |  6 +--
 test/unit/{ => app}/util-test.js              |  2 +-
 test/unit/{ => migrations}/migrations-test.js | 28 +++++------
 test/unit/{ => migrations}/migrator-test.js   |  6 +--
 29 files changed, 108 insertions(+), 59 deletions(-)
 rename test/unit/{ => app}/ComposableObservableStore.js (92%)
 rename test/unit/{ => app}/account-import-strategies.spec.js (93%)
 create mode 100644 test/unit/app/buy-eth-url.spec.js
 rename test/unit/{ => app/controllers}/address-book-controller.js (95%)
 rename test/unit/{ => app/controllers}/blacklist-controller-test.js (94%)
 rename test/unit/{ => app/controllers}/currency-controller-test.js (97%)
 rename test/unit/{ => app/controllers}/infura-controller-test.js (95%)
 rename test/unit/{ => app/controllers}/metamask-controller-test.js (98%)
 rename test/unit/{ => app/controllers}/network-contoller-test.js (92%)
 rename test/unit/{ => app/controllers}/notice-controller-test.js (96%)
 rename test/unit/{ => app/controllers}/preferences-controller-test.js (94%)
 rename test/unit/{ => app/controllers}/token-rates-controller.js (92%)
 rename test/unit/{ => app/controllers/transactions}/nonce-tracker-test.js (98%)
 rename test/unit/{ => app/controllers/transactions}/pending-tx-test.js (98%)
 rename test/unit/{ => app/controllers/transactions}/tx-controller-test.js (98%)
 rename test/unit/{ => app/controllers/transactions}/tx-gas-util-test.js (93%)
 rename test/unit/{ => app/controllers/transactions}/tx-helper-test.js (88%)
 rename test/unit/{ => app/controllers/transactions}/tx-state-history-helper-test.js (95%)
 rename test/unit/{ => app/controllers/transactions}/tx-state-manager-test.js (98%)
 rename test/unit/{ => app/controllers/transactions}/tx-utils-test.js (97%)
 rename test/unit/{ => app}/edge-encryptor-test.js (97%)
 rename test/unit/{ => app}/message-manager-test.js (97%)
 rename test/unit/{ => app}/nodeify-test.js (92%)
 rename test/unit/{ => app}/pending-balance-test.js (94%)
 rename test/unit/{ => app}/personal-message-manager-test.js (97%)
 rename test/unit/{ => app}/seed-phrase-verifier-test.js (95%)
 rename test/unit/{ => app}/util-test.js (92%)
 rename test/unit/{ => migrations}/migrations-test.js (81%)
 rename test/unit/{ => migrations}/migrator-test.js (90%)

diff --git a/test/unit/ComposableObservableStore.js b/test/unit/app/ComposableObservableStore.js
similarity index 92%
rename from test/unit/ComposableObservableStore.js
rename to test/unit/app/ComposableObservableStore.js
index 3fba200c1..aa8abd463 100644
--- a/test/unit/ComposableObservableStore.js
+++ b/test/unit/app/ComposableObservableStore.js
@@ -1,5 +1,5 @@
 const assert = require('assert')
-const ComposableObservableStore = require('../../app/scripts/lib/ComposableObservableStore')
+const ComposableObservableStore = require('../../../app/scripts/lib/ComposableObservableStore')
 const ObservableStore = require('obs-store')
 
 describe('ComposableObservableStore', () => {
diff --git a/test/unit/account-import-strategies.spec.js b/test/unit/app/account-import-strategies.spec.js
similarity index 93%
rename from test/unit/account-import-strategies.spec.js
rename to test/unit/app/account-import-strategies.spec.js
index acc39c88c..83cfaeb3e 100644
--- a/test/unit/account-import-strategies.spec.js
+++ b/test/unit/app/account-import-strategies.spec.js
@@ -1,5 +1,6 @@
 const assert = require('assert')
-const accountImporter = require('../../app/scripts/account-import-strategies/index')
+const path = require('path')
+const accountImporter = require('../../../app/scripts/account-import-strategies/index')
 const ethUtil = require('ethereumjs-util')
 
 describe('Account Import Strategies', function () {
diff --git a/test/unit/app/buy-eth-url.spec.js b/test/unit/app/buy-eth-url.spec.js
new file mode 100644
index 000000000..36646fa68
--- /dev/null
+++ b/test/unit/app/buy-eth-url.spec.js
@@ -0,0 +1,48 @@
+const assert = require('assert')
+const getBuyEthUrl = require('../../../app/scripts/lib/buy-eth-url')
+
+describe('', function () {
+  const mainnet = {
+    network: '1',
+    amount: 5,
+    address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+  }
+  const ropsten = {
+    network: '3',
+  }
+  const rinkeby = {
+    network: '4',
+  }
+  const kovan = {
+    network: '42',
+  }
+
+  it('returns coinbase url with amount and address for network 1', function () {
+    const coinbaseUrl = getBuyEthUrl(mainnet)
+    const coinbase = coinbaseUrl.match(/(https:\/\/buy.coinbase.com)/)
+    const amount = coinbaseUrl.match(/(amount)\D\d/)
+    const address = coinbaseUrl.match(/(address)(.*)(?=&)/)
+
+    assert.equal(coinbase[0], 'https://buy.coinbase.com')
+    assert.equal(amount[0], 'amount=5')
+    assert.equal(address[0], 'address=0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc')
+
+  })
+
+  it('returns metamask ropsten faucet for network 3', function () {
+    const ropstenUrl = getBuyEthUrl(ropsten)
+    assert.equal(ropstenUrl, 'https://faucet.metamask.io/')
+  })
+
+  it('returns rinkeby dapp for network 4', function () {
+    const rinkebyUrl = getBuyEthUrl(rinkeby)
+    assert.equal(rinkebyUrl, 'https://www.rinkeby.io/')
+  })
+
+  it('returns kovan github test faucet for network 42', function () {
+    const kovanUrl = getBuyEthUrl(kovan)
+    assert.equal(kovanUrl, 'https://github.com/kovan-testnet/faucet')
+  })
+
+})
+
diff --git a/test/unit/address-book-controller.js b/test/unit/app/controllers/address-book-controller.js
similarity index 95%
rename from test/unit/address-book-controller.js
rename to test/unit/app/controllers/address-book-controller.js
index 655c9022c..1836dea94 100644
--- a/test/unit/address-book-controller.js
+++ b/test/unit/app/controllers/address-book-controller.js
@@ -1,5 +1,5 @@
 const assert = require('assert')
-const AddressBookController = require('../../app/scripts/controllers/address-book')
+const AddressBookController = require('../../../../app/scripts/controllers/address-book')
 
 const mockKeyringController = {
   memStore: {
diff --git a/test/unit/blacklist-controller-test.js b/test/unit/app/controllers/blacklist-controller-test.js
similarity index 94%
rename from test/unit/blacklist-controller-test.js
rename to test/unit/app/controllers/blacklist-controller-test.js
index cbf73d3e5..085641777 100644
--- a/test/unit/blacklist-controller-test.js
+++ b/test/unit/app/controllers/blacklist-controller-test.js
@@ -1,5 +1,5 @@
 const assert = require('assert')
-const BlacklistController = require('../../app/scripts/controllers/blacklist')
+const BlacklistController = require('../../../../app/scripts/controllers/blacklist')
 
 describe('blacklist controller', function () {
   let blacklistController
diff --git a/test/unit/currency-controller-test.js b/test/unit/app/controllers/currency-controller-test.js
similarity index 97%
rename from test/unit/currency-controller-test.js
rename to test/unit/app/controllers/currency-controller-test.js
index 73a97d120..1941d1c43 100644
--- a/test/unit/currency-controller-test.js
+++ b/test/unit/app/controllers/currency-controller-test.js
@@ -3,7 +3,7 @@ global.fetch = global.fetch || require('isomorphic-fetch')
 
 const assert = require('assert')
 const nock = require('nock')
-const CurrencyController = require('../../app/scripts/controllers/currency')
+const CurrencyController = require('../../../../app/scripts/controllers/currency')
 
 describe('currency-controller', function () {
   var currencyController
diff --git a/test/unit/infura-controller-test.js b/test/unit/app/controllers/infura-controller-test.js
similarity index 95%
rename from test/unit/infura-controller-test.js
rename to test/unit/app/controllers/infura-controller-test.js
index c9f0e7587..7bd95dd4b 100644
--- a/test/unit/infura-controller-test.js
+++ b/test/unit/app/controllers/infura-controller-test.js
@@ -1,6 +1,6 @@
 const assert = require('assert')
 const sinon = require('sinon')
-const InfuraController = require('../../app/scripts/controllers/infura')
+const InfuraController = require('../../../../app/scripts/controllers/infura')
 
 describe('infura-controller', function () {
   let infuraController, sandbox, networkStatus
diff --git a/test/unit/metamask-controller-test.js b/test/unit/app/controllers/metamask-controller-test.js
similarity index 98%
rename from test/unit/metamask-controller-test.js
rename to test/unit/app/controllers/metamask-controller-test.js
index 23372d823..65a6fea09 100644
--- a/test/unit/metamask-controller-test.js
+++ b/test/unit/app/controllers/metamask-controller-test.js
@@ -3,9 +3,9 @@ const sinon = require('sinon')
 const clone = require('clone')
 const nock = require('nock')
 const createThoughStream = require('through2').obj
-const MetaMaskController = require('../../app/scripts/metamask-controller')
-const blacklistJSON = require('../stub/blacklist')
-const firstTimeState = require('../../app/scripts/first-time-state')
+const MetaMaskController = require('../../../../app/scripts/metamask-controller')
+const blacklistJSON = require('../../../stub/blacklist')
+const firstTimeState = require('../../../../app/scripts/first-time-state')
 
 const currentNetworkId = 42
 const DEFAULT_LABEL = 'Account 1'
diff --git a/test/unit/network-contoller-test.js b/test/unit/app/controllers/network-contoller-test.js
similarity index 92%
rename from test/unit/network-contoller-test.js
rename to test/unit/app/controllers/network-contoller-test.js
index 2d590a3f6..789850ef3 100644
--- a/test/unit/network-contoller-test.js
+++ b/test/unit/app/controllers/network-contoller-test.js
@@ -1,11 +1,11 @@
 const assert = require('assert')
 const nock = require('nock')
-const NetworkController = require('../../app/scripts/controllers/network')
+const NetworkController = require('../../../../app/scripts/controllers/network')
 const {
   getNetworkDisplayName,
-} = require('../../app/scripts/controllers/network/util')
+} = require('../../../../app/scripts/controllers/network/util')
 
-const { createTestProviderTools } = require('../stub/provider')
+const { createTestProviderTools } = require('../../../stub/provider')
 const providerResultStub = {}
 
 describe('# Network Controller', function () {
diff --git a/test/unit/notice-controller-test.js b/test/unit/app/controllers/notice-controller-test.js
similarity index 96%
rename from test/unit/notice-controller-test.js
rename to test/unit/app/controllers/notice-controller-test.js
index 09eeda15c..e78b69623 100644
--- a/test/unit/notice-controller-test.js
+++ b/test/unit/app/controllers/notice-controller-test.js
@@ -1,6 +1,6 @@
 const assert = require('assert')
-const configManagerGen = require('../lib/mock-config-manager')
-const NoticeController = require('../../app/scripts/notice-controller')
+const configManagerGen = require('../../../lib/mock-config-manager')
+const NoticeController = require('../../../../app/scripts/notice-controller')
 
 describe('notice-controller', function () {
   var noticeController
diff --git a/test/unit/preferences-controller-test.js b/test/unit/app/controllers/preferences-controller-test.js
similarity index 94%
rename from test/unit/preferences-controller-test.js
rename to test/unit/app/controllers/preferences-controller-test.js
index 9fb5e4251..3d903bd5b 100644
--- a/test/unit/preferences-controller-test.js
+++ b/test/unit/app/controllers/preferences-controller-test.js
@@ -1,5 +1,5 @@
 const assert = require('assert')
-const PreferencesController = require('../../app/scripts/controllers/preferences')
+const PreferencesController = require('../../../../app/scripts/controllers/preferences')
 
 describe('preferences controller', function () {
   let preferencesController
diff --git a/test/unit/token-rates-controller.js b/test/unit/app/controllers/token-rates-controller.js
similarity index 92%
rename from test/unit/token-rates-controller.js
rename to test/unit/app/controllers/token-rates-controller.js
index a49547313..28e583d8d 100644
--- a/test/unit/token-rates-controller.js
+++ b/test/unit/app/controllers/token-rates-controller.js
@@ -1,6 +1,6 @@
 const assert = require('assert')
 const sinon = require('sinon')
-const TokenRatesController = require('../../app/scripts/controllers/token-rates')
+const TokenRatesController = require('../../../../app/scripts/controllers/token-rates')
 const ObservableStore = require('obs-store')
 
 describe('TokenRatesController', () => {
diff --git a/test/unit/nonce-tracker-test.js b/test/unit/app/controllers/transactions/nonce-tracker-test.js
similarity index 98%
rename from test/unit/nonce-tracker-test.js
rename to test/unit/app/controllers/transactions/nonce-tracker-test.js
index cf26945d3..fc852458c 100644
--- a/test/unit/nonce-tracker-test.js
+++ b/test/unit/app/controllers/transactions/nonce-tracker-test.js
@@ -1,6 +1,6 @@
 const assert = require('assert')
-const NonceTracker = require('../../app/scripts/controllers/transactions/nonce-tracker')
-const MockTxGen = require('../lib/mock-tx-gen')
+const NonceTracker = require('../../../../../app/scripts/controllers/transactions/nonce-tracker')
+const MockTxGen = require('../../../../lib/mock-tx-gen')
 let providerResultStub = {}
 
 describe('Nonce Tracker', function () {
diff --git a/test/unit/pending-tx-test.js b/test/unit/app/controllers/transactions/pending-tx-test.js
similarity index 98%
rename from test/unit/pending-tx-test.js
rename to test/unit/app/controllers/transactions/pending-tx-test.js
index 97ac8524b..e7705c594 100644
--- a/test/unit/pending-tx-test.js
+++ b/test/unit/app/controllers/transactions/pending-tx-test.js
@@ -3,9 +3,9 @@ const ethUtil = require('ethereumjs-util')
 const EthTx = require('ethereumjs-tx')
 const ObservableStore = require('obs-store')
 const clone = require('clone')
-const { createTestProviderTools } = require('../stub/provider')
-const PendingTransactionTracker = require('../../app/scripts/controllers/transactions/pending-tx-tracker')
-const MockTxGen = require('../lib/mock-tx-gen')
+const { createTestProviderTools } = require('../../../../stub/provider')
+const PendingTransactionTracker = require('../../../../../app/scripts/controllers/transactions/pending-tx-tracker')
+const MockTxGen = require('../../../../lib/mock-tx-gen')
 const sinon = require('sinon')
 const noop = () => true
 const currentNetworkId = 42
diff --git a/test/unit/tx-controller-test.js b/test/unit/app/controllers/transactions/tx-controller-test.js
similarity index 98%
rename from test/unit/tx-controller-test.js
rename to test/unit/app/controllers/transactions/tx-controller-test.js
index ddd921652..f1d67f64e 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/app/controllers/transactions/tx-controller-test.js
@@ -4,9 +4,9 @@ const EthTx = require('ethereumjs-tx')
 const EthjsQuery = require('ethjs-query')
 const ObservableStore = require('obs-store')
 const sinon = require('sinon')
-const TransactionController = require('../../app/scripts/controllers/transactions')
-const TxGasUtils = require('../../app/scripts/controllers/transactions/tx-gas-utils')
-const { createTestProviderTools, getTestAccounts } = require('../stub/provider')
+const TransactionController = require('../../../../../app/scripts/controllers/transactions')
+const TxGasUtils = require('../../../../../app/scripts/controllers/transactions/tx-gas-utils')
+const { createTestProviderTools, getTestAccounts } = require('../../../../stub/provider')
 
 const noop = () => true
 const currentNetworkId = 42
diff --git a/test/unit/tx-gas-util-test.js b/test/unit/app/controllers/transactions/tx-gas-util-test.js
similarity index 93%
rename from test/unit/tx-gas-util-test.js
rename to test/unit/app/controllers/transactions/tx-gas-util-test.js
index c1d5966da..d1ee86033 100644
--- a/test/unit/tx-gas-util-test.js
+++ b/test/unit/app/controllers/transactions/tx-gas-util-test.js
@@ -3,8 +3,8 @@ const Transaction = require('ethereumjs-tx')
 const BN = require('bn.js')
 
 
-const { hexToBn, bnToHex } = require('../../app/scripts/lib/util')
-const TxUtils = require('../../app/scripts/controllers/transactions/tx-gas-utils')
+const { hexToBn, bnToHex } = require('../../../../../app/scripts/lib/util')
+const TxUtils = require('../../../../../app/scripts/controllers/transactions/tx-gas-utils')
 
 
 describe('txUtils', function () {
diff --git a/test/unit/tx-helper-test.js b/test/unit/app/controllers/transactions/tx-helper-test.js
similarity index 88%
rename from test/unit/tx-helper-test.js
rename to test/unit/app/controllers/transactions/tx-helper-test.js
index cc6543c30..ce54ef483 100644
--- a/test/unit/tx-helper-test.js
+++ b/test/unit/app/controllers/transactions/tx-helper-test.js
@@ -1,5 +1,5 @@
 const assert = require('assert')
-const txHelper = require('../../ui/lib/tx-helper')
+const txHelper = require('../../../../../ui/lib/tx-helper')
 
 describe('txHelper', function () {
   it('always shows the oldest tx first', function () {
diff --git a/test/unit/tx-state-history-helper-test.js b/test/unit/app/controllers/transactions/tx-state-history-helper-test.js
similarity index 95%
rename from test/unit/tx-state-history-helper-test.js
rename to test/unit/app/controllers/transactions/tx-state-history-helper-test.js
index 5ad014dbb..f4c3a6be1 100644
--- a/test/unit/tx-state-history-helper-test.js
+++ b/test/unit/app/controllers/transactions/tx-state-history-helper-test.js
@@ -1,6 +1,6 @@
 const assert = require('assert')
-const txStateHistoryHelper = require('../../app/scripts/controllers/transactions/lib/tx-state-history-helper')
-const testVault = require('../data/v17-long-history.json')
+const txStateHistoryHelper = require('../../../../../app/scripts/controllers/transactions/lib/tx-state-history-helper')
+const testVault = require('../../../../data/v17-long-history.json')
 
 describe ('Transaction state history helper', function () {
 
diff --git a/test/unit/tx-state-manager-test.js b/test/unit/app/controllers/transactions/tx-state-manager-test.js
similarity index 98%
rename from test/unit/tx-state-manager-test.js
rename to test/unit/app/controllers/transactions/tx-state-manager-test.js
index 179542f90..20bc08b94 100644
--- a/test/unit/tx-state-manager-test.js
+++ b/test/unit/app/controllers/transactions/tx-state-manager-test.js
@@ -1,8 +1,8 @@
 const assert = require('assert')
 const clone = require('clone')
 const ObservableStore = require('obs-store')
-const TxStateManager = require('../../app/scripts/controllers/transactions/tx-state-manager')
-const txStateHistoryHelper = require('../../app/scripts/controllers/transactions/lib/tx-state-history-helper')
+const TxStateManager = require('../../../../../app/scripts/controllers/transactions/tx-state-manager')
+const txStateHistoryHelper = require('../../../../../app/scripts/controllers/transactions/lib/tx-state-history-helper')
 const noop = () => true
 
 describe('TransactionStateManager', function () {
diff --git a/test/unit/tx-utils-test.js b/test/unit/app/controllers/transactions/tx-utils-test.js
similarity index 97%
rename from test/unit/tx-utils-test.js
rename to test/unit/app/controllers/transactions/tx-utils-test.js
index be16225ba..115127f85 100644
--- a/test/unit/tx-utils-test.js
+++ b/test/unit/app/controllers/transactions/tx-utils-test.js
@@ -1,5 +1,5 @@
 const assert = require('assert')
-const txUtils = require('../../app/scripts/controllers/transactions/lib/util')
+const txUtils = require('../../../../../app/scripts/controllers/transactions/lib/util')
 
 
 describe('txUtils', function () {
diff --git a/test/unit/edge-encryptor-test.js b/test/unit/app/edge-encryptor-test.js
similarity index 97%
rename from test/unit/edge-encryptor-test.js
rename to test/unit/app/edge-encryptor-test.js
index d3f014d74..cc9777389 100644
--- a/test/unit/edge-encryptor-test.js
+++ b/test/unit/app/edge-encryptor-test.js
@@ -1,6 +1,6 @@
 const assert = require('assert')
 
-const EdgeEncryptor = require('../../app/scripts/edge-encryptor')
+const EdgeEncryptor = require('../../../app/scripts/edge-encryptor')
 
 var password = 'passw0rd1'
 var data = 'some random data'
diff --git a/test/unit/message-manager-test.js b/test/unit/app/message-manager-test.js
similarity index 97%
rename from test/unit/message-manager-test.js
rename to test/unit/app/message-manager-test.js
index 5e7039841..36ef6c29f 100644
--- a/test/unit/message-manager-test.js
+++ b/test/unit/app/message-manager-test.js
@@ -1,5 +1,5 @@
 const assert = require('assert')
-const MessageManager = require('../../app/scripts/lib/message-manager')
+const MessageManager = require('../../../app/scripts/lib/message-manager')
 
 describe('Message Manager', function () {
   let messageManager
diff --git a/test/unit/nodeify-test.js b/test/unit/app/nodeify-test.js
similarity index 92%
rename from test/unit/nodeify-test.js
rename to test/unit/app/nodeify-test.js
index c7b127889..901603c8b 100644
--- a/test/unit/nodeify-test.js
+++ b/test/unit/app/nodeify-test.js
@@ -1,5 +1,5 @@
 const assert = require('assert')
-const nodeify = require('../../app/scripts/lib/nodeify')
+const nodeify = require('../../../app/scripts/lib/nodeify')
 
 describe('nodeify', function () {
   var obj = {
diff --git a/test/unit/pending-balance-test.js b/test/unit/app/pending-balance-test.js
similarity index 94%
rename from test/unit/pending-balance-test.js
rename to test/unit/app/pending-balance-test.js
index dc4c1c3e4..1418e4a4e 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/app/pending-balance-test.js
@@ -1,6 +1,6 @@
 const assert = require('assert')
-const PendingBalanceCalculator = require('../../app/scripts/lib/pending-balance-calculator')
-const MockTxGen = require('../lib/mock-tx-gen')
+const PendingBalanceCalculator = require('../../../app/scripts/lib/pending-balance-calculator')
+const MockTxGen = require('../../lib/mock-tx-gen')
 const BN = require('ethereumjs-util').BN
 let providerResultStub = {}
 
diff --git a/test/unit/personal-message-manager-test.js b/test/unit/app/personal-message-manager-test.js
similarity index 97%
rename from test/unit/personal-message-manager-test.js
rename to test/unit/app/personal-message-manager-test.js
index ec2f9a4d1..b07167bff 100644
--- a/test/unit/personal-message-manager-test.js
+++ b/test/unit/app/personal-message-manager-test.js
@@ -1,6 +1,6 @@
 const assert = require('assert')
 
-const PersonalMessageManager = require('../../app/scripts/lib/personal-message-manager')
+const PersonalMessageManager = require('../../../app/scripts/lib/personal-message-manager')
 
 describe('Personal Message Manager', function () {
   let messageManager
diff --git a/test/unit/seed-phrase-verifier-test.js b/test/unit/app/seed-phrase-verifier-test.js
similarity index 95%
rename from test/unit/seed-phrase-verifier-test.js
rename to test/unit/app/seed-phrase-verifier-test.js
index 4e314806b..b0da534da 100644
--- a/test/unit/seed-phrase-verifier-test.js
+++ b/test/unit/app/seed-phrase-verifier-test.js
@@ -1,9 +1,9 @@
 const assert = require('assert')
 const clone = require('clone')
 const KeyringController = require('eth-keyring-controller')
-const firstTimeState = require('../../app/scripts/first-time-state')
-const seedPhraseVerifier = require('../../app/scripts/lib/seed-phrase-verifier')
-const mockEncryptor = require('../lib/mock-encryptor')
+const firstTimeState = require('../../../app/scripts/first-time-state')
+const seedPhraseVerifier = require('../../../app/scripts/lib/seed-phrase-verifier')
+const mockEncryptor = require('../../lib/mock-encryptor')
 
 describe('SeedPhraseVerifier', function () {
 
diff --git a/test/unit/util-test.js b/test/unit/app/util-test.js
similarity index 92%
rename from test/unit/util-test.js
rename to test/unit/app/util-test.js
index 6da185b2c..670bc4d22 100644
--- a/test/unit/util-test.js
+++ b/test/unit/app/util-test.js
@@ -1,5 +1,5 @@
 const assert = require('assert')
-const { sufficientBalance } = require('../../app/scripts/lib/util')
+const { sufficientBalance } = require('../../../app/scripts/lib/util')
 
 
 describe('SufficientBalance', function () {
diff --git a/test/unit/migrations-test.js b/test/unit/migrations/migrations-test.js
similarity index 81%
rename from test/unit/migrations-test.js
rename to test/unit/migrations/migrations-test.js
index 5bad25a45..50afd9c2e 100644
--- a/test/unit/migrations-test.js
+++ b/test/unit/migrations/migrations-test.js
@@ -1,22 +1,22 @@
 const assert = require('assert')
 const path = require('path')
 
-const wallet1 = require(path.join('..', 'lib', 'migrations', '001.json'))
-const vault4 = require(path.join('..', 'lib', 'migrations', '004.json'))
+const wallet1 = require(path.join('..', '..', 'lib', 'migrations', '001.json'))
+const vault4 = require(path.join('..', '..', 'lib', 'migrations', '004.json'))
 let vault5, vault6, vault7, vault8, vault9 // vault10, vault11
 
-const migration2 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '002'))
-const migration3 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '003'))
-const migration4 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '004'))
-const migration5 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '005'))
-const migration6 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '006'))
-const migration7 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '007'))
-const migration8 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '008'))
-const migration9 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '009'))
-const migration10 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '010'))
-const migration11 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '011'))
-const migration12 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '012'))
-const migration13 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '013'))
+const migration2 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '002'))
+const migration3 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '003'))
+const migration4 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '004'))
+const migration5 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '005'))
+const migration6 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '006'))
+const migration7 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '007'))
+const migration8 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '008'))
+const migration9 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '009'))
+const migration10 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '010'))
+const migration11 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '011'))
+const migration12 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '012'))
+const migration13 = require(path.join('..', '..', '..', 'app', 'scripts', 'migrations', '013'))
 
 
 const oldTestRpc = 'https://rawtestrpc.metamask.io/'
diff --git a/test/unit/migrator-test.js b/test/unit/migrations/migrator-test.js
similarity index 90%
rename from test/unit/migrator-test.js
rename to test/unit/migrations/migrator-test.js
index 4404e1dc4..a9374dff1 100644
--- a/test/unit/migrator-test.js
+++ b/test/unit/migrations/migrator-test.js
@@ -1,7 +1,7 @@
 const assert = require('assert')
 const clone = require('clone')
-const Migrator = require('../../app/scripts/lib/migrator/')
-const liveMigrations = require('../../app/scripts/migrations/')
+const Migrator = require('../../../app/scripts/lib/migrator/')
+const liveMigrations = require('../../../app/scripts/migrations/')
 const stubMigrations = [
   {
     version: 1,
@@ -33,7 +33,7 @@ const versionedData = {meta: {version: 0}, data: {hello: 'world'}}
 
 const firstTimeState = {
   meta: { version: 0 },
-  data: require('../../app/scripts/first-time-state'),
+  data: require('../../../app/scripts/first-time-state'),
 }
 
 describe('Migrator', () => {