diff --git a/.github/workflows/test-env.yml b/.github/workflows/test-env.yml
index 291440e91..9e26bf33f 100644
--- a/.github/workflows/test-env.yml
+++ b/.github/workflows/test-env.yml
@@ -20,7 +20,6 @@ jobs:
       matrix:
         tsModuleResolution: [ "node", "node16", "nodenext" ]
         tsModule: [ "commonjs", "es2020" ]
-        pkgType: [ "module", "commonjs" ]
 
     steps:
       - name: Use Node.js
@@ -36,8 +35,8 @@ jobs:
       - name: Copy tests to working directory
         run: cp faux_modules/ethers/testcases/test-env/test-tsc/* .
 
-      - name: Prepare setup moduleResolution=${{ matrix.tsModuleResolution }} module=${{ matrix.tsModule }} type=${{ matrix.pkgType }}
-        run: node prepare.cjs ${{ matrix.tsModuleResolution }} ${{ matrix.tsModule }} ${{ matrix.pkgType }}
+      - name: Prepare setup moduleResolution=${{ matrix.tsModuleResolution }} module=${{ matrix.tsModule }}
+        run: node prepare.cjs ${{ matrix.tsModuleResolution }} ${{ matrix.tsModule }}
 
       - name: Dump Config
         run: cat package.json tsconfig.json
diff --git a/testcases/test-env/test-3983/.gitignore b/testcases/test-env/test-3983/.gitignore
deleted file mode 100644
index a358b8e00..000000000
--- a/testcases/test-env/test-3983/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-index.d.ts
-index.js
diff --git a/testcases/test-env/test-3983/index.ts b/testcases/test-env/test-3983/index.ts
deleted file mode 100644
index 9c33b08f0..000000000
--- a/testcases/test-env/test-3983/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ethers } from "ethers";
-
-console.log("Version:", ethers.version);
-
-console.log(ethers.getAddress("0x0123456789abcdef0123456789abcdef01234567"));
diff --git a/testcases/test-env/test-3983/package.json b/testcases/test-env/test-3983/package.json
deleted file mode 100644
index 1ea20f579..000000000
--- a/testcases/test-env/test-3983/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "test",
-  "dependencies": {
-    "ethers": "^6.0.0"
-  },
-  "devDependencies": {
-    "typescript": "^5.0.0"
-  },
-  "version": "0.0.1",
-  "description": "Test case for simple import for ethers.",
-  "main": "index.js",
-  "private": true,
-  "publishConfig": {
-    "access": "private"
-  },
-  "scripts": {
-    "build": "tsc --project tsconfig.json",
-    "clean": "rm -rf node_modules package-lock.json *.js *.d.ts",
-    "postinstall": "find node_modules | grep package.json",
-    "test": "npm run build && node index.js"
-  },
-  "keywords": [
-    "ethers",
-    "tests",
-    "typescipt"
-  ],
-  "author": "Richard Moore <me@ricmoo.com>",
-  "license": "MIT"
-}
diff --git a/testcases/test-env/test-3983/tsconfig.json b/testcases/test-env/test-3983/tsconfig.json
deleted file mode 100644
index 65942093a..000000000
--- a/testcases/test-env/test-3983/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "importHelpers": false,
-    "lib": [
-      "dom",
-      "es2020",
-      "es5"
-    ],
-    "module": "commonjs",
-    "moduleResolution": "nodenext",
-    "strict": true,
-    "target": "es2022"
-  },
-  "exclude": [ ],
-  "include": [
-    "./index.ts"
-  ],
-}
diff --git a/testcases/test-env/test-tsc/prepare.cjs b/testcases/test-env/test-tsc/prepare.cjs
index de4cf0aa8..9eebedac7 100644
--- a/testcases/test-env/test-tsc/prepare.cjs
+++ b/testcases/test-env/test-tsc/prepare.cjs
@@ -12,8 +12,9 @@ replace("tsconfig.json", "${TS_MODULE_RESOLUTION}", process.argv[2]);
 // module: commonjs, es2020
 replace("tsconfig.json", "${TS_MODULE}", process.argv[3]);
 
-// type: module, commonjs
-replace("package.json", "${PKG_TYPE}", process.argv[4]);
+// type: commonjs, module
+const type = (process.argv[3] === "commonjs") ? "commonjs": "module";
+replace("package.json", "${PKG_TYPE}", type);
 
 // JavaScript
-fs.writeFileSync("index.ts", fs.readFileSync("js-" + process.argv[4] + ".ts"));
+fs.writeFileSync("index.ts", fs.readFileSync("js-" + type + ".ts"));
diff --git a/testcases/test-env/ts-import-cjs-node16/.gitignore b/testcases/test-env/ts-import-cjs-node16/.gitignore
deleted file mode 100644
index a358b8e00..000000000
--- a/testcases/test-env/ts-import-cjs-node16/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-index.d.ts
-index.js
diff --git a/testcases/test-env/ts-import-cjs-node16/index.ts b/testcases/test-env/ts-import-cjs-node16/index.ts
deleted file mode 100644
index a3026bfcf..000000000
--- a/testcases/test-env/ts-import-cjs-node16/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-const { ethers } = require("ethers");
-
-console.log("Version:", ethers.version);
-
-console.log(ethers.getAddress("0x0123456789abcdef0123456789abcdef01234567"));
diff --git a/testcases/test-env/ts-import-cjs-node16/package.json b/testcases/test-env/ts-import-cjs-node16/package.json
deleted file mode 100644
index 22dececb3..000000000
--- a/testcases/test-env/ts-import-cjs-node16/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "test",
-  "dependencies": {
-    "ethers": "^6.0.0"
-  },
-  "devDependencies": {
-    "typescript": "^5.0.0"
-  },
-  "version": "0.0.1",
-  "description": "Test case for simple import for ethers.",
-  "main": "index.js",
-  "private": true,
-  "publishConfig": { "access": "private" },
-  "scripts": {
-    "build": "tsc --project tsconfig.json",
-    "clean": "rm -rf node_modules package-lock.json *.js *.d.ts",
-    "postinstall": "find node_modules | grep package.json",
-    "test": "npm run build && node index.js"
-  },
-  "license": "MIT"
-}
diff --git a/testcases/test-env/ts-import-cjs-node16/tsconfig.json b/testcases/test-env/ts-import-cjs-node16/tsconfig.json
deleted file mode 100644
index 1ec02a581..000000000
--- a/testcases/test-env/ts-import-cjs-node16/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "importHelpers": false,
-    "lib": [
-      "dom",
-      "es2020",
-      "es5"
-    ],
-    "module": "es2020",
-    "moduleResolution": "node16",
-    "strict": true,
-    "target": "es2022"
-  },
-  "exclude": [ ],
-  "include": [
-    "./index.ts"
-  ],
-}
diff --git a/testcases/test-env/ts-import-cjs/.gitignore b/testcases/test-env/ts-import-cjs/.gitignore
deleted file mode 100644
index a358b8e00..000000000
--- a/testcases/test-env/ts-import-cjs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-index.d.ts
-index.js
diff --git a/testcases/test-env/ts-import-cjs/index.ts b/testcases/test-env/ts-import-cjs/index.ts
deleted file mode 100644
index a3026bfcf..000000000
--- a/testcases/test-env/ts-import-cjs/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-const { ethers } = require("ethers");
-
-console.log("Version:", ethers.version);
-
-console.log(ethers.getAddress("0x0123456789abcdef0123456789abcdef01234567"));
diff --git a/testcases/test-env/ts-import-cjs/package.json b/testcases/test-env/ts-import-cjs/package.json
deleted file mode 100644
index 22dececb3..000000000
--- a/testcases/test-env/ts-import-cjs/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "test",
-  "dependencies": {
-    "ethers": "^6.0.0"
-  },
-  "devDependencies": {
-    "typescript": "^5.0.0"
-  },
-  "version": "0.0.1",
-  "description": "Test case for simple import for ethers.",
-  "main": "index.js",
-  "private": true,
-  "publishConfig": { "access": "private" },
-  "scripts": {
-    "build": "tsc --project tsconfig.json",
-    "clean": "rm -rf node_modules package-lock.json *.js *.d.ts",
-    "postinstall": "find node_modules | grep package.json",
-    "test": "npm run build && node index.js"
-  },
-  "license": "MIT"
-}
diff --git a/testcases/test-env/ts-import-cjs/tsconfig.json b/testcases/test-env/ts-import-cjs/tsconfig.json
deleted file mode 100644
index cf90c7550..000000000
--- a/testcases/test-env/ts-import-cjs/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "importHelpers": false,
-    "lib": [
-      "dom",
-      "es2020",
-      "es5"
-    ],
-    "module": "es2020",
-    "moduleResolution": "node",
-    "strict": true,
-    "target": "es2022"
-  },
-  "exclude": [ ],
-  "include": [
-    "./index.ts"
-  ],
-}
diff --git a/testcases/test-env/ts-import-esm-node16/.gitignore b/testcases/test-env/ts-import-esm-node16/.gitignore
deleted file mode 100644
index a358b8e00..000000000
--- a/testcases/test-env/ts-import-esm-node16/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-index.d.ts
-index.js
diff --git a/testcases/test-env/ts-import-esm-node16/index.ts b/testcases/test-env/ts-import-esm-node16/index.ts
deleted file mode 100644
index 9c33b08f0..000000000
--- a/testcases/test-env/ts-import-esm-node16/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ethers } from "ethers";
-
-console.log("Version:", ethers.version);
-
-console.log(ethers.getAddress("0x0123456789abcdef0123456789abcdef01234567"));
diff --git a/testcases/test-env/ts-import-esm-node16/package.json b/testcases/test-env/ts-import-esm-node16/package.json
deleted file mode 100644
index 93223e2c4..000000000
--- a/testcases/test-env/ts-import-esm-node16/package.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "test",
-  "dependencies": {
-    "ethers": "^6.0.0"
-  },
-  "devDependencies": {
-    "typescript": "^5.0.0"
-  },
-  "version": "0.0.1",
-  "description": "Test case for simple import for ethers.",
-  "main": "index.js",
-  "private": true,
-  "publishConfig": {
-    "access": "private"
-  },
-  "type": "module",
-  "scripts": {
-    "build": "tsc --project tsconfig.json",
-    "clean": "rm -rf node_modules package-lock.json *.js *.d.ts",
-    "postinstall": "find node_modules | grep package.json",
-    "test": "npm run build && node index.js"
-  },
-  "keywords": [
-    "ethers",
-    "tests",
-    "typescipt"
-  ],
-  "author": "Richard Moore <me@ricmoo.com>",
-  "license": "MIT"
-}
diff --git a/testcases/test-env/ts-import-esm-node16/tsconfig.json b/testcases/test-env/ts-import-esm-node16/tsconfig.json
deleted file mode 100644
index 1ec02a581..000000000
--- a/testcases/test-env/ts-import-esm-node16/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "importHelpers": false,
-    "lib": [
-      "dom",
-      "es2020",
-      "es5"
-    ],
-    "module": "es2020",
-    "moduleResolution": "node16",
-    "strict": true,
-    "target": "es2022"
-  },
-  "exclude": [ ],
-  "include": [
-    "./index.ts"
-  ],
-}
diff --git a/testcases/test-env/ts-import-esm/.gitignore b/testcases/test-env/ts-import-esm/.gitignore
deleted file mode 100644
index a358b8e00..000000000
--- a/testcases/test-env/ts-import-esm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-index.d.ts
-index.js
diff --git a/testcases/test-env/ts-import-esm/index.ts b/testcases/test-env/ts-import-esm/index.ts
deleted file mode 100644
index 9c33b08f0..000000000
--- a/testcases/test-env/ts-import-esm/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ethers } from "ethers";
-
-console.log("Version:", ethers.version);
-
-console.log(ethers.getAddress("0x0123456789abcdef0123456789abcdef01234567"));
diff --git a/testcases/test-env/ts-import-esm/package.json b/testcases/test-env/ts-import-esm/package.json
deleted file mode 100644
index 93223e2c4..000000000
--- a/testcases/test-env/ts-import-esm/package.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "test",
-  "dependencies": {
-    "ethers": "^6.0.0"
-  },
-  "devDependencies": {
-    "typescript": "^5.0.0"
-  },
-  "version": "0.0.1",
-  "description": "Test case for simple import for ethers.",
-  "main": "index.js",
-  "private": true,
-  "publishConfig": {
-    "access": "private"
-  },
-  "type": "module",
-  "scripts": {
-    "build": "tsc --project tsconfig.json",
-    "clean": "rm -rf node_modules package-lock.json *.js *.d.ts",
-    "postinstall": "find node_modules | grep package.json",
-    "test": "npm run build && node index.js"
-  },
-  "keywords": [
-    "ethers",
-    "tests",
-    "typescipt"
-  ],
-  "author": "Richard Moore <me@ricmoo.com>",
-  "license": "MIT"
-}
diff --git a/testcases/test-env/ts-import-esm/tsconfig.json b/testcases/test-env/ts-import-esm/tsconfig.json
deleted file mode 100644
index cf90c7550..000000000
--- a/testcases/test-env/ts-import-esm/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "importHelpers": false,
-    "lib": [
-      "dom",
-      "es2020",
-      "es5"
-    ],
-    "module": "es2020",
-    "moduleResolution": "node",
-    "strict": true,
-    "target": "es2022"
-  },
-  "exclude": [ ],
-  "include": [
-    "./index.ts"
-  ],
-}