diff --git a/.env.test b/.env.test
index ddb917ec1b99..6b1f4957ca69 100644
--- a/.env.test
+++ b/.env.test
@@ -4,4 +4,5 @@ GETH_DOCKER_IMAGE=ethereum/client-go:v1.13.11
 GETH_BINARY_DIR=
 LIGHTHOUSE_DOCKER_IMAGE=sigp/lighthouse:v4.6.0-amd64-modern-dev
 NETHERMIND_DOCKER_IMAGE=nethermind/nethermind:1.25.3
-LODESTAR_PRESET=minimal
\ No newline at end of file
+# We mostly use mainnet for unit testsing 
+LODESTAR_PRESET=mainnet
\ No newline at end of file
diff --git a/package.json b/package.json
index 15e0469f7223..25e06ef9d3ac 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "test-coverage:e2e-sim": "c8 --config .c8rc.json --report-dir coverage/e2e-sim/ --all npm run test:e2e:sim",
     "test-coverage:spec": "c8 --config .c8rc.json --report-dir coverage/spec/ --all npm run test:spec",
     "benchmark": "yarn benchmark:files 'packages/*/test/perf/**/*.test.ts'",
-    "benchmark:files": "LODESTAR_PRESET=mainnet NODE_OPTIONS='--max-old-space-size=4096 --loader=ts-node/esm' benchmark --config .benchrc.yaml --defaultBranch unstable",
+    "benchmark:files": "NODE_OPTIONS='--max-old-space-size=4096 --loader=ts-node/esm' benchmark --config .benchrc.yaml --defaultBranch unstable",
     "release:create-rc": "node scripts/release/create_rc.mjs",
     "release:tag-rc": "node scripts/release/tag_rc.mjs",
     "release:tag-stable": "node scripts/release/tag_stable.mjs",
diff --git a/packages/beacon-node/package.json b/packages/beacon-node/package.json
index 3d91f6af735a..401d3595148b 100644
--- a/packages/beacon-node/package.json
+++ b/packages/beacon-node/package.json
@@ -76,9 +76,9 @@
     "lint": "eslint --color --ext .ts src/ test/",
     "lint:fix": "yarn run lint --fix",
     "test": "yarn test:unit && yarn test:e2e",
-    "test:unit:minimal": "vitest --run --segfaultRetry 3 --dir test/unit/",
-    "test:unit:mainnet": "LODESTAR_PRESET=mainnet vitest --run --dir test/unit-mainnet",
-    "test:unit": "wrapper() { yarn test:unit:minimal $@ && yarn test:unit:mainnet $@; }; wrapper",
+    "test:unit:minimal": "LODESTAR_PRESET=minimal vitest --run --segfaultRetry 3 --dir test/unit/",
+    "test:unit:mainnet": "vitest --run --segfaultRetry 3 --dir test/unit-mainnet",
+    "test:unit": "LODESTAR_PRESET=minimal yarn test:unit:minimal && LODESTAR_PRESET=mainnet yarn test:unit:mainnet",
     "test:e2e": "vitest --run --segfaultRetry 3 --config vitest.e2e.config.ts --dir test/e2e",
     "test:sim": "vitest --run test/sim/**/*.test.ts",
     "test:sim:merge-interop": "vitest --run test/sim/merge-interop.test.ts",
@@ -88,8 +88,8 @@
     "download-spec-tests": "node --loader=ts-node/esm test/spec/downloadTests.ts",
     "test:spec:bls": "vitest --run --config vitest.spec.config.ts --dir test/spec/bls/",
     "test:spec:general": "vitest --run --config vitest.spec.config.ts --dir test/spec/general/",
-    "test:spec:minimal": "vitest --run --config vitest.spec.config.ts --dir test/spec/presets/",
-    "test:spec:mainnet": "LODESTAR_PRESET=mainnet vitest --run --config vitest.spec.config.ts --dir test/spec/presets/",
+    "test:spec:minimal": "LODESTAR_PRESET=minimal vitest --run --config vitest.spec.config.ts --dir test/spec/presets/",
+    "test:spec:mainnet": "vitest --run --config vitest.spec.config.ts --dir test/spec/presets/",
     "test:spec": "yarn test:spec:bls && yarn test:spec:general && yarn test:spec:minimal && yarn test:spec:mainnet",
     "check-readme": "typescript-docs-verifier"
   },
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8602ef1b5714..78f2d8a37eca 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -32,11 +32,11 @@
     "lint:fix": "yarn run lint --fix",
     "test:unit": "vitest --run --dir test/unit/",
     "test:e2e": "vitest --run --config vitest.e2e.config.ts --dir test/e2e/",
-    "test:sim:multifork": "DOTENV_CONFIG_PATH=../../.env.test node -r dotenv/config --loader ts-node/esm test/sim/multi_fork.test.ts",
-    "test:sim:mixedclient": "DOTENV_CONFIG_PATH=../../.env.test node -r dotenv/config --loader ts-node/esm test/sim/mixed_client.test.ts",
-    "test:sim:endpoints": "DOTENV_CONFIG_PATH=../../.env.test node -r dotenv/config --loader ts-node/esm test/sim/endpoints.test.ts",
-    "test:sim:deneb": "DOTENV_CONFIG_PATH=../../.env.test node -r dotenv/config --loader ts-node/esm test/sim/deneb.test.ts",
-    "test:sim:backup_eth_provider": "DOTENV_CONFIG_PATH=../../.env.test node -r dotenv/config --loader ts-node/esm test/sim/backup_eth_provider.test.ts",
+    "test:sim:multifork": "LODESTAR_PRESET=minimal DOTENV_CONFIG_PATH=../../.env.test node -r dotenv/config --loader ts-node/esm test/sim/multi_fork.test.ts",
+    "test:sim:mixedclient": "LODESTAR_PRESET=minimal DOTENV_CONFIG_PATH=../../.env.test node -r dotenv/config --loader ts-node/esm test/sim/mixed_client.test.ts",
+    "test:sim:endpoints": "LODESTAR_PRESET=minimal DOTENV_CONFIG_PATH=../../.env.test node -r dotenv/config --loader ts-node/esm test/sim/endpoints.test.ts",
+    "test:sim:deneb": "LODESTAR_PRESET=minimal DOTENV_CONFIG_PATH=../../.env.test node -r dotenv/config --loader ts-node/esm test/sim/deneb.test.ts",
+    "test:sim:backup_eth_provider": "LODESTAR_PRESET=minimal DOTENV_CONFIG_PATH=../../.env.test node -r dotenv/config --loader ts-node/esm test/sim/backup_eth_provider.test.ts",
     "test": "yarn test:unit && yarn test:e2e",
     "coverage": "codecov -F lodestar",
     "check-readme": "typescript-docs-verifier"
diff --git a/packages/types/package.json b/packages/types/package.json
index 7076099fa8ab..2423a4b96a2d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -62,9 +62,9 @@
     "lint": "eslint --color --ext .ts src/ test/",
     "lint:fix": "yarn run lint --fix",
     "test": "yarn test:unit",
-    "test:constants:minimal": "vitest --run --dir test/constants/",
-    "test:constants:mainnet": "LODESTAR_PRESET=mainnet vitest --run --dir test/constants/",
-    "test:unit": "wrapper() { yarn test:constants:minimal $@ && yarn test:constants:mainnet $@ && vitest --run --dir test/unit/ $@; }; wrapper",
+    "test:constants:minimal": "LODESTAR_PRESET=minimal vitest --run --dir test/constants/",
+    "test:constants:mainnet": "vitest --run --dir test/constants/",
+    "test:unit": "LODESTAR_PRESET=minimal yarn test:constants:minimal && yarn test:constants:mainnet && vitest --run --dir test/unit/",
     "test:browsers": "yarn test:browsers:chrome && yarn test:browsers:firefox && yarn test:browsers:electron",
     "test:browsers:chrome": "vitest --run --browser chrome --config ./vitest.browser.config.ts --dir test/unit",
     "test:browsers:firefox": "vitest --run --browser firefox --config ./vitest.browser.config.ts --dir test/unit",
diff --git a/packages/validator/package.json b/packages/validator/package.json
index 5b913ad84a63..1865001d0dc3 100644
--- a/packages/validator/package.json
+++ b/packages/validator/package.json
@@ -30,7 +30,7 @@
     "test:unit": "vitest --run --dir test/unit/",
     "test": "yarn test:unit && yarn test:e2e",
     "test:spec": "vitest --run --config vitest.spec.config.ts --dir test/spec/",
-    "test:e2e": "LODESTAR_PRESET=mainnet vitest --run --config vitest.e2e.config.ts --dir test/e2e",
+    "test:e2e": "vitest --run --config vitest.e2e.config.ts --dir test/e2e",
     "download-spec-tests": "node --loader=ts-node/esm test/spec/downloadTests.ts",
     "coverage": "codecov -F lodestar-validator",
     "check-readme": "typescript-docs-verifier"