diff --git a/packages/artifactor/test/contracts.js b/packages/artifactor/test/contracts.js
index da1309b8b1f..0e4fcccf6fd 100644
--- a/packages/artifactor/test/contracts.js
+++ b/packages/artifactor/test/contracts.js
@@ -138,8 +138,6 @@ describe("artifactor + require", () => {
       })
       .then(done)
       .catch(done);
-    // TODO: investigate why timeout needed to be increased
-    //  issue: https://github.com/web3/web3.js/issues/6311
   }).timeout(3000);
 
   it("shouldn't synchronize constant functions", done => {
@@ -188,8 +186,6 @@ describe("artifactor + require", () => {
       })
       .then(done)
       .catch(done);
-    // TODO: investigate why timeout needed to be increased
-    //  issue: https://github.com/web3/web3.js/issues/6311
   }).timeout(3000);
 
   it("should return transaction hash, logs and receipt when using synchronised transactions", done => {
@@ -225,8 +221,6 @@ describe("artifactor + require", () => {
       })
       .then(done)
       .catch(done);
-    // TODO: investigate why timeout needed to be increased
-    //  issue: https://github.com/web3/web3.js/issues/6311
   }).timeout(3000);
 
   it("should trigger the fallback function when calling sendTransaction()", () => {
@@ -252,8 +246,6 @@ describe("artifactor + require", () => {
           "1 ether has been sent but the balance does not match that"
         );
       });
-    // TODO: investigate why timeout needed to be increased
-    //  issue: https://github.com/web3/web3.js/issues/6311
   }).timeout(3000);
 
   it("should trigger the fallback function when calling send() (shorthand notation)", () => {
@@ -277,8 +269,6 @@ describe("artifactor + require", () => {
           "1 ether has been sent but the balance does not match that"
         );
       });
-    // TODO: investigate why timeout needed to be increased
-    //  issue: https://github.com/web3/web3.js/issues/6311
   }).timeout(3000);
 
   it("errors when setting an invalid provider", done => {
diff --git a/packages/decoder/test/current/test/downgrade-test.js b/packages/decoder/test/current/test/downgrade-test.js
index a53a53ee5bb..497d7ae362e 100644
--- a/packages/decoder/test/current/test/downgrade-test.js
+++ b/packages/decoder/test/current/test/downgrade-test.js
@@ -59,8 +59,6 @@ describe("Graceful degradation when information is missing", function () {
     source.ast = undefined;
 
     await runTestBody(mangledCompilations);
-    // TODO: investigate why timeout needed to be increased
-    //  issue: https://github.com/web3/web3.js/issues/6311
   }).timeout(5000);
 
   it("Correctly degrades on allocation when error", async function () {
@@ -80,8 +78,6 @@ describe("Graceful degradation when information is missing", function () {
     //the decoder from recognizing it as a struct definition
 
     await runTestBody(mangledCompilations, true);
-    // TODO: investigate why timeout needed to be increased
-    //  issue: https://github.com/web3/web3.js/issues/6311
   }).timeout(3000);
 
   it("Correctly degrades on decoding when error", async function () {
@@ -101,14 +97,10 @@ describe("Graceful degradation when information is missing", function () {
     //the decoder from recognizing it as a enum definition
 
     await runTestBody(mangledCompilations, true);
-    // TODO: investigate why timeout needed to be increased
-    //  issue: https://github.com/web3/web3.js/issues/6311
   }).timeout(3000);
 
   it("Correctly abifies after finishing", async function () {
     await runTestBody(compilations, false, true); //for once, we're not modifying it!
-    // TODO: investigate why timeout needed to be increased
-    //  issue: https://github.com/web3/web3.js/issues/6311
   }).timeout(5000);
 
   it("Correctly decodes decimals", async function () {
diff --git a/packages/decoder/test/current/test/wire-test.js b/packages/decoder/test/current/test/wire-test.js
index 02db7f3db2b..d810160f76a 100644
--- a/packages/decoder/test/current/test/wire-test.js
+++ b/packages/decoder/test/current/test/wire-test.js
@@ -50,11 +50,7 @@ describe("Over-the-wire decoding", function () {
     ];
   });
 
-  //todo web3.js-migration
-  //Error: reference "x" resolves to more than one schema
   it("should correctly decode transactions and events", async function () {
-    // TODO: investigate why timeout needed to be increased
-    //  issue: https://github.com/web3/web3.js/issues/6311
     this.timeout(20000);
     let deployedContract = await abstractions.WireTest.new(
       true,
@@ -326,13 +322,7 @@ describe("Over-the-wire decoding", function () {
     let indexTestBlock = indexTest.receipt.blockNumber;
     let libraryTestBlock = libraryTest.receipt.blockNumber;
 
-    try {
-      //due to web3's having ethers's crappy decoder built in,
-      //we have to put this in a try block to catch the error
-      await deployedContract.danger();
-    } catch (_) {
-      //discard the error!
-    }
+    await deployedContract.danger();
 
     let constructorEvents = await decoder.events({
       fromBlock: constructorBlock,