diff --git a/CLI/package.json b/CLI/package.json
index 92430ac59..9eee76624 100644
--- a/CLI/package.json
+++ b/CLI/package.json
@@ -15,6 +15,6 @@
     "readline-sync": "^1.4.9",
     "request": "^2.88.0",
     "request-promise": "^4.2.2",
-    "web3": "^1.0.0-beta.35"
+    "web3": "1.0.0-beta.34"
   }
 }
diff --git a/CLI/yarn.lock b/CLI/yarn.lock
index 4a06bda2e..9a48fd1a5 100644
--- a/CLI/yarn.lock
+++ b/CLI/yarn.lock
@@ -2,11 +2,6 @@
 # yarn lockfile v1
 
 
-"@types/node@^10.3.2":
-  version "10.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.11.7.tgz#0e75ca9357d646ca754016ca1d68a127ad7e7300"
-  integrity sha512-yOxFfkN9xUFLyvWaeYj90mlqTJ41CsQzWKS3gXdOMOyPVacUsymejKxJ4/pMW7exouubuEeZLJawGgcNGYlTeg==
-
 accepts@~1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
@@ -15,11 +10,6 @@ accepts@~1.3.5:
     mime-types "~2.1.18"
     negotiator "0.6.1"
 
-aes-js@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d"
-  integrity sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=
-
 ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -327,14 +317,7 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-combined-stream@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
   integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
@@ -378,20 +361,15 @@ cookie@0.3.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
   integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
-cookiejar@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
-  integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==
-
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cors@^2.8.1:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.4.tgz#2bd381f2eb201020105cd50ea59da63090694686"
-  integrity sha1-K9OB8usgECAQXNUOpZ2mMJBpRoY=
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
   dependencies:
     object-assign "^4"
     vary "^1"
@@ -578,16 +556,6 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-elliptic@6.3.3:
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.3.tgz#5482d9646d54bcb89fd7d994fc9e2e9568876e3f"
-  integrity sha1-VILZZG1UvLif19mU/J4ulWiHbj8=
-  dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
-    hash.js "^1.0.0"
-    inherits "^2.0.1"
-
 elliptic@^6.0.0, elliptic@^6.4.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -628,14 +596,6 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-eth-ens-namehash@2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz#229ac46eca86d52e0c991e7cb2aef83ff0f68bcf"
-  integrity sha1-IprEbsqG1S4MmR58sq74P/D2i88=
-  dependencies:
-    idna-uts46-hx "^2.3.1"
-    js-sha3 "^0.5.7"
-
 eth-lib@0.1.27, eth-lib@^0.1.26:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.1.27.tgz#f0b0fd144f865d2d6bf8257a40004f2e75ca1dd6"
@@ -658,22 +618,6 @@ eth-lib@0.2.7:
     elliptic "^6.4.0"
     xhr-request-promise "^0.1.2"
 
-ethers@4.0.0-beta.1:
-  version "4.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.0-beta.1.tgz#0648268b83e0e91a961b1af971c662cdf8cbab6d"
-  integrity sha512-SoYhktEbLxf+fiux5SfCEwdzWENMvgIbMZD90I62s4GZD9nEjgEWy8ZboI3hck193Vs0bDoTohDISx84f2H2tw==
-  dependencies:
-    "@types/node" "^10.3.2"
-    aes-js "3.0.0"
-    bn.js "^4.4.0"
-    elliptic "6.3.3"
-    hash.js "1.1.3"
-    js-sha3 "0.5.7"
-    scrypt-js "2.0.3"
-    setimmediate "1.0.4"
-    uuid "2.0.1"
-    xmlhttprequest "1.8.0"
-
 ethjs-unit@0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699"
@@ -804,12 +748,12 @@ forever-agent@~0.6.1:
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "1.0.6"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 forwarded@~0.1.2:
@@ -921,9 +865,9 @@ got@7.1.0, got@^7.1.0:
     url-to-options "^1.0.1"
 
 graceful-fs@^4.1.10, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
@@ -968,14 +912,6 @@ hash-base@^3.0.0:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-hash.js@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
-  integrity sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.0"
-
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
@@ -1024,13 +960,6 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-idna-uts46-hx@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz#a1dc5c4df37eee522bf66d969cc980e00e8711f9"
-  integrity sha512-PWoF9Keq6laYdIRwwCdhTPl60xRqAloYNMQLiyUnG42VjT53oW07BXIRM+NK7eQjzXjAk2gUvX9caRxlnF9TAA==
-  dependencies:
-    punycode "2.1.0"
-
 ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
@@ -1117,11 +1046,6 @@ isurl@^1.0.0-alpha5:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
 
-js-sha3@0.5.7, js-sha3@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7"
-  integrity sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=
-
 js-sha3@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.3.1.tgz#86122802142f0828502a0d1dee1d95e253bb0243"
@@ -1221,17 +1145,17 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
-  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
+mime-db@~1.37.0:
+  version "1.37.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
+  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
 
 mime-types@^2.1.12, mime-types@^2.1.16, mime-types@~2.1.18, mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
-  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
+  version "2.1.21"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
   dependencies:
-    mime-db "~1.36.0"
+    mime-db "~1.37.0"
 
 mime@1.4.1:
   version "1.4.1"
@@ -1508,11 +1432,6 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
     safe-buffer "^5.1.2"
 
-punycode@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
-  integrity sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=
-
 punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -1653,11 +1572,6 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-scrypt-js@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.3.tgz#bb0040be03043da9a012a2cea9fc9f852cfc87d4"
-  integrity sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=
-
 scrypt.js@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/scrypt.js/-/scrypt.js-0.2.0.tgz#af8d1465b71e9990110bedfc593b9479e03a8ada"
@@ -1727,11 +1641,6 @@ servify@^0.1.12:
     request "^2.79.0"
     xhr "^2.3.3"
 
-setimmediate@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.4.tgz#20e81de622d4a02588ce0c8da8973cbcf1d3138f"
-  integrity sha1-IOgd5iLUoCWIzgyNqJc8vPHTE48=
-
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@@ -1772,9 +1681,9 @@ simple-get@^2.7.0:
     simple-concat "^1.0.0"
 
 sshpk@^1.7.0:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.1.tgz#b79a089a732e346c6e0714830f36285cd38191a2"
-  integrity sha512-mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.2.tgz#c946d6bd9b1a39d0e8635763f5242d6ed6dcb629"
+  integrity sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -2034,86 +1943,87 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-web3-bzz@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.0.0-beta.36.tgz#adb3fe7a70053eb7843e32b106792b01b482ef41"
-  integrity sha512-clDRS/ziboJ5ytnrfxq80YSu9HQsT0vggnT3BkoXadrauyEE/9JNLxRu016jjUxqdkfdv4MgIPDdOS3Bv2ghiw==
+web3-bzz@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.0.0-beta.34.tgz#068d37777ab65e5c60f8ec8b9a50cfe45277929c"
+  integrity sha1-Bo03d3q2Xlxg+OyLmlDP5FJ3kpw=
   dependencies:
     got "7.1.0"
     swarm-js "0.1.37"
     underscore "1.8.3"
 
-web3-core-helpers@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.36.tgz#6f618e80f1a6588d846efbfdc28f92ae0477f8d2"
-  integrity sha512-gu74l0htiGWuxLQuMnZqKToFvkSM+UFPE7qUuy1ZosH/h2Jd+VBWg6k4CyNYVYfP0hL5x3CN8SBmB+HMowo55A==
+web3-core-helpers@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.34.tgz#b168da00d3e19e156bc15ae203203dd4dfee2d03"
+  integrity sha1-sWjaANPhnhVrwVriAyA91N/uLQM=
   dependencies:
     underscore "1.8.3"
-    web3-eth-iban "1.0.0-beta.36"
-    web3-utils "1.0.0-beta.36"
+    web3-eth-iban "1.0.0-beta.34"
+    web3-utils "1.0.0-beta.34"
 
-web3-core-method@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.36.tgz#855c0365ae7d0ead394d973ea9e28828602900e0"
-  integrity sha512-dJsP3KkGaqBBSdxfzvLsYPOmVaSs1lR/3oKob/gtUYG7UyTnwquwliAc7OXj+gqRA2E/FHZcM83cWdl31ltdSA==
+web3-core-method@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.34.tgz#ec163c8a2c490fa02a7ec15559fa7307fc7cc6dd"
+  integrity sha1-7BY8iixJD6AqfsFVWfpzB/x8xt0=
   dependencies:
     underscore "1.8.3"
-    web3-core-helpers "1.0.0-beta.36"
-    web3-core-promievent "1.0.0-beta.36"
-    web3-core-subscriptions "1.0.0-beta.36"
-    web3-utils "1.0.0-beta.36"
+    web3-core-helpers "1.0.0-beta.34"
+    web3-core-promievent "1.0.0-beta.34"
+    web3-core-subscriptions "1.0.0-beta.34"
+    web3-utils "1.0.0-beta.34"
 
-web3-core-promievent@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.36.tgz#3a5127787fff751be6de272722cbc77dc9523fd5"
-  integrity sha512-RGIL6TjcOeJTullFLMurChPTsg94cPF6LI763y/sPYtXTDol1vVa+J5aGLp/4WW8v+s+1bSQO6zYq2ZtkbmtEQ==
+web3-core-promievent@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.34.tgz#a4f4fa6784bb293e82c60960ae5b56a94cd03edc"
+  integrity sha1-pPT6Z4S7KT6CxglgrltWqUzQPtw=
   dependencies:
     any-promise "1.3.0"
     eventemitter3 "1.1.1"
 
-web3-core-requestmanager@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.36.tgz#70c8eead84da9ed1cf258e6dde3f137116d0691b"
-  integrity sha512-/CHuaMbiMDu1v8ANGYI7yFCnh1GaCWx5pKnUPJf+QTk2xAAw+Bvd97yZJIWPOK5AOPUIzxgwx9Ob/5ln6mTmYA==
+web3-core-requestmanager@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.34.tgz#01f8f6cf2ae6b6f0b70c38bae1ef741b5bab215c"
+  integrity sha1-Afj2zyrmtvC3DDi64e90G1urIVw=
   dependencies:
     underscore "1.8.3"
-    web3-core-helpers "1.0.0-beta.36"
-    web3-providers-http "1.0.0-beta.36"
-    web3-providers-ipc "1.0.0-beta.36"
-    web3-providers-ws "1.0.0-beta.36"
+    web3-core-helpers "1.0.0-beta.34"
+    web3-providers-http "1.0.0-beta.34"
+    web3-providers-ipc "1.0.0-beta.34"
+    web3-providers-ws "1.0.0-beta.34"
 
-web3-core-subscriptions@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.36.tgz#20f1f20c85d5b40f1e5a49b070ba977a142621f3"
-  integrity sha512-/evyLQ8CMEYXC5aUCodDpmEnmGVYQxaIjiEIfA/85f9ifHkfzP1aOwCAjcsLsJWnwrWDagxSpjCYrDtnNabdEw==
+web3-core-subscriptions@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.34.tgz#9fed144033f221c3cf21060302ffdaf5ef2de2de"
+  integrity sha1-n+0UQDPyIcPPIQYDAv/a9e8t4t4=
   dependencies:
     eventemitter3 "1.1.1"
     underscore "1.8.3"
-    web3-core-helpers "1.0.0-beta.36"
+    web3-core-helpers "1.0.0-beta.34"
 
-web3-core@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.36.tgz#86182f2456c2cf1cd6e7654d314e195eac211917"
-  integrity sha512-C2QW9CMMRZdYAiKiLkMrKRSp+gekSqTDgZTNvlxAdN1hXn4d9UmcmWSJXOmIHqr5N2ISbRod+bW+qChODxVE3Q==
+web3-core@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.34.tgz#121be8555e9fb00d2c5d05ddd3381d0c9e46987e"
+  integrity sha1-EhvoVV6fsA0sXQXd0zgdDJ5GmH4=
   dependencies:
-    web3-core-helpers "1.0.0-beta.36"
-    web3-core-method "1.0.0-beta.36"
-    web3-core-requestmanager "1.0.0-beta.36"
-    web3-utils "1.0.0-beta.36"
+    web3-core-helpers "1.0.0-beta.34"
+    web3-core-method "1.0.0-beta.34"
+    web3-core-requestmanager "1.0.0-beta.34"
+    web3-utils "1.0.0-beta.34"
 
-web3-eth-abi@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.36.tgz#21c0f222701db827a8a269accb9cd18bbd8f70f9"
-  integrity sha512-fBfW+7hvA0rxEMV45fO7JU+0R32ayT7aRwG9Cl6NW2/QvhFeME2qVbMIWw0q5MryPZGIN8A6366hKNuWvVidDg==
+web3-eth-abi@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.34.tgz#034533e3aa2f7e59ff31793eaea685c0ed5af67a"
+  integrity sha1-A0Uz46ovfln/MXk+rqaFwO1a9no=
   dependencies:
-    ethers "4.0.0-beta.1"
+    bn.js "4.11.6"
     underscore "1.8.3"
-    web3-utils "1.0.0-beta.36"
+    web3-core-helpers "1.0.0-beta.34"
+    web3-utils "1.0.0-beta.34"
 
-web3-eth-accounts@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.36.tgz#8aea37df9b038ef2c6cda608856ffd861b39eeef"
-  integrity sha512-MmgIlBEZ0ILLWV4+wfMrbeVVMU/VmQnCpgSDcw7wHKOKu47bKncJ6rVqVsUbC6d9F613Rios+Yj2Ua6SCHtmrg==
+web3-eth-accounts@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.34.tgz#e09142eeecc797ac3459b75e9b23946d3695f333"
+  integrity sha1-4JFC7uzHl6w0WbdemyOUbTaV8zM=
   dependencies:
     any-promise "1.3.0"
     crypto-browserify "3.12.0"
@@ -2121,126 +2031,111 @@ web3-eth-accounts@1.0.0-beta.36:
     scrypt.js "0.2.0"
     underscore "1.8.3"
     uuid "2.0.1"
-    web3-core "1.0.0-beta.36"
-    web3-core-helpers "1.0.0-beta.36"
-    web3-core-method "1.0.0-beta.36"
-    web3-utils "1.0.0-beta.36"
+    web3-core "1.0.0-beta.34"
+    web3-core-helpers "1.0.0-beta.34"
+    web3-core-method "1.0.0-beta.34"
+    web3-utils "1.0.0-beta.34"
 
-web3-eth-contract@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.36.tgz#c0c366c4e4016896142208cee758a2ff2a31be2a"
-  integrity sha512-cywqcIrUsCW4fyqsHdOb24OCC8AnBol8kNiptI+IHRylyCjTNgr53bUbjrXWjmEnear90rO0QhAVjLB1a4iEbQ==
+web3-eth-contract@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.34.tgz#9dbb38fae7643a808427a20180470ec7415c91e6"
+  integrity sha1-nbs4+udkOoCEJ6IBgEcOx0FckeY=
   dependencies:
     underscore "1.8.3"
-    web3-core "1.0.0-beta.36"
-    web3-core-helpers "1.0.0-beta.36"
-    web3-core-method "1.0.0-beta.36"
-    web3-core-promievent "1.0.0-beta.36"
-    web3-core-subscriptions "1.0.0-beta.36"
-    web3-eth-abi "1.0.0-beta.36"
-    web3-utils "1.0.0-beta.36"
-
-web3-eth-ens@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.0.0-beta.36.tgz#c7440b42b597fd74f64bc402f03ad2e832f423d8"
-  integrity sha512-8ZdD7XoJfSX3jNlZHSLe4G837xQ0v5a8cHCcDcd1IoqoY855X9SrIQ0Xdqia9p4mR1YcH1vgmkXY9/3hsvxS7g==
-  dependencies:
-    eth-ens-namehash "2.0.8"
-    underscore "1.8.3"
-    web3-core "1.0.0-beta.36"
-    web3-core-helpers "1.0.0-beta.36"
-    web3-core-promievent "1.0.0-beta.36"
-    web3-eth-abi "1.0.0-beta.36"
-    web3-eth-contract "1.0.0-beta.36"
-    web3-utils "1.0.0-beta.36"
-
-web3-eth-iban@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.36.tgz#00cb3aba7a5aeb15d02b07421042e263d7b2e01b"
-  integrity sha512-b5AEDjjhOLR4q47Hbzf65zYE+7U7JgCgrUb13RU4HMIGoMb1q4DXaJw1UH8VVHCZulevl2QBjpCyrntecMqqCQ==
+    web3-core "1.0.0-beta.34"
+    web3-core-helpers "1.0.0-beta.34"
+    web3-core-method "1.0.0-beta.34"
+    web3-core-promievent "1.0.0-beta.34"
+    web3-core-subscriptions "1.0.0-beta.34"
+    web3-eth-abi "1.0.0-beta.34"
+    web3-utils "1.0.0-beta.34"
+
+web3-eth-iban@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.34.tgz#9af458605867ccf74ea979aaf326b38ba6a5ba0c"
+  integrity sha1-mvRYYFhnzPdOqXmq8yazi6alugw=
   dependencies:
     bn.js "4.11.6"
-    web3-utils "1.0.0-beta.36"
+    web3-utils "1.0.0-beta.34"
 
-web3-eth-personal@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.36.tgz#95545998a8ee377e3bb71e27c8d1a5dc1d7d5a21"
-  integrity sha512-+oxvhojeWh4C/XtnlYURWRR3F5Cg7bQQNjtN1ZGnouKAZyBLoYDVVJ6OaPiveNtfC9RKnzLikn9/Uqc0xz410A==
+web3-eth-personal@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.34.tgz#9afba167342ebde5420bcd5895c3f6c34388f205"
+  integrity sha1-mvuhZzQuveVCC81YlcP2w0OI8gU=
   dependencies:
-    web3-core "1.0.0-beta.36"
-    web3-core-helpers "1.0.0-beta.36"
-    web3-core-method "1.0.0-beta.36"
-    web3-net "1.0.0-beta.36"
-    web3-utils "1.0.0-beta.36"
+    web3-core "1.0.0-beta.34"
+    web3-core-helpers "1.0.0-beta.34"
+    web3-core-method "1.0.0-beta.34"
+    web3-net "1.0.0-beta.34"
+    web3-utils "1.0.0-beta.34"
 
-web3-eth@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.36.tgz#04a8c748d344c1accaa26d7d5d0eac0da7127f14"
-  integrity sha512-uEa0UnbnNHUB4N2O1U+LsvxzSPJ/w3azy5115IseaUdDaiz6IFFgFfFP3ssauayQNCf7v2F44GXLfPhrNeb/Sw==
+web3-eth@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.34.tgz#74086000850c6fe6f535ef49837d6d4bb6113268"
+  integrity sha1-dAhgAIUMb+b1Ne9Jg31tS7YRMmg=
   dependencies:
     underscore "1.8.3"
-    web3-core "1.0.0-beta.36"
-    web3-core-helpers "1.0.0-beta.36"
-    web3-core-method "1.0.0-beta.36"
-    web3-core-subscriptions "1.0.0-beta.36"
-    web3-eth-abi "1.0.0-beta.36"
-    web3-eth-accounts "1.0.0-beta.36"
-    web3-eth-contract "1.0.0-beta.36"
-    web3-eth-ens "1.0.0-beta.36"
-    web3-eth-iban "1.0.0-beta.36"
-    web3-eth-personal "1.0.0-beta.36"
-    web3-net "1.0.0-beta.36"
-    web3-utils "1.0.0-beta.36"
-
-web3-net@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.36.tgz#396cd35cb40934ed022a1f44a8a642d3908c41eb"
-  integrity sha512-BriXK0Pjr6Hc/VDq1Vn8vyOum4JB//wpCjgeGziFD6jC7Of8YaWC7AJYXje89OckzfcqX1aJyJlBwDpasNkAzQ==
-  dependencies:
-    web3-core "1.0.0-beta.36"
-    web3-core-method "1.0.0-beta.36"
-    web3-utils "1.0.0-beta.36"
-
-web3-providers-http@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.0.0-beta.36.tgz#c1937a2e64f8db7cd30f166794e37cf0fcca1131"
-  integrity sha512-KLSqMS59nRdpet9B0B64MKgtM3n9wAHTcAHJ03hv79avQNTjHxtjZm0ttcjcFUPpWDgTCtcYCa7tqaYo9Pbeog==
-  dependencies:
-    web3-core-helpers "1.0.0-beta.36"
-    xhr2-cookies "1.1.0"
-
-web3-providers-ipc@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.36.tgz#0c78efb4ed6b0305ec830e1e0b785e61217ee605"
-  integrity sha512-iEUrmdd2CzoWgp+75/ydom/1IaoLw95qkAzsgwjjZp1waDncHP/cvVGX74+fbUx4hRaPdchyzxCQfNpgLDmNjQ==
+    web3-core "1.0.0-beta.34"
+    web3-core-helpers "1.0.0-beta.34"
+    web3-core-method "1.0.0-beta.34"
+    web3-core-subscriptions "1.0.0-beta.34"
+    web3-eth-abi "1.0.0-beta.34"
+    web3-eth-accounts "1.0.0-beta.34"
+    web3-eth-contract "1.0.0-beta.34"
+    web3-eth-iban "1.0.0-beta.34"
+    web3-eth-personal "1.0.0-beta.34"
+    web3-net "1.0.0-beta.34"
+    web3-utils "1.0.0-beta.34"
+
+web3-net@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.34.tgz#427cea2f431881449c8e38d523290f173f9ff63d"
+  integrity sha1-QnzqL0MYgUScjjjVIykPFz+f9j0=
+  dependencies:
+    web3-core "1.0.0-beta.34"
+    web3-core-method "1.0.0-beta.34"
+    web3-utils "1.0.0-beta.34"
+
+web3-providers-http@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.0.0-beta.34.tgz#e561b52bbb43766282007d40285bfe3550c27e7a"
+  integrity sha1-5WG1K7tDdmKCAH1AKFv+NVDCfno=
+  dependencies:
+    web3-core-helpers "1.0.0-beta.34"
+    xhr2 "0.1.4"
+
+web3-providers-ipc@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.34.tgz#a1b77f1a306d73649a9c039052e40cb71328d00a"
+  integrity sha1-obd/GjBtc2SanAOQUuQMtxMo0Ao=
   dependencies:
     oboe "2.1.3"
     underscore "1.8.3"
-    web3-core-helpers "1.0.0-beta.36"
+    web3-core-helpers "1.0.0-beta.34"
 
-web3-providers-ws@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.36.tgz#27b74082c7adfa0cb5a65535eb312e49008c97c3"
-  integrity sha512-wAnENuZx75T5ZSrT2De2LOaUuPf2yRjq1VfcbD7+Zd79F3DZZLBJcPyCNVQ1U0fAXt0wfgCKl7sVw5pffqR9Bw==
+web3-providers-ws@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.34.tgz#7de70f1b83f2de36476772156becfef6e3516eb3"
+  integrity sha1-fecPG4Py3jZHZ3IVa+z+9uNRbrM=
   dependencies:
     underscore "1.8.3"
-    web3-core-helpers "1.0.0-beta.36"
+    web3-core-helpers "1.0.0-beta.34"
     websocket "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible"
 
-web3-shh@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.36.tgz#6ff297594480edefc710d9d287765a0c4a5d5af1"
-  integrity sha512-bREGHS/WprYFSvGUhyIk8RSpT2Z5SvJOKGBrsUW2nDIMWO6z0Op8E7fzC6GXY2HZfZliAqq6LirbXLgcLRWuPw==
+web3-shh@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.34.tgz#975061d71eaec42ccee576f7bd8f70f03844afe0"
+  integrity sha1-l1Bh1x6uxCzO5Xb3vY9w8DhEr+A=
   dependencies:
-    web3-core "1.0.0-beta.36"
-    web3-core-method "1.0.0-beta.36"
-    web3-core-subscriptions "1.0.0-beta.36"
-    web3-net "1.0.0-beta.36"
+    web3-core "1.0.0-beta.34"
+    web3-core-method "1.0.0-beta.34"
+    web3-core-subscriptions "1.0.0-beta.34"
+    web3-net "1.0.0-beta.34"
 
-web3-utils@1.0.0-beta.36:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.36.tgz#dc19c9aeec009b1816cc91ef64d7fe9f8ee344c9"
-  integrity sha512-7ri74lG5fS2Th0fhYvTtiEHMB1Pmf2p7dQx1COQ3OHNI/CHNEMjzoNMEbBU6FAENrywfoFur40K4m0AOmEUq5A==
+web3-utils@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.34.tgz#9411fc39aaef39ca4e06169f762297d9ff020970"
+  integrity sha1-lBH8OarvOcpOBhafdiKX2f8CCXA=
   dependencies:
     bn.js "4.11.6"
     eth-lib "0.1.27"
@@ -2250,18 +2145,18 @@ web3-utils@1.0.0-beta.36:
     underscore "1.8.3"
     utf8 "2.1.1"
 
-web3@^1.0.0-beta.35:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.36.tgz#2954da9e431124c88396025510d840ba731c8373"
-  integrity sha512-fZDunw1V0AQS27r5pUN3eOVP7u8YAvyo6vOapdgVRolAu5LgaweP7jncYyLINqIX9ZgWdS5A090bt+ymgaYHsw==
+web3@1.0.0-beta.34:
+  version "1.0.0-beta.34"
+  resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.34.tgz#347e561b784098cb5563315f490479a1d91f2ab1"
+  integrity sha1-NH5WG3hAmMtVYzFfSQR5odkfKrE=
   dependencies:
-    web3-bzz "1.0.0-beta.36"
-    web3-core "1.0.0-beta.36"
-    web3-eth "1.0.0-beta.36"
-    web3-eth-personal "1.0.0-beta.36"
-    web3-net "1.0.0-beta.36"
-    web3-shh "1.0.0-beta.36"
-    web3-utils "1.0.0-beta.36"
+    web3-bzz "1.0.0-beta.34"
+    web3-core "1.0.0-beta.34"
+    web3-eth "1.0.0-beta.34"
+    web3-eth-personal "1.0.0-beta.34"
+    web3-net "1.0.0-beta.34"
+    web3-shh "1.0.0-beta.34"
+    web3-utils "1.0.0-beta.34"
 
 "websocket@git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible":
   version "1.0.26"
@@ -2306,12 +2201,10 @@ xhr-request@^1.0.1:
     url-set-query "^1.0.0"
     xhr "^2.0.4"
 
-xhr2-cookies@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz#7d77449d0999197f155cb73b23df72505ed89d48"
-  integrity sha1-fXdEnQmZGX8VXLc7I99yUF7YnUg=
-  dependencies:
-    cookiejar "^2.1.1"
+xhr2@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f"
+  integrity sha1-f4dliEdxbbUCYyOBL4GMras4el8=
 
 xhr@^2.0.4, xhr@^2.3.3:
   version "2.5.0"
@@ -2323,11 +2216,6 @@ xhr@^2.0.4, xhr@^2.3.3:
     parse-headers "^2.0.0"
     xtend "^4.0.0"
 
-xmlhttprequest@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
-  integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=
-
 xtend@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
diff --git a/README.md b/README.md
index f276431d9..28a86946a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/PolymathNetwork/polymath-core.svg?branch=master)](https://travis-ci.org/PolymathNetwork/polymath-core)
 [![Coverage Status](https://coveralls.io/repos/github/PolymathNetwork/polymath-core/badge.svg?branch=master)](https://coveralls.io/github/PolymathNetwork/polymath-core?branch=master)
 [![Gitter](https://img.shields.io/badge/chat-gitter-green.svg)](https://gitter.im/PolymathNetwork/Lobby)
-[![Telegram](https://img.shields.io/badge/50k+-telegram-blue.svg)](https://gitter.im/PolymathNetwork/Lobby)
+[![Telegram](https://img.shields.io/badge/50k+-telegram-blue.svg)](https://gitter.im/PolymathNetwork/Lobby) [![Greenkeeper badge](https://badges.greenkeeper.io/PolymathNetwork/polymath-core.svg)](https://greenkeeper.io/)
 
 ![Polymath logo](Polymath.png)
 
diff --git a/greenkeeper.json b/greenkeeper.json
new file mode 100644
index 000000000..14662df10
--- /dev/null
+++ b/greenkeeper.json
@@ -0,0 +1,10 @@
+{
+  "groups": {
+    "default": {
+      "packages": [
+        "CLI/package.json",
+        "package.json"
+      ]
+    }
+  }
+}
diff --git a/package.json b/package.json
index d4b107efd..744c3bc39 100644
--- a/package.json
+++ b/package.json
@@ -60,12 +60,12 @@
     "babel-preset-stage-2": "6.24.1",
     "babel-preset-stage-3": "6.24.1",
     "babel-register": "6.26.0",
-    "bignumber.js": "^5.0.0",
+    "bignumber.js": "5.0.0",
     "chalk": "^2.4.1",
     "coveralls": "^3.0.1",
     "ethereumjs-testrpc": "^6.0.3",
-    "ethers": "^3.0.15",
-    "fs": "0.0.1-security",
+    "ethers": "^4.0.7",
+    "fs": "0.0.2",
     "openzeppelin-solidity": "1.10.0",
     "readline-sync": "^1.4.9",
     "request": "^2.88.0",
@@ -73,17 +73,17 @@
     "shelljs": "^0.8.2",
     "solc": "^0.4.24",
     "truffle-contract": "^3.0.4",
-    "truffle-hdwallet-provider-privkey": "^0.1.0",
+    "truffle-hdwallet-provider-privkey": "0.2.0",
     "web3": "1.0.0-beta.34"
   },
   "devDependencies": {
     "@soldoc/soldoc": "^0.4.3",
-    "eslint": "^4.19.1",
-    "eslint-config-standard": "^11.0.0",
+    "eslint": "^5.8.0",
+    "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.10.0",
-    "eslint-plugin-node": "^6.0.1",
-    "eslint-plugin-promise": "^3.7.0",
-    "eslint-plugin-standard": "^3.0.1",
+    "eslint-plugin-node": "^8.0.0",
+    "eslint-plugin-promise": "^4.0.1",
+    "eslint-plugin-standard": "^4.0.0",
     "ethereum-bridge": "^0.6.1",
     "ethereumjs-abi": "^0.6.5",
     "fast-csv": "^2.4.1",
@@ -98,7 +98,10 @@
   },
   "greenkeeper": {
     "ignore": [
-      "openzeppelin-solidity"
+      "openzeppelin-solidity",
+      "web3",
+      "bignumber.js",
+      "truffle-hdwallet-provider-privkey"
     ]
   }
 }
diff --git a/test/b_capped_sto.js b/test/b_capped_sto.js
index d89fe6eba..f9238ffd9 100644
--- a/test/b_capped_sto.js
+++ b/test/b_capped_sto.js
@@ -470,7 +470,7 @@ contract("CappedSTO", accounts => {
         it("Should fundRaised value equal to the raised value in the funds receiver wallet", async () => {
             const newBalance = await web3.eth.getBalance(account_fundsReceiver);
             //console.log("WWWW",newBalance,await I_CappedSTO.fundsRaised.call(),balanceOfReceiver);
-            let op = BigNumber(newBalance)
+            let op = new BigNumber(newBalance)
                 .minus(balanceOfReceiver)
                 .toNumber();
             assert.equal(
diff --git a/test/c_checkpoints.js b/test/c_checkpoints.js
index 6a08b6dea..830acf600 100644
--- a/test/c_checkpoints.js
+++ b/test/c_checkpoints.js
@@ -226,10 +226,10 @@ contract("Checkpoints", accounts => {
             let cps = [];
             let ts = [];
             for (let j = 0; j < 10; j++) {
-                let balance1 = BigNumber(await I_SecurityToken.balanceOf(account_investor1));
-                let balance2 = BigNumber(await I_SecurityToken.balanceOf(account_investor2));
-                let balance3 = BigNumber(await I_SecurityToken.balanceOf(account_investor3));
-                let totalSupply = BigNumber(await I_SecurityToken.totalSupply());
+                let balance1 = new BigNumber(await I_SecurityToken.balanceOf(account_investor1));
+                let balance2 = new BigNumber(await I_SecurityToken.balanceOf(account_investor2));
+                let balance3 = new BigNumber(await I_SecurityToken.balanceOf(account_investor3));
+                let totalSupply = new BigNumber(await I_SecurityToken.totalSupply());
                 cps.push([balance1, balance2, balance3]);
                 ts.push(totalSupply);
                 console.log(
@@ -265,18 +265,18 @@ contract("Checkpoints", accounts => {
                         receiver = account_investor3;
                     }
                     let m = Math.random();
-                    let amount = BigNumber(await I_SecurityToken.balanceOf(sender))
+                    let amount = new BigNumber(await I_SecurityToken.balanceOf(sender))
                         .mul(Math.random().toFixed(10))
                         .toFixed(0);
                     if (m > 0.8) {
                         console.log("Sending full balance");
-                        amount = BigNumber(await I_SecurityToken.balanceOf(sender));
+                        amount = new BigNumber(await I_SecurityToken.balanceOf(sender));
                     }
                     console.log("Sender: " + sender + " Receiver: " + receiver + " Amount: " + JSON.stringify(amount));
                     await I_SecurityToken.transfer(receiver, amount, { from: sender });
                 }
                 if (Math.random() > 0.5) {
-                    let n = BigNumber(Math.random().toFixed(10))
+                    let n = new BigNumber(Math.random().toFixed(10))
                         .mul(10 ** 17)
                         .toFixed(0);
                     let p = Math.random() * 3;
@@ -293,7 +293,7 @@ contract("Checkpoints", accounts => {
                     await I_SecurityToken.mint(minter, n, { from: token_owner });
                 }
                 if (Math.random() > 0.5) {
-                    let n = BigNumber(Math.random().toFixed(10)).mul(10 ** 17);
+                    let n = new BigNumber(Math.random().toFixed(10)).mul(10 ** 17);
                     let p = Math.random() * 3;
                     let r = Math.random() * 3;
                     let burner;
@@ -304,7 +304,7 @@ contract("Checkpoints", accounts => {
                     } else {
                         burner = account_investor3;
                     }
-                    let burnerBalance = BigNumber(await I_SecurityToken.balanceOf(burner));
+                    let burnerBalance = new BigNumber(await I_SecurityToken.balanceOf(burner));
                     if (n.gt(burnerBalance.div(2))) {
                         n = burnerBalance.div(2);
                     }
@@ -314,10 +314,10 @@ contract("Checkpoints", accounts => {
                 }
                 console.log("Checking Interim...");
                 for (let k = 0; k < cps.length; k++) {
-                    let balance1 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor1, k + 1));
-                    let balance2 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor2, k + 1));
-                    let balance3 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor3, k + 1));
-                    let totalSupply = BigNumber(await I_SecurityToken.totalSupplyAt(k + 1));
+                    let balance1 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor1, k + 1));
+                    let balance2 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor2, k + 1));
+                    let balance3 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor3, k + 1));
+                    let totalSupply = new BigNumber(await I_SecurityToken.totalSupplyAt(k + 1));
                     let balances = [balance1, balance2, balance3];
                     console.log("Checking TotalSupply: " + totalSupply + " is " + ts[k] + " at checkpoint: " + (k + 1));
                     assert.isTrue(totalSupply.eq(ts[k]));
@@ -330,10 +330,10 @@ contract("Checkpoints", accounts => {
             }
             console.log("Checking...");
             for (let k = 0; k < cps.length; k++) {
-                let balance1 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor1, k + 1));
-                let balance2 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor2, k + 1));
-                let balance3 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor3, k + 1));
-                let totalSupply = BigNumber(await I_SecurityToken.totalSupplyAt(k + 1));
+                let balance1 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor1, k + 1));
+                let balance2 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor2, k + 1));
+                let balance3 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor3, k + 1));
+                let totalSupply = new BigNumber(await I_SecurityToken.totalSupplyAt(k + 1));
                 let balances = [balance1, balance2, balance3];
                 console.log("Checking TotalSupply: " + totalSupply + " is " + ts[k] + " at checkpoint: " + (k + 1));
                 assert.isTrue(totalSupply.eq(ts[k]));
diff --git a/test/e_erc20_dividends.js b/test/e_erc20_dividends.js
index b832bcee2..26adb85b0 100644
--- a/test/e_erc20_dividends.js
+++ b/test/e_erc20_dividends.js
@@ -353,11 +353,11 @@ contract("ERC20DividendCheckpoint", accounts => {
         });
 
         it("Issuer pushes dividends iterating over account holders - dividends proportional to checkpoint", async () => {
-            let investor1Balance = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2Balance = BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor1Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
             await I_ERC20DividendCheckpoint.pushDividendPayment(0, 0, 10, { from: token_owner, gas: 5000000 });
-            let investor1BalanceAfter = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2BalanceAfter = BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor1BalanceAfter = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2BalanceAfter = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
             assert.equal(investor1BalanceAfter.sub(investor1Balance).toNumber(), web3.utils.toWei("0.5", "ether"));
             assert.equal(investor2BalanceAfter.sub(investor2Balance).toNumber(), web3.utils.toWei("1", "ether"));
             //Check fully claimed
@@ -515,13 +515,13 @@ contract("ERC20DividendCheckpoint", accounts => {
 
         it("should investor 3 claims dividend", async () => {
             console.log((await I_ERC20DividendCheckpoint.dividends(2))[5].toNumber());
-            let investor1Balance = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2Balance = BigNumber(await I_PolyToken.balanceOf(account_investor2));
-            let investor3Balance = BigNumber(await I_PolyToken.balanceOf(account_investor3));
+            let investor1Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor3Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
             await I_ERC20DividendCheckpoint.pullDividendPayment(2, { from: account_investor3, gasPrice: 0 });
-            let investor1BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
-            let investor3BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
+            let investor1BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor3BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
             assert.equal(investor1BalanceAfter1.sub(investor1Balance).toNumber(), 0);
             assert.equal(investor2BalanceAfter1.sub(investor2Balance).toNumber(), 0);
             assert.equal(investor3BalanceAfter1.sub(investor3Balance).toNumber(), web3.utils.toWei("7", "ether"));
@@ -533,15 +533,15 @@ contract("ERC20DividendCheckpoint", accounts => {
 
         it("should issuer pushes remain", async () => {
             console.log((await I_ERC20DividendCheckpoint.dividends(2))[5].toNumber());
-            let investor1BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
-            let investor3BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
-            let investorTempBalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_temp));
+            let investor1BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor3BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
+            let investorTempBalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_temp));
             await I_ERC20DividendCheckpoint.pushDividendPayment(2, 0, 10, { from: token_owner });
-            let investor1BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
-            let investor3BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
-            let investorTempBalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_temp));
+            let investor1BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor3BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
+            let investorTempBalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_temp));
             assert.equal(investor1BalanceAfter2.sub(investor1BalanceAfter1).toNumber(), 0);
             assert.equal(investor2BalanceAfter2.sub(investor2BalanceAfter1).toNumber(), web3.utils.toWei("3", "ether"));
             assert.equal(investor3BalanceAfter2.sub(investor3BalanceAfter1).toNumber(), 0);
@@ -778,15 +778,15 @@ contract("ERC20DividendCheckpoint", accounts => {
         });
 
         it("Investor 2 claims dividend", async () => {
-            let investor1Balance = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2Balance = BigNumber(await I_PolyToken.balanceOf(account_investor2));
-            let investor3Balance = BigNumber(await I_PolyToken.balanceOf(account_investor3));
-            let tempBalance = BigNumber(await web3.eth.getBalance(account_temp));
+            let investor1Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor3Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
+            let tempBalance = new BigNumber(await web3.eth.getBalance(account_temp));
             await I_ERC20DividendCheckpoint.pullDividendPayment(3, { from: account_investor2, gasPrice: 0 });
-            let investor1BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
-            let investor3BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
-            let tempBalanceAfter1 = BigNumber(await web3.eth.getBalance(account_temp));
+            let investor1BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor3BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
+            let tempBalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_temp));
             assert.equal(investor1BalanceAfter1.sub(investor1Balance).toNumber(), 0);
             assert.equal(investor2BalanceAfter1.sub(investor2Balance).toNumber(), web3.utils.toWei("1.8", "ether"));
             assert.equal(investor3BalanceAfter1.sub(investor3Balance).toNumber(), 0);
@@ -794,15 +794,15 @@ contract("ERC20DividendCheckpoint", accounts => {
         });
 
         it("Should issuer pushes temp investor - investor1 excluded", async () => {
-            let investor1BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
-            let investor3BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
-            let tempBalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_temp));
+            let investor1BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor3BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
+            let tempBalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_temp));
             await I_ERC20DividendCheckpoint.pushDividendPaymentToAddresses(3, [account_temp, account_investor1], { from: token_owner });
-            let investor1BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
-            let investor3BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
-            let tempBalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_temp));
+            let investor1BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor3BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
+            let tempBalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_temp));
             assert.equal(investor1BalanceAfter2.sub(investor1BalanceAfter1).toNumber(), 0);
             assert.equal(investor2BalanceAfter2.sub(investor2BalanceAfter1).toNumber(), 0);
             assert.equal(investor3BalanceAfter2.sub(investor3BalanceAfter1).toNumber(), 0);
@@ -823,9 +823,9 @@ contract("ERC20DividendCheckpoint", accounts => {
         });
 
         it("Issuer reclaims withholding tax", async () => {
-            let issuerBalance = BigNumber(await I_PolyToken.balanceOf(token_owner));
+            let issuerBalance = new BigNumber(await I_PolyToken.balanceOf(token_owner));
             await I_ERC20DividendCheckpoint.withdrawWithholding(3, { from: token_owner, gasPrice: 0 });
-            let issuerBalanceAfter = BigNumber(await I_PolyToken.balanceOf(token_owner));
+            let issuerBalanceAfter = new BigNumber(await I_PolyToken.balanceOf(token_owner));
             assert.equal(issuerBalanceAfter.sub(issuerBalance).toNumber(), web3.utils.toWei("0.4", "ether"));
         });
 
@@ -843,9 +843,9 @@ contract("ERC20DividendCheckpoint", accounts => {
         });
 
         it("Issuer is able to reclaim dividend after expiry", async () => {
-            let tokenOwnerBalance = BigNumber(await I_PolyToken.balanceOf(token_owner));
+            let tokenOwnerBalance = new BigNumber(await I_PolyToken.balanceOf(token_owner));
             await I_ERC20DividendCheckpoint.reclaimDividend(3, { from: token_owner, gasPrice: 0 });
-            let tokenOwnerAfter = BigNumber(await I_PolyToken.balanceOf(token_owner));
+            let tokenOwnerAfter = new BigNumber(await I_PolyToken.balanceOf(token_owner));
             assert.equal(tokenOwnerAfter.sub(tokenOwnerBalance).toNumber(), web3.utils.toWei("7", "ether"));
         });
 
diff --git a/test/f_ether_dividends.js b/test/f_ether_dividends.js
index b4e5bbf2b..261a7fd4b 100644
--- a/test/f_ether_dividends.js
+++ b/test/f_ether_dividends.js
@@ -324,11 +324,11 @@ contract("EtherDividendCheckpoint", accounts => {
         });
 
         it("Issuer pushes dividends iterating over account holders - dividends proportional to checkpoint", async () => {
-            let investor1Balance = BigNumber(await web3.eth.getBalance(account_investor1));
-            let investor2Balance = BigNumber(await web3.eth.getBalance(account_investor2));
+            let investor1Balance = new BigNumber(await web3.eth.getBalance(account_investor1));
+            let investor2Balance = new BigNumber(await web3.eth.getBalance(account_investor2));
             await I_EtherDividendCheckpoint.pushDividendPayment(0, 0, 10, { from: token_owner });
-            let investor1BalanceAfter = BigNumber(await web3.eth.getBalance(account_investor1));
-            let investor2BalanceAfter = BigNumber(await web3.eth.getBalance(account_investor2));
+            let investor1BalanceAfter = new BigNumber(await web3.eth.getBalance(account_investor1));
+            let investor2BalanceAfter = new BigNumber(await web3.eth.getBalance(account_investor2));
             assert.equal(investor1BalanceAfter.sub(investor1Balance).toNumber(), web3.utils.toWei("0.5", "ether"));
             assert.equal(investor2BalanceAfter.sub(investor2Balance).toNumber(), web3.utils.toWei("0.8", "ether"));
             //Check fully claimed
@@ -343,16 +343,16 @@ contract("EtherDividendCheckpoint", accounts => {
         });
 
         it("Issuer reclaims withholding tax", async () => {
-            let issuerBalance = BigNumber(await web3.eth.getBalance(token_owner));
+            let issuerBalance = new BigNumber(await web3.eth.getBalance(token_owner));
             await I_EtherDividendCheckpoint.withdrawWithholding(0, { from: token_owner, gasPrice: 0 });
-            let issuerBalanceAfter = BigNumber(await web3.eth.getBalance(token_owner));
+            let issuerBalanceAfter = new BigNumber(await web3.eth.getBalance(token_owner));
             assert.equal(issuerBalanceAfter.sub(issuerBalance).toNumber(), web3.utils.toWei("0.2", "ether"));
         });
 
         it("No more withholding tax to withdraw", async () => {
-            let issuerBalance = BigNumber(await web3.eth.getBalance(token_owner));
+            let issuerBalance = new BigNumber(await web3.eth.getBalance(token_owner));
             await I_EtherDividendCheckpoint.withdrawWithholding(0, { from: token_owner, gasPrice: 0 });
-            let issuerBalanceAfter = BigNumber(await web3.eth.getBalance(token_owner));
+            let issuerBalanceAfter = new BigNumber(await web3.eth.getBalance(token_owner));
             assert.equal(issuerBalanceAfter.sub(issuerBalance).toNumber(), web3.utils.toWei("0", "ether"));
         });
 
@@ -401,9 +401,9 @@ contract("EtherDividendCheckpoint", accounts => {
         });
 
         it("Still no more withholding tax to withdraw", async () => {
-            let issuerBalance = BigNumber(await web3.eth.getBalance(token_owner));
+            let issuerBalance = new BigNumber(await web3.eth.getBalance(token_owner));
             await I_EtherDividendCheckpoint.withdrawWithholding(0, { from: token_owner, gasPrice: 0 });
-            let issuerBalanceAfter = BigNumber(await web3.eth.getBalance(token_owner));
+            let issuerBalanceAfter = new BigNumber(await web3.eth.getBalance(token_owner));
             assert.equal(issuerBalanceAfter.sub(issuerBalance).toNumber(), web3.utils.toWei("0", "ether"));
         });
 
@@ -445,29 +445,29 @@ contract("EtherDividendCheckpoint", accounts => {
         });
 
         it("should investor 3 claims dividend - fails bad index", async () => {
-            let investor1Balance = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2Balance = BigNumber(await I_PolyToken.balanceOf(account_investor2));
-            let investor3Balance = BigNumber(await I_PolyToken.balanceOf(account_investor3));
+            let investor1Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor3Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
             await catchRevert(I_EtherDividendCheckpoint.pullDividendPayment(5, { from: account_investor3, gasPrice: 0 }));
         });
 
         it("Should investor 3 claims dividend", async () => {
-            let investor1Balance = BigNumber(await web3.eth.getBalance(account_investor1));
-            let investor2Balance = BigNumber(await web3.eth.getBalance(account_investor2));
-            let investor3Balance = BigNumber(await web3.eth.getBalance(account_investor3));
+            let investor1Balance = new BigNumber(await web3.eth.getBalance(account_investor1));
+            let investor2Balance = new BigNumber(await web3.eth.getBalance(account_investor2));
+            let investor3Balance = new BigNumber(await web3.eth.getBalance(account_investor3));
             await I_EtherDividendCheckpoint.pullDividendPayment(2, { from: account_investor3, gasPrice: 0 });
-            let investor1BalanceAfter1 = BigNumber(await web3.eth.getBalance(account_investor1));
-            let investor2BalanceAfter1 = BigNumber(await web3.eth.getBalance(account_investor2));
-            let investor3BalanceAfter1 = BigNumber(await web3.eth.getBalance(account_investor3));
+            let investor1BalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_investor1));
+            let investor2BalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_investor2));
+            let investor3BalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_investor3));
             assert.equal(investor1BalanceAfter1.sub(investor1Balance).toNumber(), 0);
             assert.equal(investor2BalanceAfter1.sub(investor2Balance).toNumber(), 0);
             assert.equal(investor3BalanceAfter1.sub(investor3Balance).toNumber(), web3.utils.toWei("7", "ether"));
         });
 
         it("Still no more withholding tax to withdraw", async () => {
-            let issuerBalance = BigNumber(await web3.eth.getBalance(token_owner));
+            let issuerBalance = new BigNumber(await web3.eth.getBalance(token_owner));
             await I_EtherDividendCheckpoint.withdrawWithholding(0, { from: token_owner, gasPrice: 0 });
-            let issuerBalanceAfter = BigNumber(await web3.eth.getBalance(token_owner));
+            let issuerBalanceAfter = new BigNumber(await web3.eth.getBalance(token_owner));
             assert.equal(issuerBalanceAfter.sub(issuerBalance).toNumber(), web3.utils.toWei("0", "ether"));
         });
 
@@ -476,13 +476,13 @@ contract("EtherDividendCheckpoint", accounts => {
         });
 
         it("Issuer pushes remainder", async () => {
-            let investor1BalanceAfter1 = BigNumber(await web3.eth.getBalance(account_investor1));
-            let investor2BalanceAfter1 = BigNumber(await web3.eth.getBalance(account_investor2));
-            let investor3BalanceAfter1 = BigNumber(await web3.eth.getBalance(account_investor3));
+            let investor1BalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_investor1));
+            let investor2BalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_investor2));
+            let investor3BalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_investor3));
             await I_EtherDividendCheckpoint.pushDividendPayment(2, 0, 10, { from: token_owner });
-            let investor1BalanceAfter2 = BigNumber(await web3.eth.getBalance(account_investor1));
-            let investor2BalanceAfter2 = BigNumber(await web3.eth.getBalance(account_investor2));
-            let investor3BalanceAfter2 = BigNumber(await web3.eth.getBalance(account_investor3));
+            let investor1BalanceAfter2 = new BigNumber(await web3.eth.getBalance(account_investor1));
+            let investor2BalanceAfter2 = new BigNumber(await web3.eth.getBalance(account_investor2));
+            let investor3BalanceAfter2 = new BigNumber(await web3.eth.getBalance(account_investor3));
             assert.equal(investor1BalanceAfter2.sub(investor1BalanceAfter1).toNumber(), 0);
             assert.equal(investor2BalanceAfter2.sub(investor2BalanceAfter1).toNumber(), web3.utils.toWei("2.4", "ether"));
             assert.equal(investor3BalanceAfter2.sub(investor3BalanceAfter1).toNumber(), 0);
@@ -491,9 +491,9 @@ contract("EtherDividendCheckpoint", accounts => {
         });
 
         it("Issuer withdraws new withholding tax", async () => {
-            let issuerBalance = BigNumber(await web3.eth.getBalance(token_owner));
+            let issuerBalance = new BigNumber(await web3.eth.getBalance(token_owner));
             await I_EtherDividendCheckpoint.withdrawWithholding(2, { from: token_owner, gasPrice: 0 });
-            let issuerBalanceAfter = BigNumber(await web3.eth.getBalance(token_owner));
+            let issuerBalanceAfter = new BigNumber(await web3.eth.getBalance(token_owner));
             assert.equal(issuerBalanceAfter.sub(issuerBalance).toNumber(), web3.utils.toWei("0.6", "ether"));
         });
 
@@ -609,9 +609,9 @@ contract("EtherDividendCheckpoint", accounts => {
         });
 
         it("Non-owner pushes investor 1 - fails", async () => {
-            let investor1Balance = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2Balance = BigNumber(await I_PolyToken.balanceOf(account_investor2));
-            let investor3Balance = BigNumber(await I_PolyToken.balanceOf(account_investor3));
+            let investor1Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor3Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
             await catchRevert(
                 I_EtherDividendCheckpoint.pushDividendPaymentToAddresses(3, [account_investor2, account_investor1], {
                     from: account_investor2,
@@ -621,9 +621,9 @@ contract("EtherDividendCheckpoint", accounts => {
         });
 
         it("issuer pushes investor 1 with bad dividend index - fails", async () => {
-            let investor1Balance = BigNumber(await I_PolyToken.balanceOf(account_investor1));
-            let investor2Balance = BigNumber(await I_PolyToken.balanceOf(account_investor2));
-            let investor3Balance = BigNumber(await I_PolyToken.balanceOf(account_investor3));
+            let investor1Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
+            let investor2Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
+            let investor3Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
             await catchRevert(
                 I_EtherDividendCheckpoint.pushDividendPaymentToAddresses(6, [account_investor2, account_investor1], {
                     from: token_owner,
@@ -649,15 +649,15 @@ contract("EtherDividendCheckpoint", accounts => {
         });
 
         it("Investor 2 claims dividend", async () => {
-            let investor1Balance = BigNumber(await web3.eth.getBalance(account_investor1));
-            let investor2Balance = BigNumber(await web3.eth.getBalance(account_investor2));
-            let investor3Balance = BigNumber(await web3.eth.getBalance(account_investor3));
-            let tempBalance = BigNumber(await web3.eth.getBalance(account_temp));
+            let investor1Balance = new BigNumber(await web3.eth.getBalance(account_investor1));
+            let investor2Balance = new BigNumber(await web3.eth.getBalance(account_investor2));
+            let investor3Balance = new BigNumber(await web3.eth.getBalance(account_investor3));
+            let tempBalance = new BigNumber(await web3.eth.getBalance(account_temp));
             await I_EtherDividendCheckpoint.pullDividendPayment(3, { from: account_investor2, gasPrice: 0 });
-            let investor1BalanceAfter1 = BigNumber(await web3.eth.getBalance(account_investor1));
-            let investor2BalanceAfter1 = BigNumber(await web3.eth.getBalance(account_investor2));
-            let investor3BalanceAfter1 = BigNumber(await web3.eth.getBalance(account_investor3));
-            let tempBalanceAfter1 = BigNumber(await web3.eth.getBalance(account_temp));
+            let investor1BalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_investor1));
+            let investor2BalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_investor2));
+            let investor3BalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_investor3));
+            let tempBalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_temp));
             assert.equal(investor1BalanceAfter1.sub(investor1Balance).toNumber(), 0);
             assert.equal(investor2BalanceAfter1.sub(investor2Balance).toNumber(), web3.utils.toWei("1.6", "ether"));
             assert.equal(investor3BalanceAfter1.sub(investor3Balance).toNumber(), 0);
@@ -665,15 +665,15 @@ contract("EtherDividendCheckpoint", accounts => {
         });
 
         it("Should issuer pushes investor 1 and temp investor", async () => {
-            let investor1BalanceAfter1 = BigNumber(await web3.eth.getBalance(account_investor1));
-            let investor2BalanceAfter1 = BigNumber(await web3.eth.getBalance(account_investor2));
-            let investor3BalanceAfter1 = BigNumber(await web3.eth.getBalance(account_investor3));
-            let tempBalanceAfter1 = BigNumber(await web3.eth.getBalance(account_temp));
+            let investor1BalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_investor1));
+            let investor2BalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_investor2));
+            let investor3BalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_investor3));
+            let tempBalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_temp));
             await I_EtherDividendCheckpoint.pushDividendPaymentToAddresses(3, [account_investor1, account_temp], { from: token_owner });
-            let investor1BalanceAfter2 = BigNumber(await web3.eth.getBalance(account_investor1));
-            let investor2BalanceAfter2 = BigNumber(await web3.eth.getBalance(account_investor2));
-            let investor3BalanceAfter2 = BigNumber(await web3.eth.getBalance(account_investor3));
-            let tempBalanceAfter2 = BigNumber(await web3.eth.getBalance(account_temp));
+            let investor1BalanceAfter2 = new BigNumber(await web3.eth.getBalance(account_investor1));
+            let investor2BalanceAfter2 = new BigNumber(await web3.eth.getBalance(account_investor2));
+            let investor3BalanceAfter2 = new BigNumber(await web3.eth.getBalance(account_investor3));
+            let tempBalanceAfter2 = new BigNumber(await web3.eth.getBalance(account_temp));
             assert.equal(investor1BalanceAfter2.sub(investor1BalanceAfter1).toNumber(), 0);
             assert.equal(investor2BalanceAfter2.sub(investor2BalanceAfter1).toNumber(), 0);
             assert.equal(investor3BalanceAfter2.sub(investor3BalanceAfter1).toNumber(), 0);
@@ -699,9 +699,9 @@ contract("EtherDividendCheckpoint", accounts => {
         });
 
         it("Issuer is able to reclaim dividend after expiry", async () => {
-            let tokenOwnerBalance = BigNumber(await web3.eth.getBalance(token_owner));
+            let tokenOwnerBalance = new BigNumber(await web3.eth.getBalance(token_owner));
             await I_EtherDividendCheckpoint.reclaimDividend(3, { from: token_owner, gasPrice: 0 });
-            let tokenOwnerAfter = BigNumber(await web3.eth.getBalance(token_owner));
+            let tokenOwnerAfter = new BigNumber(await web3.eth.getBalance(token_owner));
             assert.equal(tokenOwnerAfter.sub(tokenOwnerBalance).toNumber(), web3.utils.toWei("7", "ether"));
         });
 
@@ -747,19 +747,19 @@ contract("EtherDividendCheckpoint", accounts => {
         });
 
         it("Should issuer pushes all dividends", async () => {
-            let investor1BalanceBefore = BigNumber(await web3.eth.getBalance(account_investor1));
-            let investor2BalanceBefore = BigNumber(await web3.eth.getBalance(account_investor2));
-            let investor3BalanceBefore = BigNumber(await web3.eth.getBalance(account_investor3));
-            let tempBalanceBefore = BigNumber(await web3.eth.getBalance(account_temp));
-            let tokenBalanceBefore = BigNumber(await web3.eth.getBalance(I_PolyToken.address));
+            let investor1BalanceBefore = new BigNumber(await web3.eth.getBalance(account_investor1));
+            let investor2BalanceBefore = new BigNumber(await web3.eth.getBalance(account_investor2));
+            let investor3BalanceBefore = new BigNumber(await web3.eth.getBalance(account_investor3));
+            let tempBalanceBefore = new BigNumber(await web3.eth.getBalance(account_temp));
+            let tokenBalanceBefore = new BigNumber(await web3.eth.getBalance(I_PolyToken.address));
 
             await I_EtherDividendCheckpoint.pushDividendPayment(4, 0, 10, { from: token_owner });
 
-            let investor1BalanceAfter = BigNumber(await web3.eth.getBalance(account_investor1));
-            let investor2BalanceAfter = BigNumber(await web3.eth.getBalance(account_investor2));
-            let investor3BalanceAfter = BigNumber(await web3.eth.getBalance(account_investor3));
-            let tempBalanceAfter = BigNumber(await web3.eth.getBalance(account_temp));
-            let tokenBalanceAfter = BigNumber(await web3.eth.getBalance(I_PolyToken.address));
+            let investor1BalanceAfter = new BigNumber(await web3.eth.getBalance(account_investor1));
+            let investor2BalanceAfter = new BigNumber(await web3.eth.getBalance(account_investor2));
+            let investor3BalanceAfter = new BigNumber(await web3.eth.getBalance(account_investor3));
+            let tempBalanceAfter = new BigNumber(await web3.eth.getBalance(account_temp));
+            let tokenBalanceAfter = new BigNumber(await web3.eth.getBalance(I_PolyToken.address));
 
             assert.equal(investor1BalanceAfter.sub(investor1BalanceBefore).toNumber(), web3.utils.toWei("1", "ether"));
             assert.equal(investor2BalanceAfter.sub(investor2BalanceBefore).toNumber(), web3.utils.toWei("1.6", "ether"));
diff --git a/test/o_security_token.js b/test/o_security_token.js
index 52521181e..b43db486d 100644
--- a/test/o_security_token.js
+++ b/test/o_security_token.js
@@ -1017,7 +1017,7 @@ contract("SecurityToken", accounts => {
             let balanceAfter = await I_PolyToken.balanceOf(token_owner);
             assert.equal(
                 BigNumber(balanceAfter)
-                    .sub(BigNumber(balanceBefore))
+                    .sub(new BigNumber(balanceBefore))
                     .toNumber(),
                 web3.utils.toWei("20000", "ether")
             );
diff --git a/test/p_usd_tiered_sto.js b/test/p_usd_tiered_sto.js
index 5332700b4..b9c825b2c 100644
--- a/test/p_usd_tiered_sto.js
+++ b/test/p_usd_tiered_sto.js
@@ -77,8 +77,8 @@ contract("USDTieredSTO", accounts => {
     const STOSetupCost = 0;
 
     // MockOracle USD prices
-    const USDETH = BigNumber(500).mul(10 ** 18); // 500 USD/ETH
-    const USDPOLY = BigNumber(25).mul(10 ** 16); // 0.25 USD/POLY
+    const USDETH = new BigNumber(500).mul(10 ** 18); // 500 USD/ETH
+    const USDPOLY = new BigNumber(25).mul(10 ** 16); // 0.25 USD/POLY
 
     // STO Configuration Arrays
     let _startTime = [];
@@ -294,10 +294,10 @@ contract("USDTieredSTO", accounts => {
             _endTime.push(_startTime[stoId] + duration.days(100));
             _ratePerTier.push([BigNumber(10 * 10 ** 16), BigNumber(15 * 10 ** 16)]); // [ 0.10 USD/Token, 0.15 USD/Token ]
             _ratePerTierDiscountPoly.push([BigNumber(10 * 10 ** 16), BigNumber(15 * 10 ** 16)]); // [ 0.10 USD/Token, 0.15 USD/Token ]
-            _tokensPerTierTotal.push([BigNumber(100000000).mul(BigNumber(10 ** 18)), BigNumber(200000000).mul(BigNumber(10 ** 18))]); // [ 100m Token, 200m Token ]
+            _tokensPerTierTotal.push([BigNumber(100000000).mul(new BigNumber(10 ** 18)), BigNumber(200000000).mul(new BigNumber(10 ** 18))]); // [ 100m Token, 200m Token ]
             _tokensPerTierDiscountPoly.push([BigNumber(0), BigNumber(0)]); // [ 0, 0 ]
-            _nonAccreditedLimitUSD.push(BigNumber(10000).mul(BigNumber(10 ** 18))); // 10k USD
-            _minimumInvestmentUSD.push(BigNumber(5 * 10 ** 18)); // 5 USD
+            _nonAccreditedLimitUSD.push(new BigNumber(10000).mul(new BigNumber(10 ** 18))); // 10k USD
+            _minimumInvestmentUSD.push(new BigNumber(5 * 10 ** 18)); // 5 USD
             _fundRaiseTypes.push([0, 1, 2]);
             _wallet.push(WALLET);
             _reserveWallet.push(RESERVEWALLET);
@@ -481,8 +481,8 @@ contract("USDTieredSTO", accounts => {
                 BigNumber(50 * 10 ** 18)
             ]);
             _tokensPerTierDiscountPoly.push([BigNumber(0), BigNumber(0), BigNumber(0), BigNumber(0), BigNumber(0), BigNumber(0)]);
-            _nonAccreditedLimitUSD.push(BigNumber(10000).mul(BigNumber(10 ** 18)));
-            _minimumInvestmentUSD.push(BigNumber(0));
+            _nonAccreditedLimitUSD.push(new BigNumber(10000).mul(new BigNumber(10 ** 18)));
+            _minimumInvestmentUSD.push(new BigNumber(0));
             _fundRaiseTypes.push([0, 1, 2]);
             _wallet.push(WALLET);
             _reserveWallet.push(RESERVEWALLET);
@@ -568,8 +568,8 @@ contract("USDTieredSTO", accounts => {
             _ratePerTierDiscountPoly.push([BigNumber(0.5 * 10 ** 18), BigNumber(1 * 10 ** 18)]); // [ 0.5 USD/Token, 1.5 USD/Token ]
             _tokensPerTierTotal.push([BigNumber(100 * 10 ** 18), BigNumber(50 * 10 ** 18)]); // [ 100 Token, 50 Token ]
             _tokensPerTierDiscountPoly.push([BigNumber(100 * 10 ** 18), BigNumber(25 * 10 ** 18)]); // [ 100 Token, 25 Token ]
-            _nonAccreditedLimitUSD.push(BigNumber(25 * 10 ** 18)); // [ 25 USD ]
-            _minimumInvestmentUSD.push(BigNumber(5));
+            _nonAccreditedLimitUSD.push(new BigNumber(25 * 10 ** 18)); // [ 25 USD ]
+            _minimumInvestmentUSD.push(new BigNumber(5));
             _fundRaiseTypes.push([0, 1, 2]);
             _wallet.push(WALLET);
             _reserveWallet.push(RESERVEWALLET);
@@ -607,8 +607,8 @@ contract("USDTieredSTO", accounts => {
             _ratePerTierDiscountPoly.push([BigNumber(10 * 10 ** 16), BigNumber(12 * 10 ** 16)]);
             _tokensPerTierTotal.push([BigNumber(100 * 10 ** 18), BigNumber(200 * 10 ** 18)]);
             _tokensPerTierDiscountPoly.push([BigNumber(0), BigNumber(50 * 10 ** 18)]);
-            _nonAccreditedLimitUSD.push(BigNumber(10000).mul(BigNumber(10 ** 18)));
-            _minimumInvestmentUSD.push(BigNumber(0));
+            _nonAccreditedLimitUSD.push(new BigNumber(10000).mul(new BigNumber(10 ** 18)));
+            _minimumInvestmentUSD.push(new BigNumber(0));
             _fundRaiseTypes.push([0, 1, 2]);
             _wallet.push(WALLET);
             _reserveWallet.push(RESERVEWALLET);
@@ -845,7 +845,7 @@ contract("USDTieredSTO", accounts => {
         it("Should successfully change config before startTime - limits and tiers, times, addresses", async () => {
             let stoId = 3;
 
-            await I_USDTieredSTO_Array[stoId].modifyLimits(BigNumber(1 * 10 ** 18), BigNumber(15 * 10 ** 18), { from: ISSUER });
+            await I_USDTieredSTO_Array[stoId].modifyLimits(new BigNumber(1 * 10 ** 18), BigNumber(15 * 10 ** 18), { from: ISSUER });
             assert.equal(
                 (await I_USDTieredSTO_Array[stoId].minimumInvestmentUSD.call()).toNumber(),
                 BigNumber(15 * 10 ** 18).toNumber(),
@@ -924,7 +924,7 @@ contract("USDTieredSTO", accounts => {
             await catchRevert(I_USDTieredSTO_Array[stoId].modifyFunding([0, 1], { from: ISSUER }));
 
             await catchRevert(
-                I_USDTieredSTO_Array[stoId].modifyLimits(BigNumber(15 * 10 ** 18), BigNumber(1 * 10 ** 18), { from: ISSUER })
+                I_USDTieredSTO_Array[stoId].modifyLimits(new BigNumber(15 * 10 ** 18), BigNumber(1 * 10 ** 18), { from: ISSUER })
             );
 
             await catchRevert(
@@ -1084,7 +1084,7 @@ contract("USDTieredSTO", accounts => {
             // Set as accredited
             await I_USDTieredSTO_Array[stoId].changeAccredited([ACCREDITED1], [true], { from: ISSUER });
 
-            let investment_USD = BigNumber(2).mul(10 ** 18);
+            let investment_USD = new BigNumber(2).mul(10 ** 18);
             let investment_ETH = await convert(stoId, tierId, false, "USD", "ETH", investment_USD);
             let investment_POLY = await convert(stoId, tierId, false, "USD", "POLY", investment_USD);
             let investment_DAI = investment_USD;
@@ -1368,23 +1368,23 @@ contract("USDTieredSTO", accounts => {
             let stoId = 0;
             let tierId = 0;
 
-            let investment_Token = BigNumber(50).mul(10 ** 18);
+            let investment_Token = new BigNumber(50).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedUSD = await I_USDTieredSTO_Array[stoId].fundsRaisedUSD.call();
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
             let init_RaisedDAI = await I_USDTieredSTO_Array[stoId].fundsRaised.call(DAI);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx1 = await web3.eth.sendTransaction({
@@ -1394,21 +1394,21 @@ contract("USDTieredSTO", accounts => {
                 gasPrice: GAS_PRICE,
                 gas: 1000000
             });
-            let gasCost1 = BigNumber(GAS_PRICE).mul(tx1.gasUsed);
+            let gasCost1 = new BigNumber(GAS_PRICE).mul(tx1.gasUsed);
             console.log("          Gas fallback purchase: ".grey + tx1.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedUSD = await I_USDTieredSTO_Array[stoId].fundsRaisedUSD.call();
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
             let final_RaisedDAI = await I_USDTieredSTO_Array[stoId].fundsRaised.call(DAI);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -1495,22 +1495,22 @@ contract("USDTieredSTO", accounts => {
             let stoId = 0;
             let tierId = 0;
 
-            let investment_Token = BigNumber(50).mul(10 ** 18);
+            let investment_Token = new BigNumber(50).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
             let init_RaisedDAI = await I_USDTieredSTO_Array[stoId].fundsRaised.call(DAI);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx1 = await I_USDTieredSTO_Array[stoId].buyWithETH(NONACCREDITED1, {
@@ -1518,20 +1518,20 @@ contract("USDTieredSTO", accounts => {
                 value: investment_ETH,
                 gasPrice: GAS_PRICE
             });
-            let gasCost1 = BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
+            let gasCost1 = new BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
             console.log("          Gas buyWithETH: ".grey + tx1.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
             let final_RaisedDAI = await I_USDTieredSTO_Array[stoId].fundsRaised.call(DAI);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -1579,7 +1579,7 @@ contract("USDTieredSTO", accounts => {
             let stoId = 0;
             let tierId = 0;
 
-            let investment_Token = BigNumber(50).mul(10 ** 18);
+            let investment_Token = new BigNumber(50).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
@@ -1589,15 +1589,15 @@ contract("USDTieredSTO", accounts => {
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
             let init_RaisedDAI = await I_USDTieredSTO_Array[stoId].fundsRaised.call(DAI);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             // Buy With POLY
@@ -1605,20 +1605,20 @@ contract("USDTieredSTO", accounts => {
                 from: NONACCREDITED1,
                 gasPrice: GAS_PRICE
             });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithPOLY: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
             let final_RaisedDAI = await I_USDTieredSTO_Array[stoId].fundsRaised.call(DAI);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -1667,7 +1667,7 @@ contract("USDTieredSTO", accounts => {
             let stoId = 0;
             let tierId = 0;
 
-            let investment_Token = BigNumber(50).mul(10 ** 18);
+            let investment_Token = new BigNumber(50).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
@@ -1678,16 +1678,16 @@ contract("USDTieredSTO", accounts => {
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let init_InvestorDAIBal = await I_DaiToken.balanceOf(NONACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
             let init_RaisedDAI = await I_USDTieredSTO_Array[stoId].fundsRaised.call(DAI);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
             let init_WalletDAIBal = await I_DaiToken.balanceOf(WALLET);
 
@@ -1696,21 +1696,21 @@ contract("USDTieredSTO", accounts => {
                 from: NONACCREDITED1,
                 gasPrice: GAS_PRICE
             });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithUSD: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let final_InvestorDAIBal = await I_DaiToken.balanceOf(NONACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
             let final_RaisedDAI = await I_USDTieredSTO_Array[stoId].fundsRaised.call(DAI);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
             let final_WalletDAIBal = await I_DaiToken.balanceOf(WALLET);
 
@@ -1764,21 +1764,21 @@ contract("USDTieredSTO", accounts => {
 
             await I_USDTieredSTO_Array[stoId].changeAccredited([ACCREDITED1], [true], { from: ISSUER });
 
-            let investment_Token = BigNumber(50).mul(10 ** 18);
+            let investment_Token = new BigNumber(50).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx1 = await web3.eth.sendTransaction({
@@ -1788,19 +1788,19 @@ contract("USDTieredSTO", accounts => {
                 gasPrice: GAS_PRICE,
                 gas: 1000000
             });
-            let gasCost1 = BigNumber(GAS_PRICE).mul(tx1.gasUsed);
+            let gasCost1 = new BigNumber(GAS_PRICE).mul(tx1.gasUsed);
             console.log("          Gas fallback purchase: ".grey + tx1.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -1847,21 +1847,21 @@ contract("USDTieredSTO", accounts => {
             let stoId = 0;
             let tierId = 0;
 
-            let investment_Token = BigNumber(50).mul(10 ** 18);
+            let investment_Token = new BigNumber(50).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx1 = await I_USDTieredSTO_Array[stoId].buyWithETH(ACCREDITED1, {
@@ -1869,19 +1869,19 @@ contract("USDTieredSTO", accounts => {
                 value: investment_ETH,
                 gasPrice: GAS_PRICE
             });
-            let gasCost1 = BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
+            let gasCost1 = new BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
             console.log("          Gas buyWithETH: ".grey + tx1.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -1928,7 +1928,7 @@ contract("USDTieredSTO", accounts => {
             let stoId = 0;
             let tierId = 0;
 
-            let investment_Token = BigNumber(50).mul(10 ** 18);
+            let investment_Token = new BigNumber(50).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
@@ -1947,14 +1947,14 @@ contract("USDTieredSTO", accounts => {
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             // Buy With POLY
@@ -1962,19 +1962,19 @@ contract("USDTieredSTO", accounts => {
                 from: ACCREDITED1,
                 gasPrice: GAS_PRICE
             });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithPOLY: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -2086,14 +2086,14 @@ contract("USDTieredSTO", accounts => {
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             // Buy with ETH
@@ -2102,19 +2102,19 @@ contract("USDTieredSTO", accounts => {
                 value: investment_ETH,
                 gasPrice: GAS_PRICE
             });
-            let gasCost1 = BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
+            let gasCost1 = new BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
             console.log("          Gas buyWithETH: ".grey + tx1.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -2183,14 +2183,14 @@ contract("USDTieredSTO", accounts => {
 
             init_TokenSupply = await I_SecurityToken.totalSupply();
             init_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            init_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             init_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             // Buy With POLY
@@ -2198,19 +2198,19 @@ contract("USDTieredSTO", accounts => {
                 from: NONACCREDITED1,
                 gasPrice: GAS_PRICE
             });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithPOLY: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             final_TokenSupply = await I_SecurityToken.totalSupply();
             final_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            final_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             final_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -2276,7 +2276,7 @@ contract("USDTieredSTO", accounts => {
             let stoId = 0;
             let tierId = 0;
 
-            let investment_Token = BigNumber(50).mul(10 ** 18);
+            let investment_Token = new BigNumber(50).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
@@ -2300,12 +2300,12 @@ contract("USDTieredSTO", accounts => {
             let tierId;
 
             // set new exchange rates
-            let high_USDETH = BigNumber(1000).mul(10 ** 18); // 1000 USD per ETH
-            let high_USDPOLY = BigNumber(50).mul(10 ** 16); // 0.5 USD per POLY
-            let low_USDETH = BigNumber(250).mul(10 ** 18); // 250 USD per ETH
-            let low_USDPOLY = BigNumber(20).mul(10 ** 16); // 0.2 USD per POLY
+            let high_USDETH = new BigNumber(1000).mul(10 ** 18); // 1000 USD per ETH
+            let high_USDPOLY = new BigNumber(50).mul(10 ** 16); // 0.5 USD per POLY
+            let low_USDETH = new BigNumber(250).mul(10 ** 18); // 250 USD per ETH
+            let low_USDPOLY = new BigNumber(20).mul(10 ** 16); // 0.2 USD per POLY
 
-            let investment_USD = BigNumber(web3.utils.toWei("50")); // USD
+            let investment_USD = new BigNumber(web3.utils.toWei("50")); // USD
             let investment_ETH_high = investment_USD.div(high_USDETH).mul(10 ** 18); // USD / USD/ETH = ETH
             let investment_POLY_high = investment_USD.div(high_USDPOLY).mul(10 ** 18); // USD / USD/POLY = POLY
             let investment_ETH_low = investment_USD.div(low_USDETH).mul(10 ** 18); // USD / USD/ETH = ETH
@@ -2370,7 +2370,7 @@ contract("USDTieredSTO", accounts => {
                 "currentTier not changed as expected"
             );
 
-            let delta_Token = BigNumber(5).mul(10 ** 18);
+            let delta_Token = new BigNumber(5).mul(10 ** 18);
             let ethTier0 = await convert(stoId, startTier, false, "TOKEN", "ETH", delta_Token);
             let ethTier1 = await convert(stoId, endTier, false, "TOKEN", "ETH", delta_Token);
 
@@ -2380,14 +2380,14 @@ contract("USDTieredSTO", accounts => {
             // Process investment
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx1 = await I_USDTieredSTO_Array[stoId].buyWithETH(NONACCREDITED1, {
@@ -2395,19 +2395,19 @@ contract("USDTieredSTO", accounts => {
                 value: investment_ETH,
                 gasPrice: GAS_PRICE
             });
-            let gasCost1 = BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
+            let gasCost1 = new BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
             console.log("          Gas buyWithETH: ".grey + tx1.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -2464,7 +2464,7 @@ contract("USDTieredSTO", accounts => {
                 "currentTier not changed as expected"
             );
 
-            let delta_Token = BigNumber(5).mul(10 ** 18); // Token
+            let delta_Token = new BigNumber(5).mul(10 ** 18); // Token
             let polyTier0 = await convert(stoId, startTier, false, "TOKEN", "POLY", delta_Token);
             let polyTier1 = await convert(stoId, endTier, false, "TOKEN", "POLY", delta_Token);
 
@@ -2477,33 +2477,33 @@ contract("USDTieredSTO", accounts => {
             // Process investment
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx2 = await I_USDTieredSTO_Array[stoId].buyWithPOLY(NONACCREDITED1, investment_POLY, {
                 from: NONACCREDITED1,
                 gasPrice: GAS_PRICE
             });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithPOLY: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -2563,7 +2563,7 @@ contract("USDTieredSTO", accounts => {
                 "currentTier not changed as expected"
             );
 
-            let delta_Token = BigNumber(5).mul(10 ** 18); // Token
+            let delta_Token = new BigNumber(5).mul(10 ** 18); // Token
             let ethTier0 = await convert(stoId, startTier, false, "TOKEN", "ETH", delta_Token);
             let ethTier1 = await convert(stoId, endTier, false, "TOKEN", "ETH", delta_Token);
 
@@ -2573,14 +2573,14 @@ contract("USDTieredSTO", accounts => {
             // Process investment
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx1 = await I_USDTieredSTO_Array[stoId].buyWithETH(ACCREDITED1, {
@@ -2588,19 +2588,19 @@ contract("USDTieredSTO", accounts => {
                 value: investment_ETH,
                 gasPrice: GAS_PRICE
             });
-            let gasCost1 = BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
+            let gasCost1 = new BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
             console.log("          Gas buyWithETH: ".grey + tx1.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -2657,7 +2657,7 @@ contract("USDTieredSTO", accounts => {
                 "currentTier not changed as expected"
             );
 
-            let delta_Token = BigNumber(5).mul(10 ** 18); // Token
+            let delta_Token = new BigNumber(5).mul(10 ** 18); // Token
             let daiTier0 = await convert(stoId, startTier, false, "TOKEN", "USD", delta_Token);
             let daiTier1 = await convert(stoId, endTier, false, "TOKEN", "USD", delta_Token);
 
@@ -2670,35 +2670,35 @@ contract("USDTieredSTO", accounts => {
             // Process investment
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let init_InvestorDAIBal = await I_DaiToken.balanceOf(ACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
             let init_RaisedDAI = await I_USDTieredSTO_Array[stoId].fundsRaised.call(DAI);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
             let init_WalletDAIBal = await I_DaiToken.balanceOf(WALLET);
 
             let tx2 = await I_USDTieredSTO_Array[stoId].buyWithUSD(ACCREDITED1, investment_DAI, { from: ACCREDITED1, gasPrice: GAS_PRICE });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithUSD: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let final_InvestorDAIBal = await I_DaiToken.balanceOf(ACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
             let final_RaisedDAI = await I_USDTieredSTO_Array[stoId].fundsRaised.call(DAI);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
             let final_WalletDAIBal = await I_DaiToken.balanceOf(WALLET);
 
@@ -2760,7 +2760,7 @@ contract("USDTieredSTO", accounts => {
                 "currentTier not changed as expected"
             );
 
-            let delta_Token = BigNumber(5).mul(10 ** 18); // Token
+            let delta_Token = new BigNumber(5).mul(10 ** 18); // Token
             let polyTier0 = await convert(stoId, startTier, false, "TOKEN", "POLY", delta_Token);
             let polyTier1 = await convert(stoId, endTier, false, "TOKEN", "POLY", delta_Token);
 
@@ -2773,33 +2773,33 @@ contract("USDTieredSTO", accounts => {
             // Process investment
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx2 = await I_USDTieredSTO_Array[stoId].buyWithPOLY(ACCREDITED1, investment_POLY, {
                 from: ACCREDITED1,
                 gasPrice: GAS_PRICE
             });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithPOLY: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -2893,7 +2893,7 @@ contract("USDTieredSTO", accounts => {
             let stoId = 1;
             let tierId = 4;
 
-            let investment_Token = BigNumber(5).mul(10 ** 18);
+            let investment_Token = new BigNumber(5).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
@@ -2949,12 +2949,12 @@ contract("USDTieredSTO", accounts => {
             let tierId = 4;
 
             // set new exchange rates
-            let high_USDETH = BigNumber(1000).mul(10 ** 18); // 1000 USD per ETH
-            let high_USDPOLY = BigNumber(50).mul(10 ** 16); // 0.5 USD per POLY
-            let low_USDETH = BigNumber(250).mul(10 ** 18); // 250 USD per ETH
-            let low_USDPOLY = BigNumber(20).mul(10 ** 16); // 0.2 USD per POLY
+            let high_USDETH = new BigNumber(1000).mul(10 ** 18); // 1000 USD per ETH
+            let high_USDPOLY = new BigNumber(50).mul(10 ** 16); // 0.5 USD per POLY
+            let low_USDETH = new BigNumber(250).mul(10 ** 18); // 250 USD per ETH
+            let low_USDPOLY = new BigNumber(20).mul(10 ** 16); // 0.2 USD per POLY
 
-            let investment_USD = BigNumber(web3.utils.toWei("50")); // USD
+            let investment_USD = new BigNumber(web3.utils.toWei("50")); // USD
             let investment_ETH_high = investment_USD.div(high_USDETH).mul(10 ** 18); // USD / USD/ETH = ETH
             let investment_POLY_high = investment_USD.div(high_USDPOLY).mul(10 ** 18); // USD / USD/POLY = POLY
             let investment_ETH_low = investment_USD.div(low_USDETH).mul(10 ** 18); // USD / USD/ETH = ETH
@@ -3040,22 +3040,22 @@ contract("USDTieredSTO", accounts => {
             let stoId = 2;
             let tierId = 0;
 
-            let investment_Token = BigNumber(5).mul(10 ** 18);
+            let investment_Token = new BigNumber(5).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedUSD = await I_USDTieredSTO_Array[stoId].fundsRaisedUSD.call();
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx1 = await web3.eth.sendTransaction({
@@ -3065,20 +3065,20 @@ contract("USDTieredSTO", accounts => {
                 gasPrice: GAS_PRICE,
                 gas: 1000000
             });
-            let gasCost1 = BigNumber(GAS_PRICE).mul(tx1.gasUsed);
+            let gasCost1 = new BigNumber(GAS_PRICE).mul(tx1.gasUsed);
             console.log("          Gas fallback purchase: ".grey + tx1.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedUSD = await I_USDTieredSTO_Array[stoId].fundsRaisedUSD.call();
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -3164,21 +3164,21 @@ contract("USDTieredSTO", accounts => {
             let stoId = 2;
             let tierId = 0;
 
-            let investment_Token = BigNumber(5).mul(10 ** 18);
+            let investment_Token = new BigNumber(5).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx1 = await I_USDTieredSTO_Array[stoId].buyWithETH(NONACCREDITED1, {
@@ -3186,19 +3186,19 @@ contract("USDTieredSTO", accounts => {
                 value: investment_ETH,
                 gasPrice: GAS_PRICE
             });
-            let gasCost1 = BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
+            let gasCost1 = new BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
             console.log("          Gas buyWithETH: ".grey + tx1.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -3245,7 +3245,7 @@ contract("USDTieredSTO", accounts => {
             let stoId = 2;
             let tierId = 0;
 
-            let investment_Token = BigNumber(5).mul(10 ** 18);
+            let investment_Token = new BigNumber(5).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, true, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, true, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, true, "TOKEN", "POLY", investment_Token);
@@ -3255,14 +3255,14 @@ contract("USDTieredSTO", accounts => {
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             // Buy With POLY
@@ -3270,19 +3270,19 @@ contract("USDTieredSTO", accounts => {
                 from: NONACCREDITED1,
                 gasPrice: GAS_PRICE
             });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithPOLY: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -3332,21 +3332,21 @@ contract("USDTieredSTO", accounts => {
 
             await I_USDTieredSTO_Array[stoId].changeAccredited([ACCREDITED1], [true], { from: ISSUER });
 
-            let investment_Token = BigNumber(5).mul(10 ** 18);
+            let investment_Token = new BigNumber(5).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx1 = await web3.eth.sendTransaction({
@@ -3356,19 +3356,19 @@ contract("USDTieredSTO", accounts => {
                 gasPrice: GAS_PRICE,
                 gas: 1000000
             });
-            let gasCost1 = BigNumber(GAS_PRICE).mul(tx1.gasUsed);
+            let gasCost1 = new BigNumber(GAS_PRICE).mul(tx1.gasUsed);
             console.log("          Gas fallback purchase: ".grey + tx1.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -3415,21 +3415,21 @@ contract("USDTieredSTO", accounts => {
             let stoId = 2;
             let tierId = 0;
 
-            let investment_Token = BigNumber(5).mul(10 ** 18);
+            let investment_Token = new BigNumber(5).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx1 = await I_USDTieredSTO_Array[stoId].buyWithETH(ACCREDITED1, {
@@ -3437,19 +3437,19 @@ contract("USDTieredSTO", accounts => {
                 value: investment_ETH,
                 gasPrice: GAS_PRICE
             });
-            let gasCost1 = BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
+            let gasCost1 = new BigNumber(GAS_PRICE).mul(tx1.receipt.gasUsed);
             console.log("          Gas buyWithETH: ".grey + tx1.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -3496,7 +3496,7 @@ contract("USDTieredSTO", accounts => {
             let stoId = 2;
             let tierId = 0;
 
-            let investment_Token = BigNumber(5).mul(10 ** 18);
+            let investment_Token = new BigNumber(5).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, true, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, true, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, true, "TOKEN", "POLY", investment_Token);
@@ -3515,14 +3515,14 @@ contract("USDTieredSTO", accounts => {
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             // Buy With POLY
@@ -3530,19 +3530,19 @@ contract("USDTieredSTO", accounts => {
                 from: ACCREDITED1,
                 gasPrice: GAS_PRICE
             });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithPOLY: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -3643,14 +3643,14 @@ contract("USDTieredSTO", accounts => {
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             // Buy With POLY
@@ -3658,19 +3658,19 @@ contract("USDTieredSTO", accounts => {
                 from: NONACCREDITED1,
                 gasPrice: GAS_PRICE
             });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithPOLY: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(NONACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(NONACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(NONACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(NONACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -3736,7 +3736,7 @@ contract("USDTieredSTO", accounts => {
             let stoId = 2;
             let tierId = 0;
 
-            let investment_Token = BigNumber(5).mul(10 ** 18);
+            let investment_Token = new BigNumber(5).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, true, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, true, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, true, "TOKEN", "POLY", investment_Token);
@@ -3762,12 +3762,12 @@ contract("USDTieredSTO", accounts => {
             let tierId = 0;
 
             // set new exchange rates
-            let high_USDETH = BigNumber(1000).mul(10 ** 18); // 1000 USD per ETH
-            let high_USDPOLY = BigNumber(50).mul(10 ** 16); // 0.5 USD per POLY
-            let low_USDETH = BigNumber(250).mul(10 ** 18); // 250 USD per ETH
-            let low_USDPOLY = BigNumber(20).mul(10 ** 16); // 0.2 USD per POLY
+            let high_USDETH = new BigNumber(1000).mul(10 ** 18); // 1000 USD per ETH
+            let high_USDPOLY = new BigNumber(50).mul(10 ** 16); // 0.5 USD per POLY
+            let low_USDETH = new BigNumber(250).mul(10 ** 18); // 250 USD per ETH
+            let low_USDPOLY = new BigNumber(20).mul(10 ** 16); // 0.2 USD per POLY
 
-            let investment_Token = BigNumber(5).mul(10 ** 18);
+            let investment_Token = new BigNumber(5).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, true, "TOKEN", "USD", investment_Token);
 
             let investment_ETH_high = investment_USD.div(high_USDETH).mul(10 ** 18); // USD / USD/ETH = ETH
@@ -3834,7 +3834,7 @@ contract("USDTieredSTO", accounts => {
                 "currentTier not changed as expected"
             );
 
-            let delta_Token = BigNumber(5).mul(10 ** 18); // Token
+            let delta_Token = new BigNumber(5).mul(10 ** 18); // Token
             let polyTier0 = await convert(stoId, startTier, true, "TOKEN", "POLY", delta_Token);
             let polyTier1 = await convert(stoId, endTier, true, "TOKEN", "POLY", delta_Token);
             let investment_Token = delta_Token.add(delta_Token); // 10 Token
@@ -3861,33 +3861,33 @@ contract("USDTieredSTO", accounts => {
             // Process investment
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             let tx2 = await I_USDTieredSTO_Array[stoId].buyWithPOLY(ACCREDITED1, investment_POLY, {
                 from: ACCREDITED1,
                 gasPrice: GAS_PRICE
             });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithPOLY: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -3938,10 +3938,10 @@ contract("USDTieredSTO", accounts => {
             let stoId = 2;
             let tierId = 1;
 
-            let discount_Token = BigNumber(20).mul(10 ** 18);
+            let discount_Token = new BigNumber(20).mul(10 ** 18);
             let discount_POLY = await convert(stoId, tierId, true, "TOKEN", "POLY", discount_Token);
 
-            let regular_Token = BigNumber(10).mul(10 ** 18);
+            let regular_Token = new BigNumber(10).mul(10 ** 18);
             let regular_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", regular_Token);
 
             let investment_Token = discount_Token.add(regular_Token);
@@ -3952,14 +3952,14 @@ contract("USDTieredSTO", accounts => {
 
             let init_TokenSupply = await I_SecurityToken.totalSupply();
             let init_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let init_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             // Buy With POLY
@@ -3967,19 +3967,19 @@ contract("USDTieredSTO", accounts => {
                 from: ACCREDITED1,
                 gasPrice: GAS_PRICE
             });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithPOLY: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
             let final_InvestorTokenBal = await I_SecurityToken.balanceOf(ACCREDITED1);
-            let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(ACCREDITED1));
+            let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(ACCREDITED1));
             let final_InvestorPOLYBal = await I_PolyToken.balanceOf(ACCREDITED1);
             let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-            let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+            let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
             let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
             let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(ETH);
             let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(POLY);
-            let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+            let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
             let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
 
             assert.equal(
@@ -4043,7 +4043,7 @@ contract("USDTieredSTO", accounts => {
                 from: ACCREDITED1,
                 gasPrice: GAS_PRICE
             });
-            let gasCost2 = BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
+            let gasCost2 = new BigNumber(GAS_PRICE).mul(tx2.receipt.gasUsed);
             console.log("          Gas buyWithPOLY: ".grey + tx2.receipt.gasUsed.toString().grey);
 
             let final_TokenSupply = await I_SecurityToken.totalSupply();
@@ -4071,7 +4071,7 @@ contract("USDTieredSTO", accounts => {
             let stoId = 2;
             let tierId = 1;
 
-            let investment_Token = BigNumber(5).mul(10 ** 18);
+            let investment_Token = new BigNumber(5).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, false, "TOKEN", "USD", investment_Token);
             let investment_ETH = await convert(stoId, tierId, false, "TOKEN", "ETH", investment_Token);
             let investment_POLY = await convert(stoId, tierId, false, "TOKEN", "POLY", investment_Token);
@@ -4111,12 +4111,12 @@ contract("USDTieredSTO", accounts => {
             let tierId = 1;
 
             // set new exchange rates
-            let high_USDETH = BigNumber(1000).mul(10 ** 18); // 1000 USD per ETH
-            let high_USDPOLY = BigNumber(50).mul(10 ** 16); // 0.5 USD per POLY
-            let low_USDETH = BigNumber(250).mul(10 ** 18); // 250 USD per ETH
-            let low_USDPOLY = BigNumber(20).mul(10 ** 16); // 0.2 USD per POLY
+            let high_USDETH = new BigNumber(1000).mul(10 ** 18); // 1000 USD per ETH
+            let high_USDPOLY = new BigNumber(50).mul(10 ** 16); // 0.5 USD per POLY
+            let low_USDETH = new BigNumber(250).mul(10 ** 18); // 250 USD per ETH
+            let low_USDPOLY = new BigNumber(20).mul(10 ** 16); // 0.2 USD per POLY
 
-            let investment_Token = BigNumber(5).mul(10 ** 18);
+            let investment_Token = new BigNumber(5).mul(10 ** 18);
             let investment_USD = await convert(stoId, tierId, true, "TOKEN", "USD", investment_Token);
 
             let investment_ETH_high = investment_USD.div(high_USDETH).mul(10 ** 18); // USD / USD/ETH = ETH
@@ -4247,7 +4247,7 @@ contract("USDTieredSTO", accounts => {
 
             it("should get the right conversion for ETH to USD", async () => {
                 // 20 ETH to 10000 USD
-                let ethInWei = BigNumber(web3.utils.toWei("20", "ether"));
+                let ethInWei = new BigNumber(web3.utils.toWei("20", "ether"));
                 let usdInWei = await I_USDTieredSTO_Array[0].convertToUSD(ETH, ethInWei);
                 assert.equal(
                     usdInWei.div(10 ** 18).toNumber(),
@@ -4260,7 +4260,7 @@ contract("USDTieredSTO", accounts => {
 
             it("should get the right conversion for POLY to USD", async () => {
                 // 40000 POLY to 10000 USD
-                let polyInWei = BigNumber(web3.utils.toWei("40000", "ether"));
+                let polyInWei = new BigNumber(web3.utils.toWei("40000", "ether"));
                 let usdInWei = await I_USDTieredSTO_Array[0].convertToUSD(POLY, polyInWei);
                 assert.equal(
                     usdInWei.div(10 ** 18).toNumber(),
@@ -4275,7 +4275,7 @@ contract("USDTieredSTO", accounts => {
         describe("convertFromUSD", async () => {
             it("should get the right conversion for USD to ETH", async () => {
                 // 10000 USD to 20 ETH
-                let usdInWei = BigNumber(web3.utils.toWei("10000", "ether"));
+                let usdInWei = new BigNumber(web3.utils.toWei("10000", "ether"));
                 let ethInWei = await I_USDTieredSTO_Array[0].convertFromUSD(ETH, usdInWei);
                 assert.equal(
                     ethInWei.div(10 ** 18).toNumber(),
@@ -4288,7 +4288,7 @@ contract("USDTieredSTO", accounts => {
 
             it("should get the right conversion for USD to POLY", async () => {
                 // 10000 USD to 40000 POLY
-                let usdInWei = BigNumber(web3.utils.toWei("10000", "ether"));
+                let usdInWei = new BigNumber(web3.utils.toWei("10000", "ether"));
                 let polyInWei = await I_USDTieredSTO_Array[0].convertFromUSD(POLY, usdInWei);
                 assert.equal(
                     polyInWei.div(10 ** 18).toNumber(),
diff --git a/test/q_usd_tiered_sto_sim.js b/test/q_usd_tiered_sto_sim.js
index 53a12e74a..0548a6db6 100644
--- a/test/q_usd_tiered_sto_sim.js
+++ b/test/q_usd_tiered_sto_sim.js
@@ -73,8 +73,8 @@ contract("USDTieredSTO Sim", accounts => {
     const STOSetupCost = 0;
 
     // MockOracle USD prices
-    const USDETH = BigNumber(500).mul(10 ** 18); // 500 USD/ETH
-    const USDPOLY = BigNumber(25).mul(10 ** 16); // 0.25 USD/POLY
+    const USDETH = new BigNumber(500).mul(10 ** 18); // 500 USD/ETH
+    const USDPOLY = new BigNumber(25).mul(10 ** 16); // 0.25 USD/POLY
 
     // STO Configuration Arrays
     let _startTime = [];
@@ -266,8 +266,8 @@ contract("USDTieredSTO Sim", accounts => {
             _ratePerTierDiscountPoly.push([BigNumber(0.05 * 10 ** 18), BigNumber(0.08 * 10 ** 18), BigNumber(0.13 * 10 ** 18)]); // [ 0.05 USD/Token, 0.08 USD/Token, 0.13 USD/Token ]
             _tokensPerTierTotal.push([BigNumber(200 * 10 ** 18), BigNumber(500 * 10 ** 18), BigNumber(300 * 10 ** 18)]); // [ 1000 Token, 2000 Token, 1500 Token ]
             _tokensPerTierDiscountPoly.push([BigNumber(0), BigNumber(50 * 10 ** 18), BigNumber(300 * 10 ** 18)]); // [ 0 Token, 1000 Token, 1500 Token ]
-            _nonAccreditedLimitUSD.push(BigNumber(10 * 10 ** 18)); // 20 USD
-            _minimumInvestmentUSD.push(BigNumber(0)); // 1 wei USD
+            _nonAccreditedLimitUSD.push(new BigNumber(10 * 10 ** 18)); // 20 USD
+            _minimumInvestmentUSD.push(new BigNumber(0)); // 1 wei USD
             _fundRaiseTypes.push([0, 1, 2]);
             _wallet.push(WALLET);
             _reserveWallet.push(RESERVEWALLET);
@@ -384,12 +384,12 @@ contract("USDTieredSTO Sim", accounts => {
         ----------------------------------------------------------
             `);
 
-            let totalTokens = BigNumber(0);
+            let totalTokens = new BigNumber(0);
             for (var i = 0; i < _tokensPerTierTotal[stoId].length; i++) {
                 totalTokens = totalTokens.add(_tokensPerTierTotal[stoId][i]);
             }
             console.log("totalTokens: " + totalTokens.div(10 ** 18).toNumber());
-            let tokensSold = BigNumber(0);
+            let tokensSold = new BigNumber(0);
             while (true) {
                 switch (getRandomInt(0, 5)) {
                     case 0: // ACCREDITED1
@@ -444,12 +444,12 @@ contract("USDTieredSTO Sim", accounts => {
                 let isPoly = Math.random() >= 0.33;
                 let isDai = Math.random() >= 0.33;
 
-                let Token_counter = BigNumber(getRandomInt(1 * 10 ** 10, 50 * 10 ** 10)).mul(10 ** 8);
-                let investment_USD = BigNumber(0);
-                let investment_ETH = BigNumber(0);
-                let investment_POLY = BigNumber(0);
-                let investment_DAI = BigNumber(0);
-                let investment_Token = BigNumber(0);
+                let Token_counter = new BigNumber(getRandomInt(1 * 10 ** 10, 50 * 10 ** 10)).mul(10 ** 8);
+                let investment_USD = new BigNumber(0);
+                let investment_ETH = new BigNumber(0);
+                let investment_POLY = new BigNumber(0);
+                let investment_DAI = new BigNumber(0);
+                let investment_Token = new BigNumber(0);
 
                 let Tokens_total = [];
                 let Tokens_discount = [];
@@ -484,19 +484,17 @@ contract("USDTieredSTO Sim", accounts => {
                         if (isPoly) {
                             // 1. POLY and discount (consume up to cap then move to regular)
                             if (Tokens_discount[tier].gt(0)) {
-                                Token_Tier = BigNumber.min([Tokens_total[tier], Tokens_discount[tier], Token_counter]);
+                                Token_Tier = new BigNumber.min([Tokens_total[tier], Tokens_discount[tier], Token_counter]);
                                 USD_Tier = Token_Tier.mul(_ratePerTierDiscountPoly[stoId][tier].div(10 ** 18));
                                 if (USD_Tier.gte(USD_remaining)) {
                                     USD_overflow = USD_Tier.sub(USD_remaining);
                                     Token_overflow = USD_overflow.mul(10 ** 18).div(_ratePerTierDiscountPoly[stoId][tier]);
                                     USD_Tier = USD_Tier.sub(USD_overflow);
                                     Token_Tier = Token_Tier.sub(Token_overflow);
-                                    Token_counter = BigNumber(0);
+                                    Token_counter = new BigNumber(0);
                                 }
-                                POLY_Tier = USD_Tier.mul(10 ** 18)
-                                    .round(0)
-                                    .div(USDPOLY)
-                                    .round(0);
+                                POLY_Tier = new BigNumber(USD_Tier.mul(10 ** 18).toFixed(0));
+                                POLY_Tier = POLY_Tier.div(USDPOLY).toFixed(0);
                                 USD_remaining = USD_remaining.sub(USD_Tier);
                                 Tokens_total[tier] = Tokens_total[tier].sub(Token_Tier);
                                 Tokens_discount[tier] = Tokens_discount[tier].sub(Token_Tier);
@@ -507,19 +505,17 @@ contract("USDTieredSTO Sim", accounts => {
                             }
                             // 2. POLY and regular (consume up to cap then skip to next tier)
                             if (Tokens_total[tier].gt(0) && Token_counter.gt(0)) {
-                                Token_Tier = BigNumber.min([Tokens_total[tier], Token_counter]);
+                                Token_Tier = new BigNumber.min([Tokens_total[tier], Token_counter]);
                                 USD_Tier = Token_Tier.mul(_ratePerTier[stoId][tier].div(10 ** 18));
                                 if (USD_Tier.gte(USD_remaining)) {
                                     USD_overflow = USD_Tier.sub(USD_remaining);
                                     Token_overflow = USD_overflow.mul(10 ** 18).div(_ratePerTier[stoId][tier]);
                                     USD_Tier = USD_Tier.sub(USD_overflow);
                                     Token_Tier = Token_Tier.sub(Token_overflow);
-                                    Token_counter = BigNumber(0);
+                                    Token_counter = new BigNumber(0);
                                 }
-                                POLY_Tier = USD_Tier.mul(10 ** 18)
-                                    .round(0)
-                                    .div(USDPOLY)
-                                    .round(0);
+                                POLY_Tier = new BigNumber(USD_Tier.mul(10 ** 18).toFixed(0));
+                                POLY_Tier = POLY_Tier.div(USDPOLY).toFixed(0);
                                 USD_remaining = USD_remaining.sub(USD_Tier);
                                 Tokens_total[tier] = Tokens_total[tier].sub(Token_Tier);
                                 Token_counter = Token_counter.sub(Token_Tier);
@@ -529,16 +525,16 @@ contract("USDTieredSTO Sim", accounts => {
                             }
                         } else if (isDai) {
                             // 3. DAI (consume up to cap then skip to next tier)
-                            Token_Tier = BigNumber.min([Tokens_total[tier], Token_counter]);
+                            Token_Tier = new BigNumber.min([Tokens_total[tier], Token_counter]);
                             USD_Tier = Token_Tier.mul(_ratePerTier[stoId][tier].div(10 ** 18));
                             if (USD_Tier.gte(USD_remaining)) {
                                 USD_overflow = USD_Tier.sub(USD_remaining);
                                 Token_overflow = USD_overflow.mul(10 ** 18).div(_ratePerTier[stoId][tier]);
                                 USD_Tier = USD_Tier.sub(USD_overflow);
                                 Token_Tier = Token_Tier.sub(Token_overflow);
-                                Token_counter = BigNumber(0);
+                                Token_counter = new BigNumber(0);
                             }
-                            DAI_Tier = USD_Tier.round(0);
+                            DAI_Tier = USD_Tier.toFixed(0);
                             USD_remaining = USD_remaining.sub(USD_Tier);
                             Tokens_total[tier] = Tokens_total[tier].sub(Token_Tier);
                             Token_counter = Token_counter.sub(Token_Tier);
@@ -547,19 +543,17 @@ contract("USDTieredSTO Sim", accounts => {
                             investment_DAI = investment_USD;
                         } else {
                             // 4. ETH (consume up to cap then skip to next tier)
-                            Token_Tier = BigNumber.min([Tokens_total[tier], Token_counter]);
+                            Token_Tier = new BigNumber.min([Tokens_total[tier], Token_counter]);
                             USD_Tier = Token_Tier.mul(_ratePerTier[stoId][tier].div(10 ** 18));
                             if (USD_Tier.gte(USD_remaining)) {
                                 USD_overflow = USD_Tier.sub(USD_remaining);
                                 Token_overflow = USD_overflow.mul(10 ** 18).div(_ratePerTier[stoId][tier]);
                                 USD_Tier = USD_Tier.sub(USD_overflow);
                                 Token_Tier = Token_Tier.sub(Token_overflow);
-                                Token_counter = BigNumber(0);
+                                Token_counter = new BigNumber(0);
                             }
-                            ETH_Tier = USD_Tier.mul(10 ** 18)
-                                .round(0)
-                                .div(USDETH)
-                                .round(0);
+                            ETH_Tier = new BigNumber(USD_Tier.mul(10 ** 18).toFixed(0));
+                            ETH_Tier = ETH_Tier.div(USDETH).toFixed(0);
                             USD_remaining = USD_remaining.sub(USD_Tier);
                             Tokens_total[tier] = Tokens_total[tier].sub(Token_Tier);
                             Token_counter = Token_counter.sub(Token_Tier);
@@ -590,9 +584,9 @@ contract("USDTieredSTO Sim", accounts => {
             async function investFAIL(_investor) {
                 let isPoly = Math.random() >= 0.3;
                 let isDAI = Math.random() >= 0.3;
-                let investment_POLY = BigNumber(40 * 10 ** 18); // 10 USD = 40 POLY
-                let investment_ETH = BigNumber(0.02 * 10 ** 18); // 10 USD = 0.02 ETH
-                let investment_DAI = BigNumber(10 * 10 ** 18); // 10 USD = DAI DAI
+                let investment_POLY = new BigNumber(40 * 10 ** 18); // 10 USD = 40 POLY
+                let investment_ETH = new BigNumber(0.02 * 10 ** 18); // 10 USD = 0.02 ETH
+                let investment_DAI = new BigNumber(10 * 10 ** 18); // 10 USD = DAI DAI
 
                 if (isPoly) {
                     await I_PolyToken.getTokens(investment_POLY, _investor);
@@ -626,11 +620,11 @@ contract("USDTieredSTO Sim", accounts => {
                 Tokens_discount,
                 tokensSold
             ) {
-                investment_Token = investment_Token.round(0);
-                investment_USD = investment_USD.round(0);
-                investment_POLY = investment_POLY.round(0);
-                investment_DAI = investment_DAI.round(0);
-                investment_ETH = investment_ETH.round(0);
+                investment_Token = new BigNumber(investment_Token.toFixed(0));
+                investment_USD = new BigNumber(investment_USD.toFixed(0));
+                investment_POLY = new BigNumber(investment_POLY.toFixed(0));
+                investment_DAI = new BigNumber(investment_DAI.toFixed(0));
+                investment_ETH = new BigNumber(investment_ETH.toFixed(0));
                 console.log(`
             ------------------- New Investment -------------------
             Investor:   ${_investor}
@@ -658,37 +652,37 @@ contract("USDTieredSTO Sim", accounts => {
 
                 let init_TokenSupply = await I_SecurityToken.totalSupply();
                 let init_InvestorTokenBal = await I_SecurityToken.balanceOf(_investor);
-                let init_InvestorETHBal = BigNumber(await web3.eth.getBalance(_investor));
+                let init_InvestorETHBal = new BigNumber(await web3.eth.getBalance(_investor));
                 let init_InvestorPOLYBal = await I_PolyToken.balanceOf(_investor);
                 let init_InvestorDAIBal = await I_DaiToken.balanceOf(_investor);
                 let init_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-                let init_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+                let init_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
                 let init_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
                 let init_STODAIBal = await I_DaiToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
                 let init_RaisedUSD = await I_USDTieredSTO_Array[stoId].fundsRaisedUSD.call();
                 let init_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(0);
                 let init_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(1);
                 let init_RaisedDAI = await I_USDTieredSTO_Array[stoId].fundsRaised.call(2);
-                let init_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+                let init_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
                 let init_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
                 let init_WalletDAIBal = await I_DaiToken.balanceOf(WALLET);
 
                 let tx;
-                let gasCost = BigNumber(0);
+                let gasCost = new BigNumber(0);
 
                 if (isPoly && investment_POLY.gt(10)) {
                     tx = await I_USDTieredSTO_Array[stoId].buyWithPOLY(_investor, investment_POLY, {
                         from: _investor,
                         gasPrice: GAS_PRICE
                     });
-                    gasCost = BigNumber(GAS_PRICE).mul(tx.receipt.gasUsed);
+                    gasCost = new BigNumber(GAS_PRICE).mul(tx.receipt.gasUsed);
                     console.log(
                         `buyWithPOLY: ${investment_Token.div(10 ** 18)} tokens for ${investment_POLY.div(10 ** 18)} POLY by ${_investor}`
                             .yellow
                     );
                 } else if (isDai && investment_DAI.gt(10)) {
                     tx = await I_USDTieredSTO_Array[stoId].buyWithUSD(_investor, investment_DAI, { from: _investor, gasPrice: GAS_PRICE });
-                    gasCost = BigNumber(GAS_PRICE).mul(tx.receipt.gasUsed);
+                    gasCost = new BigNumber(GAS_PRICE).mul(tx.receipt.gasUsed);
                     console.log(
                         `buyWithUSD: ${investment_Token.div(10 ** 18)} tokens for ${investment_DAI.div(10 ** 18)} DAI by ${_investor}`
                             .yellow
@@ -699,7 +693,7 @@ contract("USDTieredSTO Sim", accounts => {
                         value: investment_ETH,
                         gasPrice: GAS_PRICE
                     });
-                    gasCost = BigNumber(GAS_PRICE).mul(tx.receipt.gasUsed);
+                    gasCost = new BigNumber(GAS_PRICE).mul(tx.receipt.gasUsed);
                     console.log(
                         `buyWithETH: ${investment_Token.div(10 ** 18)} tokens for ${investment_ETH.div(10 ** 18)} ETH by ${_investor}`
                             .yellow
@@ -709,18 +703,18 @@ contract("USDTieredSTO Sim", accounts => {
 
                 let final_TokenSupply = await I_SecurityToken.totalSupply();
                 let final_InvestorTokenBal = await I_SecurityToken.balanceOf(_investor);
-                let final_InvestorETHBal = BigNumber(await web3.eth.getBalance(_investor));
+                let final_InvestorETHBal = new BigNumber(await web3.eth.getBalance(_investor));
                 let final_InvestorPOLYBal = await I_PolyToken.balanceOf(_investor);
                 let final_InvestorDAIBal = await I_DaiToken.balanceOf(_investor);
                 let final_STOTokenSold = await I_USDTieredSTO_Array[stoId].getTokensSold();
-                let final_STOETHBal = BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
+                let final_STOETHBal = new BigNumber(await web3.eth.getBalance(I_USDTieredSTO_Array[stoId].address));
                 let final_STOPOLYBal = await I_PolyToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
                 let final_STODAIBal = await I_DaiToken.balanceOf(I_USDTieredSTO_Array[stoId].address);
                 let final_RaisedUSD = await I_USDTieredSTO_Array[stoId].fundsRaisedUSD.call();
                 let final_RaisedETH = await I_USDTieredSTO_Array[stoId].fundsRaised.call(0);
                 let final_RaisedPOLY = await I_USDTieredSTO_Array[stoId].fundsRaised.call(1);
                 let final_RaisedDAI = await I_USDTieredSTO_Array[stoId].fundsRaised.call(2);
-                let final_WalletETHBal = BigNumber(await web3.eth.getBalance(WALLET));
+                let final_WalletETHBal = new BigNumber(await web3.eth.getBalance(WALLET));
                 let final_WalletPOLYBal = await I_PolyToken.balanceOf(WALLET);
                 let final_WalletDAIBal = await I_DaiToken.balanceOf(WALLET);
 
diff --git a/test/s_v130_to_v140_upgrade.js b/test/s_v130_to_v140_upgrade.js
index 3fb3092aa..014b44ac2 100644
--- a/test/s_v130_to_v140_upgrade.js
+++ b/test/s_v130_to_v140_upgrade.js
@@ -353,8 +353,8 @@ contract("Upgrade from v1.3.0 to v1.4.0", accounts => {
             let _ratePerTierDiscountPoly = [BigNumber(0), BigNumber(0), BigNumber(0)];
             let _tokensPerTierTotal = [BigNumber(100).mul(10 ** 18), BigNumber(200).mul(10 ** 18), BigNumber(300).mul(10 ** 18)];
             let _tokensPerTierDiscountPoly = [BigNumber(0), BigNumber(0), BigNumber(0)];
-            let _nonAccreditedLimitUSD = BigNumber(100).mul(10 ** 18);
-            let _minimumInvestmentUSD = BigNumber(5).mul(10 ** 18);
+            let _nonAccreditedLimitUSD = new BigNumber(100).mul(10 ** 18);
+            let _minimumInvestmentUSD = new BigNumber(5).mul(10 ** 18);
             let _fundRaiseTypes = [0, 1];
             let _wallet = ISSUER1;
             let _reserveWallet = ISSUER1;
diff --git a/yarn.lock b/yarn.lock
index 2e19f3d57..aba68e85b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,22 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+  dependencies:
+    "@babel/highlight" "^7.0.0"
+
+"@babel/highlight@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
+
 "@soldoc/markdown@^0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@soldoc/markdown/-/markdown-0.1.0.tgz#9f85be75049af9721b5129f133d52dafbf5f671e"
@@ -19,6 +35,11 @@
     valid-url "^1.0.9"
     yargs "^11.0.0"
 
+"@types/node@^10.3.2":
+  version "10.12.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.2.tgz#d77f9faa027cadad9c912cd47f4f8b07b0fb0864"
+  integrity sha512-53ElVDSnZeFUUFIYzI8WLQ25IhWzb6vbddNp8UHlXQyU0ET2RhV5zg0NfubzU7iNMh5bBXb0htCzfvrSVNgzaQ==
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -66,10 +87,15 @@ acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-acorn@^5.0.0, acorn@^5.5.0:
+acorn@^5.0.0:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
 
+acorn@^6.0.2:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754"
+  integrity sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==
+
 aes-js@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d"
@@ -86,7 +112,7 @@ ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
 
-ajv@^5.1.1, ajv@^5.2.2, ajv@^5.2.3, ajv@^5.3.0:
+ajv@^5.1.1, ajv@^5.2.2, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -317,7 +343,7 @@ aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
-babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -949,6 +975,11 @@ big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
 
+bignumber.js@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-5.0.0.tgz#fbce63f09776b3000a83185badcde525daf34833"
+  integrity sha512-KWTu6ZMVk9sxlDJQh2YH1UOnfDP8O8TpxUxgQG/vKASoSnEjK9aVuOueFaPcQEYQ5fyNXNTOYwYw3099RYebWg==
+
 bignumber.js@^4.0.2:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1"
@@ -1057,7 +1088,7 @@ borc@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/borc/-/borc-2.0.3.tgz#08845ea73a6d3211120928ee3929f8dc2de9f52e"
   dependencies:
-    bignumber.js "^6.0.0"
+    bignumber.js "^7.2.1"
     commander "^2.15.0"
     ieee754 "^1.1.8"
     json-text-sequence "^0.1"
@@ -1659,7 +1690,7 @@ cron-parser@^2.4.0:
     is-nan "^1.2.1"
     moment-timezone "^0.5.0"
 
-cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
   dependencies:
@@ -1667,6 +1698,17 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 crypto-browserify@3.12.0, crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -1731,7 +1773,7 @@ death@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/death/-/death-1.1.0.tgz#01aa9c401edd92750514470b8266390c66c67318"
 
-debug@*:
+debug@*, debug@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
   dependencies:
@@ -2214,6 +2256,14 @@ eslint-module-utils@^2.2.0:
     debug "^2.6.8"
     pkg-dir "^1.0.0"
 
+eslint-plugin-es@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.3.1.tgz#5acb2565db4434803d1d46a9b4cbc94b345bd028"
+  integrity sha512-9XcVyZiQRVeFjqHw8qHNDAZcQLqaHlOGGpeYqzYh8S4JYCWTCO3yzyen8yVmA5PratfzTRWDwCOFphtDEG+w/w==
+  dependencies:
+    eslint-utils "^1.3.0"
+    regexpp "^2.0.0"
+
 eslint-plugin-import@^2.10.0:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8"
@@ -2233,10 +2283,12 @@ eslint-plugin-node@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz#bf19642298064379315d7a4b2a75937376fa05e4"
   dependencies:
-    ignore "^3.3.6"
+    eslint-plugin-es "^1.3.1"
+    eslint-utils "^1.3.1"
+    ignore "^5.0.2"
     minimatch "^3.0.4"
-    resolve "^1.3.3"
-    semver "^5.4.1"
+    resolve "^1.8.1"
+    semver "^5.5.0"
 
 eslint-plugin-promise@^3.7.0:
   version "3.8.0"
@@ -2253,6 +2305,11 @@ eslint-scope@^3.7.1:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-utils@^1.3.0, eslint-utils@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
+  integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
+
 eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
@@ -2261,51 +2318,52 @@ eslint@^4.19.1:
   version "4.19.1"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
   dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.5.3"
     chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
-    debug "^3.1.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.1"
     doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
+    eslint-scope "^4.0.0"
+    eslint-utils "^1.3.1"
     eslint-visitor-keys "^1.0.0"
-    espree "^3.5.4"
-    esquery "^1.0.0"
+    espree "^4.0.0"
+    esquery "^1.0.1"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
     functional-red-black-tree "^1.0.1"
     glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
+    globals "^11.7.0"
+    ignore "^4.0.6"
     imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
+    inquirer "^6.1.0"
+    is-resolvable "^1.1.0"
+    js-yaml "^3.12.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
+    lodash "^4.17.5"
+    minimatch "^3.0.4"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
     optionator "^0.8.2"
     path-is-inside "^1.0.2"
     pluralize "^7.0.0"
     progress "^2.0.0"
-    regexpp "^1.0.1"
+    regexpp "^2.0.1"
     require-uncached "^1.0.3"
-    semver "^5.3.0"
+    semver "^5.5.1"
     strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
+    strip-json-comments "^2.0.1"
+    table "^5.0.2"
+    text-table "^0.2.0"
 
 espree@^3.5.4:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
   dependencies:
-    acorn "^5.5.0"
-    acorn-jsx "^3.0.0"
+    acorn "^6.0.2"
+    acorn-jsx "^5.0.0"
+    eslint-visitor-keys "^1.0.0"
 
 esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
@@ -2315,7 +2373,7 @@ esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
 
-esquery@^1.0.0:
+esquery@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
   dependencies:
@@ -2453,7 +2511,7 @@ ethereumjs-abi@0.6.4:
 
 ethereumjs-abi@^0.6.5, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git":
   version "0.6.5"
-  resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#00ba8463a7f7a67fcad737ff9c2ebd95643427f7"
+  resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#2863c40e0982acfc0b7163f0285d4c56427c7799"
   dependencies:
     bn.js "^4.10.0"
     ethereumjs-util "^5.0.0"
@@ -2492,7 +2550,7 @@ ethereumjs-testrpc@^6.0.3:
   dependencies:
     webpack "^3.0.0"
 
-ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.1, ethereumjs-tx@^1.3.3:
+ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.1, ethereumjs-tx@^1.3.3, ethereumjs-tx@^1.3.4:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz#88323a2d875b10549b8347e09f4862b546f3d89a"
   dependencies:
@@ -2554,13 +2612,13 @@ ethers@^3.0.15:
   version "3.0.29"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-3.0.29.tgz#ce8139955b4ed44456eb6764b089bb117c86775d"
   dependencies:
+    "@types/node" "^10.3.2"
     aes-js "3.0.0"
     bn.js "^4.4.0"
     elliptic "6.3.3"
-    hash.js "^1.0.0"
-    inherits "2.0.1"
+    hash.js "1.1.3"
     js-sha3 "0.5.7"
-    scrypt-js "2.0.3"
+    scrypt-js "2.0.4"
     setimmediate "1.0.4"
     uuid "2.0.1"
     xmlhttprequest "1.8.0"
@@ -2723,8 +2781,8 @@ external-editor@^2.0.4:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
   dependencies:
-    chardet "^0.4.0"
-    iconv-lite "^0.4.17"
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
 extglob@^0.3.1:
@@ -2914,7 +2972,7 @@ form-data@~2.3.2:
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "1.0.6"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 forwarded@~0.1.2:
@@ -3128,7 +3186,7 @@ global@~4.3.0:
     min-document "^2.19.0"
     process "~0.5.1"
 
-globals@^11.0.1:
+globals@^11.7.0:
   version "11.8.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
 
@@ -3279,6 +3337,14 @@ hash-base@^3.0.0:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+hash.js@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
+  integrity sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.0"
+
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
@@ -3359,7 +3425,7 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   dependencies:
@@ -3429,13 +3495,12 @@ inquirer@^3.0.6:
     chalk "^2.0.0"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^2.0.4"
+    external-editor "^3.0.0"
     figures "^2.0.0"
-    lodash "^4.3.0"
+    lodash "^4.17.10"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
+    rxjs "^6.1.0"
     string-width "^2.1.0"
     strip-ansi "^4.0.0"
     through "^2.3.6"
@@ -3684,7 +3749,7 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
-is-resolvable@^1.0.0:
+is-resolvable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
 
@@ -3789,7 +3854,7 @@ js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
 
-"js-tokens@^3.0.0 || ^4.0.0":
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
 
@@ -3797,7 +3862,7 @@ js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@3.x, js-yaml@^3.11.0, js-yaml@^3.9.1:
+js-yaml@3.x, js-yaml@^3.11.0, js-yaml@^3.12.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
@@ -4055,7 +4120,7 @@ lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
 
-lodash@4.x, lodash@^4.13.1, lodash@^4.14.2, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
+lodash@4.x, lodash@^4.13.1, lodash@^4.14.2, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
 
@@ -4269,7 +4334,7 @@ mime-types@^2.1.12, mime-types@^2.1.16, mime-types@~2.1.18, mime-types@~2.1.19:
   version "2.1.20"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
   dependencies:
-    mime-db "~1.36.0"
+    mime-db "~1.37.0"
 
 mime@1.4.1:
   version "1.4.1"
@@ -4297,7 +4362,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -4483,6 +4548,11 @@ next-tick@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
 
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
 node-async-loop@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/node-async-loop/-/node-async-loop-1.2.2.tgz#c5870299bf6477b780c88b431aa5b37733f55a3d"
@@ -4855,7 +4925,7 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
-path-key@^2.0.0:
+path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
@@ -5105,7 +5175,7 @@ react-dom@^16.2.0:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    schedule "^0.5.0"
+    scheduler "^0.10.0"
 
 react@^16.2.0:
   version "16.5.2"
@@ -5114,7 +5184,7 @@ react@^16.2.0:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    schedule "^0.5.0"
+    scheduler "^0.10.0"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
@@ -5155,7 +5225,7 @@ readable-stream@^1.0.33:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -5354,7 +5424,7 @@ resolve@1.1.x:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.6, resolve@^1.3.3, resolve@^1.5.0, resolve@^1.6.0:
+resolve@^1.1.6, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   dependencies:
@@ -5474,6 +5544,7 @@ schedule@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.5.0.tgz#c128fffa0b402488b08b55ae74bb9df55cc29cc8"
   dependencies:
+    loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
 scrypt-async@^1.2.0:
@@ -5526,7 +5597,7 @@ semaphore@>=1.0.1, semaphore@^1.0.3:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.1.0.tgz#aaad8b86b20fe8e9b32b16dc2ee682a8cd26a8aa"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
 
@@ -6035,7 +6106,7 @@ strip-hex-prefix@1.0.0:
   dependencies:
     is-hex-prefixed "1.0.0"
 
-strip-json-comments@~2.0.1:
+strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
@@ -6095,10 +6166,8 @@ table@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
   dependencies:
-    ajv "^5.2.3"
-    ajv-keywords "^2.1.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
+    ajv "^6.5.3"
+    lodash "^4.17.10"
     slice-ansi "1.0.0"
     string-width "^2.1.1"
 
@@ -6173,7 +6242,7 @@ taskgroup@^4.0.5, taskgroup@^4.2.0:
     ambi "^2.2.0"
     csextends "^1.0.3"
 
-text-table@^0.2.0, text-table@~0.2.0:
+text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
@@ -6309,10 +6378,10 @@ truffle-hdwallet-provider-privkey@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/truffle-hdwallet-provider-privkey/-/truffle-hdwallet-provider-privkey-0.1.0.tgz#9417047a74ad37d923df926154b6486ffb57f6c9"
   dependencies:
-    ethereumjs-tx "^1.3.3"
+    ethereumjs-tx "^1.3.4"
     ethereumjs-wallet "^0.6.0"
-    web3 "^0.20.5"
-    web3-provider-engine "^13.6.4"
+    web3 "^0.20.6"
+    web3-provider-engine "^13.8.0"
 
 truffle-wallet-provider@0.0.5:
   version "0.0.5"
@@ -6330,6 +6399,11 @@ truffle@4.1.14:
     original-require "1.0.1"
     solc "0.4.24"
 
+tslib@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -6732,7 +6806,7 @@ web3-net@1.0.0-beta.34:
     web3-core-method "1.0.0-beta.34"
     web3-utils "1.0.0-beta.34"
 
-web3-provider-engine@^13.6.4:
+web3-provider-engine@^13.8.0:
   version "13.8.0"
   resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-13.8.0.tgz#4c7c1ad2af5f1fe10343b8a65495879a2f9c00df"
   dependencies:
@@ -6880,7 +6954,7 @@ web3@^0.18.2, web3@^0.18.4:
     xhr2 "*"
     xmlhttprequest "*"
 
-web3@^0.20.5:
+web3@^0.20.6:
   version "0.20.7"
   resolved "https://registry.yarnpkg.com/web3/-/web3-0.20.7.tgz#1605e6d81399ed6f85a471a4f3da0c8be57df2f7"
   dependencies: