diff --git a/package.json b/package.json
index 31621317..ddc4366b 100644
--- a/package.json
+++ b/package.json
@@ -20,26 +20,15 @@
     "hardhat:mumbai": "hardhat --network mumbai",
     "hardhat:matic": "hardhat --network matic",
     "compile": "SKIP_LOAD=true hardhat compile",
-    "console:fork": "MAINNET_FORK=true hardhat console",
-    "test": "TS_NODE_TRANSPILE_ONLY=1 hardhat test ./test/*.spec.ts",
-    "test-scenarios": "npx hardhat test test/__setup.spec.ts test/scenario.spec.ts",
-    "test-repay-with-collateral": "hardhat test test/__setup.spec.ts test/repay-with-collateral.spec.ts",
-    "test-liquidate-with-collateral": "hardhat test test/__setup.spec.ts test/flash-liquidation-with-collateral.spec.ts",
-    "test-liquidate-underlying": "hardhat test test/__setup.spec.ts test/liquidation-underlying.spec.ts",
-    "test-configurator": "hardhat test test/__setup.spec.ts test/configurator.spec.ts",
-    "test-transfers": "hardhat test test/__setup.spec.ts test/atoken-transfer.spec.ts",
-    "test-flash": "hardhat test test/__setup.spec.ts test/flashloan.spec.ts",
-    "test-liquidate": "hardhat test test/__setup.spec.ts test/liquidation-atoken.spec.ts",
-    "test-deploy": "hardhat test test/__setup.spec.ts test/test-init.spec.ts",
-    "test-pausable": "hardhat test test/__setup.spec.ts test/pausable-functions.spec.ts",
-    "test-permit": "hardhat test test/__setup.spec.ts test/atoken-permit.spec.ts",
-    "test-stable-and-atokens": "hardhat test test/__setup.spec.ts test/atoken-transfer.spec.ts test/stable-token.spec.ts",
-    "test-subgraph:scenarios": "hardhat --network hardhatevm_docker test test/__setup.spec.ts test/subgraph-scenarios.spec.ts",
-    "test-weth": "hardhat test test/__setup.spec.ts test/weth-gateway.spec.ts",
-    "test-uniswap": "hardhat test test/__setup.spec.ts test/uniswapAdapters*.spec.ts",
-    "test:main:check-list": "MAINNET_FORK=true TS_NODE_TRANSPILE_ONLY=1 hardhat test  test/__setup.spec.ts test/mainnet/check-list.spec.ts",
-    "test:main:staticAToken": "MAINNET_FORK=true TS_NODE_TRANSPILE_ONLY=1 hardhat test test/mainnet/static-atoken.spec.ts",
-    "dev:coverage": "npm run compile && npx hardhat coverage --testfiles 'test-suites/test-aave/*.ts'",
+    "console:fork": "FORK=main hardhat console",
+    "test": "npm run compile && TS_NODE_TRANSPILE_ONLY=1 hardhat test ./test-suites/test-aave/*.spec.ts",
+    "test-amm": "npm run compile && TS_NODE_TRANSPILE_ONLY=1 hardhat test ./test-suites/test-amm/*.spec.ts",
+    "test-amm-scenarios": "npm run compile && TS_NODE_TRANSPILE_ONLY=1 hardhat test ./test-suites/test-amm/__setup.spec.ts test-suites/test-amm/scenario.spec.ts",
+    "test-scenarios": "npm run compile && npx hardhat test test-suites/test-aave/__setup.spec.ts test-suites/test-aave/scenario.spec.ts",
+    "test-subgraph:scenarios": "npm run compile && hardhat --network hardhatevm_docker test test-suites/test-aave/__setup.spec.ts test-suites/test-aave/subgraph-scenarios.spec.ts",
+    "test:main:check-list": "npm run compile && FORK=main TS_NODE_TRANSPILE_ONLY=1 hardhat test  test-suites/test-aave/__setup.spec.ts test-suites/test-aave/mainnet/check-list.spec.ts",
+    "dev:coverage": "buidler compile --force && buidler coverage --network coverage",
+    "coverage": "npm run compile && npx hardhat coverage --testfiles 'test-suites/test-aave/emptyrun.coverage.ts' && rm -rf coverage.json coverage/ && MAINNET_FORK=true TS_NODE_TRANSPILE_ONLY=1  hardhat coverage --testfiles 'test-suites/test-aave/*.ts'",
     "aave:evm:dev:migration": "npm run compile && hardhat aave:dev",
     "aave:docker:full:migration": "npm run compile && npm run hardhat:docker -- aave:mainnet --skip-registry",
     "aave:kovan:full:migration": "npm run compile && npm run hardhat:kovan -- aave:mainnet --skip-registry",