diff --git a/contracts/utils/BancorFormula.sol b/contracts/utils/BancorFormula.sol
index 03e5228..c93450a 100644
--- a/contracts/utils/BancorFormula.sol
+++ b/contracts/utils/BancorFormula.sol
@@ -268,10 +268,11 @@ contract BancorFormula {
 
         while (lo + 1 < hi) {
             uint8 mid = (lo + hi) / 2;
-            if (maxExpArray[mid] >= _x)
+            if (maxExpArray[mid] >= _x) {
                 lo = mid;
-            else
+            } else {
                 hi = mid;
+            }
         }
 
         if (maxExpArray[hi] >= _x)
diff --git a/contracts/token/ERC20Token.sol b/contracts/utils/ERC20Token.sol
similarity index 100%
rename from contracts/token/ERC20Token.sol
rename to contracts/utils/ERC20Token.sol
diff --git a/contracts/utils/MiniMeTokenInterface.sol b/contracts/utils/MiniMeTokenInterface.sol
index 893f5c1..0b2256b 100644
--- a/contracts/utils/MiniMeTokenInterface.sol
+++ b/contracts/utils/MiniMeTokenInterface.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.2;
 
-import "../token/ERC20Token.sol";
+import "./ERC20Token.sol";
 
 
 contract MiniMeTokenInterface is ERC20Token {
diff --git a/test/dappstore_spec.js b/test/dappstore_spec.js
index a4dd949..c9bf331 100644
--- a/test/dappstore_spec.js
+++ b/test/dappstore_spec.js
@@ -32,7 +32,8 @@ config({
     "DAppStore": {
       args: [ "$SNT" ]
     },
-    "TestBancorFormula": { }
+    "TestBancorFormula": { },
+    "Controlled": { }
   }
 }, (_err, web3_accounts) => {
   accounts = web3_accounts