diff --git a/lib/api.js b/lib/api.js
index ddcc620b..14b9a33d 100644
--- a/lib/api.js
+++ b/lib/api.js
@@ -49,9 +49,8 @@ class API {
     this.skipFiles = config.skipFiles || [];
 
     this.log = config.log || console.log;
-
-    this.gasLimit = 0xffffffffff;            // default "gas sent" with transactions
-    this.gasLimitString = "0xfffffffffff";   // block gas limit for ganache (higher than "gas sent")
+    this.gasLimit = 0x1fffffffffffff;           // default "gas sent" with transactions
+    this.gasLimitString = "0x1fffffffffffff";   // block gas limit for ganache (higher than "gas sent")
     this.gasPrice = 0x01;
 
     this.istanbulFolder = config.istanbulFolder || false;
diff --git a/plugins/hardhat.plugin.js b/plugins/hardhat.plugin.js
index 72841daf..9c369fa4 100644
--- a/plugins/hardhat.plugin.js
+++ b/plugins/hardhat.plugin.js
@@ -4,7 +4,6 @@ const nomiclabsUtils = require('./resources/nomiclabs.utils');
 const PluginUI = require('./resources/nomiclabs.ui');
 
 const pkg = require('./../package.json');
-const death = require('death');
 const path = require('path');
 
 const { task, types } = require("hardhat/config");
@@ -87,12 +86,13 @@ task("coverage", "Generates a code coverage report for tests")
   measureCoverage = true;
 
   try {
-    death(nomiclabsUtils.finish.bind(null, config, api)); // Catch interrupt signals
-
     config = nomiclabsUtils.normalizeConfig(env.config, args);
     ui = new PluginUI(config.logger.log);
     api = new API(utils.loadSolcoverJS(config));
 
+    // Catch interrupt signals
+    process.on("SIGINT", nomiclabsUtils.finish.bind(null, config, api));
+
     // Version Info
     ui.report('hardhat-versions', [pkg.version]);
 
diff --git a/test/units/buidler/standard.js b/test/units/buidler/standard.js
index 06360cd4..3e066755 100644
--- a/test/units/buidler/standard.js
+++ b/test/units/buidler/standard.js
@@ -69,16 +69,15 @@ describe('Buidler Plugin: standard use cases', function() {
     );
   });
 
-  // Simple.sol with a failing assertion in a buidler-truffle5 test
-  it('unit tests failing', async function() {
-    mock.install('Simple', 'truffle-test-fail.js', solcoverConfig);
+  it('tests crash w/ syntax error', async function() {
+    mock.install('Simple', 'truffle-crash.js', solcoverConfig);
     mock.buidlerSetupEnv(this);
 
     try {
       await this.env.run("coverage");
       assert.fail()
     } catch(err){
-      assert(err.message.includes('failed under coverage'));
+      assert(err.toString().includes('SyntaxError'));
     }
 
     verify.coverageGenerated(buidlerConfig);
diff --git a/test/util/integration.js b/test/util/integration.js
index cfca60c4..5554f411 100644
--- a/test/util/integration.js
+++ b/test/util/integration.js
@@ -40,7 +40,7 @@ function decacheConfigs(){
     `${process.cwd()}/${temp}/contracts/Simple.sol`,
     `${process.cwd()}/${temp}/test/simple.js`,
     `${process.cwd()}/${temp}/test/account-one.js`,
-    `${process.cwd()}/${temp}/test/truffle-test-fail.js`
+    `${process.cwd()}/${temp}/test/truffle-crash.js`
   ];
 
   paths.forEach(pth => {