diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
index 74abed50..18c34a64 100644
--- a/contracts/hardhat.config.ts
+++ b/contracts/hardhat.config.ts
@@ -142,7 +142,7 @@ const config: HardhatUserConfig = {
       // https://hardhat.org/hardhat-network/#solidity-optimizer-support
       optimizer: {
         enabled: true,
-        runs: 800,
+        runs: 2000,
       },
     },
   },
@@ -158,6 +158,9 @@ const config: HardhatUserConfig = {
     collapseNewlines: true,
     exclude: ['test'],
   },
+  mocha: {
+    timeout: 200_000, // 90 seconds // increase the timeout for subdomain validation tests
+  },
 };
 
 export default config;
diff --git a/contracts/package.json b/contracts/package.json
index fc3cd495..dd71c1c0 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -68,7 +68,7 @@
   },
   "scripts": {
     "build": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat compile",
-    "coverage": "hardhat coverage --solcoverjs ./.solcover.js --temp artifacts --testfiles \"test/**/*.ts\" && yarn typechain",
+    "coverage": "NODE_OPTIONS='--max-old-space-size=8192' hardhat coverage --solcoverjs ./.solcover.js --temp artifacts --testfiles \"test/**/*.ts\" && yarn typechain",
     "deploy": "hardhat deploy",
     "lint": "yarn lint:sol && yarn lint:ts",
     "lint:sol": "cd .. && yarn run lint:contracts:sol",