777 files changed, 333 insertions, 357 deletions

diff --git a/cli/tests/testdata/003_relative_import.ts b/cli/tests/testdata/003_relative_import.ts
deleted file mode 100644
index 01d5d7faa..000000000
--- a/cli/tests/testdata/003_relative_import.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { printHello } from "./subdir/print_hello.ts";
-
-printHello();
diff --git a/cli/tests/testdata/014_duplicate_import.ts b/cli/tests/testdata/014_duplicate_import.ts
deleted file mode 100644
index 88f934526..000000000
--- a/cli/tests/testdata/014_duplicate_import.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// with all the imports of the same module, the module should only be
-// instantiated once
-import "./subdir/auto_print_hello.ts";
-
-import "./subdir/auto_print_hello.ts";
-
-(async () => {
-  await import("./subdir/auto_print_hello.ts");
-})();
diff --git a/cli/tests/testdata/020_json_modules.ts b/cli/tests/testdata/020_json_modules.ts
deleted file mode 100644
index fdc85c440..000000000
--- a/cli/tests/testdata/020_json_modules.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import config from "./subdir/config.json";
-console.log(JSON.stringify(config));
diff --git a/cli/tests/testdata/021_mjs_modules.ts b/cli/tests/testdata/021_mjs_modules.ts
deleted file mode 100644
index 6052b9081..000000000
--- a/cli/tests/testdata/021_mjs_modules.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { isMod5 } from "./subdir/mod5.mjs";
-console.log(isMod5);
diff --git a/cli/tests/testdata/023_no_ext b/cli/tests/testdata/023_no_ext
deleted file mode 100644
index 0dcfb6209..000000000
--- a/cli/tests/testdata/023_no_ext
+++ /dev/null
@@ -1,2 +0,0 @@
-import * as mod4 from "./subdir/mod4.js";
-console.log(mod4.isMod4);
diff --git a/cli/tests/testdata/024_import_no_ext_with_headers.ts b/cli/tests/testdata/024_import_no_ext_with_headers.ts
deleted file mode 100644
index c8621d0e6..000000000
--- a/cli/tests/testdata/024_import_no_ext_with_headers.ts
+++ /dev/null
@@ -1 +0,0 @@
-import "./023_no_ext_with_headers";
diff --git a/cli/tests/testdata/024_import_no_ext_with_headers.ts.out b/cli/tests/testdata/024_import_no_ext_with_headers.ts.out
deleted file mode 100644
index e427984d4..000000000
--- a/cli/tests/testdata/024_import_no_ext_with_headers.ts.out
+++ /dev/null
@@ -1 +0,0 @@
-HELLO
diff --git a/cli/tests/testdata/029_eval.out b/cli/tests/testdata/029_eval.out
deleted file mode 100644
index ce0136250..000000000
--- a/cli/tests/testdata/029_eval.out
+++ /dev/null
@@ -1 +0,0 @@
-hello
diff --git a/cli/tests/testdata/030_eval_ts.out b/cli/tests/testdata/030_eval_ts.out
deleted file mode 100644
index 190a18037..000000000
--- a/cli/tests/testdata/030_eval_ts.out
+++ /dev/null
@@ -1 +0,0 @@
-123
diff --git a/cli/tests/testdata/035_cached_only_flag.out b/cli/tests/testdata/035_cached_only_flag.out
deleted file mode 100644
index 10c8611fa..000000000
--- a/cli/tests/testdata/035_cached_only_flag.out
+++ /dev/null
@@ -1,4 +0,0 @@
-error: Specifier not found in cache: "http://127.0.0.1:4545/019_media_types.ts", --cached-only is specified.
-
-Caused by:
-    Specifier not found in cache: "http://127.0.0.1:4545/019_media_types.ts", --cached-only is specified.
diff --git a/cli/tests/testdata/044_bad_resource.ts b/cli/tests/testdata/044_bad_resource.ts
deleted file mode 100644
index 05e1354dc..000000000
--- a/cli/tests/testdata/044_bad_resource.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-const file = await Deno.open("044_bad_resource.ts", { read: true });
-file.close();
-await file.seek(10, 0);
diff --git a/cli/tests/testdata/045_proxy_test.ts.out b/cli/tests/testdata/045_proxy_test.ts.out
deleted file mode 100644
index 4ebf97dee..000000000
--- a/cli/tests/testdata/045_proxy_test.ts.out
+++ /dev/null
@@ -1,6 +0,0 @@
-Proxy server listening on [WILDCARD]
-Proxy request to: http://localhost:4545/045_mod.ts
-Proxy request to: http://localhost:4545/045_mod.ts
-Proxy request to: http://localhost:4545/045_output.ts
-Proxy request to: http://localhost:4545/045_mod.ts
-proxy-authorization: Basic dXNlcm5hbWU6cGFzc3dvcmQ=
diff --git a/cli/tests/testdata/052_no_remote_flag.out b/cli/tests/testdata/052_no_remote_flag.out
deleted file mode 100644
index 712fcf3d6..000000000
--- a/cli/tests/testdata/052_no_remote_flag.out
+++ /dev/null
@@ -1,4 +0,0 @@
-error: A remote specifier was requested: "http://127.0.0.1:4545/019_media_types.ts", but --no-remote is specified.
-
-Caused by:
-    A remote specifier was requested: "http://127.0.0.1:4545/019_media_types.ts", but --no-remote is specified.
diff --git a/cli/tests/testdata/053_import_compression/main.ts b/cli/tests/testdata/053_import_compression/main.ts
deleted file mode 100644
index 1ff1b0c83..000000000
--- a/cli/tests/testdata/053_import_compression/main.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import "http://127.0.0.1:4545/053_import_compression/gziped";
-import "http://127.0.0.1:4545/053_import_compression/brotli";
-
-console.log(
-  await fetch(
-    "http://127.0.0.1:4545/053_import_compression/gziped",
-  ).then((res) => res.text()),
-);
-console.log(
-  await fetch(
-    "http://127.0.0.1:4545/053_import_compression/brotli",
-  ).then((res) => res.text()),
-);
diff --git a/cli/tests/testdata/072_location_relative_fetch.ts b/cli/tests/testdata/072_location_relative_fetch.ts
deleted file mode 100644
index d4764bf7f..000000000
--- a/cli/tests/testdata/072_location_relative_fetch.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-const response = await fetch("fetch/hello.txt");
-console.log(await response.text());
diff --git a/cli/tests/testdata/084_worker_custom_inspect.ts b/cli/tests/testdata/084_worker_custom_inspect.ts
deleted file mode 100644
index 27e27e51f..000000000
--- a/cli/tests/testdata/084_worker_custom_inspect.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-new Worker(
-  import.meta.resolve("./084_worker_custom_inspect_worker.ts"),
-  { type: "module" },
-);
diff --git a/cli/tests/testdata/Component.tsx b/cli/tests/testdata/Component.tsx
deleted file mode 100644
index 81dfd6957..000000000
--- a/cli/tests/testdata/Component.tsx
+++ /dev/null
@@ -1 +0,0 @@
-import "./046_jsx_test.tsx";
diff --git a/cli/tests/testdata/DenoWinRunner.cs b/cli/tests/testdata/assets/DenoWinRunner.cs
index 2f9e9f89f..2f9e9f89f 100644
--- a/cli/tests/testdata/DenoWinRunner.cs
+++ b/cli/tests/testdata/assets/DenoWinRunner.cs
diff --git a/cli/tests/testdata/DenoWinRunner.ps1 b/cli/tests/testdata/assets/DenoWinRunner.ps1
index 203b5d36c..203b5d36c 100644
--- a/cli/tests/testdata/DenoWinRunner.ps1
+++ b/cli/tests/testdata/assets/DenoWinRunner.ps1
diff --git a/cli/tests/testdata/deno_dom_0.1.3-alpha2.wasm b/cli/tests/testdata/assets/deno_dom_0.1.3-alpha2.wasm
index 6dd9d0e91..6dd9d0e91 100644
--- a/cli/tests/testdata/deno_dom_0.1.3-alpha2.wasm
+++ b/cli/tests/testdata/assets/deno_dom_0.1.3-alpha2.wasm
diff --git a/cli/tests/testdata/fixture.json b/cli/tests/testdata/assets/fixture.json
index 56e056b6a..56e056b6a 100644
--- a/cli/tests/testdata/fixture.json
+++ b/cli/tests/testdata/assets/fixture.json
diff --git a/cli/tests/testdata/hello.txt b/cli/tests/testdata/assets/hello.txt
index 6769dd60b..6769dd60b 100644
--- a/cli/tests/testdata/hello.txt
+++ b/cli/tests/testdata/assets/hello.txt
diff --git a/cli/tests/testdata/unreachable.wasm b/cli/tests/testdata/assets/unreachable.wasm
index a4110ee39..a4110ee39 100644
--- a/cli/tests/testdata/unreachable.wasm
+++ b/cli/tests/testdata/assets/unreachable.wasm
diff --git a/cli/tests/testdata/response_string_perf.js b/cli/tests/testdata/benches/response_string_perf.js
index f55376c77..f55376c77 100644
--- a/cli/tests/testdata/response_string_perf.js
+++ b/cli/tests/testdata/benches/response_string_perf.js
diff --git a/cli/tests/testdata/text_decoder_perf.js b/cli/tests/testdata/benches/text_decoder_perf.js
index 2e52b1f8b..2e52b1f8b 100644
--- a/cli/tests/testdata/text_decoder_perf.js
+++ b/cli/tests/testdata/benches/text_decoder_perf.js
diff --git a/cli/tests/testdata/text_encoder_into_perf.js b/cli/tests/testdata/benches/text_encoder_into_perf.js
index 8d60e9f00..8d60e9f00 100644
--- a/cli/tests/testdata/text_encoder_into_perf.js
+++ b/cli/tests/testdata/benches/text_encoder_into_perf.js
diff --git a/cli/tests/testdata/text_encoder_perf.js b/cli/tests/testdata/benches/text_encoder_perf.js
index 6f61f019e..6f61f019e 100644
--- a/cli/tests/testdata/text_encoder_perf.js
+++ b/cli/tests/testdata/benches/text_encoder_perf.js
diff --git a/cli/tests/testdata/095_cache_with_bare_import.ts b/cli/tests/testdata/bundle/bare_imports/error_with_bare_import.ts
index c0748305d..c0748305d 100644
--- a/cli/tests/testdata/095_cache_with_bare_import.ts
+++ b/cli/tests/testdata/bundle/bare_imports/error_with_bare_import.ts
diff --git a/cli/tests/testdata/error_027_bundle_with_bare_import.ts.out b/cli/tests/testdata/bundle/bare_imports/error_with_bare_import.ts.out
index e2edd118a..44d063a5e 100644
--- a/cli/tests/testdata/error_027_bundle_with_bare_import.ts.out
+++ b/cli/tests/testdata/bundle/bare_imports/error_with_bare_import.ts.out
@@ -1,2 +1,2 @@
 [WILDCARD]error: Relative import path "foo" not prefixed with / or ./ or ../
-    at file:///[WILDCARD]/error_027_bundle_with_bare_import.ts:[WILDCARD]
+    at file:///[WILDCARD]/error_with_bare_import.ts:[WILDCARD]
diff --git a/cli/tests/testdata/bundle.test.out b/cli/tests/testdata/bundle/bundle.test.out
index 6b1c109d3..6b1c109d3 100644
--- a/cli/tests/testdata/bundle.test.out
+++ b/cli/tests/testdata/bundle/bundle.test.out
diff --git a/cli/tests/testdata/bundle/check_local_by_default.out b/cli/tests/testdata/bundle/check_local_by_default/no_errors.out
index c4559d1fa..c4559d1fa 100644
--- a/cli/tests/testdata/bundle/check_local_by_default.out
+++ b/cli/tests/testdata/bundle/check_local_by_default/no_errors.out
diff --git a/cli/tests/testdata/bundle/check_local_by_default.ts b/cli/tests/testdata/bundle/check_local_by_default/no_errors.ts
index 2ae8c2692..2ae8c2692 100644
--- a/cli/tests/testdata/bundle/check_local_by_default.ts
+++ b/cli/tests/testdata/bundle/check_local_by_default/no_errors.ts
diff --git a/cli/tests/testdata/bundle/check_local_by_default2.out b/cli/tests/testdata/bundle/check_local_by_default/type_error.out
index 60f5760f8..6d53e9498 100644
--- a/cli/tests/testdata/bundle/check_local_by_default2.out
+++ b/cli/tests/testdata/bundle/check_local_by_default/type_error.out
@@ -1,4 +1,4 @@
 error: TS2322 [ERROR]: Type '12' is not assignable to type '"b"'.
 const b: "b" = 12;
       ^
-    at [WILDCARD]bundle/check_local_by_default2.ts:3:7
+    at [WILDCARD]bundle/check_local_by_default/type_error.ts:3:7
diff --git a/cli/tests/testdata/bundle/check_local_by_default2.ts b/cli/tests/testdata/bundle/check_local_by_default/type_error.ts
index 5177ff944..5177ff944 100644
--- a/cli/tests/testdata/bundle/check_local_by_default2.ts
+++ b/cli/tests/testdata/bundle/check_local_by_default/type_error.ts
diff --git a/cli/tests/testdata/ts_decorators_bundle.out b/cli/tests/testdata/bundle/decorators/ts_decorators.out
index 2f503fdd0..2f503fdd0 100644
--- a/cli/tests/testdata/ts_decorators_bundle.out
+++ b/cli/tests/testdata/bundle/decorators/ts_decorators.out
diff --git a/cli/tests/testdata/ts_decorators_bundle.ts b/cli/tests/testdata/bundle/decorators/ts_decorators.ts
index 72120b2ec..61299bccf 100644
--- a/cli/tests/testdata/ts_decorators_bundle.ts
+++ b/cli/tests/testdata/bundle/decorators/ts_decorators.ts
@@ -1,6 +1,6 @@
 // deno-lint-ignore-file
 
-import { B } from "./subdir/more_decorators.ts";
+import { B } from "../../subdir/more_decorators.ts";
 
 function Decorator() {
   return function (
diff --git a/cli/tests/testdata/bundle_dynamic_import.ts b/cli/tests/testdata/bundle/dynamic_import.ts
index d8c7d08ec..d8c7d08ec 100644
--- a/cli/tests/testdata/bundle_dynamic_import.ts
+++ b/cli/tests/testdata/bundle/dynamic_import.ts
diff --git a/cli/tests/testdata/bundle_ignore_directives.test.out b/cli/tests/testdata/bundle/ignore_directives.test.out
index b69c2632c..b69c2632c 100644
--- a/cli/tests/testdata/bundle_ignore_directives.test.out
+++ b/cli/tests/testdata/bundle/ignore_directives.test.out
diff --git a/cli/tests/testdata/bundle/import_map/import_map.json b/cli/tests/testdata/bundle/import_map/import_map.json
new file mode 100644
index 000000000..c02f72718
--- /dev/null
+++ b/cli/tests/testdata/bundle/import_map/import_map.json
@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "mod2": "../../subdir/subdir2/mod2.ts"
+  }
+}
diff --git a/cli/tests/testdata/bundle_im.ts b/cli/tests/testdata/bundle/import_map/main.ts
index 74834de20..74834de20 100644
--- a/cli/tests/testdata/bundle_im.ts
+++ b/cli/tests/testdata/bundle/import_map/main.ts
diff --git a/cli/tests/testdata/bundle_jsx.out b/cli/tests/testdata/bundle/jsx.out
index da83cde82..da83cde82 100644
--- a/cli/tests/testdata/bundle_jsx.out
+++ b/cli/tests/testdata/bundle/jsx.out
diff --git a/cli/tests/testdata/lock_check_err_with_bundle.json b/cli/tests/testdata/bundle/lockfile/check_error.json
index a218d7000..a218d7000 100644
--- a/cli/tests/testdata/lock_check_err_with_bundle.json
+++ b/cli/tests/testdata/bundle/lockfile/check_error.json
diff --git a/cli/tests/testdata/lock_check_err_with_bundle.out b/cli/tests/testdata/bundle/lockfile/check_error.out
index a20e9b3af..9299bc27e 100644
--- a/cli/tests/testdata/lock_check_err_with_bundle.out
+++ b/cli/tests/testdata/bundle/lockfile/check_error.out
@@ -1,4 +1,4 @@
 [WILDCARD]
 error: The source code is invalid, as it does not match the expected hash in the lock file.
   Specifier: http://127.0.0.1:4545/subdir/subdir2/mod2.ts
-  Lock file: lock_check_err_with_bundle.json
+  Lock file: bundle/lockfile/check_error.json
diff --git a/cli/tests/testdata/bundle_im.json b/cli/tests/testdata/bundle_im.json
deleted file mode 100644
index 8ebc00c5b..000000000
--- a/cli/tests/testdata/bundle_im.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "imports": {
-    "mod2": "./subdir/subdir2/mod2.ts"
-  }
-}
diff --git a/cli/tests/testdata/036_import_map_fetch.out b/cli/tests/testdata/cache/036_import_map_fetch.out
index e69de29bb..e69de29bb 100644
--- a/cli/tests/testdata/036_import_map_fetch.out
+++ b/cli/tests/testdata/cache/036_import_map_fetch.out
diff --git a/cli/tests/testdata/037_fetch_multiple.out b/cli/tests/testdata/cache/037_fetch_multiple.out
index 09c6c0f60..09c6c0f60 100644
--- a/cli/tests/testdata/037_fetch_multiple.out
+++ b/cli/tests/testdata/cache/037_fetch_multiple.out
diff --git a/cli/tests/testdata/error_027_bundle_with_bare_import.ts b/cli/tests/testdata/cache/095_cache_with_bare_import.ts
index c0748305d..c0748305d 100644
--- a/cli/tests/testdata/error_027_bundle_with_bare_import.ts
+++ b/cli/tests/testdata/cache/095_cache_with_bare_import.ts
diff --git a/cli/tests/testdata/095_cache_with_bare_import.ts.out b/cli/tests/testdata/cache/095_cache_with_bare_import.ts.out
index 2668a6e08..2668a6e08 100644
--- a/cli/tests/testdata/095_cache_with_bare_import.ts.out
+++ b/cli/tests/testdata/cache/095_cache_with_bare_import.ts.out
diff --git a/cli/tests/testdata/cache_extensionless.out b/cli/tests/testdata/cache/cache_extensionless.out
index 3694c67cb..3694c67cb 100644
--- a/cli/tests/testdata/cache_extensionless.out
+++ b/cli/tests/testdata/cache/cache_extensionless.out
diff --git a/cli/tests/testdata/cache_random_extension.out b/cli/tests/testdata/cache/cache_random_extension.out
index 745a2e0e3..745a2e0e3 100644
--- a/cli/tests/testdata/cache_random_extension.out
+++ b/cli/tests/testdata/cache/cache_random_extension.out
diff --git a/cli/tests/testdata/ignore_require.js b/cli/tests/testdata/cache/ignore_require.js
index a8ef15021..a8ef15021 100644
--- a/cli/tests/testdata/ignore_require.js
+++ b/cli/tests/testdata/cache/ignore_require.js
diff --git a/cli/tests/testdata/performance_stats.out b/cli/tests/testdata/cache/performance_stats.out
index 141829ee6..141829ee6 100644
--- a/cli/tests/testdata/performance_stats.out
+++ b/cli/tests/testdata/cache/performance_stats.out
diff --git a/cli/tests/testdata/redirect_cache.out b/cli/tests/testdata/cache/redirect_cache.out
index 8905c4529..8905c4529 100644
--- a/cli/tests/testdata/redirect_cache.out
+++ b/cli/tests/testdata/cache/redirect_cache.out
diff --git a/cli/tests/testdata/cafile_info.ts b/cli/tests/testdata/cert/cafile_info.ts
index b41873f73..b41873f73 100644
--- a/cli/tests/testdata/cafile_info.ts
+++ b/cli/tests/testdata/cert/cafile_info.ts
diff --git a/cli/tests/testdata/cafile_info.ts.out b/cli/tests/testdata/cert/cafile_info.ts.out
index 3ce03961d..4c7e6c6c7 100644
--- a/cli/tests/testdata/cafile_info.ts.out
+++ b/cli/tests/testdata/cert/cafile_info.ts.out
@@ -2,7 +2,7 @@ local: [WILDCARD]https[WILDCARD]localhost_PORT5545[WILDCARD]
 type: TypeScript
 dependencies: 8 unique (total [WILDCARD])
 
-https://localhost:5545/cafile_info.ts ([WILDCARD])
+https://localhost:5545/cert/cafile_info.ts ([WILDCARD])
 ├── https://localhost:5545/subdir/mt_application_ecmascript.j2.js ([WILDCARD])
 ├── https://localhost:5545/subdir/mt_application_x_javascript.j4.js ([WILDCARD])
 ├── https://localhost:5545/subdir/mt_application_x_typescript.t4.ts ([WILDCARD])
diff --git a/cli/tests/testdata/cafile_ts_fetch.ts b/cli/tests/testdata/cert/cafile_ts_fetch.ts
index 03afb6d2f..12fcda007 100644
--- a/cli/tests/testdata/cafile_ts_fetch.ts
+++ b/cli/tests/testdata/cert/cafile_ts_fetch.ts
@@ -1,3 +1,3 @@
-fetch("https://localhost:5545/cafile_ts_fetch.ts.out")
+fetch("https://localhost:5545/cert/cafile_ts_fetch.ts.out")
   .then((r) => r.text())
   .then((t) => console.log(t.trimEnd()));
diff --git a/cli/tests/testdata/cafile_ts_fetch.ts.out b/cli/tests/testdata/cert/cafile_ts_fetch.ts.out
index 699b756ed..699b756ed 100644
--- a/cli/tests/testdata/cafile_ts_fetch.ts.out
+++ b/cli/tests/testdata/cert/cafile_ts_fetch.ts.out
diff --git a/cli/tests/testdata/cafile_ts_fetch_unsafe_ssl.ts.out b/cli/tests/testdata/cert/cafile_ts_fetch_unsafe_ssl.ts.out
index a0934e584..a0934e584 100644
--- a/cli/tests/testdata/cafile_ts_fetch_unsafe_ssl.ts.out
+++ b/cli/tests/testdata/cert/cafile_ts_fetch_unsafe_ssl.ts.out
diff --git a/cli/tests/testdata/cafile_url_imports.ts b/cli/tests/testdata/cert/cafile_url_imports.ts
index 2355a8628..2355a8628 100644
--- a/cli/tests/testdata/cafile_url_imports.ts
+++ b/cli/tests/testdata/cert/cafile_url_imports.ts
diff --git a/cli/tests/testdata/cafile_url_imports.ts.out b/cli/tests/testdata/cert/cafile_url_imports.ts.out
index 989ce33e9..989ce33e9 100644
--- a/cli/tests/testdata/cafile_url_imports.ts.out
+++ b/cli/tests/testdata/cert/cafile_url_imports.ts.out
diff --git a/cli/tests/testdata/cafile_url_imports_unsafe_ssl.ts.out b/cli/tests/testdata/cert/cafile_url_imports_unsafe_ssl.ts.out
index daebcd766..daebcd766 100644
--- a/cli/tests/testdata/cafile_url_imports_unsafe_ssl.ts.out
+++ b/cli/tests/testdata/cert/cafile_url_imports_unsafe_ssl.ts.out
diff --git a/cli/tests/testdata/deno_land_unsafe_ssl.ts b/cli/tests/testdata/cert/deno_land_unsafe_ssl.ts
index f5e8dcc80..f5e8dcc80 100644
--- a/cli/tests/testdata/deno_land_unsafe_ssl.ts
+++ b/cli/tests/testdata/cert/deno_land_unsafe_ssl.ts
diff --git a/cli/tests/testdata/deno_land_unsafe_ssl.ts.out b/cli/tests/testdata/cert/deno_land_unsafe_ssl.ts.out
index cbf52b076..cbf52b076 100644
--- a/cli/tests/testdata/deno_land_unsafe_ssl.ts.out
+++ b/cli/tests/testdata/cert/deno_land_unsafe_ssl.ts.out
diff --git a/cli/tests/testdata/ip_address_unsafe_ssl.ts b/cli/tests/testdata/cert/ip_address_unsafe_ssl.ts
index a3268888f..a3268888f 100644
--- a/cli/tests/testdata/ip_address_unsafe_ssl.ts
+++ b/cli/tests/testdata/cert/ip_address_unsafe_ssl.ts
diff --git a/cli/tests/testdata/ip_address_unsafe_ssl.ts.out b/cli/tests/testdata/cert/ip_address_unsafe_ssl.ts.out
index d4ebb2617..d4ebb2617 100644
--- a/cli/tests/testdata/ip_address_unsafe_ssl.ts.out
+++ b/cli/tests/testdata/cert/ip_address_unsafe_ssl.ts.out
diff --git a/cli/tests/testdata/listen_tls_alpn.ts b/cli/tests/testdata/cert/listen_tls_alpn.ts
index b3ade686e..b3ade686e 100644
--- a/cli/tests/testdata/listen_tls_alpn.ts
+++ b/cli/tests/testdata/cert/listen_tls_alpn.ts
diff --git a/cli/tests/testdata/listen_tls_alpn_fail.ts b/cli/tests/testdata/cert/listen_tls_alpn_fail.ts
index 04f9ec11f..da60383f0 100644
--- a/cli/tests/testdata/listen_tls_alpn_fail.ts
+++ b/cli/tests/testdata/cert/listen_tls_alpn_fail.ts
@@ -1,4 +1,4 @@
-import { assertRejects } from "../../../test_util/std/testing/asserts.ts";
+import { assertRejects } from "../../../../test_util/std/testing/asserts.ts";
 
 const listener = Deno.listenTls({
   port: Number(Deno.args[0]),
diff --git a/cli/tests/testdata/localhost_unsafe_ssl.ts.out b/cli/tests/testdata/cert/localhost_unsafe_ssl.ts.out
index 0bfaeb25d..0bfaeb25d 100644
--- a/cli/tests/testdata/localhost_unsafe_ssl.ts.out
+++ b/cli/tests/testdata/cert/localhost_unsafe_ssl.ts.out
diff --git a/cli/tests/testdata/check_all.out b/cli/tests/testdata/check/check_all.out
index 344264634..344264634 100644
--- a/cli/tests/testdata/check_all.out
+++ b/cli/tests/testdata/check/check_all.out
diff --git a/cli/tests/testdata/check_all.ts b/cli/tests/testdata/check/check_all.ts
index 2ae8c2692..2ae8c2692 100644
--- a/cli/tests/testdata/check_all.ts
+++ b/cli/tests/testdata/check/check_all.ts
diff --git a/cli/tests/testdata/declaration_header_file_with_no_exports.ts b/cli/tests/testdata/check/declaration_header_file_with_no_exports.ts
index ef5da7a38..ef5da7a38 100644
--- a/cli/tests/testdata/declaration_header_file_with_no_exports.ts
+++ b/cli/tests/testdata/check/declaration_header_file_with_no_exports.ts
diff --git a/cli/tests/testdata/declaration_header_file_with_no_exports_js.d.ts b/cli/tests/testdata/check/declaration_header_file_with_no_exports_js.d.ts
index e69de29bb..e69de29bb 100644
--- a/cli/tests/testdata/declaration_header_file_with_no_exports_js.d.ts
+++ b/cli/tests/testdata/check/declaration_header_file_with_no_exports_js.d.ts
diff --git a/cli/tests/testdata/declaration_header_file_with_no_exports_js.js b/cli/tests/testdata/check/declaration_header_file_with_no_exports_js.js
index b8ae2bcef..b8ae2bcef 100644
--- a/cli/tests/testdata/declaration_header_file_with_no_exports_js.js
+++ b/cli/tests/testdata/check/declaration_header_file_with_no_exports_js.js
diff --git a/cli/tests/testdata/check/module_detection_force.ts b/cli/tests/testdata/check/module_detection_force.ts
new file mode 100644
index 000000000..185ceb816
--- /dev/null
+++ b/cli/tests/testdata/check/module_detection_force.ts
@@ -0,0 +1,3 @@
+const a = 1;
+await import("./module_detection_force/import.ts");
+console.log(a);
diff --git a/cli/tests/testdata/module_detection_force_import.ts b/cli/tests/testdata/check/module_detection_force/import.ts
index 66b229870..66b229870 100644
--- a/cli/tests/testdata/module_detection_force_import.ts
+++ b/cli/tests/testdata/check/module_detection_force/import.ts
diff --git a/cli/tests/testdata/check/module_detection_force/main.ts b/cli/tests/testdata/check/module_detection_force/main.ts
new file mode 100644
index 000000000..a55c9962b
--- /dev/null
+++ b/cli/tests/testdata/check/module_detection_force/main.ts
@@ -0,0 +1,3 @@
+const a = 1;
+await import("./import.ts");
+console.log(a);
diff --git a/cli/tests/testdata/circular1.js b/cli/tests/testdata/circular1.js
deleted file mode 100644
index 8b2cc4960..000000000
--- a/cli/tests/testdata/circular1.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import "./circular2.js";
-console.log("circular1");
diff --git a/cli/tests/testdata/circular1.js.out b/cli/tests/testdata/circular1.js.out
deleted file mode 100644
index 21f7fd585..000000000
--- a/cli/tests/testdata/circular1.js.out
+++ /dev/null
@@ -1,2 +0,0 @@
-circular2
-circular1
diff --git a/cli/tests/testdata/circular2.js b/cli/tests/testdata/circular2.js
deleted file mode 100644
index 62127e04d..000000000
--- a/cli/tests/testdata/circular2.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import "./circular1.js";
-console.log("circular2");
diff --git a/cli/tests/testdata/028_args.ts b/cli/tests/testdata/compile/args.ts
index ec41d52f9..ec41d52f9 100644
--- a/cli/tests/testdata/028_args.ts
+++ b/cli/tests/testdata/compile/args.ts
diff --git a/cli/tests/testdata/standalone_error.ts b/cli/tests/testdata/compile/standalone_error.ts
index 279398113..279398113 100644
--- a/cli/tests/testdata/standalone_error.ts
+++ b/cli/tests/testdata/compile/standalone_error.ts
diff --git a/cli/tests/testdata/standalone_error_module_with_imports_1.ts b/cli/tests/testdata/compile/standalone_error_module_with_imports_1.ts
index bf38f7263..bf38f7263 100644
--- a/cli/tests/testdata/standalone_error_module_with_imports_1.ts
+++ b/cli/tests/testdata/compile/standalone_error_module_with_imports_1.ts
diff --git a/cli/tests/testdata/standalone_error_module_with_imports_2.ts b/cli/tests/testdata/compile/standalone_error_module_with_imports_2.ts
index ef052b512..ef052b512 100644
--- a/cli/tests/testdata/standalone_error_module_with_imports_2.ts
+++ b/cli/tests/testdata/compile/standalone_error_module_with_imports_2.ts
diff --git a/cli/tests/testdata/standalone_follow_redirects.ts b/cli/tests/testdata/compile/standalone_follow_redirects.ts
index f0957bc3d..f0957bc3d 100644
--- a/cli/tests/testdata/standalone_follow_redirects.ts
+++ b/cli/tests/testdata/compile/standalone_follow_redirects.ts
diff --git a/cli/tests/testdata/standalone_follow_redirects_2.js b/cli/tests/testdata/compile/standalone_follow_redirects_2.js
index c0130ef5a..c0130ef5a 100644
--- a/cli/tests/testdata/standalone_follow_redirects_2.js
+++ b/cli/tests/testdata/compile/standalone_follow_redirects_2.js
diff --git a/cli/tests/testdata/standalone_import_datauri.ts b/cli/tests/testdata/compile/standalone_import_datauri.ts
index 68f348828..68f348828 100644
--- a/cli/tests/testdata/standalone_import_datauri.ts
+++ b/cli/tests/testdata/compile/standalone_import_datauri.ts
diff --git a/cli/tests/testdata/compile/standalone_import_map.json b/cli/tests/testdata/compile/standalone_import_map.json
new file mode 100644
index 000000000..9e5b90bd7
--- /dev/null
+++ b/cli/tests/testdata/compile/standalone_import_map.json
@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "hello": "../run/001_hello.js"
+  }
+}
diff --git a/cli/tests/testdata/standalone_import_map.ts b/cli/tests/testdata/compile/standalone_import_map.ts
index 097b96356..097b96356 100644
--- a/cli/tests/testdata/standalone_import_map.ts
+++ b/cli/tests/testdata/compile/standalone_import_map.ts
diff --git a/cli/tests/testdata/standalone_runtime_flags.ts b/cli/tests/testdata/compile/standalone_runtime_flags.ts
index 0154c7f4e..0154c7f4e 100644
--- a/cli/tests/testdata/standalone_runtime_flags.ts
+++ b/cli/tests/testdata/compile/standalone_runtime_flags.ts
diff --git a/cli/tests/testdata/config.ts.out b/cli/tests/testdata/config.ts.out
deleted file mode 100644
index 44b123f97..000000000
--- a/cli/tests/testdata/config.ts.out
+++ /dev/null
@@ -1,4 +0,0 @@
-[WILDCARD]Unsupported compiler options in "[WILDCARD]config.tsconfig.json".
-  The following options were ignored:
-    module, target
-Check [WILDCARD]/config.ts
diff --git a/cli/tests/testdata/config_json_import.ts b/cli/tests/testdata/config_json_import.ts
deleted file mode 100644
index d344c0fb7..000000000
--- a/cli/tests/testdata/config_json_import.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import config from "./jsx/deno-jsx.json" assert { type: "json" };
-console.log(config);
diff --git a/cli/tests/testdata/config_types_remote.tsconfig.json b/cli/tests/testdata/config_types_remote.tsconfig.json
deleted file mode 100644
index f40d5b1c4..000000000
--- a/cli/tests/testdata/config_types_remote.tsconfig.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "compilerOptions": {
-    "types": [
-      "http://localhost:4545/subdir/types.d.ts"
-    ]
-  }
-}
diff --git a/cli/tests/testdata/disallow_http_from_https_js.out b/cli/tests/testdata/disallow_http_from_https_js.out
deleted file mode 100644
index e4f9e8d59..000000000
--- a/cli/tests/testdata/disallow_http_from_https_js.out
+++ /dev/null
@@ -1,3 +0,0 @@
-error: Modules imported via https are not allowed to import http modules.
-  Importing: http://localhost:4545/001_hello.js
-    at https://localhost:5545/disallow_http_from_https.js:2:8
diff --git a/cli/tests/testdata/disallow_http_from_https_ts.out b/cli/tests/testdata/disallow_http_from_https_ts.out
deleted file mode 100644
index 3f885001f..000000000
--- a/cli/tests/testdata/disallow_http_from_https_ts.out
+++ /dev/null
@@ -1,3 +0,0 @@
-error: Modules imported via https are not allowed to import http modules.
-  Importing: http://localhost:4545/001_hello.js
-    at https://localhost:5545/disallow_http_from_https.ts:2:8
diff --git a/cli/tests/testdata/060_deno_doc_displays_all_overloads_in_details_view.ts b/cli/tests/testdata/doc/060_deno_doc_displays_all_overloads_in_details_view.ts
index 854c1b464..854c1b464 100644
--- a/cli/tests/testdata/060_deno_doc_displays_all_overloads_in_details_view.ts
+++ b/cli/tests/testdata/doc/060_deno_doc_displays_all_overloads_in_details_view.ts
diff --git a/cli/tests/testdata/060_deno_doc_displays_all_overloads_in_details_view.ts.out b/cli/tests/testdata/doc/060_deno_doc_displays_all_overloads_in_details_view.ts.out
index 2cd36931c..2cd36931c 100644
--- a/cli/tests/testdata/060_deno_doc_displays_all_overloads_in_details_view.ts.out
+++ b/cli/tests/testdata/doc/060_deno_doc_displays_all_overloads_in_details_view.ts.out
diff --git a/cli/tests/testdata/deno_doc.ts b/cli/tests/testdata/doc/deno_doc.ts
index fb3c50957..fb3c50957 100644
--- a/cli/tests/testdata/deno_doc.ts
+++ b/cli/tests/testdata/doc/deno_doc.ts
diff --git a/cli/tests/testdata/deno_doc_builtin.out b/cli/tests/testdata/doc/deno_doc_builtin.out
index b4a90d6bc..b4a90d6bc 100644
--- a/cli/tests/testdata/deno_doc_builtin.out
+++ b/cli/tests/testdata/doc/deno_doc_builtin.out
diff --git a/cli/tests/testdata/empty.out b/cli/tests/testdata/empty.out
deleted file mode 100644
index e69de29bb..000000000
--- a/cli/tests/testdata/empty.out
+++ /dev/null
diff --git a/cli/tests/testdata/error_002.ts b/cli/tests/testdata/error_002.ts
deleted file mode 100644
index 6aa0fcc3b..000000000
--- a/cli/tests/testdata/error_002.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { throwsError } from "./subdir/mod1.ts";
-
-function foo() {
-  throwsError();
-}
-
-foo();
diff --git a/cli/tests/testdata/error_010_nonexistent_arg.disabled b/cli/tests/testdata/error_010_nonexistent_arg.disabled
deleted file mode 100644
index 9d183107c..000000000
--- a/cli/tests/testdata/error_010_nonexistent_arg.disabled
+++ /dev/null
@@ -1,4 +0,0 @@
-args: not-a-valid-filename.ts
-output: tests/error_010_nonexistent_arg.out
-exit_code: 1
-check_stderr: true
diff --git a/cli/tests/testdata/error_010_nonexistent_arg.out b/cli/tests/testdata/error_010_nonexistent_arg.out
deleted file mode 100644
index ef4f7b041..000000000
--- a/cli/tests/testdata/error_010_nonexistent_arg.out
+++ /dev/null
@@ -1 +0,0 @@
-[WILDCARD]Cannot resolve module "file:[WILDCARD]not-a-valid-filename.ts" from "."
diff --git a/cli/tests/testdata/error_026_remote_import_error.ts b/cli/tests/testdata/error_026_remote_import_error.ts
deleted file mode 100644
index 2718e768a..000000000
--- a/cli/tests/testdata/error_026_remote_import_error.ts
+++ /dev/null
@@ -1 +0,0 @@
-import "http://localhost:4545/error_001.ts";
diff --git a/cli/tests/testdata/error_026_remote_import_error.ts.out b/cli/tests/testdata/error_026_remote_import_error.ts.out
deleted file mode 100644
index bec0cf1c5..000000000
--- a/cli/tests/testdata/error_026_remote_import_error.ts.out
+++ /dev/null
@@ -1,7 +0,0 @@
-[WILDCARD]error: Uncaught Error: bad
-  throw Error("bad");
-        ^
-    at foo (http://localhost:4545/error_001.ts:2:9)
-    at bar (http://localhost:4545/error_001.ts:6:3)
-    at http://localhost:4545/error_001.ts:9:1
-[WILDCARD]
diff --git a/cli/tests/testdata/error_no_check.ts b/cli/tests/testdata/error_no_check.ts
deleted file mode 100644
index db9257a1d..000000000
--- a/cli/tests/testdata/error_no_check.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { AnInterface, isAnInterface } from "./subdir/type_and_code.ts";
diff --git a/cli/tests/testdata/error_no_check.ts.out b/cli/tests/testdata/error_no_check.ts.out
deleted file mode 100644
index cac1367ba..000000000
--- a/cli/tests/testdata/error_no_check.ts.out
+++ /dev/null
@@ -1,2 +0,0 @@
-error: Uncaught SyntaxError: The requested module './subdir/type_and_code.ts' does not provide an export named 'AnInterface'
-[WILDCARD]
\ No newline at end of file
diff --git a/cli/tests/testdata/error_type_definitions.ts b/cli/tests/testdata/error_type_definitions.ts
deleted file mode 100644
index ceb11787e..000000000
--- a/cli/tests/testdata/error_type_definitions.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// @deno-types="./type_definitions/bar.d.ts"
-import { Bar } from "./type_definitions/bar.js";
-
-const bar = new Bar();
-console.log(bar);
diff --git a/cli/tests/testdata/error_worker_permissions_local.ts b/cli/tests/testdata/error_worker_permissions_local.ts
deleted file mode 100644
index ed938a025..000000000
--- a/cli/tests/testdata/error_worker_permissions_local.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-new Worker(
-  import.meta.resolve("./subdeb/worker_types.ts"),
-  { type: "module" },
-);
diff --git a/cli/tests/testdata/041_dyn_import_eval.out b/cli/tests/testdata/eval/dyn_import_eval.out
index a1d6c3687..a1d6c3687 100644
--- a/cli/tests/testdata/041_dyn_import_eval.out
+++ b/cli/tests/testdata/eval/dyn_import_eval.out
diff --git a/cli/tests/testdata/export_type_def.ts b/cli/tests/testdata/export_type_def.ts
deleted file mode 100644
index e33b70a64..000000000
--- a/cli/tests/testdata/export_type_def.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// @deno-types="./type_definitions/foo.d.ts"
-export { foo } from "./type_definitions/foo.js";
diff --git a/cli/tests/testdata/fix_emittable_skipped.js b/cli/tests/testdata/fix_emittable_skipped.js
deleted file mode 100644
index f61907b06..000000000
--- a/cli/tests/testdata/fix_emittable_skipped.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/// <reference types="./subdir/emittable.d.ts" />
-
-import "./subdir/polyfill.ts";
-
-export const a = "a";
-
-console.log(globalThis.polyfill);
diff --git a/cli/tests/testdata/fix_js_import_js.ts b/cli/tests/testdata/fix_js_import_js.ts
deleted file mode 100644
index c9f341748..000000000
--- a/cli/tests/testdata/fix_js_import_js.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { isMod4 } from "./subdir/mod6.js";
-
-console.log(isMod4);
diff --git a/cli/tests/testdata/fix_js_imports.ts b/cli/tests/testdata/fix_js_imports.ts
deleted file mode 100644
index 4770b1ab6..000000000
--- a/cli/tests/testdata/fix_js_imports.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as amdLike from "./subdir/amd_like.js";
-
-console.log(amdLike);
diff --git a/cli/tests/testdata/badly_formatted.json b/cli/tests/testdata/fmt/badly_formatted.json
index f2bacf73d..f2bacf73d 100644
--- a/cli/tests/testdata/badly_formatted.json
+++ b/cli/tests/testdata/fmt/badly_formatted.json
diff --git a/cli/tests/testdata/badly_formatted.md b/cli/tests/testdata/fmt/badly_formatted.md
index 26afe483b..26afe483b 100644
--- a/cli/tests/testdata/badly_formatted.md
+++ b/cli/tests/testdata/fmt/badly_formatted.md
diff --git a/cli/tests/testdata/badly_formatted.mjs b/cli/tests/testdata/fmt/badly_formatted.mjs
index bc515a330..bc515a330 100644
--- a/cli/tests/testdata/badly_formatted.mjs
+++ b/cli/tests/testdata/fmt/badly_formatted.mjs
diff --git a/cli/tests/testdata/badly_formatted_fixed.js b/cli/tests/testdata/fmt/badly_formatted_fixed.js
index e9062ba85..e9062ba85 100644
--- a/cli/tests/testdata/badly_formatted_fixed.js
+++ b/cli/tests/testdata/fmt/badly_formatted_fixed.js
diff --git a/cli/tests/testdata/badly_formatted_fixed.json b/cli/tests/testdata/fmt/badly_formatted_fixed.json
index 0d697a2c6..0d697a2c6 100644
--- a/cli/tests/testdata/badly_formatted_fixed.json
+++ b/cli/tests/testdata/fmt/badly_formatted_fixed.json
diff --git a/cli/tests/testdata/badly_formatted_fixed.md b/cli/tests/testdata/fmt/badly_formatted_fixed.md
index 8ba74cac3..8ba74cac3 100644
--- a/cli/tests/testdata/badly_formatted_fixed.md
+++ b/cli/tests/testdata/fmt/badly_formatted_fixed.md
diff --git a/cli/tests/testdata/fmt/with_config/subdir/a.ts b/cli/tests/testdata/fmt/with_config/subdir/a.ts
index 50db0d2e1..4baf8d485 100644
--- a/cli/tests/testdata/fmt/with_config/subdir/a.ts
+++ b/cli/tests/testdata/fmt/with_config/subdir/a.ts
@@ -3,7 +3,7 @@ Deno.test(
 	async function responseClone() {
 		const response =
 			await fetch(
-				'http://localhost:4545/fixture.json',
+				'http://localhost:4545/assets/fixture.json',
 			);
 		const response1 =
 			response.clone();
diff --git a/cli/tests/testdata/fmt/with_config/subdir/b.ts b/cli/tests/testdata/fmt/with_config/subdir/b.ts
index 840198d89..d7eb08b09 100644
--- a/cli/tests/testdata/fmt/with_config/subdir/b.ts
+++ b/cli/tests/testdata/fmt/with_config/subdir/b.ts
@@ -3,10 +3,10 @@ Deno.test(
     { perms: { net: true } },
     async function fetchBodyUsedCancelStream() {
       const response = await fetch(
-        "http://localhost:4545/fixture.json",
+        "http://localhost:4545/assets/fixture.json",
       );
       assert(response.body !== null);
-  
+
       assertEquals(response.bodyUsed, false);
       const promise = response.body.cancel();
       assertEquals(response.bodyUsed, true);
diff --git a/cli/tests/testdata/import_meta2.ts b/cli/tests/testdata/import_meta2.ts
deleted file mode 100644
index 7f59a5a46..000000000
--- a/cli/tests/testdata/import_meta2.ts
+++ /dev/null
@@ -1 +0,0 @@
-console.log("import_meta2", import.meta.url, import.meta.main);
diff --git a/cli/tests/testdata/031_info_ts_error.out b/cli/tests/testdata/info/031_info_ts_error.out
index 2dc7bb4e8..2dc7bb4e8 100644
--- a/cli/tests/testdata/031_info_ts_error.out
+++ b/cli/tests/testdata/info/031_info_ts_error.out
diff --git a/cli/tests/testdata/031_info_ts_error.ts b/cli/tests/testdata/info/031_info_ts_error.ts
index 9b7492dbe..9b7492dbe 100644
--- a/cli/tests/testdata/031_info_ts_error.ts
+++ b/cli/tests/testdata/info/031_info_ts_error.ts
diff --git a/cli/tests/testdata/041_info_flag.out b/cli/tests/testdata/info/041_info_flag.out
index 3506a29e4..3506a29e4 100644
--- a/cli/tests/testdata/041_info_flag.out
+++ b/cli/tests/testdata/info/041_info_flag.out
diff --git a/cli/tests/testdata/041_info_flag_location.out b/cli/tests/testdata/info/041_info_flag_location.out
index b9e72f659..b9e72f659 100644
--- a/cli/tests/testdata/041_info_flag_location.out
+++ b/cli/tests/testdata/info/041_info_flag_location.out
diff --git a/cli/tests/testdata/049_info_flag_script_jsx.out b/cli/tests/testdata/info/049_info_flag_script_jsx.out
index 860d127fe..16736c893 100644
--- a/cli/tests/testdata/049_info_flag_script_jsx.out
+++ b/cli/tests/testdata/info/049_info_flag_script_jsx.out
@@ -3,7 +3,7 @@ local: [WILDCARD]http[WILDCARD]127.0.0.1_PORT4545[WILDCARD]
 type: TypeScript
 dependencies: 8 unique (total [WILDCARD])
 
-http://127.0.0.1:4545/048_media_types_jsx.ts ([WILDCARD])
+http://127.0.0.1:4545/run/048_media_types_jsx.ts ([WILDCARD])
 ├── http://localhost:4545/subdir/mt_application_ecmascript_jsx.j2.jsx ([WILDCARD])
 ├── http://localhost:4545/subdir/mt_application_x_javascript_jsx.j4.jsx ([WILDCARD])
 ├── http://localhost:4545/subdir/mt_application_x_typescript_tsx.t4.tsx ([WILDCARD])
diff --git a/cli/tests/testdata/054_info_local_imports.out b/cli/tests/testdata/info/054_info_local_imports.out
index cde5ff3ab..cde5ff3ab 100644
--- a/cli/tests/testdata/054_info_local_imports.out
+++ b/cli/tests/testdata/info/054_info_local_imports.out
diff --git a/cli/tests/testdata/065_import_map_info.out b/cli/tests/testdata/info/065_import_map_info.out
index 8771d0594..8771d0594 100644
--- a/cli/tests/testdata/065_import_map_info.out
+++ b/cli/tests/testdata/info/065_import_map_info.out
diff --git a/cli/tests/testdata/076_info_json_deps_order.out b/cli/tests/testdata/info/076_info_json_deps_order.out
index db890ef02..db890ef02 100644
--- a/cli/tests/testdata/076_info_json_deps_order.out
+++ b/cli/tests/testdata/info/076_info_json_deps_order.out
diff --git a/cli/tests/testdata/076_info_json_deps_order.ts b/cli/tests/testdata/info/076_info_json_deps_order.ts
index b1ae75e68..b1ae75e68 100644
--- a/cli/tests/testdata/076_info_json_deps_order.ts
+++ b/cli/tests/testdata/info/076_info_json_deps_order.ts
diff --git a/cli/tests/testdata/error_009_missing_js_module.js b/cli/tests/testdata/info/error_009_missing_js_module.js
index e6ca88934..e6ca88934 100644
--- a/cli/tests/testdata/error_009_missing_js_module.js
+++ b/cli/tests/testdata/info/error_009_missing_js_module.js
diff --git a/cli/tests/testdata/error_009_missing_js_module.js.out b/cli/tests/testdata/info/error_009_missing_js_module.js.out
index edb08da1c..edb08da1c 100644
--- a/cli/tests/testdata/error_009_missing_js_module.js.out
+++ b/cli/tests/testdata/info/error_009_missing_js_module.js.out
diff --git a/cli/tests/testdata/info_json.out b/cli/tests/testdata/info/info_json.out
index 3215af742..3215af742 100644
--- a/cli/tests/testdata/info_json.out
+++ b/cli/tests/testdata/info/info_json.out
diff --git a/cli/tests/testdata/info_json_location.out b/cli/tests/testdata/info/info_json_location.out
index 510fa7749..510fa7749 100644
--- a/cli/tests/testdata/info_json_location.out
+++ b/cli/tests/testdata/info/info_json_location.out
diff --git a/cli/tests/testdata/info_missing_module.out b/cli/tests/testdata/info/info_missing_module.out
index 07f893eec..07f893eec 100644
--- a/cli/tests/testdata/info_missing_module.out
+++ b/cli/tests/testdata/info/info_missing_module.out
diff --git a/cli/tests/testdata/info_recursive_imports_test.out b/cli/tests/testdata/info/info_recursive_imports_test.out
index 10ee54534..10ee54534 100644
--- a/cli/tests/testdata/info_recursive_imports_test.out
+++ b/cli/tests/testdata/info/info_recursive_imports_test.out
diff --git a/cli/tests/testdata/info_recursive_imports_test.ts b/cli/tests/testdata/info/info_recursive_imports_test.ts
index c9ba44755..c9ba44755 100644
--- a/cli/tests/testdata/info_recursive_imports_test.ts
+++ b/cli/tests/testdata/info/info_recursive_imports_test.ts
diff --git a/cli/tests/testdata/info_type_import.out b/cli/tests/testdata/info/info_type_import.out
index 6b9869f1f..6b9869f1f 100644
--- a/cli/tests/testdata/info_type_import.out
+++ b/cli/tests/testdata/info/info_type_import.out
diff --git a/cli/tests/testdata/info/info_type_import.ts b/cli/tests/testdata/info/info_type_import.ts
new file mode 100644
index 000000000..4db9f3387
--- /dev/null
+++ b/cli/tests/testdata/info/info_type_import.ts
@@ -0,0 +1,3 @@
+import { AnInterface as _, isAnInterface } from "../subdir/type_and_code.ts";
+
+isAnInterface({});
diff --git a/cli/tests/testdata/055_info_file_json.out b/cli/tests/testdata/info/json_output/main.out
index 2dc10a0c2..124fc7351 100644
--- a/cli/tests/testdata/055_info_file_json.out
+++ b/cli/tests/testdata/info/json_output/main.out
@@ -1,12 +1,12 @@
 {
   "roots": [
-    "file://[WILDCARD]/005_more_imports.ts"
+    "file://[WILDCARD]/info/json_output/main.ts"
   ],
   "modules": [
     {
       "dependencies": [
         {
-          "specifier": "./subdir/mod1.ts",
+          "specifier": "../../subdir/mod1.ts",
           "code": {
             "specifier": "file://[WILDCARD]/subdir/mod1.ts",
             "span": {
@@ -16,17 +16,17 @@
               },
               "end": {
                 "line": 0,
-                "character": 70
+                "character": 74
               }
             }
           }
         }
       ],
       "kind": "esm",
-      "local": "[WILDCARD]005_more_imports.ts",
+      "local": "[WILDCARD]main.ts",
       [WILDCARD]
       "mediaType": "TypeScript",
-      "specifier": "file://[WILDCARD]/005_more_imports.ts"
+      "specifier": "file://[WILDCARD]/json_output/main.ts"
     },
     {
       "dependencies": [
diff --git a/cli/tests/testdata/info/json_output/main.ts b/cli/tests/testdata/info/json_output/main.ts
new file mode 100644
index 000000000..927bc55ed
--- /dev/null
+++ b/cli/tests/testdata/info/json_output/main.ts
@@ -0,0 +1,11 @@
+import { printHello3, returnsFoo2, returnsHi } from "../../subdir/mod1.ts";
+
+printHello3();
+
+if (returnsHi() !== "Hi") {
+  throw Error("Unexpected");
+}
+
+if (returnsFoo2() !== "Foo") {
+  throw Error("Unexpected");
+}
diff --git a/cli/tests/testdata/022_info_flag_script.out b/cli/tests/testdata/info/multiple_imports.out
index e86b7dda4..d4e315397 100644
--- a/cli/tests/testdata/022_info_flag_script.out
+++ b/cli/tests/testdata/info/multiple_imports.out
@@ -3,7 +3,7 @@ local: [WILDCARD]http[WILDCARD]127.0.0.1_PORT4545[WILDCARD]
 type: TypeScript
 dependencies: 8 unique (total [WILDCARD])
 
-http://127.0.0.1:4545/019_media_types.ts ([WILDCARD])
+http://127.0.0.1:4545/run/019_media_types.ts ([WILDCARD])
 ├── http://localhost:4545/subdir/mt_application_ecmascript.j2.js ([WILDCARD])
 ├── http://localhost:4545/subdir/mt_application_x_javascript.j4.js ([WILDCARD])
 ├── http://localhost:4545/subdir/mt_application_x_typescript.t4.ts ([WILDCARD])
diff --git a/cli/tests/testdata/recursive_imports/A.ts b/cli/tests/testdata/info/recursive_imports/A.ts
index 43ecdbe5e..43ecdbe5e 100644
--- a/cli/tests/testdata/recursive_imports/A.ts
+++ b/cli/tests/testdata/info/recursive_imports/A.ts
diff --git a/cli/tests/testdata/recursive_imports/B.ts b/cli/tests/testdata/info/recursive_imports/B.ts
index 9fff0fdc9..9fff0fdc9 100644
--- a/cli/tests/testdata/recursive_imports/B.ts
+++ b/cli/tests/testdata/info/recursive_imports/B.ts
diff --git a/cli/tests/testdata/recursive_imports/C.ts b/cli/tests/testdata/info/recursive_imports/C.ts
index e47e77b41..e47e77b41 100644
--- a/cli/tests/testdata/recursive_imports/C.ts
+++ b/cli/tests/testdata/info/recursive_imports/C.ts
diff --git a/cli/tests/testdata/recursive_imports/common.ts b/cli/tests/testdata/info/recursive_imports/common.ts
index 2b16a7bf1..2b16a7bf1 100644
--- a/cli/tests/testdata/recursive_imports/common.ts
+++ b/cli/tests/testdata/info/recursive_imports/common.ts
diff --git a/cli/tests/testdata/info_type_import.ts b/cli/tests/testdata/info_type_import.ts
deleted file mode 100644
index eeef46c89..000000000
--- a/cli/tests/testdata/info_type_import.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { AnInterface as _, isAnInterface } from "./subdir/type_and_code.ts";
-
-isAnInterface({});
diff --git a/cli/tests/testdata/inline_js_source_map_2.js b/cli/tests/testdata/inline_js_source_map_2.js
deleted file mode 100644
index 036f351b9..000000000
--- a/cli/tests/testdata/inline_js_source_map_2.js
+++ /dev/null
@@ -1,4 +0,0 @@
-"use strict";
-1 + 1;
-throw new Error("Hello world!");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaHR0cDovL2xvY2FsaG9zdDo0NTQ1L2lubGluZV9qc19zb3VyY2VfbWFwXzIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLENBQUMsR0FBQyxDQUFDLENBQUM7QUFLSixNQUFNLElBQUksS0FBSyxDQUFDLGNBQStCLENBQUMsQ0FBQyJ9
\ No newline at end of file
diff --git a/cli/tests/testdata/inline_js_source_map_2.js.out b/cli/tests/testdata/inline_js_source_map_2.js.out
deleted file mode 100644
index 4f9127da6..000000000
--- a/cli/tests/testdata/inline_js_source_map_2.js.out
+++ /dev/null
@@ -1,2 +0,0 @@
-error: Uncaught Error: Hello world!
-    at http://localhost:4545/inline_js_source_map_2.ts:6:7
diff --git a/cli/tests/testdata/inline_js_source_map_2_with_inline_contents.js b/cli/tests/testdata/inline_js_source_map_2_with_inline_contents.js
deleted file mode 100644
index 5bea615b8..000000000
--- a/cli/tests/testdata/inline_js_source_map_2_with_inline_contents.js
+++ /dev/null
@@ -1,4 +0,0 @@
-"use strict";
-
-throw new Error("Hello world!");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaHR0cDovL2xvY2FsaG9zdDo0NTQ1L2lubGluZV9qc19zb3VyY2VfbWFwXzIudHMiXSwic291cmNlc0NvbnRlbnQiOlsiMSsxO1xuaW50ZXJmYWNlIFRlc3Qge1xuICBoZWxsbzogc3RyaW5nO1xufVxuXG50aHJvdyBuZXcgRXJyb3IoXCJIZWxsbyB3b3JsZCFcIiBhcyB1bmtub3duIGFzIHN0cmluZyk7XG4iXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLENBQUMsR0FBQyxDQUFDLENBQUM7QUFLSixNQUFNLElBQUksS0FBSyxDQUFDLGNBQStCLENBQUMsQ0FBQyJ9
\ No newline at end of file
diff --git a/cli/tests/testdata/inline_js_source_map_2_with_inline_contents.js.out b/cli/tests/testdata/inline_js_source_map_2_with_inline_contents.js.out
deleted file mode 100644
index 4f9127da6..000000000
--- a/cli/tests/testdata/inline_js_source_map_2_with_inline_contents.js.out
+++ /dev/null
@@ -1,2 +0,0 @@
-error: Uncaught Error: Hello world!
-    at http://localhost:4545/inline_js_source_map_2.ts:6:7
diff --git a/cli/tests/testdata/inline_js_source_map_with_contents_from_graph.js b/cli/tests/testdata/inline_js_source_map_with_contents_from_graph.js
deleted file mode 100644
index decf47bdc..000000000
--- a/cli/tests/testdata/inline_js_source_map_with_contents_from_graph.js
+++ /dev/null
@@ -1,4 +0,0 @@
-"use strict";
-import "http://localhost:4545/inline_js_source_map.ts";
-throw new Error("Hello world!");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaHR0cDovL2xvY2FsaG9zdDo0NTQ1L2lubGluZV9qc19zb3VyY2VfbWFwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxDQUFDLEdBQUMsQ0FBQyxDQUFDO0FBS0osTUFBTSxJQUFJLEtBQUssQ0FBQyxjQUErQixDQUFDLENBQUMifQ==
\ No newline at end of file
diff --git a/cli/tests/testdata/issue13562.ts b/cli/tests/testdata/issue13562.ts
deleted file mode 100644
index 9f3134aef..000000000
--- a/cli/tests/testdata/issue13562.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { printHello3 } from "./subdir/mod1.ts?q=.json";
-
-printHello3();
diff --git a/cli/tests/testdata/lock_check_err.out b/cli/tests/testdata/lock_check_err.out
deleted file mode 100644
index 3c5eceb8c..000000000
--- a/cli/tests/testdata/lock_check_err.out
+++ /dev/null
@@ -1,3 +0,0 @@
-[WILDCARD]The source code is invalid, as it does not match the expected hash in the lock file.
-  Specifier: http://127.0.0.1:4545/003_relative_import.ts
-  Lock file: lock_check_err.json
diff --git a/cli/tests/testdata/lsp/code_action_redirect_response.json b/cli/tests/testdata/lsp/code_action_redirect_response.json
index b2bb470bd..235127570 100644
--- a/cli/tests/testdata/lsp/code_action_redirect_response.json
+++ b/cli/tests/testdata/lsp/code_action_redirect_response.json
@@ -17,10 +17,10 @@
         "severity": 3,
         "code": "redirect",
         "source": "deno",
-        "message": "The import of \"http://127.0.0.1:4545/x_deno_warning.js\" was redirected to \"http://127.0.0.1:4545/x_deno_warning_redirect.js\".",
+        "message": "The import of \"http://127.0.0.1:4545/x_deno_warning.js\" was redirected to \"http://127.0.0.1:4545/lsp/x_deno_warning_redirect.js\".",
         "data": {
           "specifier": "http://127.0.0.1:4545/x_deno_warning.js",
-          "redirect": "http://127.0.0.1:4545/x_deno_warning_redirect.js"
+          "redirect": "http://127.0.0.1:4545/lsp/x_deno_warning_redirect.js"
         }
       }
     ],
@@ -38,7 +38,7 @@
                 "character": 60
               }
             },
-            "newText": "\"http://127.0.0.1:4545/x_deno_warning_redirect.js\""
+            "newText": "\"http://127.0.0.1:4545/lsp/x_deno_warning_redirect.js\""
           }
         ]
       }
diff --git a/cli/tests/testdata/x_deno_warning_redirect.js b/cli/tests/testdata/lsp/x_deno_warning_redirect.js
index 34b950566..34b950566 100644
--- a/cli/tests/testdata/x_deno_warning_redirect.js
+++ b/cli/tests/testdata/lsp/x_deno_warning_redirect.js
diff --git a/cli/tests/testdata/main_module.ts b/cli/tests/testdata/main_module.ts
deleted file mode 100644
index 19988f4bf..000000000
--- a/cli/tests/testdata/main_module.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-console.log("main_module", Deno.mainModule);
-
-import "./main_module2.ts";
diff --git a/cli/tests/testdata/main_module.ts.out b/cli/tests/testdata/main_module.ts.out
deleted file mode 100644
index 817bb6b8c..000000000
--- a/cli/tests/testdata/main_module.ts.out
+++ /dev/null
@@ -1,2 +0,0 @@
-main_module2 [WILDCARD]/main_module.ts
-main_module [WILDCARD]/main_module.ts
diff --git a/cli/tests/testdata/main_module2.ts b/cli/tests/testdata/main_module2.ts
deleted file mode 100644
index 585615c7f..000000000
--- a/cli/tests/testdata/main_module2.ts
+++ /dev/null
@@ -1 +0,0 @@
-console.log("main_module2", Deno.mainModule);
diff --git a/cli/tests/testdata/module_detection_force.ts b/cli/tests/testdata/module_detection_force.ts
deleted file mode 100644
index 7729ae366..000000000
--- a/cli/tests/testdata/module_detection_force.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-const a = 1;
-await import("./module_detection_force_import.ts");
-console.log(a);
diff --git a/cli/tests/testdata/nested_error.ts.out b/cli/tests/testdata/nested_error.ts.out
deleted file mode 100644
index 042a179ff..000000000
--- a/cli/tests/testdata/nested_error.ts.out
+++ /dev/null
@@ -1,4 +0,0 @@
-error: Uncaught {
-  foo: Error
-    at file:///[WILDCARD]testdata/nested_error.ts:2:8
-}
diff --git a/cli/tests/testdata/no_color.js b/cli/tests/testdata/no_color.js
deleted file mode 100644
index cea11a52f..000000000
--- a/cli/tests/testdata/no_color.js
+++ /dev/null
@@ -1 +0,0 @@
-console.log("noColor", Deno.noColor);
diff --git a/cli/tests/testdata/raw_mode.ts b/cli/tests/testdata/raw_mode.ts
deleted file mode 100644
index 87502e7d9..000000000
--- a/cli/tests/testdata/raw_mode.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-Deno.setRaw(0, true);
-Deno.setRaw(0, true); // Can be called multiple times
-
-Deno.stdout.writeSync(new TextEncoder().encode("S"));
-
-const buf = new Uint8Array(3);
-for (let i = 0; i < 3; i++) {
-  const nread = await Deno.stdin.read(buf);
-  if (nread === null) {
-    break;
-  } else {
-    const data = new TextDecoder().decode(buf.subarray(0, nread));
-    Deno.stdout.writeSync(new TextEncoder().encode(data.toUpperCase()));
-  }
-}
-
-Deno.setRaw(0, false); // restores old mode.
-Deno.setRaw(0, false); // Can be safely called multiple times
diff --git a/cli/tests/testdata/import_type.ts b/cli/tests/testdata/repl/import_type.ts
index 851ebad86..851ebad86 100644
--- a/cli/tests/testdata/import_type.ts
+++ b/cli/tests/testdata/repl/import_type.ts
diff --git a/cli/tests/testdata/001_hello.js b/cli/tests/testdata/run/001_hello.js
index accefceba..accefceba 100644
--- a/cli/tests/testdata/001_hello.js
+++ b/cli/tests/testdata/run/001_hello.js
diff --git a/cli/tests/testdata/001_hello.js.out b/cli/tests/testdata/run/001_hello.js.out
index 557db03de..557db03de 100644
--- a/cli/tests/testdata/001_hello.js.out
+++ b/cli/tests/testdata/run/001_hello.js.out
diff --git a/cli/tests/testdata/002_hello.ts b/cli/tests/testdata/run/002_hello.ts
index accefceba..accefceba 100644
--- a/cli/tests/testdata/002_hello.ts
+++ b/cli/tests/testdata/run/002_hello.ts
diff --git a/cli/tests/testdata/002_hello.ts.out b/cli/tests/testdata/run/002_hello.ts.out
index 557db03de..557db03de 100644
--- a/cli/tests/testdata/002_hello.ts.out
+++ b/cli/tests/testdata/run/002_hello.ts.out
diff --git a/cli/tests/testdata/run/003_relative_import.ts b/cli/tests/testdata/run/003_relative_import.ts
new file mode 100644
index 000000000..840121bfe
--- /dev/null
+++ b/cli/tests/testdata/run/003_relative_import.ts
@@ -0,0 +1,3 @@
+import { printHello } from "../subdir/print_hello.ts";
+
+printHello();
diff --git a/cli/tests/testdata/003_relative_import.ts.out b/cli/tests/testdata/run/003_relative_import.ts.out
index 699b756ed..699b756ed 100644
--- a/cli/tests/testdata/003_relative_import.ts.out
+++ b/cli/tests/testdata/run/003_relative_import.ts.out
diff --git a/cli/tests/testdata/004_set_timeout.ts b/cli/tests/testdata/run/004_set_timeout.ts
index 214b25086..214b25086 100644
--- a/cli/tests/testdata/004_set_timeout.ts
+++ b/cli/tests/testdata/run/004_set_timeout.ts
diff --git a/cli/tests/testdata/004_set_timeout.ts.out b/cli/tests/testdata/run/004_set_timeout.ts.out
index f9264f7fb..f9264f7fb 100644
--- a/cli/tests/testdata/004_set_timeout.ts.out
+++ b/cli/tests/testdata/run/004_set_timeout.ts.out
diff --git a/cli/tests/testdata/005_more_imports.ts b/cli/tests/testdata/run/005_more_imports.ts
index 0266bf46c..6c96fac64 100644
--- a/cli/tests/testdata/005_more_imports.ts
+++ b/cli/tests/testdata/run/005_more_imports.ts
@@ -1,4 +1,4 @@
-import { printHello3, returnsFoo2, returnsHi } from "./subdir/mod1.ts";
+import { printHello3, returnsFoo2, returnsHi } from "../subdir/mod1.ts";
 
 printHello3();
 
diff --git a/cli/tests/testdata/005_more_imports.ts.out b/cli/tests/testdata/run/005_more_imports.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/testdata/005_more_imports.ts.out
+++ b/cli/tests/testdata/run/005_more_imports.ts.out
diff --git a/cli/tests/testdata/006_url_imports.ts b/cli/tests/testdata/run/006_url_imports.ts
index 4036f27ed..4036f27ed 100644
--- a/cli/tests/testdata/006_url_imports.ts
+++ b/cli/tests/testdata/run/006_url_imports.ts
diff --git a/cli/tests/testdata/006_url_imports.ts.out b/cli/tests/testdata/run/006_url_imports.ts.out
index 989ce33e9..989ce33e9 100644
--- a/cli/tests/testdata/006_url_imports.ts.out
+++ b/cli/tests/testdata/run/006_url_imports.ts.out
diff --git a/cli/tests/testdata/012_async.ts b/cli/tests/testdata/run/012_async.ts
index 536197b68..536197b68 100644
--- a/cli/tests/testdata/012_async.ts
+++ b/cli/tests/testdata/run/012_async.ts
diff --git a/cli/tests/testdata/012_async.ts.out b/cli/tests/testdata/run/012_async.ts.out
index 01e79c32a..01e79c32a 100644
--- a/cli/tests/testdata/012_async.ts.out
+++ b/cli/tests/testdata/run/012_async.ts.out
diff --git a/cli/tests/testdata/013_dynamic_import.ts b/cli/tests/testdata/run/013_dynamic_import.ts
index d4dc55152..fc231936c 100644
--- a/cli/tests/testdata/013_dynamic_import.ts
+++ b/cli/tests/testdata/run/013_dynamic_import.ts
@@ -1,6 +1,6 @@
 (async () => {
   const { returnsHi, returnsFoo2, printHello3 } = await import(
-    "./subdir/mod1.ts"
+    "../subdir/mod1.ts"
   );
 
   printHello3();
diff --git a/cli/tests/testdata/013_dynamic_import.ts.out b/cli/tests/testdata/run/013_dynamic_import.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/testdata/013_dynamic_import.ts.out
+++ b/cli/tests/testdata/run/013_dynamic_import.ts.out
diff --git a/cli/tests/testdata/run/014_duplicate_import.ts b/cli/tests/testdata/run/014_duplicate_import.ts
new file mode 100644
index 000000000..c7dd881cf
--- /dev/null
+++ b/cli/tests/testdata/run/014_duplicate_import.ts
@@ -0,0 +1,9 @@
+// with all the imports of the same module, the module should only be
+// instantiated once
+import "../subdir/auto_print_hello.ts";
+
+import "../subdir/auto_print_hello.ts";
+
+(async () => {
+  await import("../subdir/auto_print_hello.ts");
+})();
diff --git a/cli/tests/testdata/014_duplicate_import.ts.out b/cli/tests/testdata/run/014_duplicate_import.ts.out
index 4effa19f4..4effa19f4 100644
--- a/cli/tests/testdata/014_duplicate_import.ts.out
+++ b/cli/tests/testdata/run/014_duplicate_import.ts.out
diff --git a/cli/tests/testdata/015_duplicate_parallel_import.js b/cli/tests/testdata/run/015_duplicate_parallel_import.js
index 172eeaf53..2fbe2c732 100644
--- a/cli/tests/testdata/015_duplicate_parallel_import.js
+++ b/cli/tests/testdata/run/015_duplicate_parallel_import.js
@@ -3,7 +3,7 @@
 
 const promises = new Array(100)
   .fill(null)
-  .map(() => import("./subdir/mod1.ts"));
+  .map(() => import("../subdir/mod1.ts"));
 
 Promise.all(promises).then((imports) => {
   const mod = imports.reduce((first, cur) => {
diff --git a/cli/tests/testdata/015_duplicate_parallel_import.js.out b/cli/tests/testdata/run/015_duplicate_parallel_import.js.out
index e965047ad..e965047ad 100644
--- a/cli/tests/testdata/015_duplicate_parallel_import.js.out
+++ b/cli/tests/testdata/run/015_duplicate_parallel_import.js.out
diff --git a/cli/tests/testdata/016_double_await.ts b/cli/tests/testdata/run/016_double_await.ts
index 457a53ff3..457a53ff3 100644
--- a/cli/tests/testdata/016_double_await.ts
+++ b/cli/tests/testdata/run/016_double_await.ts
diff --git a/cli/tests/testdata/016_double_await.ts.out b/cli/tests/testdata/run/016_double_await.ts.out
index da29283aa..da29283aa 100644
--- a/cli/tests/testdata/016_double_await.ts.out
+++ b/cli/tests/testdata/run/016_double_await.ts.out
diff --git a/cli/tests/testdata/017_import_redirect.ts b/cli/tests/testdata/run/017_import_redirect.ts
index 1265dd4ed..1265dd4ed 100644
--- a/cli/tests/testdata/017_import_redirect.ts
+++ b/cli/tests/testdata/run/017_import_redirect.ts
diff --git a/cli/tests/testdata/017_import_redirect.ts.out b/cli/tests/testdata/run/017_import_redirect.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/testdata/017_import_redirect.ts.out
+++ b/cli/tests/testdata/run/017_import_redirect.ts.out
diff --git a/cli/tests/testdata/017_import_redirect_info.out b/cli/tests/testdata/run/017_import_redirect_info.out
index d3a2e86fc..d3a2e86fc 100644
--- a/cli/tests/testdata/017_import_redirect_info.out
+++ b/cli/tests/testdata/run/017_import_redirect_info.out
diff --git a/cli/tests/testdata/018_async_catch.ts b/cli/tests/testdata/run/018_async_catch.ts
index ac43a52e8..ac43a52e8 100644
--- a/cli/tests/testdata/018_async_catch.ts
+++ b/cli/tests/testdata/run/018_async_catch.ts
diff --git a/cli/tests/testdata/018_async_catch.ts.out b/cli/tests/testdata/run/018_async_catch.ts.out
index 4fc219973..4fc219973 100644
--- a/cli/tests/testdata/018_async_catch.ts.out
+++ b/cli/tests/testdata/run/018_async_catch.ts.out
diff --git a/cli/tests/testdata/019_media_types.ts b/cli/tests/testdata/run/019_media_types.ts
index d985bd249..d985bd249 100644
--- a/cli/tests/testdata/019_media_types.ts
+++ b/cli/tests/testdata/run/019_media_types.ts
diff --git a/cli/tests/testdata/019_media_types.ts.out b/cli/tests/testdata/run/019_media_types.ts.out
index b3e94678c..b3e94678c 100644
--- a/cli/tests/testdata/019_media_types.ts.out
+++ b/cli/tests/testdata/run/019_media_types.ts.out
diff --git a/cli/tests/testdata/run/020_json_modules.ts b/cli/tests/testdata/run/020_json_modules.ts
new file mode 100644
index 000000000..b4ae60665
--- /dev/null
+++ b/cli/tests/testdata/run/020_json_modules.ts
@@ -0,0 +1,2 @@
+import config from "../subdir/config.json";
+console.log(JSON.stringify(config));
diff --git a/cli/tests/testdata/020_json_modules.ts.out b/cli/tests/testdata/run/020_json_modules.ts.out
index da33c40bf..da33c40bf 100644
--- a/cli/tests/testdata/020_json_modules.ts.out
+++ b/cli/tests/testdata/run/020_json_modules.ts.out
diff --git a/cli/tests/testdata/run/021_mjs_modules.ts b/cli/tests/testdata/run/021_mjs_modules.ts
new file mode 100644
index 000000000..838cd2c38
--- /dev/null
+++ b/cli/tests/testdata/run/021_mjs_modules.ts
@@ -0,0 +1,2 @@
+import { isMod5 } from "../subdir/mod5.mjs";
+console.log(isMod5);
diff --git a/cli/tests/testdata/021_mjs_modules.ts.out b/cli/tests/testdata/run/021_mjs_modules.ts.out
index 27ba77dda..27ba77dda 100644
--- a/cli/tests/testdata/021_mjs_modules.ts.out
+++ b/cli/tests/testdata/run/021_mjs_modules.ts.out
diff --git a/cli/tests/testdata/run/023_no_ext b/cli/tests/testdata/run/023_no_ext
new file mode 100644
index 000000000..d2cd6a037
--- /dev/null
+++ b/cli/tests/testdata/run/023_no_ext
@@ -0,0 +1,2 @@
+import * as mod4 from "../subdir/mod4.js";
+console.log(mod4.isMod4);
diff --git a/cli/tests/testdata/023_no_ext.out b/cli/tests/testdata/run/023_no_ext.out
index 27ba77dda..27ba77dda 100644
--- a/cli/tests/testdata/023_no_ext.out
+++ b/cli/tests/testdata/run/023_no_ext.out
diff --git a/cli/tests/testdata/025_hrtime.ts b/cli/tests/testdata/run/025_hrtime.ts
index b69d61488..b69d61488 100644
--- a/cli/tests/testdata/025_hrtime.ts
+++ b/cli/tests/testdata/run/025_hrtime.ts
diff --git a/cli/tests/testdata/025_hrtime.ts.out b/cli/tests/testdata/run/025_hrtime.ts.out
index bb101b641..bb101b641 100644
--- a/cli/tests/testdata/025_hrtime.ts.out
+++ b/cli/tests/testdata/run/025_hrtime.ts.out
diff --git a/cli/tests/testdata/025_reload_js_type_error.js b/cli/tests/testdata/run/025_reload_js_type_error.js
index 3b7c23cc9..3b7c23cc9 100644
--- a/cli/tests/testdata/025_reload_js_type_error.js
+++ b/cli/tests/testdata/run/025_reload_js_type_error.js
diff --git a/cli/tests/testdata/025_reload_js_type_error.js.out b/cli/tests/testdata/run/025_reload_js_type_error.js.out
index ce0136250..ce0136250 100644
--- a/cli/tests/testdata/025_reload_js_type_error.js.out
+++ b/cli/tests/testdata/run/025_reload_js_type_error.js.out
diff --git a/cli/tests/testdata/026_redirect_javascript.js b/cli/tests/testdata/run/026_redirect_javascript.js
index 226a6b622..226a6b622 100644
--- a/cli/tests/testdata/026_redirect_javascript.js
+++ b/cli/tests/testdata/run/026_redirect_javascript.js
diff --git a/cli/tests/testdata/026_redirect_javascript.js.out b/cli/tests/testdata/run/026_redirect_javascript.js.out
index 290864299..290864299 100644
--- a/cli/tests/testdata/026_redirect_javascript.js.out
+++ b/cli/tests/testdata/run/026_redirect_javascript.js.out
diff --git a/cli/tests/testdata/027_redirect_typescript.ts b/cli/tests/testdata/run/027_redirect_typescript.ts
index 584341975..584341975 100644
--- a/cli/tests/testdata/027_redirect_typescript.ts
+++ b/cli/tests/testdata/run/027_redirect_typescript.ts
diff --git a/cli/tests/testdata/027_redirect_typescript.ts.out b/cli/tests/testdata/run/027_redirect_typescript.ts.out
index 480d4e8ca..480d4e8ca 100644
--- a/cli/tests/testdata/027_redirect_typescript.ts.out
+++ b/cli/tests/testdata/run/027_redirect_typescript.ts.out
diff --git a/cli/tests/testdata/run/028_args.ts b/cli/tests/testdata/run/028_args.ts
new file mode 100644
index 000000000..ec41d52f9
--- /dev/null
+++ b/cli/tests/testdata/run/028_args.ts
@@ -0,0 +1,3 @@
+Deno.args.forEach((arg) => {
+  console.log(arg);
+});
diff --git a/cli/tests/testdata/028_args.ts.out b/cli/tests/testdata/run/028_args.ts.out
index 0f1b5c59e..0f1b5c59e 100644
--- a/cli/tests/testdata/028_args.ts.out
+++ b/cli/tests/testdata/run/028_args.ts.out
diff --git a/cli/tests/testdata/033_import_map.out b/cli/tests/testdata/run/033_import_map.out
index e9b9160e9..e9b9160e9 100644
--- a/cli/tests/testdata/033_import_map.out
+++ b/cli/tests/testdata/run/033_import_map.out
diff --git a/cli/tests/testdata/033_import_map_remote.out b/cli/tests/testdata/run/033_import_map_remote.out
index 804fa0d57..804fa0d57 100644
--- a/cli/tests/testdata/033_import_map_remote.out
+++ b/cli/tests/testdata/run/033_import_map_remote.out
diff --git a/cli/tests/testdata/run/035_cached_only_flag.out b/cli/tests/testdata/run/035_cached_only_flag.out
new file mode 100644
index 000000000..3bda398b6
--- /dev/null
+++ b/cli/tests/testdata/run/035_cached_only_flag.out
@@ -0,0 +1,4 @@
+error: Specifier not found in cache: "http://127.0.0.1:4545/run/019_media_types.ts", --cached-only is specified.
+
+Caused by:
+    Specifier not found in cache: "http://127.0.0.1:4545/run/019_media_types.ts", --cached-only is specified.
diff --git a/cli/tests/testdata/038_checkjs.js b/cli/tests/testdata/run/038_checkjs.js
index f0856d94c..f0856d94c 100644
--- a/cli/tests/testdata/038_checkjs.js
+++ b/cli/tests/testdata/run/038_checkjs.js
diff --git a/cli/tests/testdata/038_checkjs.js.out b/cli/tests/testdata/run/038_checkjs.js.out
index 4ea473e4f..4ea473e4f 100644
--- a/cli/tests/testdata/038_checkjs.js.out
+++ b/cli/tests/testdata/run/038_checkjs.js.out
diff --git a/cli/tests/testdata/042_dyn_import_evalcontext.ts b/cli/tests/testdata/run/042_dyn_import_evalcontext.ts
index ccda3a972..ccda3a972 100644
--- a/cli/tests/testdata/042_dyn_import_evalcontext.ts
+++ b/cli/tests/testdata/run/042_dyn_import_evalcontext.ts
diff --git a/cli/tests/testdata/042_dyn_import_evalcontext.ts.out b/cli/tests/testdata/run/042_dyn_import_evalcontext.ts.out
index 12a45b8da..12a45b8da 100644
--- a/cli/tests/testdata/042_dyn_import_evalcontext.ts.out
+++ b/cli/tests/testdata/run/042_dyn_import_evalcontext.ts.out
diff --git a/cli/tests/testdata/run/044_bad_resource.ts b/cli/tests/testdata/run/044_bad_resource.ts
new file mode 100644
index 000000000..b956a3e3f
--- /dev/null
+++ b/cli/tests/testdata/run/044_bad_resource.ts
@@ -0,0 +1,3 @@
+const file = await Deno.open("./run/044_bad_resource.ts", { read: true });
+file.close();
+await file.seek(10, 0);
diff --git a/cli/tests/testdata/044_bad_resource.ts.out b/cli/tests/testdata/run/044_bad_resource.ts.out
index c9912711d..c9912711d 100644
--- a/cli/tests/testdata/044_bad_resource.ts.out
+++ b/cli/tests/testdata/run/044_bad_resource.ts.out
diff --git a/cli/tests/testdata/045_mod.ts b/cli/tests/testdata/run/045_mod.ts
index b5f2a0b5b..b5f2a0b5b 100644
--- a/cli/tests/testdata/045_mod.ts
+++ b/cli/tests/testdata/run/045_mod.ts
diff --git a/cli/tests/testdata/045_output.ts b/cli/tests/testdata/run/045_output.ts
index 398760ca0..398760ca0 100644
--- a/cli/tests/testdata/045_output.ts
+++ b/cli/tests/testdata/run/045_output.ts
diff --git a/cli/tests/testdata/045_programmatic_proxy_client.ts b/cli/tests/testdata/run/045_programmatic_proxy_client.ts
index 039c6e9ae..8bc45a4b6 100644
--- a/cli/tests/testdata/045_programmatic_proxy_client.ts
+++ b/cli/tests/testdata/run/045_programmatic_proxy_client.ts
@@ -8,7 +8,7 @@ const client = Deno.createHttpClient({
 });
 
 const res = await fetch(
-  "http://localhost:4545/045_mod.ts",
+  "http://localhost:4545/run/045_mod.ts",
   { client },
 );
 console.log(`Response http: ${await res.text()}`);
diff --git a/cli/tests/testdata/045_proxy_client.ts b/cli/tests/testdata/run/045_proxy_client.ts
index 9d068bc48..2a8728afa 100644
--- a/cli/tests/testdata/045_proxy_client.ts
+++ b/cli/tests/testdata/run/045_proxy_client.ts
@@ -1,5 +1,5 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 const res = await fetch(
-  "http://localhost:4545/045_mod.ts",
+  "http://localhost:4545/run/045_mod.ts",
 );
 console.log(`Response http: ${await res.text()}`);
diff --git a/cli/tests/testdata/045_proxy_test.ts b/cli/tests/testdata/run/045_proxy_test.ts
index 6a4e72aff..0ff7184b1 100644
--- a/cli/tests/testdata/045_proxy_test.ts
+++ b/cli/tests/testdata/run/045_proxy_test.ts
@@ -1,6 +1,6 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
-import { Server } from "../../../test_util/std/http/server.ts";
-import { assertEquals } from "../../../test_util/std/testing/asserts.ts";
+import { Server } from "../../../../test_util/std/http/server.ts";
+import { assertEquals } from "../../../../test_util/std/testing/asserts.ts";
 
 const addr = Deno.args[1] || "localhost:4555";
 
@@ -37,7 +37,7 @@ async function testFetch() {
       "--quiet",
       "--reload",
       "--allow-net",
-      "045_proxy_client.ts",
+      "run/045_proxy_client.ts",
     ],
     env: {
       HTTP_PROXY: `http://${addr}`,
@@ -53,7 +53,7 @@ async function testModuleDownload() {
       "cache",
       "--reload",
       "--quiet",
-      "http://localhost:4545/045_mod.ts",
+      "http://localhost:4545/run/045_mod.ts",
     ],
     env: {
       HTTP_PROXY: `http://${addr}`,
@@ -70,7 +70,7 @@ async function testFetchNoProxy() {
       "--quiet",
       "--reload",
       "--allow-net",
-      "045_proxy_client.ts",
+      "run/045_proxy_client.ts",
     ],
     env: {
       HTTP_PROXY: "http://not.exising.proxy.server",
@@ -87,7 +87,7 @@ async function testModuleDownloadNoProxy() {
       "cache",
       "--reload",
       "--quiet",
-      "http://localhost:4545/045_mod.ts",
+      "http://localhost:4545/run/045_mod.ts",
     ],
     env: {
       HTTP_PROXY: "http://not.exising.proxy.server",
@@ -106,7 +106,7 @@ async function testFetchProgrammaticProxy() {
       "--reload",
       "--allow-net=localhost:4545,localhost:4555",
       "--unstable",
-      "045_programmatic_proxy_client.ts",
+      "run/045_programmatic_proxy_client.ts",
     ],
   });
   assertEquals(code, 0);
diff --git a/cli/tests/testdata/run/045_proxy_test.ts.out b/cli/tests/testdata/run/045_proxy_test.ts.out
new file mode 100644
index 000000000..a1e567a14
--- /dev/null
+++ b/cli/tests/testdata/run/045_proxy_test.ts.out
@@ -0,0 +1,6 @@
+Proxy server listening on [WILDCARD]
+Proxy request to: http://localhost:4545/run/045_mod.ts
+Proxy request to: http://localhost:4545/run/045_mod.ts
+Proxy request to: http://localhost:4545/run/045_output.ts
+Proxy request to: http://localhost:4545/run/045_mod.ts
+proxy-authorization: Basic dXNlcm5hbWU6cGFzc3dvcmQ=
diff --git a/cli/tests/testdata/046_jsx_test.tsx b/cli/tests/testdata/run/046_jsx_test.tsx
index 5ed3ff2fa..5ed3ff2fa 100644
--- a/cli/tests/testdata/046_jsx_test.tsx
+++ b/cli/tests/testdata/run/046_jsx_test.tsx
diff --git a/cli/tests/testdata/046_jsx_test.tsx.out b/cli/tests/testdata/run/046_jsx_test.tsx.out
index 85cfe824b..85cfe824b 100644
--- a/cli/tests/testdata/046_jsx_test.tsx.out
+++ b/cli/tests/testdata/run/046_jsx_test.tsx.out
diff --git a/cli/tests/testdata/047_jsx_test.jsx b/cli/tests/testdata/run/047_jsx_test.jsx
index 4c2314072..4c2314072 100644
--- a/cli/tests/testdata/047_jsx_test.jsx
+++ b/cli/tests/testdata/run/047_jsx_test.jsx
diff --git a/cli/tests/testdata/047_jsx_test.jsx.out b/cli/tests/testdata/run/047_jsx_test.jsx.out
index 85cfe824b..85cfe824b 100644
--- a/cli/tests/testdata/047_jsx_test.jsx.out
+++ b/cli/tests/testdata/run/047_jsx_test.jsx.out
diff --git a/cli/tests/testdata/048_media_types_jsx.ts b/cli/tests/testdata/run/048_media_types_jsx.ts
index 8dcd0ad68..8dcd0ad68 100644
--- a/cli/tests/testdata/048_media_types_jsx.ts
+++ b/cli/tests/testdata/run/048_media_types_jsx.ts
diff --git a/cli/tests/testdata/048_media_types_jsx.ts.out b/cli/tests/testdata/run/048_media_types_jsx.ts.out
index 266cc5741..266cc5741 100644
--- a/cli/tests/testdata/048_media_types_jsx.ts.out
+++ b/cli/tests/testdata/run/048_media_types_jsx.ts.out
diff --git a/cli/tests/testdata/run/052_no_remote_flag.out b/cli/tests/testdata/run/052_no_remote_flag.out
new file mode 100644
index 000000000..f511f6d94
--- /dev/null
+++ b/cli/tests/testdata/run/052_no_remote_flag.out
@@ -0,0 +1,4 @@
+error: A remote specifier was requested: "http://127.0.0.1:4545/run/019_media_types.ts", but --no-remote is specified.
+
+Caused by:
+    A remote specifier was requested: "http://127.0.0.1:4545/run/019_media_types.ts", but --no-remote is specified.
diff --git a/cli/tests/testdata/056_make_temp_file_write_perm.out b/cli/tests/testdata/run/056_make_temp_file_write_perm.out
index c56aae43f..c56aae43f 100644
--- a/cli/tests/testdata/056_make_temp_file_write_perm.out
+++ b/cli/tests/testdata/run/056_make_temp_file_write_perm.out
diff --git a/cli/tests/testdata/056_make_temp_file_write_perm.ts b/cli/tests/testdata/run/056_make_temp_file_write_perm.ts
index c0deda8a2..c0deda8a2 100644
--- a/cli/tests/testdata/056_make_temp_file_write_perm.ts
+++ b/cli/tests/testdata/run/056_make_temp_file_write_perm.ts
diff --git a/cli/tests/testdata/058_tasks_microtasks_close.ts b/cli/tests/testdata/run/058_tasks_microtasks_close.ts
index 38e156044..38e156044 100644
--- a/cli/tests/testdata/058_tasks_microtasks_close.ts
+++ b/cli/tests/testdata/run/058_tasks_microtasks_close.ts
diff --git a/cli/tests/testdata/058_tasks_microtasks_close.ts.out b/cli/tests/testdata/run/058_tasks_microtasks_close.ts.out
index 218273cab..218273cab 100644
--- a/cli/tests/testdata/058_tasks_microtasks_close.ts.out
+++ b/cli/tests/testdata/run/058_tasks_microtasks_close.ts.out
diff --git a/cli/tests/testdata/059_fs_relative_path_perm.ts b/cli/tests/testdata/run/059_fs_relative_path_perm.ts
index 26630fe1c..26630fe1c 100644
--- a/cli/tests/testdata/059_fs_relative_path_perm.ts
+++ b/cli/tests/testdata/run/059_fs_relative_path_perm.ts
diff --git a/cli/tests/testdata/059_fs_relative_path_perm.ts.out b/cli/tests/testdata/run/059_fs_relative_path_perm.ts.out
index b55412137..b55412137 100644
--- a/cli/tests/testdata/059_fs_relative_path_perm.ts.out
+++ b/cli/tests/testdata/run/059_fs_relative_path_perm.ts.out
diff --git a/cli/tests/testdata/061_permissions_request.ts b/cli/tests/testdata/run/061_permissions_request.ts
index c31e7ac42..c31e7ac42 100644
--- a/cli/tests/testdata/061_permissions_request.ts
+++ b/cli/tests/testdata/run/061_permissions_request.ts
diff --git a/cli/tests/testdata/062_permissions_request_global.ts b/cli/tests/testdata/run/062_permissions_request_global.ts
index e431bc31b..e431bc31b 100644
--- a/cli/tests/testdata/062_permissions_request_global.ts
+++ b/cli/tests/testdata/run/062_permissions_request_global.ts
diff --git a/cli/tests/testdata/063_permissions_revoke.ts b/cli/tests/testdata/run/063_permissions_revoke.ts
index a81eee7cb..a81eee7cb 100644
--- a/cli/tests/testdata/063_permissions_revoke.ts
+++ b/cli/tests/testdata/run/063_permissions_revoke.ts
diff --git a/cli/tests/testdata/063_permissions_revoke.ts.out b/cli/tests/testdata/run/063_permissions_revoke.ts.out
index bbd64c557..bbd64c557 100644
--- a/cli/tests/testdata/063_permissions_revoke.ts.out
+++ b/cli/tests/testdata/run/063_permissions_revoke.ts.out
diff --git a/cli/tests/testdata/064_permissions_revoke_global.ts b/cli/tests/testdata/run/064_permissions_revoke_global.ts
index a9b1fcd40..a9b1fcd40 100644
--- a/cli/tests/testdata/064_permissions_revoke_global.ts
+++ b/cli/tests/testdata/run/064_permissions_revoke_global.ts
diff --git a/cli/tests/testdata/064_permissions_revoke_global.ts.out b/cli/tests/testdata/run/064_permissions_revoke_global.ts.out
index f7e389a76..f7e389a76 100644
--- a/cli/tests/testdata/064_permissions_revoke_global.ts.out
+++ b/cli/tests/testdata/run/064_permissions_revoke_global.ts.out
diff --git a/cli/tests/testdata/066_prompt.ts b/cli/tests/testdata/run/066_prompt.ts
index e3daa7ac0..e3daa7ac0 100644
--- a/cli/tests/testdata/066_prompt.ts
+++ b/cli/tests/testdata/run/066_prompt.ts
diff --git a/cli/tests/testdata/070_location.ts b/cli/tests/testdata/run/070_location.ts
index 05e5abdf1..05e5abdf1 100644
--- a/cli/tests/testdata/070_location.ts
+++ b/cli/tests/testdata/run/070_location.ts
diff --git a/cli/tests/testdata/070_location.ts.out b/cli/tests/testdata/run/070_location.ts.out
index 692d7c976..692d7c976 100644
--- a/cli/tests/testdata/070_location.ts.out
+++ b/cli/tests/testdata/run/070_location.ts.out
diff --git a/cli/tests/testdata/071_location_unset.ts b/cli/tests/testdata/run/071_location_unset.ts
index f560d2716..f560d2716 100644
--- a/cli/tests/testdata/071_location_unset.ts
+++ b/cli/tests/testdata/run/071_location_unset.ts
diff --git a/cli/tests/testdata/071_location_unset.ts.out b/cli/tests/testdata/run/071_location_unset.ts.out
index 99f87a7fc..99f87a7fc 100644
--- a/cli/tests/testdata/071_location_unset.ts.out
+++ b/cli/tests/testdata/run/071_location_unset.ts.out
diff --git a/cli/tests/testdata/run/072_location_relative_fetch.ts b/cli/tests/testdata/run/072_location_relative_fetch.ts
new file mode 100644
index 000000000..b2a291693
--- /dev/null
+++ b/cli/tests/testdata/run/072_location_relative_fetch.ts
@@ -0,0 +1,2 @@
+const response = await fetch("run/fetch/hello.txt");
+console.log(await response.text());
diff --git a/cli/tests/testdata/072_location_relative_fetch.ts.out b/cli/tests/testdata/run/072_location_relative_fetch.ts.out
index 8151f6f88..8151f6f88 100644
--- a/cli/tests/testdata/072_location_relative_fetch.ts.out
+++ b/cli/tests/testdata/run/072_location_relative_fetch.ts.out
diff --git a/cli/tests/testdata/075_import_local_query_hash.ts b/cli/tests/testdata/run/075_import_local_query_hash.ts
index 99c7ceab4..99c7ceab4 100644
--- a/cli/tests/testdata/075_import_local_query_hash.ts
+++ b/cli/tests/testdata/run/075_import_local_query_hash.ts
diff --git a/cli/tests/testdata/075_import_local_query_hash.ts.out b/cli/tests/testdata/run/075_import_local_query_hash.ts.out
index 340777742..340777742 100644
--- a/cli/tests/testdata/075_import_local_query_hash.ts.out
+++ b/cli/tests/testdata/run/075_import_local_query_hash.ts.out
diff --git a/cli/tests/testdata/077_fetch_empty.ts b/cli/tests/testdata/run/077_fetch_empty.ts
index b10a9094e..b10a9094e 100644
--- a/cli/tests/testdata/077_fetch_empty.ts
+++ b/cli/tests/testdata/run/077_fetch_empty.ts
diff --git a/cli/tests/testdata/077_fetch_empty.ts.out b/cli/tests/testdata/run/077_fetch_empty.ts.out
index e546cfcec..e546cfcec 100644
--- a/cli/tests/testdata/077_fetch_empty.ts.out
+++ b/cli/tests/testdata/run/077_fetch_empty.ts.out
diff --git a/cli/tests/testdata/078_unload_on_exit.ts b/cli/tests/testdata/run/078_unload_on_exit.ts
index 43d33eb25..43d33eb25 100644
--- a/cli/tests/testdata/078_unload_on_exit.ts
+++ b/cli/tests/testdata/run/078_unload_on_exit.ts
diff --git a/cli/tests/testdata/078_unload_on_exit.ts.out b/cli/tests/testdata/run/078_unload_on_exit.ts.out
index e213f9632..e213f9632 100644
--- a/cli/tests/testdata/078_unload_on_exit.ts.out
+++ b/cli/tests/testdata/run/078_unload_on_exit.ts.out
diff --git a/cli/tests/testdata/079_location_authentication.ts b/cli/tests/testdata/run/079_location_authentication.ts
index 4989312ac..4989312ac 100644
--- a/cli/tests/testdata/079_location_authentication.ts
+++ b/cli/tests/testdata/run/079_location_authentication.ts
diff --git a/cli/tests/testdata/079_location_authentication.ts.out b/cli/tests/testdata/run/079_location_authentication.ts.out
index bb2458497..bb2458497 100644
--- a/cli/tests/testdata/079_location_authentication.ts.out
+++ b/cli/tests/testdata/run/079_location_authentication.ts.out
diff --git a/cli/tests/testdata/081_location_relative_fetch_redirect.ts b/cli/tests/testdata/run/081_location_relative_fetch_redirect.ts
index 742ef0afb..742ef0afb 100644
--- a/cli/tests/testdata/081_location_relative_fetch_redirect.ts
+++ b/cli/tests/testdata/run/081_location_relative_fetch_redirect.ts
diff --git a/cli/tests/testdata/081_location_relative_fetch_redirect.ts.out b/cli/tests/testdata/run/081_location_relative_fetch_redirect.ts.out
index f62b93195..f62b93195 100644
--- a/cli/tests/testdata/081_location_relative_fetch_redirect.ts.out
+++ b/cli/tests/testdata/run/081_location_relative_fetch_redirect.ts.out
diff --git a/cli/tests/testdata/082_prepare_stack_trace_throw.js b/cli/tests/testdata/run/082_prepare_stack_trace_throw.js
index 8137bfdc8..8137bfdc8 100644
--- a/cli/tests/testdata/082_prepare_stack_trace_throw.js
+++ b/cli/tests/testdata/run/082_prepare_stack_trace_throw.js
diff --git a/cli/tests/testdata/082_prepare_stack_trace_throw.js.out b/cli/tests/testdata/run/082_prepare_stack_trace_throw.js.out
index 751b7c971..751b7c971 100644
--- a/cli/tests/testdata/082_prepare_stack_trace_throw.js.out
+++ b/cli/tests/testdata/run/082_prepare_stack_trace_throw.js.out
diff --git a/cli/tests/testdata/083_legacy_external_source_map.ts b/cli/tests/testdata/run/083_legacy_external_source_map.ts
index 73d267b87..73d267b87 100644
--- a/cli/tests/testdata/083_legacy_external_source_map.ts
+++ b/cli/tests/testdata/run/083_legacy_external_source_map.ts
diff --git a/cli/tests/testdata/088_dynamic_import_already_evaluating.ts b/cli/tests/testdata/run/088_dynamic_import_already_evaluating.ts
index 272163a5d..272163a5d 100644
--- a/cli/tests/testdata/088_dynamic_import_already_evaluating.ts
+++ b/cli/tests/testdata/run/088_dynamic_import_already_evaluating.ts
diff --git a/cli/tests/testdata/088_dynamic_import_already_evaluating.ts.out b/cli/tests/testdata/run/088_dynamic_import_already_evaluating.ts.out
index a36dd11e7..a36dd11e7 100644
--- a/cli/tests/testdata/088_dynamic_import_already_evaluating.ts.out
+++ b/cli/tests/testdata/run/088_dynamic_import_already_evaluating.ts.out
diff --git a/cli/tests/testdata/088_dynamic_import_target.ts b/cli/tests/testdata/run/088_dynamic_import_target.ts
index 226f1851a..226f1851a 100644
--- a/cli/tests/testdata/088_dynamic_import_target.ts
+++ b/cli/tests/testdata/run/088_dynamic_import_target.ts
diff --git a/cli/tests/testdata/089_run_allow_list.ts b/cli/tests/testdata/run/089_run_allow_list.ts
index d7bc8e195..d7bc8e195 100644
--- a/cli/tests/testdata/089_run_allow_list.ts
+++ b/cli/tests/testdata/run/089_run_allow_list.ts
diff --git a/cli/tests/testdata/089_run_allow_list.ts.out b/cli/tests/testdata/run/089_run_allow_list.ts.out
index 68a4a2ac5..68a4a2ac5 100644
--- a/cli/tests/testdata/089_run_allow_list.ts.out
+++ b/cli/tests/testdata/run/089_run_allow_list.ts.out
diff --git a/cli/tests/testdata/090_run_permissions_request.ts b/cli/tests/testdata/run/090_run_permissions_request.ts
index 8ecad2b3b..8ecad2b3b 100644
--- a/cli/tests/testdata/090_run_permissions_request.ts
+++ b/cli/tests/testdata/run/090_run_permissions_request.ts
diff --git a/cli/tests/testdata/091_use_define_for_class_fields.ts b/cli/tests/testdata/run/091_use_define_for_class_fields.ts
index 46be3ac0b..46be3ac0b 100644
--- a/cli/tests/testdata/091_use_define_for_class_fields.ts
+++ b/cli/tests/testdata/run/091_use_define_for_class_fields.ts
diff --git a/cli/tests/testdata/091_use_define_for_class_fields.ts.out b/cli/tests/testdata/run/091_use_define_for_class_fields.ts.out
index 08f94a967..08f94a967 100644
--- a/cli/tests/testdata/091_use_define_for_class_fields.ts.out
+++ b/cli/tests/testdata/run/091_use_define_for_class_fields.ts.out
diff --git a/cli/tests/testdata/092_import_map_unmapped_bare_specifier.ts b/cli/tests/testdata/run/092_import_map_unmapped_bare_specifier.ts
index 87684430d..87684430d 100644
--- a/cli/tests/testdata/092_import_map_unmapped_bare_specifier.ts
+++ b/cli/tests/testdata/run/092_import_map_unmapped_bare_specifier.ts
diff --git a/cli/tests/testdata/092_import_map_unmapped_bare_specifier.ts.out b/cli/tests/testdata/run/092_import_map_unmapped_bare_specifier.ts.out
index 6e82ad410..6e82ad410 100644
--- a/cli/tests/testdata/092_import_map_unmapped_bare_specifier.ts.out
+++ b/cli/tests/testdata/run/092_import_map_unmapped_bare_specifier.ts.out
diff --git a/cli/tests/testdata/aggregate_error.out b/cli/tests/testdata/run/aggregate_error.out
index 7d0c09c70..7d0c09c70 100644
--- a/cli/tests/testdata/aggregate_error.out
+++ b/cli/tests/testdata/run/aggregate_error.out
diff --git a/cli/tests/testdata/aggregate_error.ts b/cli/tests/testdata/run/aggregate_error.ts
index ce4b54376..ce4b54376 100644
--- a/cli/tests/testdata/aggregate_error.ts
+++ b/cli/tests/testdata/run/aggregate_error.ts
diff --git a/cli/tests/testdata/async_error.ts b/cli/tests/testdata/run/async_error.ts
index b55c73aeb..b55c73aeb 100644
--- a/cli/tests/testdata/async_error.ts
+++ b/cli/tests/testdata/run/async_error.ts
diff --git a/cli/tests/testdata/async_error.ts.out b/cli/tests/testdata/run/async_error.ts.out
index b424f9072..b424f9072 100644
--- a/cli/tests/testdata/async_error.ts.out
+++ b/cli/tests/testdata/run/async_error.ts.out
diff --git a/cli/tests/testdata/before_unload.js b/cli/tests/testdata/run/before_unload.js
index 2572e512b..2572e512b 100644
--- a/cli/tests/testdata/before_unload.js
+++ b/cli/tests/testdata/run/before_unload.js
diff --git a/cli/tests/testdata/before_unload.js.out b/cli/tests/testdata/run/before_unload.js.out
index f1f2ab49a..f1f2ab49a 100644
--- a/cli/tests/testdata/before_unload.js.out
+++ b/cli/tests/testdata/run/before_unload.js.out
diff --git a/cli/tests/testdata/blob_gc_finalization.js b/cli/tests/testdata/run/blob_gc_finalization.js
index c721e6b45..c721e6b45 100644
--- a/cli/tests/testdata/blob_gc_finalization.js
+++ b/cli/tests/testdata/run/blob_gc_finalization.js
diff --git a/cli/tests/testdata/blob_gc_finalization.js.out b/cli/tests/testdata/run/blob_gc_finalization.js.out
index dcc4500f8..dcc4500f8 100644
--- a/cli/tests/testdata/blob_gc_finalization.js.out
+++ b/cli/tests/testdata/run/blob_gc_finalization.js.out
diff --git a/cli/tests/testdata/byte_order_mark.out b/cli/tests/testdata/run/byte_order_mark.out
index 557db03de..557db03de 100644
--- a/cli/tests/testdata/byte_order_mark.out
+++ b/cli/tests/testdata/run/byte_order_mark.out
diff --git a/cli/tests/testdata/byte_order_mark.ts b/cli/tests/testdata/run/byte_order_mark.ts
index 40eb23c1d..40eb23c1d 100644
--- a/cli/tests/testdata/byte_order_mark.ts
+++ b/cli/tests/testdata/run/byte_order_mark.ts
diff --git a/cli/tests/testdata/checkjs.tsconfig.json b/cli/tests/testdata/run/checkjs.tsconfig.json
index 46d96db9e..46d96db9e 100644
--- a/cli/tests/testdata/checkjs.tsconfig.json
+++ b/cli/tests/testdata/run/checkjs.tsconfig.json
diff --git a/cli/tests/testdata/commonjs.cjs b/cli/tests/testdata/run/cjs_imports/commonjs.cjs
index 7df7d571e..7df7d571e 100644
--- a/cli/tests/testdata/commonjs.cjs
+++ b/cli/tests/testdata/run/cjs_imports/commonjs.cjs
diff --git a/cli/tests/testdata/cjs_imports.ts.out b/cli/tests/testdata/run/cjs_imports/main.out
index 557db03de..557db03de 100644
--- a/cli/tests/testdata/cjs_imports.ts.out
+++ b/cli/tests/testdata/run/cjs_imports/main.out
diff --git a/cli/tests/testdata/cjs_imports.ts b/cli/tests/testdata/run/cjs_imports/main.ts
index d8b77c22e..d8b77c22e 100644
--- a/cli/tests/testdata/cjs_imports.ts
+++ b/cli/tests/testdata/run/cjs_imports/main.ts
diff --git a/cli/tests/testdata/classic_workers_event_loop.js b/cli/tests/testdata/run/classic_workers_event_loop.js
index 810a6df7f..810a6df7f 100644
--- a/cli/tests/testdata/classic_workers_event_loop.js
+++ b/cli/tests/testdata/run/classic_workers_event_loop.js
diff --git a/cli/tests/testdata/classic_workers_event_loop.js.out b/cli/tests/testdata/run/classic_workers_event_loop.js.out
index 19f86f493..19f86f493 100644
--- a/cli/tests/testdata/classic_workers_event_loop.js.out
+++ b/cli/tests/testdata/run/classic_workers_event_loop.js.out
diff --git a/cli/tests/testdata/colors_without_globalThis.js b/cli/tests/testdata/run/colors_without_globalThis.js
index f9d4b68fc..f9d4b68fc 100644
--- a/cli/tests/testdata/colors_without_globalThis.js
+++ b/cli/tests/testdata/run/colors_without_globalThis.js
diff --git a/cli/tests/testdata/complex_error.ts b/cli/tests/testdata/run/complex_error.ts
index b462992ac..b462992ac 100644
--- a/cli/tests/testdata/complex_error.ts
+++ b/cli/tests/testdata/run/complex_error.ts
diff --git a/cli/tests/testdata/complex_error.ts.out b/cli/tests/testdata/run/complex_error.ts.out
index eef1b7699..eef1b7699 100644
--- a/cli/tests/testdata/complex_error.ts.out
+++ b/cli/tests/testdata/run/complex_error.ts.out
diff --git a/cli/tests/testdata/complex_permissions_test.ts b/cli/tests/testdata/run/complex_permissions_test.ts
index bae157246..bae157246 100644
--- a/cli/tests/testdata/complex_permissions_test.ts
+++ b/cli/tests/testdata/run/complex_permissions_test.ts
diff --git a/cli/tests/testdata/run/config/main.out b/cli/tests/testdata/run/config/main.out
new file mode 100644
index 000000000..277314807
--- /dev/null
+++ b/cli/tests/testdata/run/config/main.out
@@ -0,0 +1,4 @@
+[WILDCARD]Unsupported compiler options in "[WILDCARD]tsconfig.json".
+  The following options were ignored:
+    module, target
+Check [WILDCARD]/main.ts
diff --git a/cli/tests/testdata/config.ts b/cli/tests/testdata/run/config/main.ts
index 51a61e447..51a61e447 100644
--- a/cli/tests/testdata/config.ts
+++ b/cli/tests/testdata/run/config/main.ts
diff --git a/cli/tests/testdata/config.tsconfig.json b/cli/tests/testdata/run/config/tsconfig.json
index 0f0881920..0f0881920 100644
--- a/cli/tests/testdata/config.tsconfig.json
+++ b/cli/tests/testdata/run/config/tsconfig.json
diff --git a/cli/tests/testdata/run/config_json_import.ts b/cli/tests/testdata/run/config_json_import.ts
new file mode 100644
index 000000000..9cf1cceaa
--- /dev/null
+++ b/cli/tests/testdata/run/config_json_import.ts
@@ -0,0 +1,2 @@
+import config from "../jsx/deno-jsx.json" assert { type: "json" };
+console.log(config);
diff --git a/cli/tests/testdata/config_json_import.ts.out b/cli/tests/testdata/run/config_json_import.ts.out
index aa55be7d5..aa55be7d5 100644
--- a/cli/tests/testdata/config_json_import.ts.out
+++ b/cli/tests/testdata/run/config_json_import.ts.out
diff --git a/cli/tests/testdata/config_types.ts.out b/cli/tests/testdata/run/config_types/main.out
index 417b7b537..417b7b537 100644
--- a/cli/tests/testdata/config_types.ts.out
+++ b/cli/tests/testdata/run/config_types/main.out
diff --git a/cli/tests/testdata/config_types.ts b/cli/tests/testdata/run/config_types/main.ts
index f1a8d6583..f1a8d6583 100644
--- a/cli/tests/testdata/config_types.ts
+++ b/cli/tests/testdata/run/config_types/main.ts
diff --git a/cli/tests/testdata/run/config_types/remote.tsconfig.json b/cli/tests/testdata/run/config_types/remote.tsconfig.json
new file mode 100644
index 000000000..255ff5def
--- /dev/null
+++ b/cli/tests/testdata/run/config_types/remote.tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "types": [
+      "http://localhost:4545/run/config_types/types.d.ts"
+    ]
+  }
+}
diff --git a/cli/tests/testdata/config_types.tsconfig.json b/cli/tests/testdata/run/config_types/tsconfig.json
index 3810d4534..85f1549e0 100644
--- a/cli/tests/testdata/config_types.tsconfig.json
+++ b/cli/tests/testdata/run/config_types/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "types": [
-      "./subdir/types.d.ts"
+      "./types.d.ts"
     ]
   }
 }
diff --git a/cli/tests/testdata/subdir/types.d.ts b/cli/tests/testdata/run/config_types/types.d.ts
index 536a6d0a6..536a6d0a6 100644
--- a/cli/tests/testdata/subdir/types.d.ts
+++ b/cli/tests/testdata/run/config_types/types.d.ts
diff --git a/cli/tests/testdata/custom_inspect_url.js b/cli/tests/testdata/run/custom_inspect_url.js
index 69aa2dc49..69aa2dc49 100644
--- a/cli/tests/testdata/custom_inspect_url.js
+++ b/cli/tests/testdata/run/custom_inspect_url.js
diff --git a/cli/tests/testdata/custom_inspect_url.js.out b/cli/tests/testdata/run/custom_inspect_url.js.out
index 1c714e34e..1c714e34e 100644
--- a/cli/tests/testdata/custom_inspect_url.js.out
+++ b/cli/tests/testdata/run/custom_inspect_url.js.out
diff --git a/cli/tests/testdata/delete_window.js b/cli/tests/testdata/run/delete_window.js
index f2f16820d..f2f16820d 100644
--- a/cli/tests/testdata/delete_window.js
+++ b/cli/tests/testdata/run/delete_window.js
diff --git a/cli/tests/testdata/deno_exit_tampering.ts b/cli/tests/testdata/run/deno_exit_tampering.ts
index 3b24261e2..3b24261e2 100644
--- a/cli/tests/testdata/deno_exit_tampering.ts
+++ b/cli/tests/testdata/run/deno_exit_tampering.ts
diff --git a/cli/tests/testdata/disallow_http_from_https.js b/cli/tests/testdata/run/disallow_http_from_https.js
index bff407b5e..b8ddff170 100644
--- a/cli/tests/testdata/disallow_http_from_https.js
+++ b/cli/tests/testdata/run/disallow_http_from_https.js
@@ -1,2 +1,2 @@
 // Trying to import "http://", while this file is accessed by "https://"
-import "http://localhost:4545/001_hello.js";
+import "http://localhost:4545/run/001_hello.js";
diff --git a/cli/tests/testdata/disallow_http_from_https.ts b/cli/tests/testdata/run/disallow_http_from_https.ts
index bff407b5e..b8ddff170 100644
--- a/cli/tests/testdata/disallow_http_from_https.ts
+++ b/cli/tests/testdata/run/disallow_http_from_https.ts
@@ -1,2 +1,2 @@
 // Trying to import "http://", while this file is accessed by "https://"
-import "http://localhost:4545/001_hello.js";
+import "http://localhost:4545/run/001_hello.js";
diff --git a/cli/tests/testdata/run/disallow_http_from_https_js.out b/cli/tests/testdata/run/disallow_http_from_https_js.out
new file mode 100644
index 000000000..5dc327975
--- /dev/null
+++ b/cli/tests/testdata/run/disallow_http_from_https_js.out
@@ -0,0 +1,3 @@
+error: Modules imported via https are not allowed to import http modules.
+  Importing: http://localhost:4545/run/001_hello.js
+    at https://localhost:5545/run/disallow_http_from_https.js:2:8
diff --git a/cli/tests/testdata/run/disallow_http_from_https_ts.out b/cli/tests/testdata/run/disallow_http_from_https_ts.out
new file mode 100644
index 000000000..e3b8f4390
--- /dev/null
+++ b/cli/tests/testdata/run/disallow_http_from_https_ts.out
@@ -0,0 +1,3 @@
+error: Modules imported via https are not allowed to import http modules.
+  Importing: http://localhost:4545/run/001_hello.js
+    at https://localhost:5545/run/disallow_http_from_https.ts:2:8
diff --git a/cli/tests/testdata/dom_exception_formatting.ts b/cli/tests/testdata/run/dom_exception_formatting.ts
index 0209ec81e..0209ec81e 100644
--- a/cli/tests/testdata/dom_exception_formatting.ts
+++ b/cli/tests/testdata/run/dom_exception_formatting.ts
diff --git a/cli/tests/testdata/dom_exception_formatting.ts.out b/cli/tests/testdata/run/dom_exception_formatting.ts.out
index bcdd714ea..bcdd714ea 100644
--- a/cli/tests/testdata/dom_exception_formatting.ts.out
+++ b/cli/tests/testdata/run/dom_exception_formatting.ts.out
diff --git a/cli/tests/testdata/error_001.ts b/cli/tests/testdata/run/dynamic_import_already_rejected/error_001.ts
index b01068bc0..b01068bc0 100644
--- a/cli/tests/testdata/error_001.ts
+++ b/cli/tests/testdata/run/dynamic_import_already_rejected/error_001.ts
diff --git a/cli/tests/testdata/086_dynamic_import_already_rejected.ts.out b/cli/tests/testdata/run/dynamic_import_already_rejected/main.out
index c3eb66f9e..c3eb66f9e 100644
--- a/cli/tests/testdata/086_dynamic_import_already_rejected.ts.out
+++ b/cli/tests/testdata/run/dynamic_import_already_rejected/main.out
diff --git a/cli/tests/testdata/086_dynamic_import_already_rejected.ts b/cli/tests/testdata/run/dynamic_import_already_rejected/main.ts
index 249de8d8b..249de8d8b 100644
--- a/cli/tests/testdata/086_dynamic_import_already_rejected.ts
+++ b/cli/tests/testdata/run/dynamic_import_already_rejected/main.ts
diff --git a/cli/tests/testdata/delayed_error.ts b/cli/tests/testdata/run/dynamic_import_async_error/delayed_error.ts
index 76057e627..76057e627 100644
--- a/cli/tests/testdata/delayed_error.ts
+++ b/cli/tests/testdata/run/dynamic_import_async_error/delayed_error.ts
diff --git a/cli/tests/testdata/085_dynamic_import_async_error.ts.out b/cli/tests/testdata/run/dynamic_import_async_error/main.out
index 974c2e426..974c2e426 100644
--- a/cli/tests/testdata/085_dynamic_import_async_error.ts.out
+++ b/cli/tests/testdata/run/dynamic_import_async_error/main.out
diff --git a/cli/tests/testdata/085_dynamic_import_async_error.ts b/cli/tests/testdata/run/dynamic_import_async_error/main.ts
index 998e7ed3e..998e7ed3e 100644
--- a/cli/tests/testdata/085_dynamic_import_async_error.ts
+++ b/cli/tests/testdata/run/dynamic_import_async_error/main.ts
diff --git a/cli/tests/testdata/dynamic_import_conditional.js b/cli/tests/testdata/run/dynamic_import_conditional.js
index 1b4193e3e..1b4193e3e 100644
--- a/cli/tests/testdata/dynamic_import_conditional.js
+++ b/cli/tests/testdata/run/dynamic_import_conditional.js
diff --git a/cli/tests/testdata/dynamic_import_conditional.js.out b/cli/tests/testdata/run/dynamic_import_conditional.js.out
index 27ba77dda..27ba77dda 100644
--- a/cli/tests/testdata/dynamic_import_conditional.js.out
+++ b/cli/tests/testdata/run/dynamic_import_conditional.js.out
diff --git a/cli/tests/testdata/subdir/empty.ts b/cli/tests/testdata/run/empty.ts
index e69de29bb..e69de29bb 100644
--- a/cli/tests/testdata/subdir/empty.ts
+++ b/cli/tests/testdata/run/empty.ts
diff --git a/cli/tests/testdata/run/error_001.ts b/cli/tests/testdata/run/error_001.ts
new file mode 100644
index 000000000..b01068bc0
--- /dev/null
+++ b/cli/tests/testdata/run/error_001.ts
@@ -0,0 +1,9 @@
+function foo(): never {
+  throw Error("bad");
+}
+
+function bar() {
+  foo();
+}
+
+bar();
diff --git a/cli/tests/testdata/error_001.ts.out b/cli/tests/testdata/run/error_001.ts.out
index 25664a9a4..25664a9a4 100644
--- a/cli/tests/testdata/error_001.ts.out
+++ b/cli/tests/testdata/run/error_001.ts.out
diff --git a/cli/tests/testdata/run/error_002.ts b/cli/tests/testdata/run/error_002.ts
new file mode 100644
index 000000000..5f8179bbe
--- /dev/null
+++ b/cli/tests/testdata/run/error_002.ts
@@ -0,0 +1,7 @@
+import { throwsError } from "../subdir/mod1.ts";
+
+function foo() {
+  throwsError();
+}
+
+foo();
diff --git a/cli/tests/testdata/error_002.ts.out b/cli/tests/testdata/run/error_002.ts.out
index 96b9e602a..96b9e602a 100644
--- a/cli/tests/testdata/error_002.ts.out
+++ b/cli/tests/testdata/run/error_002.ts.out
diff --git a/cli/tests/testdata/error_003_typescript.ts b/cli/tests/testdata/run/error_003_typescript.ts
index e1f882123..e1f882123 100644
--- a/cli/tests/testdata/error_003_typescript.ts
+++ b/cli/tests/testdata/run/error_003_typescript.ts
diff --git a/cli/tests/testdata/error_003_typescript.ts.out b/cli/tests/testdata/run/error_003_typescript.ts.out
index bbb2ec470..bbb2ec470 100644
--- a/cli/tests/testdata/error_003_typescript.ts.out
+++ b/cli/tests/testdata/run/error_003_typescript.ts.out
diff --git a/cli/tests/testdata/error_004_missing_module.ts b/cli/tests/testdata/run/error_004_missing_module.ts
index 82b281181..82b281181 100644
--- a/cli/tests/testdata/error_004_missing_module.ts
+++ b/cli/tests/testdata/run/error_004_missing_module.ts
diff --git a/cli/tests/testdata/error_004_missing_module.ts.out b/cli/tests/testdata/run/error_004_missing_module.ts.out
index 9a2cfb8a8..9a2cfb8a8 100644
--- a/cli/tests/testdata/error_004_missing_module.ts.out
+++ b/cli/tests/testdata/run/error_004_missing_module.ts.out
diff --git a/cli/tests/testdata/error_005_missing_dynamic_import.ts b/cli/tests/testdata/run/error_005_missing_dynamic_import.ts
index 8ea8ff94e..8ea8ff94e 100644
--- a/cli/tests/testdata/error_005_missing_dynamic_import.ts
+++ b/cli/tests/testdata/run/error_005_missing_dynamic_import.ts
diff --git a/cli/tests/testdata/error_005_missing_dynamic_import.ts.out b/cli/tests/testdata/run/error_005_missing_dynamic_import.ts.out
index 55e4a8524..55e4a8524 100644
--- a/cli/tests/testdata/error_005_missing_dynamic_import.ts.out
+++ b/cli/tests/testdata/run/error_005_missing_dynamic_import.ts.out
diff --git a/cli/tests/testdata/error_006_import_ext_failure.ts b/cli/tests/testdata/run/error_006_import_ext_failure.ts
index 3c32303a3..3c32303a3 100644
--- a/cli/tests/testdata/error_006_import_ext_failure.ts
+++ b/cli/tests/testdata/run/error_006_import_ext_failure.ts
diff --git a/cli/tests/testdata/error_006_import_ext_failure.ts.out b/cli/tests/testdata/run/error_006_import_ext_failure.ts.out
index 667579bd8..667579bd8 100644
--- a/cli/tests/testdata/error_006_import_ext_failure.ts.out
+++ b/cli/tests/testdata/run/error_006_import_ext_failure.ts.out
diff --git a/cli/tests/testdata/error_007_any.ts b/cli/tests/testdata/run/error_007_any.ts
index bfef1289b..bfef1289b 100644
--- a/cli/tests/testdata/error_007_any.ts
+++ b/cli/tests/testdata/run/error_007_any.ts
diff --git a/cli/tests/testdata/error_007_any.ts.out b/cli/tests/testdata/run/error_007_any.ts.out
index b93ceb1d0..b93ceb1d0 100644
--- a/cli/tests/testdata/error_007_any.ts.out
+++ b/cli/tests/testdata/run/error_007_any.ts.out
diff --git a/cli/tests/testdata/error_008_checkjs.js b/cli/tests/testdata/run/error_008_checkjs.js
index f0856d94c..f0856d94c 100644
--- a/cli/tests/testdata/error_008_checkjs.js
+++ b/cli/tests/testdata/run/error_008_checkjs.js
diff --git a/cli/tests/testdata/error_008_checkjs.js.out b/cli/tests/testdata/run/error_008_checkjs.js.out
index e43187382..e43187382 100644
--- a/cli/tests/testdata/error_008_checkjs.js.out
+++ b/cli/tests/testdata/run/error_008_checkjs.js.out
diff --git a/cli/tests/testdata/error_009_extensions_error.js b/cli/tests/testdata/run/error_009_extensions_error.js
index 01b97ea38..01b97ea38 100644
--- a/cli/tests/testdata/error_009_extensions_error.js
+++ b/cli/tests/testdata/run/error_009_extensions_error.js
diff --git a/cli/tests/testdata/error_009_extensions_error.js.out b/cli/tests/testdata/run/error_009_extensions_error.js.out
index 8510980f6..8510980f6 100644
--- a/cli/tests/testdata/error_009_extensions_error.js.out
+++ b/cli/tests/testdata/run/error_009_extensions_error.js.out
diff --git a/cli/tests/testdata/error_009_missing_js_module.disabled b/cli/tests/testdata/run/error_009_missing_js_module.disabled
index 3156fc94b..3156fc94b 100644
--- a/cli/tests/testdata/error_009_missing_js_module.disabled
+++ b/cli/tests/testdata/run/error_009_missing_js_module.disabled
diff --git a/cli/tests/testdata/error_011_bad_module_specifier.ts b/cli/tests/testdata/run/error_011_bad_module_specifier.ts
index 1c57e37a5..1c57e37a5 100644
--- a/cli/tests/testdata/error_011_bad_module_specifier.ts
+++ b/cli/tests/testdata/run/error_011_bad_module_specifier.ts
diff --git a/cli/tests/testdata/error_011_bad_module_specifier.ts.out b/cli/tests/testdata/run/error_011_bad_module_specifier.ts.out
index 81be915d1..81be915d1 100644
--- a/cli/tests/testdata/error_011_bad_module_specifier.ts.out
+++ b/cli/tests/testdata/run/error_011_bad_module_specifier.ts.out
diff --git a/cli/tests/testdata/error_012_bad_dynamic_import_specifier.ts b/cli/tests/testdata/run/error_012_bad_dynamic_import_specifier.ts
index 5f39f407c..5f39f407c 100644
--- a/cli/tests/testdata/error_012_bad_dynamic_import_specifier.ts
+++ b/cli/tests/testdata/run/error_012_bad_dynamic_import_specifier.ts
diff --git a/cli/tests/testdata/error_012_bad_dynamic_import_specifier.ts.out b/cli/tests/testdata/run/error_012_bad_dynamic_import_specifier.ts.out
index 7acd66713..7acd66713 100644
--- a/cli/tests/testdata/error_012_bad_dynamic_import_specifier.ts.out
+++ b/cli/tests/testdata/run/error_012_bad_dynamic_import_specifier.ts.out
diff --git a/cli/tests/testdata/error_013_missing_script.out b/cli/tests/testdata/run/error_013_missing_script.out
index 7ee268de4..7ee268de4 100644
--- a/cli/tests/testdata/error_013_missing_script.out
+++ b/cli/tests/testdata/run/error_013_missing_script.out
diff --git a/cli/tests/testdata/error_014_catch_dynamic_import_error.js b/cli/tests/testdata/run/error_014_catch_dynamic_import_error.js
index 483be7b1a..c58e54dcb 100644
--- a/cli/tests/testdata/error_014_catch_dynamic_import_error.js
+++ b/cli/tests/testdata/run/error_014_catch_dynamic_import_error.js
@@ -7,21 +7,21 @@
   }
 
   try {
-    await import("./subdir/indirect_import_error.js");
+    await import("../subdir/indirect_import_error.js");
   } catch (err) {
     console.log("Caught indirect direct dynamic import error.");
     console.log(err);
   }
 
   try {
-    await import("./subdir/throws.js");
+    await import("../subdir/throws.js");
   } catch (err) {
     console.log("Caught error thrown by dynamically imported module.");
     console.log(err);
   }
 
   try {
-    await import("./subdir/indirect_throws.js");
+    await import("../subdir/indirect_throws.js");
   } catch (err) {
     console.log(
       "Caught error thrown indirectly by dynamically imported module.",
diff --git a/cli/tests/testdata/error_014_catch_dynamic_import_error.js.out b/cli/tests/testdata/run/error_014_catch_dynamic_import_error.js.out
index 701ddc3b5..701ddc3b5 100644
--- a/cli/tests/testdata/error_014_catch_dynamic_import_error.js.out
+++ b/cli/tests/testdata/run/error_014_catch_dynamic_import_error.js.out
diff --git a/cli/tests/testdata/error_015_dynamic_import_permissions.js b/cli/tests/testdata/run/error_015_dynamic_import_permissions.js
index 73da56fd8..73da56fd8 100644
--- a/cli/tests/testdata/error_015_dynamic_import_permissions.js
+++ b/cli/tests/testdata/run/error_015_dynamic_import_permissions.js
diff --git a/cli/tests/testdata/error_015_dynamic_import_permissions.out b/cli/tests/testdata/run/error_015_dynamic_import_permissions.out
index ef54f331b..ef54f331b 100644
--- a/cli/tests/testdata/error_015_dynamic_import_permissions.out
+++ b/cli/tests/testdata/run/error_015_dynamic_import_permissions.out
diff --git a/cli/tests/testdata/error_016_dynamic_import_permissions2.js b/cli/tests/testdata/run/error_016_dynamic_import_permissions2.js
index f018d4a2e..f018d4a2e 100644
--- a/cli/tests/testdata/error_016_dynamic_import_permissions2.js
+++ b/cli/tests/testdata/run/error_016_dynamic_import_permissions2.js
diff --git a/cli/tests/testdata/error_016_dynamic_import_permissions2.out b/cli/tests/testdata/run/error_016_dynamic_import_permissions2.out
index 710871f41..710871f41 100644
--- a/cli/tests/testdata/error_016_dynamic_import_permissions2.out
+++ b/cli/tests/testdata/run/error_016_dynamic_import_permissions2.out
diff --git a/cli/tests/testdata/error_017_hide_long_source_ts.ts b/cli/tests/testdata/run/error_017_hide_long_source_ts.ts
index d61cb1277..d61cb1277 100644
--- a/cli/tests/testdata/error_017_hide_long_source_ts.ts
+++ b/cli/tests/testdata/run/error_017_hide_long_source_ts.ts
diff --git a/cli/tests/testdata/error_017_hide_long_source_ts.ts.out b/cli/tests/testdata/run/error_017_hide_long_source_ts.ts.out
index 917061ab9..917061ab9 100644
--- a/cli/tests/testdata/error_017_hide_long_source_ts.ts.out
+++ b/cli/tests/testdata/run/error_017_hide_long_source_ts.ts.out
diff --git a/cli/tests/testdata/error_018_hide_long_source_js.js b/cli/tests/testdata/run/error_018_hide_long_source_js.js
index d61cb1277..d61cb1277 100644
--- a/cli/tests/testdata/error_018_hide_long_source_js.js
+++ b/cli/tests/testdata/run/error_018_hide_long_source_js.js
diff --git a/cli/tests/testdata/error_018_hide_long_source_js.js.out b/cli/tests/testdata/run/error_018_hide_long_source_js.js.out
index cc98669a7..cc98669a7 100644
--- a/cli/tests/testdata/error_018_hide_long_source_js.js.out
+++ b/cli/tests/testdata/run/error_018_hide_long_source_js.js.out
diff --git a/cli/tests/testdata/error_019_stack_function.ts b/cli/tests/testdata/run/error_019_stack_function.ts
index a6a69d146..a6a69d146 100644
--- a/cli/tests/testdata/error_019_stack_function.ts
+++ b/cli/tests/testdata/run/error_019_stack_function.ts
diff --git a/cli/tests/testdata/error_019_stack_function.ts.out b/cli/tests/testdata/run/error_019_stack_function.ts.out
index 03967d12b..03967d12b 100644
--- a/cli/tests/testdata/error_019_stack_function.ts.out
+++ b/cli/tests/testdata/run/error_019_stack_function.ts.out
diff --git a/cli/tests/testdata/error_020_stack_constructor.ts b/cli/tests/testdata/run/error_020_stack_constructor.ts
index 526d1a661..526d1a661 100644
--- a/cli/tests/testdata/error_020_stack_constructor.ts
+++ b/cli/tests/testdata/run/error_020_stack_constructor.ts
diff --git a/cli/tests/testdata/error_020_stack_constructor.ts.out b/cli/tests/testdata/run/error_020_stack_constructor.ts.out
index 01fdfb3c4..01fdfb3c4 100644
--- a/cli/tests/testdata/error_020_stack_constructor.ts.out
+++ b/cli/tests/testdata/run/error_020_stack_constructor.ts.out
diff --git a/cli/tests/testdata/error_021_stack_method.ts b/cli/tests/testdata/run/error_021_stack_method.ts
index b6ebe1f5e..b6ebe1f5e 100644
--- a/cli/tests/testdata/error_021_stack_method.ts
+++ b/cli/tests/testdata/run/error_021_stack_method.ts
diff --git a/cli/tests/testdata/error_021_stack_method.ts.out b/cli/tests/testdata/run/error_021_stack_method.ts.out
index 999f0aaa0..999f0aaa0 100644
--- a/cli/tests/testdata/error_021_stack_method.ts.out
+++ b/cli/tests/testdata/run/error_021_stack_method.ts.out
diff --git a/cli/tests/testdata/error_022_stack_custom_error.ts b/cli/tests/testdata/run/error_022_stack_custom_error.ts
index b95743503..b95743503 100644
--- a/cli/tests/testdata/error_022_stack_custom_error.ts
+++ b/cli/tests/testdata/run/error_022_stack_custom_error.ts
diff --git a/cli/tests/testdata/error_022_stack_custom_error.ts.out b/cli/tests/testdata/run/error_022_stack_custom_error.ts.out
index 78b0dcaea..78b0dcaea 100644
--- a/cli/tests/testdata/error_022_stack_custom_error.ts.out
+++ b/cli/tests/testdata/run/error_022_stack_custom_error.ts.out
diff --git a/cli/tests/testdata/error_023_stack_async.ts b/cli/tests/testdata/run/error_023_stack_async.ts
index fdabaa5df..fdabaa5df 100644
--- a/cli/tests/testdata/error_023_stack_async.ts
+++ b/cli/tests/testdata/run/error_023_stack_async.ts
diff --git a/cli/tests/testdata/error_023_stack_async.ts.out b/cli/tests/testdata/run/error_023_stack_async.ts.out
index 95f0eae64..95f0eae64 100644
--- a/cli/tests/testdata/error_023_stack_async.ts.out
+++ b/cli/tests/testdata/run/error_023_stack_async.ts.out
diff --git a/cli/tests/testdata/error_024_stack_promise_all.ts b/cli/tests/testdata/run/error_024_stack_promise_all.ts
index 8ca7b203c..8ca7b203c 100644
--- a/cli/tests/testdata/error_024_stack_promise_all.ts
+++ b/cli/tests/testdata/run/error_024_stack_promise_all.ts
diff --git a/cli/tests/testdata/error_024_stack_promise_all.ts.out b/cli/tests/testdata/run/error_024_stack_promise_all.ts.out
index 6cd88715c..6cd88715c 100644
--- a/cli/tests/testdata/error_024_stack_promise_all.ts.out
+++ b/cli/tests/testdata/run/error_024_stack_promise_all.ts.out
diff --git a/cli/tests/testdata/error_025_tab_indent b/cli/tests/testdata/run/error_025_tab_indent
index 35a25bcea..35a25bcea 100644
--- a/cli/tests/testdata/error_025_tab_indent
+++ b/cli/tests/testdata/run/error_025_tab_indent
diff --git a/cli/tests/testdata/error_025_tab_indent.out b/cli/tests/testdata/run/error_025_tab_indent.out
index f1466ce3f..f1466ce3f 100644
--- a/cli/tests/testdata/error_025_tab_indent.out
+++ b/cli/tests/testdata/run/error_025_tab_indent.out
diff --git a/cli/tests/testdata/run/error_026_remote_import_error.ts b/cli/tests/testdata/run/error_026_remote_import_error.ts
new file mode 100644
index 000000000..1b230d06b
--- /dev/null
+++ b/cli/tests/testdata/run/error_026_remote_import_error.ts
@@ -0,0 +1 @@
+import "http://localhost:4545/run/error_001.ts";
diff --git a/cli/tests/testdata/run/error_026_remote_import_error.ts.out b/cli/tests/testdata/run/error_026_remote_import_error.ts.out
new file mode 100644
index 000000000..84f926f24
--- /dev/null
+++ b/cli/tests/testdata/run/error_026_remote_import_error.ts.out
@@ -0,0 +1,7 @@
+[WILDCARD]error: Uncaught Error: bad
+  throw Error("bad");
+        ^
+    at foo (http://localhost:4545/run/error_001.ts:2:9)
+    at bar (http://localhost:4545/run/error_001.ts:6:3)
+    at http://localhost:4545/run/error_001.ts:9:1
+[WILDCARD]
diff --git a/cli/tests/testdata/error_cause.ts b/cli/tests/testdata/run/error_cause.ts
index 385ce2a03..385ce2a03 100644
--- a/cli/tests/testdata/error_cause.ts
+++ b/cli/tests/testdata/run/error_cause.ts
diff --git a/cli/tests/testdata/error_cause.ts.out b/cli/tests/testdata/run/error_cause.ts.out
index 2aab020d9..2aab020d9 100644
--- a/cli/tests/testdata/error_cause.ts.out
+++ b/cli/tests/testdata/run/error_cause.ts.out
diff --git a/cli/tests/testdata/error_cause_recursive.ts b/cli/tests/testdata/run/error_cause_recursive.ts
index a6999b1ff..a6999b1ff 100644
--- a/cli/tests/testdata/error_cause_recursive.ts
+++ b/cli/tests/testdata/run/error_cause_recursive.ts
diff --git a/cli/tests/testdata/error_cause_recursive.ts.out b/cli/tests/testdata/run/error_cause_recursive.ts.out
index ac729574d..ac729574d 100644
--- a/cli/tests/testdata/error_cause_recursive.ts.out
+++ b/cli/tests/testdata/run/error_cause_recursive.ts.out
diff --git a/cli/tests/testdata/error_for_await.ts b/cli/tests/testdata/run/error_for_await.ts
index 64c81abe4..64c81abe4 100644
--- a/cli/tests/testdata/error_for_await.ts
+++ b/cli/tests/testdata/run/error_for_await.ts
diff --git a/cli/tests/testdata/error_for_await.ts.out b/cli/tests/testdata/run/error_for_await.ts.out
index db3cdecb4..db3cdecb4 100644
--- a/cli/tests/testdata/error_for_await.ts.out
+++ b/cli/tests/testdata/run/error_for_await.ts.out
diff --git a/cli/tests/testdata/error_import_map_unable_to_load.out b/cli/tests/testdata/run/error_import_map_unable_to_load.out
index 50760e438..50760e438 100644
--- a/cli/tests/testdata/error_import_map_unable_to_load.out
+++ b/cli/tests/testdata/run/error_import_map_unable_to_load.out
diff --git a/cli/tests/testdata/error_local_static_import_from_remote.js b/cli/tests/testdata/run/error_local_static_import_from_remote.js
index eb7fd23ba..eb7fd23ba 100644
--- a/cli/tests/testdata/error_local_static_import_from_remote.js
+++ b/cli/tests/testdata/run/error_local_static_import_from_remote.js
diff --git a/cli/tests/testdata/error_local_static_import_from_remote.js.out b/cli/tests/testdata/run/error_local_static_import_from_remote.js.out
index 1ea10bd88..34f9e81e1 100644
--- a/cli/tests/testdata/error_local_static_import_from_remote.js.out
+++ b/cli/tests/testdata/run/error_local_static_import_from_remote.js.out
@@ -1,4 +1,4 @@
 [WILDCARD]
 error: Remote modules are not allowed to import local modules. Consider using a dynamic import instead.
   Importing: file:///some/dir/file.js
-    at http://localhost:4545/error_local_static_import_from_remote.js:1:8
+    at http://localhost:4545/run/error_local_static_import_from_remote.js:1:8
diff --git a/cli/tests/testdata/error_local_static_import_from_remote.ts b/cli/tests/testdata/run/error_local_static_import_from_remote.ts
index a831db0c4..a831db0c4 100644
--- a/cli/tests/testdata/error_local_static_import_from_remote.ts
+++ b/cli/tests/testdata/run/error_local_static_import_from_remote.ts
diff --git a/cli/tests/testdata/error_local_static_import_from_remote.ts.out b/cli/tests/testdata/run/error_local_static_import_from_remote.ts.out
index 7308c6f9d..88990a049 100644
--- a/cli/tests/testdata/error_local_static_import_from_remote.ts.out
+++ b/cli/tests/testdata/run/error_local_static_import_from_remote.ts.out
@@ -1,4 +1,4 @@
 [WILDCARD]
 error: Remote modules are not allowed to import local modules. Consider using a dynamic import instead.
   Importing: file:///some/dir/file.ts
-    at http://localhost:4545/error_local_static_import_from_remote.ts:1:8
+    at http://localhost:4545/run/error_local_static_import_from_remote.ts:1:8
diff --git a/cli/tests/testdata/error_missing_module_named_import.ts b/cli/tests/testdata/run/error_missing_module_named_import.ts
index 9eb5239ff..9eb5239ff 100644
--- a/cli/tests/testdata/error_missing_module_named_import.ts
+++ b/cli/tests/testdata/run/error_missing_module_named_import.ts
diff --git a/cli/tests/testdata/error_missing_module_named_import.ts.out b/cli/tests/testdata/run/error_missing_module_named_import.ts.out
index 3dccaffb1..3dccaffb1 100644
--- a/cli/tests/testdata/error_missing_module_named_import.ts.out
+++ b/cli/tests/testdata/run/error_missing_module_named_import.ts.out
diff --git a/cli/tests/testdata/error_name_non_string.js b/cli/tests/testdata/run/error_name_non_string.js
index ae9609927..ae9609927 100644
--- a/cli/tests/testdata/error_name_non_string.js
+++ b/cli/tests/testdata/run/error_name_non_string.js
diff --git a/cli/tests/testdata/error_name_non_string.js.out b/cli/tests/testdata/run/error_name_non_string.js.out
index a77f336e9..a77f336e9 100644
--- a/cli/tests/testdata/error_name_non_string.js.out
+++ b/cli/tests/testdata/run/error_name_non_string.js.out
diff --git a/cli/tests/testdata/run/error_no_check.ts b/cli/tests/testdata/run/error_no_check.ts
new file mode 100644
index 000000000..2da01e639
--- /dev/null
+++ b/cli/tests/testdata/run/error_no_check.ts
@@ -0,0 +1 @@
+export { AnInterface, isAnInterface } from "../subdir/type_and_code.ts";
diff --git a/cli/tests/testdata/run/error_no_check.ts.out b/cli/tests/testdata/run/error_no_check.ts.out
new file mode 100644
index 000000000..78f478045
--- /dev/null
+++ b/cli/tests/testdata/run/error_no_check.ts.out
@@ -0,0 +1,2 @@
+error: Uncaught SyntaxError: The requested module '../subdir/type_and_code.ts' does not provide an export named 'AnInterface'
+[WILDCARD]
\ No newline at end of file
diff --git a/cli/tests/testdata/error_syntax.js b/cli/tests/testdata/run/error_syntax.js
index c0414c356..c0414c356 100644
--- a/cli/tests/testdata/error_syntax.js
+++ b/cli/tests/testdata/run/error_syntax.js
diff --git a/cli/tests/testdata/error_syntax.js.out b/cli/tests/testdata/run/error_syntax.js.out
index 6d3f05b8e..6d3f05b8e 100644
--- a/cli/tests/testdata/error_syntax.js.out
+++ b/cli/tests/testdata/run/error_syntax.js.out
diff --git a/cli/tests/testdata/error_syntax_empty_trailing_line.mjs b/cli/tests/testdata/run/error_syntax_empty_trailing_line.mjs
index 864dfb0c7..864dfb0c7 100644
--- a/cli/tests/testdata/error_syntax_empty_trailing_line.mjs
+++ b/cli/tests/testdata/run/error_syntax_empty_trailing_line.mjs
diff --git a/cli/tests/testdata/error_syntax_empty_trailing_line.mjs.out b/cli/tests/testdata/run/error_syntax_empty_trailing_line.mjs.out
index f4bbc6708..f4bbc6708 100644
--- a/cli/tests/testdata/error_syntax_empty_trailing_line.mjs.out
+++ b/cli/tests/testdata/run/error_syntax_empty_trailing_line.mjs.out
diff --git a/cli/tests/testdata/run/error_type_definitions.ts b/cli/tests/testdata/run/error_type_definitions.ts
new file mode 100644
index 000000000..86675cbaa
--- /dev/null
+++ b/cli/tests/testdata/run/error_type_definitions.ts
@@ -0,0 +1,5 @@
+// @deno-types="../type_definitions/bar.d.ts"
+import { Bar } from "../type_definitions/bar.js";
+
+const bar = new Bar();
+console.log(bar);
diff --git a/cli/tests/testdata/error_type_definitions.ts.out b/cli/tests/testdata/run/error_type_definitions.ts.out
index 5e1d73ca4..5e1d73ca4 100644
--- a/cli/tests/testdata/error_type_definitions.ts.out
+++ b/cli/tests/testdata/run/error_type_definitions.ts.out
diff --git a/cli/tests/testdata/es_private_fields.js b/cli/tests/testdata/run/es_private_fields.js
index b5f83e39c..b5f83e39c 100644
--- a/cli/tests/testdata/es_private_fields.js
+++ b/cli/tests/testdata/run/es_private_fields.js
diff --git a/cli/tests/testdata/es_private_fields.js.out b/cli/tests/testdata/run/es_private_fields.js.out
index be1970b05..be1970b05 100644
--- a/cli/tests/testdata/es_private_fields.js.out
+++ b/cli/tests/testdata/run/es_private_fields.js.out
diff --git a/cli/tests/testdata/eval_context_throw_dom_exception.js b/cli/tests/testdata/run/eval_context_throw_dom_exception.js
index b8e99d498..b8e99d498 100644
--- a/cli/tests/testdata/eval_context_throw_dom_exception.js
+++ b/cli/tests/testdata/run/eval_context_throw_dom_exception.js
diff --git a/cli/tests/testdata/eval_context_throw_dom_exception.js.out b/cli/tests/testdata/run/eval_context_throw_dom_exception.js.out
index 39e164083..39e164083 100644
--- a/cli/tests/testdata/eval_context_throw_dom_exception.js.out
+++ b/cli/tests/testdata/run/eval_context_throw_dom_exception.js.out
diff --git a/cli/tests/testdata/event_listener_error.ts b/cli/tests/testdata/run/event_listener_error.ts
index 1cbdf7bc2..1cbdf7bc2 100644
--- a/cli/tests/testdata/event_listener_error.ts
+++ b/cli/tests/testdata/run/event_listener_error.ts
diff --git a/cli/tests/testdata/event_listener_error.ts.out b/cli/tests/testdata/run/event_listener_error.ts.out
index a20a91dfd..a20a91dfd 100644
--- a/cli/tests/testdata/event_listener_error.ts.out
+++ b/cli/tests/testdata/run/event_listener_error.ts.out
diff --git a/cli/tests/testdata/event_listener_error_handled.ts b/cli/tests/testdata/run/event_listener_error_handled.ts
index c4c8fd1cd..c4c8fd1cd 100644
--- a/cli/tests/testdata/event_listener_error_handled.ts
+++ b/cli/tests/testdata/run/event_listener_error_handled.ts
diff --git a/cli/tests/testdata/event_listener_error_handled.ts.out b/cli/tests/testdata/run/event_listener_error_handled.ts.out
index d3cf525c3..d3cf525c3 100644
--- a/cli/tests/testdata/event_listener_error_handled.ts.out
+++ b/cli/tests/testdata/run/event_listener_error_handled.ts.out
diff --git a/cli/tests/testdata/event_listener_error_immediate_exit.ts b/cli/tests/testdata/run/event_listener_error_immediate_exit.ts
index c9e94c01b..c9e94c01b 100644
--- a/cli/tests/testdata/event_listener_error_immediate_exit.ts
+++ b/cli/tests/testdata/run/event_listener_error_immediate_exit.ts
diff --git a/cli/tests/testdata/event_listener_error_immediate_exit.ts.out b/cli/tests/testdata/run/event_listener_error_immediate_exit.ts.out
index 1fb3ce76a..1fb3ce76a 100644
--- a/cli/tests/testdata/event_listener_error_immediate_exit.ts.out
+++ b/cli/tests/testdata/run/event_listener_error_immediate_exit.ts.out
diff --git a/cli/tests/testdata/event_listener_error_immediate_exit_worker.ts b/cli/tests/testdata/run/event_listener_error_immediate_exit_worker.ts
index 58c45d1bb..58c45d1bb 100644
--- a/cli/tests/testdata/event_listener_error_immediate_exit_worker.ts
+++ b/cli/tests/testdata/run/event_listener_error_immediate_exit_worker.ts
diff --git a/cli/tests/testdata/event_listener_error_immediate_exit_worker.ts.out b/cli/tests/testdata/run/event_listener_error_immediate_exit_worker.ts.out
index 8bd312298..8bd312298 100644
--- a/cli/tests/testdata/event_listener_error_immediate_exit_worker.ts.out
+++ b/cli/tests/testdata/run/event_listener_error_immediate_exit_worker.ts.out
diff --git a/cli/tests/testdata/exec_path.ts b/cli/tests/testdata/run/exec_path.ts
index b70b23237..b70b23237 100644
--- a/cli/tests/testdata/exec_path.ts
+++ b/cli/tests/testdata/run/exec_path.ts
diff --git a/cli/tests/testdata/exit_error42.ts b/cli/tests/testdata/run/exit_error42.ts
index e4db41f3a..e4db41f3a 100644
--- a/cli/tests/testdata/exit_error42.ts
+++ b/cli/tests/testdata/run/exit_error42.ts
diff --git a/cli/tests/testdata/exit_error42.ts.out b/cli/tests/testdata/run/exit_error42.ts.out
index 90be1f305..90be1f305 100644
--- a/cli/tests/testdata/exit_error42.ts.out
+++ b/cli/tests/testdata/run/exit_error42.ts.out
diff --git a/cli/tests/testdata/run/export_type_def.ts b/cli/tests/testdata/run/export_type_def.ts
new file mode 100644
index 000000000..9a1e2b0fe
--- /dev/null
+++ b/cli/tests/testdata/run/export_type_def.ts
@@ -0,0 +1,2 @@
+// @deno-types="../type_definitions/foo.d.ts"
+export { foo } from "../type_definitions/foo.js";
diff --git a/cli/tests/testdata/fetch/hello.txt b/cli/tests/testdata/run/fetch/hello.txt
index af5626b4a..af5626b4a 100644
--- a/cli/tests/testdata/fetch/hello.txt
+++ b/cli/tests/testdata/run/fetch/hello.txt
diff --git a/cli/tests/testdata/fetch/other.ts b/cli/tests/testdata/run/fetch/other.ts
index 91fe376b3..91fe376b3 100644
--- a/cli/tests/testdata/fetch/other.ts
+++ b/cli/tests/testdata/run/fetch/other.ts
diff --git a/cli/tests/testdata/fetch/test.ts b/cli/tests/testdata/run/fetch/test.ts
index baa52775d..baa52775d 100644
--- a/cli/tests/testdata/fetch/test.ts
+++ b/cli/tests/testdata/run/fetch/test.ts
diff --git a/cli/tests/testdata/fetch_async_error_stack.ts b/cli/tests/testdata/run/fetch_async_error_stack.ts
index f583192c2..f583192c2 100644
--- a/cli/tests/testdata/fetch_async_error_stack.ts
+++ b/cli/tests/testdata/run/fetch_async_error_stack.ts
diff --git a/cli/tests/testdata/fetch_async_error_stack.ts.out b/cli/tests/testdata/run/fetch_async_error_stack.ts.out
index 0a7b353e2..0a7b353e2 100644
--- a/cli/tests/testdata/fetch_async_error_stack.ts.out
+++ b/cli/tests/testdata/run/fetch_async_error_stack.ts.out
diff --git a/cli/tests/testdata/fetch_response_finalization.js b/cli/tests/testdata/run/fetch_response_finalization.js
index dd7c355eb..dd7c355eb 100644
--- a/cli/tests/testdata/fetch_response_finalization.js
+++ b/cli/tests/testdata/run/fetch_response_finalization.js
diff --git a/cli/tests/testdata/fetch_response_finalization.js.out b/cli/tests/testdata/run/fetch_response_finalization.js.out
index 844a4e4b2..844a4e4b2 100644
--- a/cli/tests/testdata/fetch_response_finalization.js.out
+++ b/cli/tests/testdata/run/fetch_response_finalization.js.out
diff --git a/cli/tests/testdata/unstable_ffi_1.js b/cli/tests/testdata/run/ffi/unstable_ffi_1.js
index 8ca6c3a60..8ca6c3a60 100644
--- a/cli/tests/testdata/unstable_ffi_1.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_1.js
diff --git a/cli/tests/testdata/unstable_ffi_1.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_1.js.out
index 7c564be8c..7c564be8c 100644
--- a/cli/tests/testdata/unstable_ffi_1.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_1.js.out
diff --git a/cli/tests/testdata/unstable_ffi_10.js b/cli/tests/testdata/run/ffi/unstable_ffi_10.js
index 83687c584..83687c584 100644
--- a/cli/tests/testdata/unstable_ffi_10.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_10.js
diff --git a/cli/tests/testdata/unstable_ffi_10.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_10.js.out
index bf7e1bd4f..bf7e1bd4f 100644
--- a/cli/tests/testdata/unstable_ffi_10.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_10.js.out
diff --git a/cli/tests/testdata/unstable_ffi_11.js b/cli/tests/testdata/run/ffi/unstable_ffi_11.js
index 5538753be..5538753be 100644
--- a/cli/tests/testdata/unstable_ffi_11.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_11.js
diff --git a/cli/tests/testdata/unstable_ffi_11.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_11.js.out
index 2d2d72666..2d2d72666 100644
--- a/cli/tests/testdata/unstable_ffi_11.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_11.js.out
diff --git a/cli/tests/testdata/unstable_ffi_12.js b/cli/tests/testdata/run/ffi/unstable_ffi_12.js
index 089c9b5b1..089c9b5b1 100644
--- a/cli/tests/testdata/unstable_ffi_12.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_12.js
diff --git a/cli/tests/testdata/unstable_ffi_12.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_12.js.out
index 377d8e4a5..377d8e4a5 100644
--- a/cli/tests/testdata/unstable_ffi_12.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_12.js.out
diff --git a/cli/tests/testdata/unstable_ffi_13.js b/cli/tests/testdata/run/ffi/unstable_ffi_13.js
index 630be2e6d..630be2e6d 100644
--- a/cli/tests/testdata/unstable_ffi_13.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_13.js
diff --git a/cli/tests/testdata/unstable_ffi_13.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_13.js.out
index 6ca67a6f2..6ca67a6f2 100644
--- a/cli/tests/testdata/unstable_ffi_13.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_13.js.out
diff --git a/cli/tests/testdata/unstable_ffi_14.js b/cli/tests/testdata/run/ffi/unstable_ffi_14.js
index b04c7865e..b04c7865e 100644
--- a/cli/tests/testdata/unstable_ffi_14.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_14.js
diff --git a/cli/tests/testdata/unstable_ffi_14.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_14.js.out
index 11fcd5580..11fcd5580 100644
--- a/cli/tests/testdata/unstable_ffi_14.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_14.js.out
diff --git a/cli/tests/testdata/unstable_ffi_15.js b/cli/tests/testdata/run/ffi/unstable_ffi_15.js
index 865f63c75..865f63c75 100644
--- a/cli/tests/testdata/unstable_ffi_15.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_15.js
diff --git a/cli/tests/testdata/unstable_ffi_15.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_15.js.out
index 3015e5c91..3015e5c91 100644
--- a/cli/tests/testdata/unstable_ffi_15.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_15.js.out
diff --git a/cli/tests/testdata/unstable_ffi_2.js b/cli/tests/testdata/run/ffi/unstable_ffi_2.js
index 7f3f34f37..7f3f34f37 100644
--- a/cli/tests/testdata/unstable_ffi_2.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_2.js
diff --git a/cli/tests/testdata/unstable_ffi_2.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_2.js.out
index cc4cc3dc6..cc4cc3dc6 100644
--- a/cli/tests/testdata/unstable_ffi_2.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_2.js.out
diff --git a/cli/tests/testdata/unstable_ffi_3.js b/cli/tests/testdata/run/ffi/unstable_ffi_3.js
index a8f7f4180..a8f7f4180 100644
--- a/cli/tests/testdata/unstable_ffi_3.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_3.js
diff --git a/cli/tests/testdata/unstable_ffi_3.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_3.js.out
index cc4cc3dc6..cc4cc3dc6 100644
--- a/cli/tests/testdata/unstable_ffi_3.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_3.js.out
diff --git a/cli/tests/testdata/unstable_ffi_4.js b/cli/tests/testdata/run/ffi/unstable_ffi_4.js
index 8b4f3d75a..8b4f3d75a 100644
--- a/cli/tests/testdata/unstable_ffi_4.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_4.js
diff --git a/cli/tests/testdata/unstable_ffi_4.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_4.js.out
index e0f40f2ee..e0f40f2ee 100644
--- a/cli/tests/testdata/unstable_ffi_4.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_4.js.out
diff --git a/cli/tests/testdata/unstable_ffi_5.js b/cli/tests/testdata/run/ffi/unstable_ffi_5.js
index d08d8eaa4..d08d8eaa4 100644
--- a/cli/tests/testdata/unstable_ffi_5.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_5.js
diff --git a/cli/tests/testdata/unstable_ffi_5.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_5.js.out
index e3db6af26..e3db6af26 100644
--- a/cli/tests/testdata/unstable_ffi_5.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_5.js.out
diff --git a/cli/tests/testdata/unstable_ffi_6.js b/cli/tests/testdata/run/ffi/unstable_ffi_6.js
index 9e4f1c761..9e4f1c761 100644
--- a/cli/tests/testdata/unstable_ffi_6.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_6.js
diff --git a/cli/tests/testdata/unstable_ffi_6.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_6.js.out
index c59f51d04..c59f51d04 100644
--- a/cli/tests/testdata/unstable_ffi_6.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_6.js.out
diff --git a/cli/tests/testdata/unstable_ffi_7.js b/cli/tests/testdata/run/ffi/unstable_ffi_7.js
index 96e60f377..96e60f377 100644
--- a/cli/tests/testdata/unstable_ffi_7.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_7.js
diff --git a/cli/tests/testdata/unstable_ffi_7.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_7.js.out
index 6ab413537..6ab413537 100644
--- a/cli/tests/testdata/unstable_ffi_7.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_7.js.out
diff --git a/cli/tests/testdata/unstable_ffi_8.js b/cli/tests/testdata/run/ffi/unstable_ffi_8.js
index 187b83891..187b83891 100644
--- a/cli/tests/testdata/unstable_ffi_8.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_8.js
diff --git a/cli/tests/testdata/unstable_ffi_8.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_8.js.out
index 338db2631..338db2631 100644
--- a/cli/tests/testdata/unstable_ffi_8.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_8.js.out
diff --git a/cli/tests/testdata/unstable_ffi_9.js b/cli/tests/testdata/run/ffi/unstable_ffi_9.js
index e968e534c..e968e534c 100644
--- a/cli/tests/testdata/unstable_ffi_9.js
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_9.js
diff --git a/cli/tests/testdata/unstable_ffi_9.js.out b/cli/tests/testdata/run/ffi/unstable_ffi_9.js.out
index fb6d75f14..fb6d75f14 100644
--- a/cli/tests/testdata/unstable_ffi_9.js.out
+++ b/cli/tests/testdata/run/ffi/unstable_ffi_9.js.out
diff --git a/cli/tests/testdata/finalization_registry.js b/cli/tests/testdata/run/finalization_registry.js
index 7d7d58149..7d7d58149 100644
--- a/cli/tests/testdata/finalization_registry.js
+++ b/cli/tests/testdata/run/finalization_registry.js
diff --git a/cli/tests/testdata/finalization_registry.js.out b/cli/tests/testdata/run/finalization_registry.js.out
index fee61413a..fee61413a 100644
--- a/cli/tests/testdata/finalization_registry.js.out
+++ b/cli/tests/testdata/run/finalization_registry.js.out
diff --git a/cli/tests/testdata/fix_dynamic_import_errors.js b/cli/tests/testdata/run/fix_dynamic_import_errors.js
index 317047ccb..1d7be37e0 100644
--- a/cli/tests/testdata/fix_dynamic_import_errors.js
+++ b/cli/tests/testdata/run/fix_dynamic_import_errors.js
@@ -1,7 +1,7 @@
-import("./dynamic_import/b.js").catch(() => {
+import("../dynamic_import/b.js").catch(() => {
   console.log("caught import error from b.js");
 });
 
-import("./dynamic_import/c.js").catch(() => {
+import("../dynamic_import/c.js").catch(() => {
   console.log("caught import error from c.js");
 });
diff --git a/cli/tests/testdata/fix_dynamic_import_errors.js.out b/cli/tests/testdata/run/fix_dynamic_import_errors.js.out
index e7856fb9c..e7856fb9c 100644
--- a/cli/tests/testdata/fix_dynamic_import_errors.js.out
+++ b/cli/tests/testdata/run/fix_dynamic_import_errors.js.out
diff --git a/cli/tests/testdata/run/fix_emittable_skipped.js b/cli/tests/testdata/run/fix_emittable_skipped.js
new file mode 100644
index 000000000..a4ccc9efd
--- /dev/null
+++ b/cli/tests/testdata/run/fix_emittable_skipped.js
@@ -0,0 +1,7 @@
+/// <reference types="../subdir/emittable.d.ts" />
+
+import "../subdir/polyfill.ts";
+
+export const a = "a";
+
+console.log(globalThis.polyfill);
diff --git a/cli/tests/testdata/fix_emittable_skipped.ts.out b/cli/tests/testdata/run/fix_emittable_skipped.ts.out
index 108c2d67f..108c2d67f 100644
--- a/cli/tests/testdata/fix_emittable_skipped.ts.out
+++ b/cli/tests/testdata/run/fix_emittable_skipped.ts.out
diff --git a/cli/tests/testdata/fix_exotic_specifiers.ts b/cli/tests/testdata/run/fix_exotic_specifiers.ts
index 101667b2a..101667b2a 100644
--- a/cli/tests/testdata/fix_exotic_specifiers.ts
+++ b/cli/tests/testdata/run/fix_exotic_specifiers.ts
diff --git a/cli/tests/testdata/fix_exotic_specifiers.ts.out b/cli/tests/testdata/run/fix_exotic_specifiers.ts.out
index 7afdb808d..7afdb808d 100644
--- a/cli/tests/testdata/fix_exotic_specifiers.ts.out
+++ b/cli/tests/testdata/run/fix_exotic_specifiers.ts.out
diff --git a/cli/tests/testdata/run/fix_js_import_js.ts b/cli/tests/testdata/run/fix_js_import_js.ts
new file mode 100644
index 000000000..0f01877cd
--- /dev/null
+++ b/cli/tests/testdata/run/fix_js_import_js.ts
@@ -0,0 +1,3 @@
+import { isMod4 } from "../subdir/mod6.js";
+
+console.log(isMod4);
diff --git a/cli/tests/testdata/fix_js_import_js.ts.out b/cli/tests/testdata/run/fix_js_import_js.ts.out
index 27ba77dda..27ba77dda 100644
--- a/cli/tests/testdata/fix_js_import_js.ts.out
+++ b/cli/tests/testdata/run/fix_js_import_js.ts.out
diff --git a/cli/tests/testdata/run/fix_js_imports.ts b/cli/tests/testdata/run/fix_js_imports.ts
new file mode 100644
index 000000000..6ed13bae3
--- /dev/null
+++ b/cli/tests/testdata/run/fix_js_imports.ts
@@ -0,0 +1,3 @@
+import * as amdLike from "../subdir/amd_like.js";
+
+console.log(amdLike);
diff --git a/cli/tests/testdata/fix_js_imports.ts.out b/cli/tests/testdata/run/fix_js_imports.ts.out
index 5e45122de..5e45122de 100644
--- a/cli/tests/testdata/fix_js_imports.ts.out
+++ b/cli/tests/testdata/run/fix_js_imports.ts.out
diff --git a/cli/tests/testdata/fix_tsc_file_exists.out b/cli/tests/testdata/run/fix_tsc_file_exists.out
index ce0136250..ce0136250 100644
--- a/cli/tests/testdata/fix_tsc_file_exists.out
+++ b/cli/tests/testdata/run/fix_tsc_file_exists.out
diff --git a/cli/tests/testdata/fix_worker_dispatchevent.ts b/cli/tests/testdata/run/fix_worker_dispatchevent.ts
index 1b73b52dc..1b73b52dc 100644
--- a/cli/tests/testdata/fix_worker_dispatchevent.ts
+++ b/cli/tests/testdata/run/fix_worker_dispatchevent.ts
diff --git a/cli/tests/testdata/fix_worker_dispatchevent.ts.out b/cli/tests/testdata/run/fix_worker_dispatchevent.ts.out
index 2e9ba477f..2e9ba477f 100644
--- a/cli/tests/testdata/fix_worker_dispatchevent.ts.out
+++ b/cli/tests/testdata/run/fix_worker_dispatchevent.ts.out
diff --git a/cli/tests/testdata/followup_dyn_import_resolves/main.ts b/cli/tests/testdata/run/followup_dyn_import_resolves/main.ts
index a8508f942..a8508f942 100644
--- a/cli/tests/testdata/followup_dyn_import_resolves/main.ts
+++ b/cli/tests/testdata/run/followup_dyn_import_resolves/main.ts
diff --git a/cli/tests/testdata/followup_dyn_import_resolves/main.ts.out b/cli/tests/testdata/run/followup_dyn_import_resolves/main.ts.out
index a19976d4a..a19976d4a 100644
--- a/cli/tests/testdata/followup_dyn_import_resolves/main.ts.out
+++ b/cli/tests/testdata/run/followup_dyn_import_resolves/main.ts.out
diff --git a/cli/tests/testdata/followup_dyn_import_resolves/sub1.ts b/cli/tests/testdata/run/followup_dyn_import_resolves/sub1.ts
index d06c30221..d06c30221 100644
--- a/cli/tests/testdata/followup_dyn_import_resolves/sub1.ts
+++ b/cli/tests/testdata/run/followup_dyn_import_resolves/sub1.ts
diff --git a/cli/tests/testdata/followup_dyn_import_resolves/sub2.ts b/cli/tests/testdata/run/followup_dyn_import_resolves/sub2.ts
index cce2b524c..cce2b524c 100644
--- a/cli/tests/testdata/followup_dyn_import_resolves/sub2.ts
+++ b/cli/tests/testdata/run/followup_dyn_import_resolves/sub2.ts
diff --git a/cli/tests/testdata/future_check.ts b/cli/tests/testdata/run/future_check.ts
index 4d41fe06a..4d41fe06a 100644
--- a/cli/tests/testdata/future_check.ts
+++ b/cli/tests/testdata/run/future_check.ts
diff --git a/cli/tests/testdata/future_check2.out b/cli/tests/testdata/run/future_check2.out
index c626a5485..c626a5485 100644
--- a/cli/tests/testdata/future_check2.out
+++ b/cli/tests/testdata/run/future_check2.out
diff --git a/cli/tests/testdata/heapstats.js b/cli/tests/testdata/run/heapstats.js
index 1f06e7f6e..1f06e7f6e 100644
--- a/cli/tests/testdata/heapstats.js
+++ b/cli/tests/testdata/run/heapstats.js
diff --git a/cli/tests/testdata/heapstats.js.out b/cli/tests/testdata/run/heapstats.js.out
index b75a755f8..b75a755f8 100644
--- a/cli/tests/testdata/heapstats.js.out
+++ b/cli/tests/testdata/run/heapstats.js.out
diff --git a/cli/tests/testdata/http2_request_url.ts b/cli/tests/testdata/run/http2_request_url.ts
index 5acff8cc2..5acff8cc2 100644
--- a/cli/tests/testdata/http2_request_url.ts
+++ b/cli/tests/testdata/run/http2_request_url.ts
diff --git a/cli/tests/testdata/https_import.ts b/cli/tests/testdata/run/https_import.ts
index 3bcc90326..3bcc90326 100644
--- a/cli/tests/testdata/https_import.ts
+++ b/cli/tests/testdata/run/https_import.ts
diff --git a/cli/tests/testdata/https_import.ts.out b/cli/tests/testdata/run/https_import.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/testdata/https_import.ts.out
+++ b/cli/tests/testdata/run/https_import.ts.out
diff --git a/cli/tests/testdata/if_main.ts b/cli/tests/testdata/run/if_main.ts
index 4dcfecea0..4dcfecea0 100644
--- a/cli/tests/testdata/if_main.ts
+++ b/cli/tests/testdata/run/if_main.ts
diff --git a/cli/tests/testdata/if_main.ts.out b/cli/tests/testdata/run/if_main.ts.out
index ba2906d06..ba2906d06 100644
--- a/cli/tests/testdata/if_main.ts.out
+++ b/cli/tests/testdata/run/if_main.ts.out
diff --git a/cli/tests/testdata/import_blob_url.ts b/cli/tests/testdata/run/import_blob_url.ts
index 86bb634e1..86bb634e1 100644
--- a/cli/tests/testdata/import_blob_url.ts
+++ b/cli/tests/testdata/run/import_blob_url.ts
diff --git a/cli/tests/testdata/import_blob_url.ts.out b/cli/tests/testdata/run/import_blob_url.ts.out
index bfa0b9d94..bfa0b9d94 100644
--- a/cli/tests/testdata/import_blob_url.ts.out
+++ b/cli/tests/testdata/run/import_blob_url.ts.out
diff --git a/cli/tests/testdata/import_blob_url_error_stack.ts b/cli/tests/testdata/run/import_blob_url_error_stack.ts
index f9c4f2e9d..f9c4f2e9d 100644
--- a/cli/tests/testdata/import_blob_url_error_stack.ts
+++ b/cli/tests/testdata/run/import_blob_url_error_stack.ts
diff --git a/cli/tests/testdata/import_blob_url_error_stack.ts.out b/cli/tests/testdata/run/import_blob_url_error_stack.ts.out
index 52b76fd5c..52b76fd5c 100644
--- a/cli/tests/testdata/import_blob_url_error_stack.ts.out
+++ b/cli/tests/testdata/run/import_blob_url_error_stack.ts.out
diff --git a/cli/tests/testdata/import_blob_url_import_relative.ts b/cli/tests/testdata/run/import_blob_url_import_relative.ts
index ad130bdac..ad130bdac 100644
--- a/cli/tests/testdata/import_blob_url_import_relative.ts
+++ b/cli/tests/testdata/run/import_blob_url_import_relative.ts
diff --git a/cli/tests/testdata/import_blob_url_import_relative.ts.out b/cli/tests/testdata/run/import_blob_url_import_relative.ts.out
index 59a6f07fb..59a6f07fb 100644
--- a/cli/tests/testdata/import_blob_url_import_relative.ts.out
+++ b/cli/tests/testdata/run/import_blob_url_import_relative.ts.out
diff --git a/cli/tests/testdata/import_blob_url_imports.ts b/cli/tests/testdata/run/import_blob_url_imports.ts
index a7c639152..a7c639152 100644
--- a/cli/tests/testdata/import_blob_url_imports.ts
+++ b/cli/tests/testdata/run/import_blob_url_imports.ts
diff --git a/cli/tests/testdata/import_blob_url_imports.ts.out b/cli/tests/testdata/run/import_blob_url_imports.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/testdata/import_blob_url_imports.ts.out
+++ b/cli/tests/testdata/run/import_blob_url_imports.ts.out
diff --git a/cli/tests/testdata/import_blob_url_jsx.ts b/cli/tests/testdata/run/import_blob_url_jsx.ts
index 8d645796a..8d645796a 100644
--- a/cli/tests/testdata/import_blob_url_jsx.ts
+++ b/cli/tests/testdata/run/import_blob_url_jsx.ts
diff --git a/cli/tests/testdata/import_blob_url_jsx.ts.out b/cli/tests/testdata/run/import_blob_url_jsx.ts.out
index c1c85f250..c1c85f250 100644
--- a/cli/tests/testdata/import_blob_url_jsx.ts.out
+++ b/cli/tests/testdata/run/import_blob_url_jsx.ts.out
diff --git a/cli/tests/testdata/053_import_compression/brotli b/cli/tests/testdata/run/import_compression/brotli
index 65f679d57..65f679d57 100644
--- a/cli/tests/testdata/053_import_compression/brotli
+++ b/cli/tests/testdata/run/import_compression/brotli
diff --git a/cli/tests/testdata/053_import_compression/gziped b/cli/tests/testdata/run/import_compression/gziped
index 9f9a7bc69..9f9a7bc69 100644
--- a/cli/tests/testdata/053_import_compression/gziped
+++ b/cli/tests/testdata/run/import_compression/gziped
diff --git a/cli/tests/testdata/053_import_compression.out b/cli/tests/testdata/run/import_compression/main.out
index 371994979..371994979 100644
--- a/cli/tests/testdata/053_import_compression.out
+++ b/cli/tests/testdata/run/import_compression/main.out
diff --git a/cli/tests/testdata/run/import_compression/main.ts b/cli/tests/testdata/run/import_compression/main.ts
new file mode 100644
index 000000000..3dcd6fa24
--- /dev/null
+++ b/cli/tests/testdata/run/import_compression/main.ts
@@ -0,0 +1,13 @@
+import "http://127.0.0.1:4545/run/import_compression/gziped";
+import "http://127.0.0.1:4545/run/import_compression/brotli";
+
+console.log(
+  await fetch(
+    "http://127.0.0.1:4545/run/import_compression/gziped",
+  ).then((res) => res.text()),
+);
+console.log(
+  await fetch(
+    "http://127.0.0.1:4545/run/import_compression/brotli",
+  ).then((res) => res.text()),
+);
diff --git a/cli/tests/testdata/import_data_url.ts b/cli/tests/testdata/run/import_data_url.ts
index 258514a5e..258514a5e 100644
--- a/cli/tests/testdata/import_data_url.ts
+++ b/cli/tests/testdata/run/import_data_url.ts
diff --git a/cli/tests/testdata/import_data_url.ts.out b/cli/tests/testdata/run/import_data_url.ts.out
index bfa0b9d94..bfa0b9d94 100644
--- a/cli/tests/testdata/import_data_url.ts.out
+++ b/cli/tests/testdata/run/import_data_url.ts.out
diff --git a/cli/tests/testdata/import_data_url_error_stack.ts b/cli/tests/testdata/run/import_data_url_error_stack.ts
index 022e49fe1..022e49fe1 100644
--- a/cli/tests/testdata/import_data_url_error_stack.ts
+++ b/cli/tests/testdata/run/import_data_url_error_stack.ts
diff --git a/cli/tests/testdata/import_data_url_error_stack.ts.out b/cli/tests/testdata/run/import_data_url_error_stack.ts.out
index ccd72e4ad..ccd72e4ad 100644
--- a/cli/tests/testdata/import_data_url_error_stack.ts.out
+++ b/cli/tests/testdata/run/import_data_url_error_stack.ts.out
diff --git a/cli/tests/testdata/import_data_url_import_relative.ts b/cli/tests/testdata/run/import_data_url_import_relative.ts
index 23947fe60..23947fe60 100644
--- a/cli/tests/testdata/import_data_url_import_relative.ts
+++ b/cli/tests/testdata/run/import_data_url_import_relative.ts
diff --git a/cli/tests/testdata/import_data_url_import_relative.ts.out b/cli/tests/testdata/run/import_data_url_import_relative.ts.out
index 821c3e4df..821c3e4df 100644
--- a/cli/tests/testdata/import_data_url_import_relative.ts.out
+++ b/cli/tests/testdata/run/import_data_url_import_relative.ts.out
diff --git a/cli/tests/testdata/import_data_url_imports.ts b/cli/tests/testdata/run/import_data_url_imports.ts
index df7dae727..df7dae727 100644
--- a/cli/tests/testdata/import_data_url_imports.ts
+++ b/cli/tests/testdata/run/import_data_url_imports.ts
diff --git a/cli/tests/testdata/import_data_url_imports.ts.out b/cli/tests/testdata/run/import_data_url_imports.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/testdata/import_data_url_imports.ts.out
+++ b/cli/tests/testdata/run/import_data_url_imports.ts.out
diff --git a/cli/tests/testdata/import_data_url_jsx.ts b/cli/tests/testdata/run/import_data_url_jsx.ts
index 1881211f9..1881211f9 100644
--- a/cli/tests/testdata/import_data_url_jsx.ts
+++ b/cli/tests/testdata/run/import_data_url_jsx.ts
diff --git a/cli/tests/testdata/import_data_url_jsx.ts.out b/cli/tests/testdata/run/import_data_url_jsx.ts.out
index c1c85f250..c1c85f250 100644
--- a/cli/tests/testdata/import_data_url_jsx.ts.out
+++ b/cli/tests/testdata/run/import_data_url_jsx.ts.out
diff --git a/cli/tests/testdata/import_dynamic_data_url.ts b/cli/tests/testdata/run/import_dynamic_data_url.ts
index 53a0fbcd3..53a0fbcd3 100644
--- a/cli/tests/testdata/import_dynamic_data_url.ts
+++ b/cli/tests/testdata/run/import_dynamic_data_url.ts
diff --git a/cli/tests/testdata/import_dynamic_data_url.ts.out b/cli/tests/testdata/run/import_dynamic_data_url.ts.out
index bfa0b9d94..bfa0b9d94 100644
--- a/cli/tests/testdata/import_dynamic_data_url.ts.out
+++ b/cli/tests/testdata/run/import_dynamic_data_url.ts.out
diff --git a/cli/tests/testdata/import_extensionless.ts b/cli/tests/testdata/run/import_extensionless.ts
index 689d553ff..689d553ff 100644
--- a/cli/tests/testdata/import_extensionless.ts
+++ b/cli/tests/testdata/run/import_extensionless.ts
diff --git a/cli/tests/testdata/import_extensionless.ts.out b/cli/tests/testdata/run/import_extensionless.ts.out
index 699b756ed..699b756ed 100644
--- a/cli/tests/testdata/import_extensionless.ts.out
+++ b/cli/tests/testdata/run/import_extensionless.ts.out
diff --git a/cli/tests/testdata/import_file_with_colon.ts b/cli/tests/testdata/run/import_file_with_colon.ts
index 619bdd66d..619bdd66d 100644
--- a/cli/tests/testdata/import_file_with_colon.ts
+++ b/cli/tests/testdata/run/import_file_with_colon.ts
diff --git a/cli/tests/testdata/import_file_with_colon.ts.out b/cli/tests/testdata/run/import_file_with_colon.ts.out
index f60bbf4b1..f60bbf4b1 100644
--- a/cli/tests/testdata/import_file_with_colon.ts.out
+++ b/cli/tests/testdata/run/import_file_with_colon.ts.out
diff --git a/cli/tests/testdata/import_meta.importmap.json b/cli/tests/testdata/run/import_meta/importmap.json
index f8c056afd..f8c056afd 100644
--- a/cli/tests/testdata/import_meta.importmap.json
+++ b/cli/tests/testdata/run/import_meta/importmap.json
diff --git a/cli/tests/testdata/import_meta.ts.out b/cli/tests/testdata/run/import_meta/main.out
index a431f61df..89aeddaf3 100644
--- a/cli/tests/testdata/import_meta.ts.out
+++ b/cli/tests/testdata/run/import_meta/main.out
@@ -1,5 +1,5 @@
-import_meta2 [WILDCARD]import_meta2.ts false
-import_meta [WILDCARD]import_meta.ts true
+other [WILDCARD]other.ts false
+main [WILDCARD]main.ts true
 Resolving ./foo.js file:///[WILDCARD]/foo.js
 Resolving bare from import map https://example.com/
 Resolving https://example.com/rewrite from import map https://example.com/rewritten
diff --git a/cli/tests/testdata/import_meta.ts b/cli/tests/testdata/run/import_meta/main.ts
index 37af69020..02f0a1c58 100644
--- a/cli/tests/testdata/import_meta.ts
+++ b/cli/tests/testdata/run/import_meta/main.ts
@@ -1,8 +1,8 @@
-import { assertThrows } from "../../../test_util/std/testing/asserts.ts";
+import { assertThrows } from "../../../../../test_util/std/testing/asserts.ts";
 
-console.log("import_meta", import.meta.url, import.meta.main);
+console.log("main", import.meta.url, import.meta.main);
 
-import "./import_meta2.ts";
+import "./other.ts";
 
 console.log("Resolving ./foo.js", import.meta.resolve("./foo.js"));
 console.log("Resolving bare from import map", import.meta.resolve("bare"));
diff --git a/cli/tests/testdata/run/import_meta/other.ts b/cli/tests/testdata/run/import_meta/other.ts
new file mode 100644
index 000000000..47d7527cd
--- /dev/null
+++ b/cli/tests/testdata/run/import_meta/other.ts
@@ -0,0 +1 @@
+console.log("other", import.meta.url, import.meta.main);
diff --git a/cli/tests/testdata/run/import_type.ts b/cli/tests/testdata/run/import_type.ts
new file mode 100644
index 000000000..22c639cbc
--- /dev/null
+++ b/cli/tests/testdata/run/import_type.ts
@@ -0,0 +1,5 @@
+import { type B, create } from "../subdir/export_types.ts";
+
+const b: B = create();
+
+console.log(b);
diff --git a/cli/tests/testdata/import_type.ts.out b/cli/tests/testdata/run/import_type.ts.out
index 188c5e25d..188c5e25d 100644
--- a/cli/tests/testdata/import_type.ts.out
+++ b/cli/tests/testdata/run/import_type.ts.out
diff --git a/cli/tests/testdata/inline_js_source_map.ts b/cli/tests/testdata/run/inline_js_source_map.ts
index 5ae7c226a..5ae7c226a 100644
--- a/cli/tests/testdata/inline_js_source_map.ts
+++ b/cli/tests/testdata/run/inline_js_source_map.ts
diff --git a/cli/tests/testdata/run/inline_js_source_map_2.js b/cli/tests/testdata/run/inline_js_source_map_2.js
new file mode 100644
index 000000000..d14d906b8
--- /dev/null
+++ b/cli/tests/testdata/run/inline_js_source_map_2.js
@@ -0,0 +1,4 @@
+"use strict";
+1 + 1;
+throw new Error("Hello world!");
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaHR0cDovL2xvY2FsaG9zdDo0NTQ1L3J1bi9pbmxpbmVfanNfc291cmNlX21hcF8yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxDQUFDLEdBQUMsQ0FBQyxDQUFDO0FBS0osTUFBTSxJQUFJLEtBQUssQ0FBQyxjQUErQixDQUFDLENBQUMifQ==
\ No newline at end of file
diff --git a/cli/tests/testdata/run/inline_js_source_map_2.js.out b/cli/tests/testdata/run/inline_js_source_map_2.js.out
new file mode 100644
index 000000000..72a531b0b
--- /dev/null
+++ b/cli/tests/testdata/run/inline_js_source_map_2.js.out
@@ -0,0 +1,2 @@
+error: Uncaught Error: Hello world!
+    at http://localhost:4545/run/inline_js_source_map_2.ts:6:7
diff --git a/cli/tests/testdata/inline_js_source_map_2.ts b/cli/tests/testdata/run/inline_js_source_map_2.ts
index fa50586e6..fa50586e6 100644
--- a/cli/tests/testdata/inline_js_source_map_2.ts
+++ b/cli/tests/testdata/run/inline_js_source_map_2.ts
diff --git a/cli/tests/testdata/run/inline_js_source_map_2_with_inline_contents.js b/cli/tests/testdata/run/inline_js_source_map_2_with_inline_contents.js
new file mode 100644
index 000000000..7660cc229
--- /dev/null
+++ b/cli/tests/testdata/run/inline_js_source_map_2_with_inline_contents.js
@@ -0,0 +1,4 @@
+"use strict";
+
+throw new Error("Hello world!");
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaHR0cDovL2xvY2FsaG9zdDo0NTQ1L3J1bi9pbmxpbmVfanNfc291cmNlX21hcF8yLnRzIl0sInNvdXJjZXNDb250ZW50IjpbIjErMTtcbmludGVyZmFjZSBUZXN0IHtcbiAgaGVsbG86IHN0cmluZztcbn1cblxudGhyb3cgbmV3IEVycm9yKFwiSGVsbG8gd29ybGQhXCIgYXMgdW5rbm93biBhcyBzdHJpbmcpO1xuIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxDQUFDLEdBQUMsQ0FBQyxDQUFDO0FBS0osTUFBTSxJQUFJLEtBQUssQ0FBQyxjQUErQixDQUFDLENBQUMifQ==
\ No newline at end of file
diff --git a/cli/tests/testdata/run/inline_js_source_map_2_with_inline_contents.js.out b/cli/tests/testdata/run/inline_js_source_map_2_with_inline_contents.js.out
new file mode 100644
index 000000000..72a531b0b
--- /dev/null
+++ b/cli/tests/testdata/run/inline_js_source_map_2_with_inline_contents.js.out
@@ -0,0 +1,2 @@
+error: Uncaught Error: Hello world!
+    at http://localhost:4545/run/inline_js_source_map_2.ts:6:7
diff --git a/cli/tests/testdata/run/inline_js_source_map_with_contents_from_graph.js b/cli/tests/testdata/run/inline_js_source_map_with_contents_from_graph.js
new file mode 100644
index 000000000..887f02320
--- /dev/null
+++ b/cli/tests/testdata/run/inline_js_source_map_with_contents_from_graph.js
@@ -0,0 +1,4 @@
+"use strict";
+import "http://localhost:4545/run/inline_js_source_map.ts";
+throw new Error("Hello world!");
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaHR0cDovL2xvY2FsaG9zdDo0NTQ1L3J1bi9pbmxpbmVfanNfc291cmNlX21hcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsQ0FBQyxHQUFDLENBQUMsQ0FBQztBQUtKLE1BQU0sSUFBSSxLQUFLLENBQUMsY0FBK0IsQ0FBQyxDQUFDIn0=
\ No newline at end of file
diff --git a/cli/tests/testdata/inline_js_source_map_with_contents_from_graph.js.out b/cli/tests/testdata/run/inline_js_source_map_with_contents_from_graph.js.out
index 7304fc5f6..9a5a26a68 100644
--- a/cli/tests/testdata/inline_js_source_map_with_contents_from_graph.js.out
+++ b/cli/tests/testdata/run/inline_js_source_map_with_contents_from_graph.js.out
@@ -1,4 +1,4 @@
 error: Uncaught Error: Hello world!
 // throw new Error("Hello world!" as string);
       ^
-    at http://localhost:4545/inline_js_source_map.ts:6:7
+    at http://localhost:4545/run/inline_js_source_map.ts:6:7
diff --git a/cli/tests/testdata/run/issue13562.ts b/cli/tests/testdata/run/issue13562.ts
new file mode 100644
index 000000000..afbf69f99
--- /dev/null
+++ b/cli/tests/testdata/run/issue13562.ts
@@ -0,0 +1,3 @@
+import { printHello3 } from "../subdir/mod1.ts?q=.json";
+
+printHello3();
diff --git a/cli/tests/testdata/issue13562.ts.out b/cli/tests/testdata/run/issue13562.ts.out
index 699b756ed..699b756ed 100644
--- a/cli/tests/testdata/issue13562.ts.out
+++ b/cli/tests/testdata/run/issue13562.ts.out
diff --git a/cli/tests/testdata/issue9750.js b/cli/tests/testdata/run/issue9750.js
index 89fd61629..89fd61629 100644
--- a/cli/tests/testdata/issue9750.js
+++ b/cli/tests/testdata/run/issue9750.js
diff --git a/cli/tests/testdata/js_import_detect.ts b/cli/tests/testdata/run/js_import_detect.ts
index 751741996..751741996 100644
--- a/cli/tests/testdata/js_import_detect.ts
+++ b/cli/tests/testdata/run/js_import_detect.ts
diff --git a/cli/tests/testdata/js_import_detect.ts.out b/cli/tests/testdata/run/js_import_detect.ts.out
index 9766475a4..9766475a4 100644
--- a/cli/tests/testdata/js_import_detect.ts.out
+++ b/cli/tests/testdata/run/js_import_detect.ts.out
diff --git a/cli/tests/testdata/js_root_with_ts_check.js b/cli/tests/testdata/run/js_root_with_ts_check.js
index adca847ee..adca847ee 100644
--- a/cli/tests/testdata/js_root_with_ts_check.js
+++ b/cli/tests/testdata/run/js_root_with_ts_check.js
diff --git a/cli/tests/testdata/js_root_with_ts_check.js.out b/cli/tests/testdata/run/js_root_with_ts_check.js.out
index 34e2fa61e..34e2fa61e 100644
--- a/cli/tests/testdata/js_root_with_ts_check.js.out
+++ b/cli/tests/testdata/run/js_root_with_ts_check.js.out
diff --git a/cli/tests/testdata/jsx_import_from_ts.App.jsx b/cli/tests/testdata/run/jsx_import_from_ts.App.jsx
index 649230613..649230613 100644
--- a/cli/tests/testdata/jsx_import_from_ts.App.jsx
+++ b/cli/tests/testdata/run/jsx_import_from_ts.App.jsx
diff --git a/cli/tests/testdata/jsx_import_from_ts.ts b/cli/tests/testdata/run/jsx_import_from_ts.ts
index 3cc916698..3cc916698 100644
--- a/cli/tests/testdata/jsx_import_from_ts.ts
+++ b/cli/tests/testdata/run/jsx_import_from_ts.ts
diff --git a/cli/tests/testdata/jsx_import_from_ts.ts.out b/cli/tests/testdata/run/jsx_import_from_ts.ts.out
index d449b8c9a..d449b8c9a 100644
--- a/cli/tests/testdata/jsx_import_from_ts.ts.out
+++ b/cli/tests/testdata/run/jsx_import_from_ts.ts.out
diff --git a/cli/tests/testdata/jsx_import_source.out b/cli/tests/testdata/run/jsx_import_source.out
index b9555987a..b9555987a 100644
--- a/cli/tests/testdata/jsx_import_source.out
+++ b/cli/tests/testdata/run/jsx_import_source.out
diff --git a/cli/tests/testdata/jsx_import_source_dev.out b/cli/tests/testdata/run/jsx_import_source_dev.out
index 38d7a12f0..38d7a12f0 100644
--- a/cli/tests/testdata/jsx_import_source_dev.out
+++ b/cli/tests/testdata/run/jsx_import_source_dev.out
diff --git a/cli/tests/testdata/jsx_import_source_error.out b/cli/tests/testdata/run/jsx_import_source_error.out
index 634a5b09b..634a5b09b 100644
--- a/cli/tests/testdata/jsx_import_source_error.out
+++ b/cli/tests/testdata/run/jsx_import_source_error.out
diff --git a/cli/tests/testdata/jsx_import_source_import_map.out b/cli/tests/testdata/run/jsx_import_source_import_map.out
index 0d3238967..0d3238967 100644
--- a/cli/tests/testdata/jsx_import_source_import_map.out
+++ b/cli/tests/testdata/run/jsx_import_source_import_map.out
diff --git a/cli/tests/testdata/jsx_import_source_import_map_dev.out b/cli/tests/testdata/run/jsx_import_source_import_map_dev.out
index 56f514d90..56f514d90 100644
--- a/cli/tests/testdata/jsx_import_source_import_map_dev.out
+++ b/cli/tests/testdata/run/jsx_import_source_import_map_dev.out
diff --git a/cli/tests/testdata/jsx_import_source_no_pragma.tsx b/cli/tests/testdata/run/jsx_import_source_no_pragma.tsx
index 2c756054f..2c756054f 100644
--- a/cli/tests/testdata/jsx_import_source_no_pragma.tsx
+++ b/cli/tests/testdata/run/jsx_import_source_no_pragma.tsx
diff --git a/cli/tests/testdata/jsx_import_source_pragma.tsx b/cli/tests/testdata/run/jsx_import_source_pragma.tsx
index c19e53d4f..c19e53d4f 100644
--- a/cli/tests/testdata/jsx_import_source_pragma.tsx
+++ b/cli/tests/testdata/run/jsx_import_source_pragma.tsx
diff --git a/cli/tests/testdata/jsx_import_source_pragma_import_map.tsx b/cli/tests/testdata/run/jsx_import_source_pragma_import_map.tsx
index 548365f18..548365f18 100644
--- a/cli/tests/testdata/jsx_import_source_pragma_import_map.tsx
+++ b/cli/tests/testdata/run/jsx_import_source_pragma_import_map.tsx
diff --git a/cli/tests/testdata/lock_check_err.json b/cli/tests/testdata/run/lock_check_err.json
index 9bf52adca..fc6c2d45c 100644
--- a/cli/tests/testdata/lock_check_err.json
+++ b/cli/tests/testdata/run/lock_check_err.json
@@ -1,4 +1,4 @@
 {
   "http://127.0.0.1:4545/subdir/print_hello.ts": "fa6692c8f9ff3fb107e773c3ece5274e9d08be282867a1e3ded1d9c00fcaa63c",
-  "http://127.0.0.1:4545/003_relative_import.ts": "bad"
+  "http://127.0.0.1:4545/run/003_relative_import.ts": "bad"
 }
diff --git a/cli/tests/testdata/run/lock_check_err.out b/cli/tests/testdata/run/lock_check_err.out
new file mode 100644
index 000000000..e4cc7b81a
--- /dev/null
+++ b/cli/tests/testdata/run/lock_check_err.out
@@ -0,0 +1,3 @@
+[WILDCARD]The source code is invalid, as it does not match the expected hash in the lock file.
+  Specifier: http://127.0.0.1:4545/run/003_relative_import.ts
+  Lock file: run/lock_check_err.json
diff --git a/cli/tests/testdata/lock_check_err2.json b/cli/tests/testdata/run/lock_check_err2.json
index a59cbc9e3..a59cbc9e3 100644
--- a/cli/tests/testdata/lock_check_err2.json
+++ b/cli/tests/testdata/run/lock_check_err2.json
diff --git a/cli/tests/testdata/lock_check_err2.out b/cli/tests/testdata/run/lock_check_err2.out
index 958c01654..065c7434b 100644
--- a/cli/tests/testdata/lock_check_err2.out
+++ b/cli/tests/testdata/run/lock_check_err2.out
@@ -1,3 +1,3 @@
 [WILDCARD]The source code is invalid, as it does not match the expected hash in the lock file.
   Specifier: http://localhost:4545/subdir/mt_text_ecmascript.j3.js
-  Lock file: lock_check_err2.json
+  Lock file: run/lock_check_err2.json
diff --git a/cli/tests/testdata/lock_check_ok.json b/cli/tests/testdata/run/lock_check_ok.json
index 9dd5b0548..94de0f630 100644
--- a/cli/tests/testdata/lock_check_ok.json
+++ b/cli/tests/testdata/run/lock_check_ok.json
@@ -1,4 +1,4 @@
 {
   "http://127.0.0.1:4545/subdir/print_hello.ts": "fa6692c8f9ff3fb107e773c3ece5274e9d08be282867a1e3ded1d9c00fcaa63c",
-  "http://127.0.0.1:4545/003_relative_import.ts": "aa9e16de824f81871a1c7164d5bd6857df7db2e18621750bd66b0bde4df07f21"
+  "http://127.0.0.1:4545/run/003_relative_import.ts": "a1572e8fd2c2712b33f04aed2561505b5feb2c8696f1f2cded3de7127931b97e"
 }
diff --git a/cli/tests/testdata/lock_check_ok2.json b/cli/tests/testdata/run/lock_check_ok2.json
index 162c755e2..162c755e2 100644
--- a/cli/tests/testdata/lock_check_ok2.json
+++ b/cli/tests/testdata/run/lock_check_ok2.json
diff --git a/cli/tests/testdata/lock_dynamic_imports.json b/cli/tests/testdata/run/lock_dynamic_imports.json
index 57263bc85..0269b9409 100644
--- a/cli/tests/testdata/lock_dynamic_imports.json
+++ b/cli/tests/testdata/run/lock_dynamic_imports.json
@@ -1,5 +1,5 @@
 {
-  "http://127.0.0.1:4545/013_dynamic_import.ts": "f0d2d108c100e769cda9f26b74326f21e44cab81611aa7f6cd2b731d4cbc1995",
+  "http://127.0.0.1:4545/run/013_dynamic_import.ts": "3f83e653329dc1f963761a986997d710b9763f667fc243eef89b3a5decacda30",
   "http://127.0.0.1:4545/subdir/mod1.ts": "bfc1037b02c99abc20367f739bca7455813a5950066abd77965bff33b6eece0f",
   "http://127.0.0.1:4545/subdir/print_hello.ts": "fa6692c8f9ff3fb107e773c3ece5274e9d08be282867a1e3ded1d9c00fcaa63c",
   "http://127.0.0.1:4545/subdir/subdir2/mod2.ts": "bad"
diff --git a/cli/tests/testdata/lock_dynamic_imports.out b/cli/tests/testdata/run/lock_dynamic_imports.out
index 601d2282b..acc65c8e6 100644
--- a/cli/tests/testdata/lock_dynamic_imports.out
+++ b/cli/tests/testdata/run/lock_dynamic_imports.out
@@ -1,4 +1,4 @@
 [WILDCARD]
 error: The source code is invalid, as it does not match the expected hash in the lock file.
   Specifier: http://127.0.0.1:4545/subdir/subdir2/mod2.ts
-  Lock file: lock_dynamic_imports.json
+  Lock file: run/lock_dynamic_imports.json
diff --git a/cli/tests/testdata/file_exists.ts b/cli/tests/testdata/run/lock_write_fetch/file_exists.ts
index 20de4d4f2..20de4d4f2 100644
--- a/cli/tests/testdata/file_exists.ts
+++ b/cli/tests/testdata/run/lock_write_fetch/file_exists.ts
diff --git a/cli/tests/testdata/lock_write_fetch.ts.out b/cli/tests/testdata/run/lock_write_fetch/main.out
index bfdb952f9..bfdb952f9 100644
--- a/cli/tests/testdata/lock_write_fetch.ts.out
+++ b/cli/tests/testdata/run/lock_write_fetch/main.out
diff --git a/cli/tests/testdata/lock_write_fetch.ts b/cli/tests/testdata/run/lock_write_fetch/main.ts
index b403f5536..3e6892cf0 100644
--- a/cli/tests/testdata/lock_write_fetch.ts
+++ b/cli/tests/testdata/run/lock_write_fetch/main.ts
@@ -13,7 +13,7 @@ const fetchProc = await Deno.spawn(Deno.execPath(), {
     "--lock=lock_write_fetch.json",
     "--lock-write",
     "--cert=tls/RootCA.pem",
-    "https_import.ts",
+    "run/https_import.ts",
   ],
 });
 
@@ -26,7 +26,7 @@ const fetchCheckProc = await Deno.spawn(Deno.execPath(), {
     "cache",
     "--lock=lock_write_fetch.json",
     "--cert=tls/RootCA.pem",
-    "https_import.ts",
+    "run/https_import.ts",
   ],
 });
 
@@ -42,7 +42,7 @@ const runProc = await Deno.spawn(Deno.execPath(), {
     "--lock=lock_write_fetch.json",
     "--lock-write",
     "--allow-read",
-    "file_exists.ts",
+    "run/lock_write_fetch/file_exists.ts",
     "lock_write_fetch.json",
   ],
 });
diff --git a/cli/tests/testdata/lock_write_requires_lock.out b/cli/tests/testdata/run/lock_write_requires_lock.out
index 7cc5906f6..7cc5906f6 100644
--- a/cli/tests/testdata/lock_write_requires_lock.out
+++ b/cli/tests/testdata/run/lock_write_requires_lock.out
diff --git a/cli/tests/testdata/long_data_url_formatting.ts b/cli/tests/testdata/run/long_data_url_formatting.ts
index 2ed2d5a03..2ed2d5a03 100644
--- a/cli/tests/testdata/long_data_url_formatting.ts
+++ b/cli/tests/testdata/run/long_data_url_formatting.ts
diff --git a/cli/tests/testdata/long_data_url_formatting.ts.out b/cli/tests/testdata/run/long_data_url_formatting.ts.out
index ea78c2591..ea78c2591 100644
--- a/cli/tests/testdata/long_data_url_formatting.ts.out
+++ b/cli/tests/testdata/run/long_data_url_formatting.ts.out
diff --git a/cli/tests/testdata/run/main_module/main.out b/cli/tests/testdata/run/main_module/main.out
new file mode 100644
index 000000000..29f592c2a
--- /dev/null
+++ b/cli/tests/testdata/run/main_module/main.out
@@ -0,0 +1,2 @@
+other [WILDCARD]/main.ts
+main [WILDCARD]/main.ts
diff --git a/cli/tests/testdata/run/main_module/main.ts b/cli/tests/testdata/run/main_module/main.ts
new file mode 100644
index 000000000..d2f2c66ee
--- /dev/null
+++ b/cli/tests/testdata/run/main_module/main.ts
@@ -0,0 +1,3 @@
+console.log("main", Deno.mainModule);
+
+import "./other.ts";
diff --git a/cli/tests/testdata/run/main_module/other.ts b/cli/tests/testdata/run/main_module/other.ts
new file mode 100644
index 000000000..b3e524b0a
--- /dev/null
+++ b/cli/tests/testdata/run/main_module/other.ts
@@ -0,0 +1 @@
+console.log("other", Deno.mainModule);
diff --git a/cli/tests/testdata/mts_dmts_mjs.out b/cli/tests/testdata/run/mts_dmts_mjs.out
index 5647bdfb9..5647bdfb9 100644
--- a/cli/tests/testdata/mts_dmts_mjs.out
+++ b/cli/tests/testdata/run/mts_dmts_mjs.out
diff --git a/cli/tests/testdata/nested_error.ts b/cli/tests/testdata/run/nested_error.ts
index 69828e1ca..69828e1ca 100644
--- a/cli/tests/testdata/nested_error.ts
+++ b/cli/tests/testdata/run/nested_error.ts
diff --git a/cli/tests/testdata/run/nested_error.ts.out b/cli/tests/testdata/run/nested_error.ts.out
new file mode 100644
index 000000000..f5ebeec4d
--- /dev/null
+++ b/cli/tests/testdata/run/nested_error.ts.out
@@ -0,0 +1,4 @@
+error: Uncaught {
+  foo: Error
+    at file:///[WILDCARD]testdata/run/nested_error.ts:2:8
+}
diff --git a/cli/tests/testdata/no_check_decorators.ts b/cli/tests/testdata/run/no_check_decorators.ts
index 9f7ec550d..9f7ec550d 100644
--- a/cli/tests/testdata/no_check_decorators.ts
+++ b/cli/tests/testdata/run/no_check_decorators.ts
diff --git a/cli/tests/testdata/no_check_decorators.ts.out b/cli/tests/testdata/run/no_check_decorators.ts.out
index 015f7076e..015f7076e 100644
--- a/cli/tests/testdata/no_check_decorators.ts.out
+++ b/cli/tests/testdata/run/no_check_decorators.ts.out
diff --git a/cli/tests/testdata/087_hello.ts b/cli/tests/testdata/run/no_check_imports_not_used_as_values/hello.ts
index 1a9d8f114..1a9d8f114 100644
--- a/cli/tests/testdata/087_hello.ts
+++ b/cli/tests/testdata/run/no_check_imports_not_used_as_values/hello.ts
diff --git a/cli/tests/testdata/087_no_check_imports_not_used_as_values.ts.out b/cli/tests/testdata/run/no_check_imports_not_used_as_values/main.out
index f744c4183..f744c4183 100644
--- a/cli/tests/testdata/087_no_check_imports_not_used_as_values.ts.out
+++ b/cli/tests/testdata/run/no_check_imports_not_used_as_values/main.out
diff --git a/cli/tests/testdata/087_no_check_imports_not_used_as_values.ts b/cli/tests/testdata/run/no_check_imports_not_used_as_values/main.ts
index 64a13f9b1..80e17aa35 100644
--- a/cli/tests/testdata/087_no_check_imports_not_used_as_values.ts
+++ b/cli/tests/testdata/run/no_check_imports_not_used_as_values/main.ts
@@ -1,4 +1,4 @@
-import { SomeType } from "./087_hello.ts";
+import { SomeType } from "./hello.ts";
 
 const string: SomeType = "Hi!";
 console.log(string);
diff --git a/cli/tests/testdata/preserve_imports.tsconfig.json b/cli/tests/testdata/run/no_check_imports_not_used_as_values/preserve_imports.tsconfig.json
index 9b19291aa..9b19291aa 100644
--- a/cli/tests/testdata/preserve_imports.tsconfig.json
+++ b/cli/tests/testdata/run/no_check_imports_not_used_as_values/preserve_imports.tsconfig.json
diff --git a/cli/tests/testdata/no_check_remote.ts b/cli/tests/testdata/run/no_check_remote.ts
index 2ae8c2692..2ae8c2692 100644
--- a/cli/tests/testdata/no_check_remote.ts
+++ b/cli/tests/testdata/run/no_check_remote.ts
diff --git a/cli/tests/testdata/no_check_remote.ts.disabled.out b/cli/tests/testdata/run/no_check_remote.ts.disabled.out
index 344264634..344264634 100644
--- a/cli/tests/testdata/no_check_remote.ts.disabled.out
+++ b/cli/tests/testdata/run/no_check_remote.ts.disabled.out
diff --git a/cli/tests/testdata/no_check_remote.ts.enabled.out b/cli/tests/testdata/run/no_check_remote.ts.enabled.out
index 48082f72f..48082f72f 100644
--- a/cli/tests/testdata/no_check_remote.ts.enabled.out
+++ b/cli/tests/testdata/run/no_check_remote.ts.enabled.out
diff --git a/cli/tests/testdata/no_mem_cache.js b/cli/tests/testdata/run/no_mem_cache.js
index a486732b6..a486732b6 100644
--- a/cli/tests/testdata/no_mem_cache.js
+++ b/cli/tests/testdata/run/no_mem_cache.js
diff --git a/cli/tests/testdata/no_mem_cache.js.out b/cli/tests/testdata/run/no_mem_cache.js.out
index a32119c8a..a32119c8a 100644
--- a/cli/tests/testdata/no_mem_cache.js.out
+++ b/cli/tests/testdata/run/no_mem_cache.js.out
diff --git a/cli/tests/testdata/no_prompt.ts b/cli/tests/testdata/run/no_prompt.ts
index 7f9750995..7f9750995 100644
--- a/cli/tests/testdata/no_prompt.ts
+++ b/cli/tests/testdata/run/no_prompt.ts
diff --git a/cli/tests/testdata/no_validate_asm.js b/cli/tests/testdata/run/no_validate_asm.js
index ef999e080..ef999e080 100644
--- a/cli/tests/testdata/no_validate_asm.js
+++ b/cli/tests/testdata/run/no_validate_asm.js
diff --git a/cli/tests/testdata/node_env_var_allowlist.ts b/cli/tests/testdata/run/node_env_var_allowlist.ts
index 95da38c24..95da38c24 100644
--- a/cli/tests/testdata/node_env_var_allowlist.ts
+++ b/cli/tests/testdata/run/node_env_var_allowlist.ts
diff --git a/cli/tests/testdata/node_env_var_allowlist_with_unstable_flag.ts.out b/cli/tests/testdata/run/node_env_var_allowlist_with_unstable_flag.ts.out
index 62f335c0f..62f335c0f 100644
--- a/cli/tests/testdata/node_env_var_allowlist_with_unstable_flag.ts.out
+++ b/cli/tests/testdata/run/node_env_var_allowlist_with_unstable_flag.ts.out
diff --git a/cli/tests/testdata/node_env_var_allowlist_without_unstable_flag.ts.out b/cli/tests/testdata/run/node_env_var_allowlist_without_unstable_flag.ts.out
index ac92cdb6b..ac92cdb6b 100644
--- a/cli/tests/testdata/node_env_var_allowlist_without_unstable_flag.ts.out
+++ b/cli/tests/testdata/run/node_env_var_allowlist_without_unstable_flag.ts.out
diff --git a/cli/tests/testdata/034_onload/imported.ts b/cli/tests/testdata/run/onload/imported.ts
index a176d4200..969f97e56 100644
--- a/cli/tests/testdata/034_onload/imported.ts
+++ b/cli/tests/testdata/run/onload/imported.ts
@@ -1,5 +1,5 @@
 // deno-lint-ignore-file no-window-prefix
-import { assert } from "../../../../test_util/std/testing/asserts.ts";
+import { assert } from "../../../../../test_util/std/testing/asserts.ts";
 import "./nest_imported.ts";
 
 const handler = (e: Event) => {
diff --git a/cli/tests/testdata/034_onload.out b/cli/tests/testdata/run/onload/main.out
index 9b1f454c9..9b1f454c9 100644
--- a/cli/tests/testdata/034_onload.out
+++ b/cli/tests/testdata/run/onload/main.out
diff --git a/cli/tests/testdata/034_onload/main.ts b/cli/tests/testdata/run/onload/main.ts
index df6713105..798b8aa7b 100644
--- a/cli/tests/testdata/034_onload/main.ts
+++ b/cli/tests/testdata/run/onload/main.ts
@@ -1,5 +1,5 @@
 // deno-lint-ignore-file no-window-prefix no-prototype-builtins
-import { assert } from "../../../../test_util/std/testing/asserts.ts";
+import { assert } from "../../../../../test_util/std/testing/asserts.ts";
 import "./imported.ts";
 
 assert(window.hasOwnProperty("onload"));
diff --git a/cli/tests/testdata/034_onload/nest_imported.ts b/cli/tests/testdata/run/onload/nest_imported.ts
index e461dd9b1..351a3cb22 100644
--- a/cli/tests/testdata/034_onload/nest_imported.ts
+++ b/cli/tests/testdata/run/onload/nest_imported.ts
@@ -1,5 +1,5 @@
 // deno-lint-ignore-file no-window-prefix
-import { assert } from "../../../../test_util/std/testing/asserts.ts";
+import { assert } from "../../../../../test_util/std/testing/asserts.ts";
 
 const handler = (e: Event) => {
   assert(!e.cancelable);
diff --git a/cli/tests/testdata/op_exit_op_set_exit_code_in_worker.ts b/cli/tests/testdata/run/op_exit_op_set_exit_code_in_worker.ts
index b2ed912de..b2ed912de 100644
--- a/cli/tests/testdata/op_exit_op_set_exit_code_in_worker.ts
+++ b/cli/tests/testdata/run/op_exit_op_set_exit_code_in_worker.ts
diff --git a/cli/tests/testdata/op_exit_op_set_exit_code_worker.js b/cli/tests/testdata/run/op_exit_op_set_exit_code_worker.js
index 3e6055747..3e6055747 100644
--- a/cli/tests/testdata/op_exit_op_set_exit_code_worker.js
+++ b/cli/tests/testdata/run/op_exit_op_set_exit_code_worker.js
diff --git a/cli/tests/testdata/permission_test.ts b/cli/tests/testdata/run/permission_test.ts
index 4b186a0a2..9b5409b4f 100644
--- a/cli/tests/testdata/permission_test.ts
+++ b/cli/tests/testdata/run/permission_test.ts
@@ -3,7 +3,7 @@ const name = Deno.args[0];
 // deno-lint-ignore no-explicit-any
 const test: { [key: string]: (...args: any[]) => void | Promise<void> } = {
   readRequired() {
-    Deno.readFileSync("hello.txt");
+    Deno.readFileSync("assets/hello.txt");
     return Promise.resolve();
   },
   writeRequired() {
diff --git a/cli/tests/testdata/private_field_presence.ts b/cli/tests/testdata/run/private_field_presence.ts
index 7ce2840d8..7ce2840d8 100644
--- a/cli/tests/testdata/private_field_presence.ts
+++ b/cli/tests/testdata/run/private_field_presence.ts
diff --git a/cli/tests/testdata/private_field_presence.ts.out b/cli/tests/testdata/run/private_field_presence.ts.out
index f582fb47a..f582fb47a 100644
--- a/cli/tests/testdata/private_field_presence.ts.out
+++ b/cli/tests/testdata/run/private_field_presence.ts.out
diff --git a/cli/tests/testdata/proto_exploit.js b/cli/tests/testdata/run/proto_exploit.js
index 8bd22cfe5..8bd22cfe5 100644
--- a/cli/tests/testdata/proto_exploit.js
+++ b/cli/tests/testdata/run/proto_exploit.js
diff --git a/cli/tests/testdata/proto_exploit.js.out b/cli/tests/testdata/run/proto_exploit.js.out
index fde881dc5..fde881dc5 100644
--- a/cli/tests/testdata/proto_exploit.js.out
+++ b/cli/tests/testdata/run/proto_exploit.js.out
diff --git a/cli/tests/testdata/queue_microtask_error.ts b/cli/tests/testdata/run/queue_microtask_error.ts
index b2e9642c5..b2e9642c5 100644
--- a/cli/tests/testdata/queue_microtask_error.ts
+++ b/cli/tests/testdata/run/queue_microtask_error.ts
diff --git a/cli/tests/testdata/queue_microtask_error.ts.out b/cli/tests/testdata/run/queue_microtask_error.ts.out
index 6c4d41936..6c4d41936 100644
--- a/cli/tests/testdata/queue_microtask_error.ts.out
+++ b/cli/tests/testdata/run/queue_microtask_error.ts.out
diff --git a/cli/tests/testdata/queue_microtask_error_handled.ts b/cli/tests/testdata/run/queue_microtask_error_handled.ts
index 7d1440135..7d1440135 100644
--- a/cli/tests/testdata/queue_microtask_error_handled.ts
+++ b/cli/tests/testdata/run/queue_microtask_error_handled.ts
diff --git a/cli/tests/testdata/queue_microtask_error_handled.ts.out b/cli/tests/testdata/run/queue_microtask_error_handled.ts.out
index 7f3f7f84a..7f3f7f84a 100644
--- a/cli/tests/testdata/queue_microtask_error_handled.ts.out
+++ b/cli/tests/testdata/run/queue_microtask_error_handled.ts.out
diff --git a/cli/tests/testdata/reference_types.ts b/cli/tests/testdata/run/reference_types.ts
index 105e23b37..105e23b37 100644
--- a/cli/tests/testdata/reference_types.ts
+++ b/cli/tests/testdata/run/reference_types.ts
diff --git a/cli/tests/testdata/reference_types.ts.out b/cli/tests/testdata/run/reference_types.ts.out
index 417b7b537..417b7b537 100644
--- a/cli/tests/testdata/reference_types.ts.out
+++ b/cli/tests/testdata/run/reference_types.ts.out
diff --git a/cli/tests/testdata/reference_types_error.js b/cli/tests/testdata/run/reference_types_error.js
index 68b6c2136..68b6c2136 100644
--- a/cli/tests/testdata/reference_types_error.js
+++ b/cli/tests/testdata/run/reference_types_error.js
diff --git a/cli/tests/testdata/reference_types_error.js.out b/cli/tests/testdata/run/reference_types_error.js.out
index ebb9b3a26..ebb9b3a26 100644
--- a/cli/tests/testdata/reference_types_error.js.out
+++ b/cli/tests/testdata/run/reference_types_error.js.out
diff --git a/cli/tests/testdata/reference_types_remote.ts b/cli/tests/testdata/run/reference_types_remote.ts
index e7fa81b2c..e7fa81b2c 100644
--- a/cli/tests/testdata/reference_types_remote.ts
+++ b/cli/tests/testdata/run/reference_types_remote.ts
diff --git a/cli/tests/testdata/reference_types_remote.ts.out b/cli/tests/testdata/run/reference_types_remote.ts.out
index 417b7b537..417b7b537 100644
--- a/cli/tests/testdata/reference_types_remote.ts.out
+++ b/cli/tests/testdata/run/reference_types_remote.ts.out
diff --git a/cli/tests/testdata/replace_self.js b/cli/tests/testdata/run/replace_self.js
index cfd473cd3..cfd473cd3 100644
--- a/cli/tests/testdata/replace_self.js
+++ b/cli/tests/testdata/run/replace_self.js
diff --git a/cli/tests/testdata/replace_self.js.out b/cli/tests/testdata/run/replace_self.js.out
index aaffb5a62..aaffb5a62 100644
--- a/cli/tests/testdata/replace_self.js.out
+++ b/cli/tests/testdata/run/replace_self.js.out
diff --git a/cli/tests/testdata/report_error.ts b/cli/tests/testdata/run/report_error.ts
index a6d4af1fd..a6d4af1fd 100644
--- a/cli/tests/testdata/report_error.ts
+++ b/cli/tests/testdata/run/report_error.ts
diff --git a/cli/tests/testdata/report_error.ts.out b/cli/tests/testdata/run/report_error.ts.out
index 185db62a5..185db62a5 100644
--- a/cli/tests/testdata/report_error.ts.out
+++ b/cli/tests/testdata/run/report_error.ts.out
diff --git a/cli/tests/testdata/report_error_end_of_program.ts b/cli/tests/testdata/run/report_error_end_of_program.ts
index cd7ce7f9c..cd7ce7f9c 100644
--- a/cli/tests/testdata/report_error_end_of_program.ts
+++ b/cli/tests/testdata/run/report_error_end_of_program.ts
diff --git a/cli/tests/testdata/report_error_end_of_program.ts.out b/cli/tests/testdata/run/report_error_end_of_program.ts.out
index ecca63389..ecca63389 100644
--- a/cli/tests/testdata/report_error_end_of_program.ts.out
+++ b/cli/tests/testdata/run/report_error_end_of_program.ts.out
diff --git a/cli/tests/testdata/report_error_handled.ts b/cli/tests/testdata/run/report_error_handled.ts
index de58f0b8e..de58f0b8e 100644
--- a/cli/tests/testdata/report_error_handled.ts
+++ b/cli/tests/testdata/run/report_error_handled.ts
diff --git a/cli/tests/testdata/report_error_handled.ts.out b/cli/tests/testdata/run/report_error_handled.ts.out
index 89fa30314..89fa30314 100644
--- a/cli/tests/testdata/report_error_handled.ts.out
+++ b/cli/tests/testdata/run/report_error_handled.ts.out
diff --git a/cli/tests/testdata/resolve_dns.ts b/cli/tests/testdata/run/resolve_dns.ts
index bde479c9a..bde479c9a 100644
--- a/cli/tests/testdata/resolve_dns.ts
+++ b/cli/tests/testdata/run/resolve_dns.ts
diff --git a/cli/tests/testdata/resolve_dns.ts.out b/cli/tests/testdata/run/resolve_dns.ts.out
index 2fe10cb9a..2fe10cb9a 100644
--- a/cli/tests/testdata/resolve_dns.ts.out
+++ b/cli/tests/testdata/run/resolve_dns.ts.out
diff --git a/cli/tests/testdata/resolve_dns.zone.in b/cli/tests/testdata/run/resolve_dns.zone.in
index c351a1de9..c351a1de9 100644
--- a/cli/tests/testdata/resolve_dns.zone.in
+++ b/cli/tests/testdata/run/resolve_dns.zone.in
diff --git a/cli/tests/testdata/runtime_decorators.ts b/cli/tests/testdata/run/runtime_decorators.ts
index 5da109110..5da109110 100644
--- a/cli/tests/testdata/runtime_decorators.ts
+++ b/cli/tests/testdata/run/runtime_decorators.ts
diff --git a/cli/tests/testdata/runtime_decorators.ts.out b/cli/tests/testdata/run/runtime_decorators.ts.out
index 0fc1d4590..0fc1d4590 100644
--- a/cli/tests/testdata/runtime_decorators.ts.out
+++ b/cli/tests/testdata/run/runtime_decorators.ts.out
diff --git a/cli/tests/testdata/seed_random.js b/cli/tests/testdata/run/seed_random.js
index 7f6e336df..7f6e336df 100644
--- a/cli/tests/testdata/seed_random.js
+++ b/cli/tests/testdata/run/seed_random.js
diff --git a/cli/tests/testdata/seed_random.js.out b/cli/tests/testdata/run/seed_random.js.out
index 4d1ebd081..4d1ebd081 100644
--- a/cli/tests/testdata/seed_random.js.out
+++ b/cli/tests/testdata/run/seed_random.js.out
diff --git a/cli/tests/testdata/set_exit_code_0.ts b/cli/tests/testdata/run/set_exit_code_0.ts
index 362a9f28a..362a9f28a 100644
--- a/cli/tests/testdata/set_exit_code_0.ts
+++ b/cli/tests/testdata/run/set_exit_code_0.ts
diff --git a/cli/tests/testdata/set_exit_code_1.ts b/cli/tests/testdata/run/set_exit_code_1.ts
index b10863568..b10863568 100644
--- a/cli/tests/testdata/set_exit_code_1.ts
+++ b/cli/tests/testdata/run/set_exit_code_1.ts
diff --git a/cli/tests/testdata/set_exit_code_2.ts b/cli/tests/testdata/run/set_exit_code_2.ts
index d68812cae..d68812cae 100644
--- a/cli/tests/testdata/set_exit_code_2.ts
+++ b/cli/tests/testdata/run/set_exit_code_2.ts
diff --git a/cli/tests/testdata/set_timeout_error.ts b/cli/tests/testdata/run/set_timeout_error.ts
index 2864574e7..2864574e7 100644
--- a/cli/tests/testdata/set_timeout_error.ts
+++ b/cli/tests/testdata/run/set_timeout_error.ts
diff --git a/cli/tests/testdata/set_timeout_error.ts.out b/cli/tests/testdata/run/set_timeout_error.ts.out
index 9db053f6c..9db053f6c 100644
--- a/cli/tests/testdata/set_timeout_error.ts.out
+++ b/cli/tests/testdata/run/set_timeout_error.ts.out
diff --git a/cli/tests/testdata/set_timeout_error_handled.ts b/cli/tests/testdata/run/set_timeout_error_handled.ts
index aee2d97d2..aee2d97d2 100644
--- a/cli/tests/testdata/set_timeout_error_handled.ts
+++ b/cli/tests/testdata/run/set_timeout_error_handled.ts
diff --git a/cli/tests/testdata/set_timeout_error_handled.ts.out b/cli/tests/testdata/run/set_timeout_error_handled.ts.out
index 054dd9b6b..054dd9b6b 100644
--- a/cli/tests/testdata/set_timeout_error_handled.ts.out
+++ b/cli/tests/testdata/run/set_timeout_error_handled.ts.out
diff --git a/cli/tests/testdata/shebang.ts b/cli/tests/testdata/run/shebang.ts
index 00feb2da0..00feb2da0 100644
--- a/cli/tests/testdata/shebang.ts
+++ b/cli/tests/testdata/run/shebang.ts
diff --git a/cli/tests/testdata/shebang.ts.out b/cli/tests/testdata/run/shebang.ts.out
index d81cc0710..d81cc0710 100644
--- a/cli/tests/testdata/shebang.ts.out
+++ b/cli/tests/testdata/run/shebang.ts.out
diff --git a/cli/tests/testdata/shebang2.ts b/cli/tests/testdata/run/shebang2.ts
index da0d7bf0c..da0d7bf0c 100644
--- a/cli/tests/testdata/shebang2.ts
+++ b/cli/tests/testdata/run/shebang2.ts
diff --git a/cli/tests/testdata/single_compile_with_reload.ts b/cli/tests/testdata/run/single_compile_with_reload.ts
index ea6a73474..ea6a73474 100644
--- a/cli/tests/testdata/single_compile_with_reload.ts
+++ b/cli/tests/testdata/run/single_compile_with_reload.ts
diff --git a/cli/tests/testdata/single_compile_with_reload.ts.out b/cli/tests/testdata/run/single_compile_with_reload.ts.out
index b0b2fcaf1..b0b2fcaf1 100644
--- a/cli/tests/testdata/single_compile_with_reload.ts.out
+++ b/cli/tests/testdata/run/single_compile_with_reload.ts.out
diff --git a/cli/tests/testdata/single_compile_with_reload_dyn.ts b/cli/tests/testdata/run/single_compile_with_reload_dyn.ts
index 0266bf46c..6c96fac64 100644
--- a/cli/tests/testdata/single_compile_with_reload_dyn.ts
+++ b/cli/tests/testdata/run/single_compile_with_reload_dyn.ts
@@ -1,4 +1,4 @@
-import { printHello3, returnsFoo2, returnsHi } from "./subdir/mod1.ts";
+import { printHello3, returnsFoo2, returnsHi } from "../subdir/mod1.ts";
 
 printHello3();
 
diff --git a/cli/tests/testdata/single_compile_with_reload_worker.ts b/cli/tests/testdata/run/single_compile_with_reload_worker.ts
index 103cafe20..103cafe20 100644
--- a/cli/tests/testdata/single_compile_with_reload_worker.ts
+++ b/cli/tests/testdata/run/single_compile_with_reload_worker.ts
diff --git a/cli/tests/testdata/spawn_stdout_inherit.ts b/cli/tests/testdata/run/spawn_stdout_inherit.ts
index be5f9b7ef..be5f9b7ef 100644
--- a/cli/tests/testdata/spawn_stdout_inherit.ts
+++ b/cli/tests/testdata/run/spawn_stdout_inherit.ts
diff --git a/cli/tests/testdata/spawn_stdout_inherit.ts.out b/cli/tests/testdata/run/spawn_stdout_inherit.ts.out
index 474891cf2..474891cf2 100644
--- a/cli/tests/testdata/spawn_stdout_inherit.ts.out
+++ b/cli/tests/testdata/run/spawn_stdout_inherit.ts.out
diff --git a/cli/tests/testdata/swc_syntax_error.ts b/cli/tests/testdata/run/swc_syntax_error.ts
index 991ca9214..991ca9214 100644
--- a/cli/tests/testdata/swc_syntax_error.ts
+++ b/cli/tests/testdata/run/swc_syntax_error.ts
diff --git a/cli/tests/testdata/swc_syntax_error.ts.out b/cli/tests/testdata/run/swc_syntax_error.ts.out
index c968db5e9..c968db5e9 100644
--- a/cli/tests/testdata/swc_syntax_error.ts.out
+++ b/cli/tests/testdata/run/swc_syntax_error.ts.out
diff --git a/cli/tests/testdata/test_and_bench_in_run.js b/cli/tests/testdata/run/test_and_bench_in_run.js
index 108ae937a..108ae937a 100644
--- a/cli/tests/testdata/test_and_bench_in_run.js
+++ b/cli/tests/testdata/run/test_and_bench_in_run.js
diff --git a/cli/tests/testdata/tls.out b/cli/tests/testdata/run/tls.out
index c8e8a135c..c8e8a135c 100644
--- a/cli/tests/testdata/tls.out
+++ b/cli/tests/testdata/run/tls.out
diff --git a/cli/tests/testdata/tls_connecttls.js b/cli/tests/testdata/run/tls_connecttls.js
index 1e8cf320c..fb3839968 100644
--- a/cli/tests/testdata/tls_connecttls.js
+++ b/cli/tests/testdata/run/tls_connecttls.js
@@ -1,10 +1,10 @@
-import { deferred } from "../../../test_util/std/async/deferred.ts";
+import { deferred } from "../../../../test_util/std/async/deferred.ts";
 import {
   assert,
   assertEquals,
-} from "../../../test_util/std/testing/asserts.ts";
-import { BufReader, BufWriter } from "../../../test_util/std/io/bufio.ts";
-import { TextProtoReader } from "../../../test_util/std/textproto/mod.ts";
+} from "../../../../test_util/std/testing/asserts.ts";
+import { BufReader, BufWriter } from "../../../../test_util/std/io/bufio.ts";
+import { TextProtoReader } from "../../../../test_util/std/textproto/mod.ts";
 
 const encoder = new TextEncoder();
 const decoder = new TextDecoder();
diff --git a/cli/tests/testdata/tls_starttls.js b/cli/tests/testdata/run/tls_starttls.js
index 9b8767eaa..7aa436512 100644
--- a/cli/tests/testdata/tls_starttls.js
+++ b/cli/tests/testdata/run/tls_starttls.js
@@ -1,10 +1,10 @@
-import { deferred } from "../../../test_util/std/async/deferred.ts";
+import { deferred } from "../../../../test_util/std/async/deferred.ts";
 import {
   assert,
   assertEquals,
-} from "../../../test_util/std/testing/asserts.ts";
-import { BufReader, BufWriter } from "../../../test_util/std/io/bufio.ts";
-import { TextProtoReader } from "../../../test_util/std/textproto/mod.ts";
+} from "../../../../test_util/std/testing/asserts.ts";
+import { BufReader, BufWriter } from "../../../../test_util/std/io/bufio.ts";
+import { TextProtoReader } from "../../../../test_util/std/textproto/mod.ts";
 
 const encoder = new TextEncoder();
 const decoder = new TextDecoder();
diff --git a/cli/tests/testdata/top_level_await_circular.js b/cli/tests/testdata/run/top_level_await/circular.js
index ff2964b6a..ff2964b6a 100644
--- a/cli/tests/testdata/top_level_await_circular.js
+++ b/cli/tests/testdata/run/top_level_await/circular.js
diff --git a/cli/tests/testdata/top_level_await_circular.out b/cli/tests/testdata/run/top_level_await/circular.out
index 72072071e..72072071e 100644
--- a/cli/tests/testdata/top_level_await_circular.out
+++ b/cli/tests/testdata/run/top_level_await/circular.out
diff --git a/cli/tests/testdata/top_level_await_loop.js b/cli/tests/testdata/run/top_level_await/loop.js
index 384f8d0ed..415db5ec7 100644
--- a/cli/tests/testdata/top_level_await_loop.js
+++ b/cli/tests/testdata/run/top_level_await/loop.js
@@ -1,9 +1,11 @@
-const importsDir = Deno.readDirSync(Deno.realPathSync("./tla2"));
+const importsDir = Deno.readDirSync(
+  Deno.realPathSync("./run/top_level_await/tla2"),
+);
 
 const resolvedPaths = [];
 
 for (const { name } of importsDir) {
-  const filePath = Deno.realPathSync(`./tla2/${name}`);
+  const filePath = Deno.realPathSync(`./run/top_level_await/tla2/${name}`);
   resolvedPaths.push(filePath);
 }
 
diff --git a/cli/tests/testdata/top_level_await_loop.out b/cli/tests/testdata/run/top_level_await/loop.out
index 70e621e45..70e621e45 100644
--- a/cli/tests/testdata/top_level_await_loop.out
+++ b/cli/tests/testdata/run/top_level_await/loop.out
diff --git a/cli/tests/testdata/top_level_await_nested.out b/cli/tests/testdata/run/top_level_await/nested.out
index 8a1218a10..8a1218a10 100644
--- a/cli/tests/testdata/top_level_await_nested.out
+++ b/cli/tests/testdata/run/top_level_await/nested.out
diff --git a/cli/tests/testdata/top_level_await_nested/a.js b/cli/tests/testdata/run/top_level_await/nested/a.js
index 74837d4ba..74837d4ba 100644
--- a/cli/tests/testdata/top_level_await_nested/a.js
+++ b/cli/tests/testdata/run/top_level_await/nested/a.js
diff --git a/cli/tests/testdata/top_level_await_nested/b.js b/cli/tests/testdata/run/top_level_await/nested/b.js
index 3bd241b50..3bd241b50 100644
--- a/cli/tests/testdata/top_level_await_nested/b.js
+++ b/cli/tests/testdata/run/top_level_await/nested/b.js
diff --git a/cli/tests/testdata/top_level_await_nested/main.js b/cli/tests/testdata/run/top_level_await/nested/main.js
index ed46a4717..ed46a4717 100644
--- a/cli/tests/testdata/top_level_await_nested/main.js
+++ b/cli/tests/testdata/run/top_level_await/nested/main.js
diff --git a/cli/tests/testdata/top_level_await_order.js b/cli/tests/testdata/run/top_level_await/order.js
index 30659cdfb..30659cdfb 100644
--- a/cli/tests/testdata/top_level_await_order.js
+++ b/cli/tests/testdata/run/top_level_await/order.js
diff --git a/cli/tests/testdata/top_level_await_order.out b/cli/tests/testdata/run/top_level_await/order.out
index 4cc27858c..4cc27858c 100644
--- a/cli/tests/testdata/top_level_await_order.out
+++ b/cli/tests/testdata/run/top_level_await/order.out
diff --git a/cli/tests/testdata/tla/a.js b/cli/tests/testdata/run/top_level_await/tla/a.js
index c3ef3f7db..c3ef3f7db 100644
--- a/cli/tests/testdata/tla/a.js
+++ b/cli/tests/testdata/run/top_level_await/tla/a.js
diff --git a/cli/tests/testdata/tla/b.js b/cli/tests/testdata/run/top_level_await/tla/b.js
index 3271c92d8..3271c92d8 100644
--- a/cli/tests/testdata/tla/b.js
+++ b/cli/tests/testdata/run/top_level_await/tla/b.js
diff --git a/cli/tests/testdata/tla/c.js b/cli/tests/testdata/run/top_level_await/tla/c.js
index 806eb0a8b..806eb0a8b 100644
--- a/cli/tests/testdata/tla/c.js
+++ b/cli/tests/testdata/run/top_level_await/tla/c.js
diff --git a/cli/tests/testdata/tla/d.js b/cli/tests/testdata/run/top_level_await/tla/d.js
index 283ebf817..283ebf817 100644
--- a/cli/tests/testdata/tla/d.js
+++ b/cli/tests/testdata/run/top_level_await/tla/d.js
diff --git a/cli/tests/testdata/tla/order.js b/cli/tests/testdata/run/top_level_await/tla/order.js
index f213a562c..f213a562c 100644
--- a/cli/tests/testdata/tla/order.js
+++ b/cli/tests/testdata/run/top_level_await/tla/order.js
diff --git a/cli/tests/testdata/tla/parent.js b/cli/tests/testdata/run/top_level_await/tla/parent.js
index 1ecc15463..1ecc15463 100644
--- a/cli/tests/testdata/tla/parent.js
+++ b/cli/tests/testdata/run/top_level_await/tla/parent.js
diff --git a/cli/tests/testdata/tla2/a.js b/cli/tests/testdata/run/top_level_await/tla2/a.js
index d07bcb94d..d07bcb94d 100644
--- a/cli/tests/testdata/tla2/a.js
+++ b/cli/tests/testdata/run/top_level_await/tla2/a.js
diff --git a/cli/tests/testdata/tla2/b.js b/cli/tests/testdata/run/top_level_await/tla2/b.js
index 68e357c1e..68e357c1e 100644
--- a/cli/tests/testdata/tla2/b.js
+++ b/cli/tests/testdata/run/top_level_await/tla2/b.js
diff --git a/cli/tests/testdata/tla3/b.js b/cli/tests/testdata/run/top_level_await/tla3/b.js
index b74c659e4..d0349545e 100644
--- a/cli/tests/testdata/tla3/b.js
+++ b/cli/tests/testdata/run/top_level_await/tla3/b.js
@@ -1,5 +1,5 @@
 import { foo } from "./timeout_loop.js";
-import { collection } from "../top_level_await_circular.js";
+import { collection } from "../circular.js";
 
 console.log("collection in b", collection);
 console.log("foo in b", foo);
diff --git a/cli/tests/testdata/tla3/timeout_loop.js b/cli/tests/testdata/run/top_level_await/tla3/timeout_loop.js
index 860e6cd2a..860e6cd2a 100644
--- a/cli/tests/testdata/tla3/timeout_loop.js
+++ b/cli/tests/testdata/run/top_level_await/tla3/timeout_loop.js
diff --git a/cli/tests/testdata/top_level_await.js b/cli/tests/testdata/run/top_level_await/top_level_await.js
index af6fbd662..ea319ea12 100644
--- a/cli/tests/testdata/top_level_await.js
+++ b/cli/tests/testdata/run/top_level_await/top_level_await.js
@@ -1,3 +1,3 @@
-const buf = await Deno.readFile("hello.txt");
+const buf = await Deno.readFile("./assets/hello.txt");
 const n = await Deno.stdout.write(buf);
 console.log(`\n\nwrite ${n}`);
diff --git a/cli/tests/testdata/top_level_await.out b/cli/tests/testdata/run/top_level_await/top_level_await.out
index 4b65d15fe..4b65d15fe 100644
--- a/cli/tests/testdata/top_level_await.out
+++ b/cli/tests/testdata/run/top_level_await/top_level_await.out
diff --git a/cli/tests/testdata/top_level_await.ts b/cli/tests/testdata/run/top_level_await/top_level_await.ts
index 65de253ea..8d47ceb21 100644
--- a/cli/tests/testdata/top_level_await.ts
+++ b/cli/tests/testdata/run/top_level_await/top_level_await.ts
@@ -1,3 +1,3 @@
-const buf: Uint8Array = await Deno.readFile("hello.txt");
+const buf: Uint8Array = await Deno.readFile("./assets/hello.txt");
 const n: number = await Deno.stdout.write(buf);
 console.log(`\n\nwrite ${n}`);
diff --git a/cli/tests/testdata/top_level_for_await.js b/cli/tests/testdata/run/top_level_await/top_level_for_await.js
index a330f6c71..a330f6c71 100644
--- a/cli/tests/testdata/top_level_for_await.js
+++ b/cli/tests/testdata/run/top_level_await/top_level_for_await.js
diff --git a/cli/tests/testdata/top_level_for_await.out b/cli/tests/testdata/run/top_level_await/top_level_for_await.out
index 4539bbf2d..4539bbf2d 100644
--- a/cli/tests/testdata/top_level_for_await.out
+++ b/cli/tests/testdata/run/top_level_await/top_level_for_await.out
diff --git a/cli/tests/testdata/top_level_for_await.ts b/cli/tests/testdata/run/top_level_await/top_level_for_await.ts
index 9179322d7..9179322d7 100644
--- a/cli/tests/testdata/top_level_for_await.ts
+++ b/cli/tests/testdata/run/top_level_await/top_level_for_await.ts
diff --git a/cli/tests/testdata/top_level_await_unresolved.js b/cli/tests/testdata/run/top_level_await/unresolved.js
index 231a8cd63..231a8cd63 100644
--- a/cli/tests/testdata/top_level_await_unresolved.js
+++ b/cli/tests/testdata/run/top_level_await/unresolved.js
diff --git a/cli/tests/testdata/top_level_await_unresolved.out b/cli/tests/testdata/run/top_level_await/unresolved.out
index d5291f833..d5291f833 100644
--- a/cli/tests/testdata/top_level_await_unresolved.out
+++ b/cli/tests/testdata/run/top_level_await/unresolved.out
diff --git a/cli/tests/testdata/ts_decorators.ts b/cli/tests/testdata/run/ts_decorators.ts
index 95fba6cd4..95fba6cd4 100644
--- a/cli/tests/testdata/ts_decorators.ts
+++ b/cli/tests/testdata/run/ts_decorators.ts
diff --git a/cli/tests/testdata/ts_decorators.ts.out b/cli/tests/testdata/run/ts_decorators.ts.out
index 381c7a809..381c7a809 100644
--- a/cli/tests/testdata/ts_decorators.ts.out
+++ b/cli/tests/testdata/run/ts_decorators.ts.out
diff --git a/cli/tests/testdata/ts_import_from_js.deps.js b/cli/tests/testdata/run/ts_import_from_js/deps.js
index ef326c444..746b5cf6b 100644
--- a/cli/tests/testdata/ts_import_from_js.deps.js
+++ b/cli/tests/testdata/run/ts_import_from_js/deps.js
@@ -1,2 +1,2 @@
-import "./005_more_imports.ts";
+import "../005_more_imports.ts";
 export { printHello } from "http://localhost:4545/subdir/mod2.ts";
diff --git a/cli/tests/testdata/run/ts_import_from_js/main.js b/cli/tests/testdata/run/ts_import_from_js/main.js
new file mode 100644
index 000000000..32d6c29a1
--- /dev/null
+++ b/cli/tests/testdata/run/ts_import_from_js/main.js
@@ -0,0 +1,3 @@
+import { printHello } from "./deps.js";
+printHello();
+console.log("success");
diff --git a/cli/tests/testdata/ts_import_from_js.js.out b/cli/tests/testdata/run/ts_import_from_js/main.out
index e1d7a869f..e1d7a869f 100644
--- a/cli/tests/testdata/ts_import_from_js.js.out
+++ b/cli/tests/testdata/run/ts_import_from_js/main.out
diff --git a/cli/tests/testdata/ts_type_imports.ts b/cli/tests/testdata/run/ts_type_imports.ts
index 73c779156..73c779156 100644
--- a/cli/tests/testdata/ts_type_imports.ts
+++ b/cli/tests/testdata/run/ts_type_imports.ts
diff --git a/cli/tests/testdata/ts_type_imports.ts.out b/cli/tests/testdata/run/ts_type_imports.ts.out
index 3972d6a97..3972d6a97 100644
--- a/cli/tests/testdata/ts_type_imports.ts.out
+++ b/cli/tests/testdata/run/ts_type_imports.ts.out
diff --git a/cli/tests/testdata/ts_type_imports_foo.ts b/cli/tests/testdata/run/ts_type_imports_foo.ts
index db20773f6..db20773f6 100644
--- a/cli/tests/testdata/ts_type_imports_foo.ts
+++ b/cli/tests/testdata/run/ts_type_imports_foo.ts
diff --git a/cli/tests/testdata/ts_type_only_import.d.ts b/cli/tests/testdata/run/ts_type_only_import.d.ts
index d48e4b48a..d48e4b48a 100644
--- a/cli/tests/testdata/ts_type_only_import.d.ts
+++ b/cli/tests/testdata/run/ts_type_only_import.d.ts
diff --git a/cli/tests/testdata/ts_type_only_import.ts b/cli/tests/testdata/run/ts_type_only_import.ts
index 53e114373..53e114373 100644
--- a/cli/tests/testdata/ts_type_only_import.ts
+++ b/cli/tests/testdata/run/ts_type_only_import.ts
diff --git a/cli/tests/testdata/ts_type_only_import.ts.out b/cli/tests/testdata/run/ts_type_only_import.ts.out
index 42852cd26..42852cd26 100644
--- a/cli/tests/testdata/ts_type_only_import.ts.out
+++ b/cli/tests/testdata/run/ts_type_only_import.ts.out
diff --git a/cli/tests/testdata/run/tsx_imports/Component.tsx b/cli/tests/testdata/run/tsx_imports/Component.tsx
new file mode 100644
index 000000000..c466a28ca
--- /dev/null
+++ b/cli/tests/testdata/run/tsx_imports/Component.tsx
@@ -0,0 +1 @@
+import "../046_jsx_test.tsx";
diff --git a/cli/tests/testdata/tsx_imports.ts b/cli/tests/testdata/run/tsx_imports/tsx_imports.ts
index 44ba10b7a..44ba10b7a 100644
--- a/cli/tests/testdata/tsx_imports.ts
+++ b/cli/tests/testdata/run/tsx_imports/tsx_imports.ts
diff --git a/cli/tests/testdata/tsx_imports.ts.out b/cli/tests/testdata/run/tsx_imports/tsx_imports.ts.out
index 1f8b10d32..1f8b10d32 100644
--- a/cli/tests/testdata/tsx_imports.ts.out
+++ b/cli/tests/testdata/run/tsx_imports/tsx_imports.ts.out
diff --git a/cli/tests/testdata/run/type_definitions.ts b/cli/tests/testdata/run/type_definitions.ts
new file mode 100644
index 000000000..594842721
--- /dev/null
+++ b/cli/tests/testdata/run/type_definitions.ts
@@ -0,0 +1,12 @@
+// deno-lint-ignore-file
+
+// @deno-types="../type_definitions/foo.d.ts"
+import { foo } from "../type_definitions/foo.js";
+// @deno-types="../type_definitions/fizz.d.ts"
+import "../type_definitions/fizz.js";
+
+import * as qat from "../type_definitions/qat.ts";
+
+console.log(foo);
+console.log(fizz);
+console.log(qat.qat);
diff --git a/cli/tests/testdata/type_definitions.ts.out b/cli/tests/testdata/run/type_definitions.ts.out
index b4fa88c50..b4fa88c50 100644
--- a/cli/tests/testdata/type_definitions.ts.out
+++ b/cli/tests/testdata/run/type_definitions.ts.out
diff --git a/cli/tests/testdata/type_definitions_for_export.ts b/cli/tests/testdata/run/type_definitions_for_export.ts
index 1f17b4962..1f17b4962 100644
--- a/cli/tests/testdata/type_definitions_for_export.ts
+++ b/cli/tests/testdata/run/type_definitions_for_export.ts
diff --git a/cli/tests/testdata/type_definitions_for_export.ts.out b/cli/tests/testdata/run/type_definitions_for_export.ts.out
index 8f1240bc7..8f1240bc7 100644
--- a/cli/tests/testdata/type_definitions_for_export.ts.out
+++ b/cli/tests/testdata/run/type_definitions_for_export.ts.out
diff --git a/cli/tests/testdata/type_directives_01.ts b/cli/tests/testdata/run/type_directives_01.ts
index 71305824c..71305824c 100644
--- a/cli/tests/testdata/type_directives_01.ts
+++ b/cli/tests/testdata/run/type_directives_01.ts
diff --git a/cli/tests/testdata/type_directives_01.ts.out b/cli/tests/testdata/run/type_directives_01.ts.out
index 77ed3ae26..77ed3ae26 100644
--- a/cli/tests/testdata/type_directives_01.ts.out
+++ b/cli/tests/testdata/run/type_directives_01.ts.out
diff --git a/cli/tests/testdata/run/type_directives_02.ts b/cli/tests/testdata/run/type_directives_02.ts
new file mode 100644
index 000000000..0c59346e2
--- /dev/null
+++ b/cli/tests/testdata/run/type_directives_02.ts
@@ -0,0 +1,3 @@
+import * as foo from "../subdir/type_reference.js";
+
+console.log(foo.foo);
diff --git a/cli/tests/testdata/type_directives_02.ts.out b/cli/tests/testdata/run/type_directives_02.ts.out
index b064483b4..b064483b4 100644
--- a/cli/tests/testdata/type_directives_02.ts.out
+++ b/cli/tests/testdata/run/type_directives_02.ts.out
diff --git a/cli/tests/testdata/run/type_directives_js_main.js b/cli/tests/testdata/run/type_directives_js_main.js
new file mode 100644
index 000000000..0c59346e2
--- /dev/null
+++ b/cli/tests/testdata/run/type_directives_js_main.js
@@ -0,0 +1,3 @@
+import * as foo from "../subdir/type_reference.js";
+
+console.log(foo.foo);
diff --git a/cli/tests/testdata/type_directives_js_main.js.out b/cli/tests/testdata/run/type_directives_js_main.js.out
index 7bca837f0..7bca837f0 100644
--- a/cli/tests/testdata/type_directives_js_main.js.out
+++ b/cli/tests/testdata/run/type_directives_js_main.js.out
diff --git a/cli/tests/testdata/run/type_directives_redirect.ts b/cli/tests/testdata/run/type_directives_redirect.ts
new file mode 100644
index 000000000..8b98831fd
--- /dev/null
+++ b/cli/tests/testdata/run/type_directives_redirect.ts
@@ -0,0 +1 @@
+import "http://localhost:4545/run/type_directives_redirect.js";
diff --git a/cli/tests/testdata/type_directives_redirect.ts.out b/cli/tests/testdata/run/type_directives_redirect.ts.out
index 471d9c0b4..471d9c0b4 100644
--- a/cli/tests/testdata/type_directives_redirect.ts.out
+++ b/cli/tests/testdata/run/type_directives_redirect.ts.out
diff --git a/cli/tests/testdata/type_headers_deno_types.ts b/cli/tests/testdata/run/type_headers_deno_types.ts
index 92391c666..9670f68cd 100644
--- a/cli/tests/testdata/type_headers_deno_types.ts
+++ b/cli/tests/testdata/run/type_headers_deno_types.ts
@@ -12,7 +12,7 @@
  * header.
  */
 
-// @deno-types="http://127.0.0.1:4545/type_headers_deno_types.foo.d.ts"
-import { foo } from "http://127.0.0.1:4545/type_headers_deno_types.foo.js";
+// @deno-types="http://127.0.0.1:4545/run/type_headers_deno_types.foo.d.ts"
+import { foo } from "http://127.0.0.1:4545/run/type_headers_deno_types.foo.js";
 
 foo("hello");
diff --git a/cli/tests/testdata/run/type_headers_deno_types.ts.out b/cli/tests/testdata/run/type_headers_deno_types.ts.out
new file mode 100644
index 000000000..798f98311
--- /dev/null
+++ b/cli/tests/testdata/run/type_headers_deno_types.ts.out
@@ -0,0 +1,5 @@
+Download http://[WILDCARD]:4545/run/type_headers_deno_types.foo.js
+Download http://[WILDCARD]:4545/run/type_headers_deno_types.foo.d.ts
+Download http://[WILDCARD]:4545/run/type_headers_deno_types.d.ts
+Check [WILDCARD]/type_headers_deno_types.ts
+hello
diff --git a/cli/tests/testdata/unbuffered_stderr.ts b/cli/tests/testdata/run/unbuffered_stderr.ts
index 0f1d2a999..0f1d2a999 100644
--- a/cli/tests/testdata/unbuffered_stderr.ts
+++ b/cli/tests/testdata/run/unbuffered_stderr.ts
diff --git a/cli/tests/testdata/unbuffered_stderr.ts.out b/cli/tests/testdata/run/unbuffered_stderr.ts.out
index 500019738..500019738 100644
--- a/cli/tests/testdata/unbuffered_stderr.ts.out
+++ b/cli/tests/testdata/run/unbuffered_stderr.ts.out
diff --git a/cli/tests/testdata/unbuffered_stdout.ts b/cli/tests/testdata/run/unbuffered_stdout.ts
index 9f1e07a97..9f1e07a97 100644
--- a/cli/tests/testdata/unbuffered_stdout.ts
+++ b/cli/tests/testdata/run/unbuffered_stdout.ts
diff --git a/cli/tests/testdata/unbuffered_stdout.ts.out b/cli/tests/testdata/run/unbuffered_stdout.ts.out
index 2e65efe2a..2e65efe2a 100644
--- a/cli/tests/testdata/unbuffered_stdout.ts.out
+++ b/cli/tests/testdata/run/unbuffered_stdout.ts.out
diff --git a/cli/tests/testdata/unhandled_rejection.ts b/cli/tests/testdata/run/unhandled_rejection.ts
index 388583434..388583434 100644
--- a/cli/tests/testdata/unhandled_rejection.ts
+++ b/cli/tests/testdata/run/unhandled_rejection.ts
diff --git a/cli/tests/testdata/run/unhandled_rejection.ts.out b/cli/tests/testdata/run/unhandled_rejection.ts.out
new file mode 100644
index 000000000..6ab1667dc
--- /dev/null
+++ b/cli/tests/testdata/run/unhandled_rejection.ts.out
@@ -0,0 +1,9 @@
+[WILDCARD]
+unhandled rejection at: Promise {
+  <rejected> Error: bar not available
+    at new Foo (file:///[WILDCARD]/testdata/run/unhandled_rejection.ts:8:20)
+    at file:///[WILDCARD]/testdata/run/unhandled_rejection.ts:12:1
+} reason: Error: bar not available
+    at new Foo (file:///[WILDCARD]/testdata/run/unhandled_rejection.ts:8:20)
+    at file:///[WILDCARD]/testdata/run/unhandled_rejection.ts:12:1
+unhandled rejection at: Promise { <rejected> undefined } reason: undefined
diff --git a/cli/tests/testdata/unhandled_rejection_sync_error.ts b/cli/tests/testdata/run/unhandled_rejection_sync_error.ts
index 0dabb1cb7..0dabb1cb7 100644
--- a/cli/tests/testdata/unhandled_rejection_sync_error.ts
+++ b/cli/tests/testdata/run/unhandled_rejection_sync_error.ts
diff --git a/cli/tests/testdata/run/unhandled_rejection_sync_error.ts.out b/cli/tests/testdata/run/unhandled_rejection_sync_error.ts.out
new file mode 100644
index 000000000..e178373f0
--- /dev/null
+++ b/cli/tests/testdata/run/unhandled_rejection_sync_error.ts.out
@@ -0,0 +1,6 @@
+[WILDCARD]
+unhandled rejection at: Promise {
+  <rejected> Error: boom!
+    at file:///[WILDCARD]testdata/run/unhandled_rejection_sync_error.ts:6:7
+} reason: Error: boom!
+    at file:///[WILDCARD]testdata/run/unhandled_rejection_sync_error.ts:6:7
diff --git a/cli/tests/testdata/unstable.js b/cli/tests/testdata/run/unstable.js
index a9894be3e..a9894be3e 100644
--- a/cli/tests/testdata/unstable.js
+++ b/cli/tests/testdata/run/unstable.js
diff --git a/cli/tests/testdata/unstable.ts b/cli/tests/testdata/run/unstable.ts
index a9894be3e..a9894be3e 100644
--- a/cli/tests/testdata/unstable.ts
+++ b/cli/tests/testdata/run/unstable.ts
diff --git a/cli/tests/testdata/unstable_disabled.out b/cli/tests/testdata/run/unstable_disabled.out
index 28659645d..28659645d 100644
--- a/cli/tests/testdata/unstable_disabled.out
+++ b/cli/tests/testdata/run/unstable_disabled.out
diff --git a/cli/tests/testdata/unstable_disabled_js.out b/cli/tests/testdata/run/unstable_disabled_js.out
index 417b7b537..417b7b537 100644
--- a/cli/tests/testdata/unstable_disabled_js.out
+++ b/cli/tests/testdata/run/unstable_disabled_js.out
diff --git a/cli/tests/testdata/unstable_enabled.out b/cli/tests/testdata/run/unstable_enabled.out
index b4cedce14..b4cedce14 100644
--- a/cli/tests/testdata/unstable_enabled.out
+++ b/cli/tests/testdata/run/unstable_enabled.out
diff --git a/cli/tests/testdata/unstable_enabled_js.out b/cli/tests/testdata/run/unstable_enabled_js.out
index b4cedce14..b4cedce14 100644
--- a/cli/tests/testdata/unstable_enabled_js.out
+++ b/cli/tests/testdata/run/unstable_enabled_js.out
diff --git a/cli/tests/testdata/unstable_worker.ts b/cli/tests/testdata/run/unstable_worker.ts
index f96de6c4a..d111d2c7e 100644
--- a/cli/tests/testdata/unstable_worker.ts
+++ b/cli/tests/testdata/run/unstable_worker.ts
@@ -1,5 +1,5 @@
 const w = new Worker(
-  import.meta.resolve("./workers/worker_unstable.ts"),
+  import.meta.resolve("../workers/worker_unstable.ts"),
   { type: "module", name: "Unstable Worker" },
 );
 
diff --git a/cli/tests/testdata/unstable_worker.ts.out b/cli/tests/testdata/run/unstable_worker.ts.out
index b40bdfeb8..b40bdfeb8 100644
--- a/cli/tests/testdata/unstable_worker.ts.out
+++ b/cli/tests/testdata/run/unstable_worker.ts.out
diff --git a/cli/tests/testdata/unsupported_dynamic_import_scheme.out b/cli/tests/testdata/run/unsupported_dynamic_import_scheme.out
index c708fced4..c708fced4 100644
--- a/cli/tests/testdata/unsupported_dynamic_import_scheme.out
+++ b/cli/tests/testdata/run/unsupported_dynamic_import_scheme.out
diff --git a/cli/tests/testdata/v8_flags.js b/cli/tests/testdata/run/v8_flags.js
index f7999c4af..f7999c4af 100644
--- a/cli/tests/testdata/v8_flags.js
+++ b/cli/tests/testdata/run/v8_flags.js
diff --git a/cli/tests/testdata/v8_flags.js.out b/cli/tests/testdata/run/v8_flags.js.out
index e2dbde096..e2dbde096 100644
--- a/cli/tests/testdata/v8_flags.js.out
+++ b/cli/tests/testdata/run/v8_flags.js.out
diff --git a/cli/tests/testdata/v8_flags_unrecognized.out b/cli/tests/testdata/run/v8_flags_unrecognized.out
index 56e70f830..56e70f830 100644
--- a/cli/tests/testdata/v8_flags_unrecognized.out
+++ b/cli/tests/testdata/run/v8_flags_unrecognized.out
diff --git a/cli/tests/testdata/v8_help.out b/cli/tests/testdata/run/v8_help.out
index 006d73557..006d73557 100644
--- a/cli/tests/testdata/v8_help.out
+++ b/cli/tests/testdata/run/v8_help.out
diff --git a/cli/tests/testdata/wasm.ts b/cli/tests/testdata/run/wasm.ts
index 96b5fdffc..96b5fdffc 100644
--- a/cli/tests/testdata/wasm.ts
+++ b/cli/tests/testdata/run/wasm.ts
diff --git a/cli/tests/testdata/wasm.ts.out b/cli/tests/testdata/run/wasm.ts.out
index d81cc0710..d81cc0710 100644
--- a/cli/tests/testdata/wasm.ts.out
+++ b/cli/tests/testdata/run/wasm.ts.out
diff --git a/cli/tests/testdata/wasm_async.js b/cli/tests/testdata/run/wasm_async.js
index 837460ae9..837460ae9 100644
--- a/cli/tests/testdata/wasm_async.js
+++ b/cli/tests/testdata/run/wasm_async.js
diff --git a/cli/tests/testdata/wasm_async.out b/cli/tests/testdata/run/wasm_async.out
index 5cdf17de7..5cdf17de7 100644
--- a/cli/tests/testdata/wasm_async.out
+++ b/cli/tests/testdata/run/wasm_async.out
diff --git a/cli/tests/testdata/wasm_shared.out b/cli/tests/testdata/run/wasm_shared.out
index e69de29bb..e69de29bb 100644
--- a/cli/tests/testdata/wasm_shared.out
+++ b/cli/tests/testdata/run/wasm_shared.out
diff --git a/cli/tests/testdata/wasm_shared.ts b/cli/tests/testdata/run/wasm_shared.ts
index b713385d5..b713385d5 100644
--- a/cli/tests/testdata/wasm_shared.ts
+++ b/cli/tests/testdata/run/wasm_shared.ts
diff --git a/cli/tests/testdata/wasm_streaming_panic_test.js b/cli/tests/testdata/run/wasm_streaming_panic_test.js
index ec017592f..ec017592f 100644
--- a/cli/tests/testdata/wasm_streaming_panic_test.js
+++ b/cli/tests/testdata/run/wasm_streaming_panic_test.js
diff --git a/cli/tests/testdata/wasm_streaming_panic_test.js.out b/cli/tests/testdata/run/wasm_streaming_panic_test.js.out
index 3e93f643a..3e93f643a 100644
--- a/cli/tests/testdata/wasm_streaming_panic_test.js.out
+++ b/cli/tests/testdata/run/wasm_streaming_panic_test.js.out
diff --git a/cli/tests/testdata/wasm_unreachable.js b/cli/tests/testdata/run/wasm_unreachable.js
index 36aab0d84..d6a4f59db 100644
--- a/cli/tests/testdata/wasm_unreachable.js
+++ b/cli/tests/testdata/run/wasm_unreachable.js
@@ -1,5 +1,5 @@
 // WebAssembly module containing a single function with an unreachable instruction
-const binary = await Deno.readFile("./unreachable.wasm");
+const binary = await Deno.readFile("./assets/unreachable.wasm");
 
 const module = new WebAssembly.Module(binary);
 const instance = new WebAssembly.Instance(module);
diff --git a/cli/tests/testdata/wasm_unreachable.out b/cli/tests/testdata/run/wasm_unreachable.out
index c213097ab..c213097ab 100644
--- a/cli/tests/testdata/wasm_unreachable.out
+++ b/cli/tests/testdata/run/wasm_unreachable.out
diff --git a/cli/tests/testdata/wasm_url.js b/cli/tests/testdata/run/wasm_url.js
index bb7ccd73d..71686ef7e 100644
--- a/cli/tests/testdata/wasm_url.js
+++ b/cli/tests/testdata/run/wasm_url.js
@@ -1,5 +1,5 @@
 const module = await WebAssembly.compileStreaming(
-  fetch("http://localhost:4545/unreachable.wasm"),
+  fetch("http://localhost:4545/assets/unreachable.wasm"),
 );
 const instance = new WebAssembly.Instance(module);
 
diff --git a/cli/tests/testdata/wasm_url.out b/cli/tests/testdata/run/wasm_url.out
index c88b51020..ae3bf491a 100644
--- a/cli/tests/testdata/wasm_url.out
+++ b/cli/tests/testdata/run/wasm_url.out
@@ -1,3 +1,3 @@
 error: Uncaught (in promise) RuntimeError: unreachable
-    at <anonymous> (http://localhost:4545/unreachable.wasm:1:41)
+    at <anonymous> (http://localhost:4545/assets/unreachable.wasm:1:41)
     at [WILDCARD]/wasm_url.js:[WILDCARD]
diff --git a/cli/tests/testdata/weakref.ts b/cli/tests/testdata/run/weakref.ts
index 47c3985fe..47c3985fe 100644
--- a/cli/tests/testdata/weakref.ts
+++ b/cli/tests/testdata/run/weakref.ts
diff --git a/cli/tests/testdata/weakref.ts.out b/cli/tests/testdata/run/weakref.ts.out
index 32bafcf2d..32bafcf2d 100644
--- a/cli/tests/testdata/weakref.ts.out
+++ b/cli/tests/testdata/run/weakref.ts.out
diff --git a/cli/tests/testdata/websocket_server_idletimeout.ts b/cli/tests/testdata/run/websocket_server_idletimeout.ts
index 9ae6698cb..9ae6698cb 100644
--- a/cli/tests/testdata/websocket_server_idletimeout.ts
+++ b/cli/tests/testdata/run/websocket_server_idletimeout.ts
diff --git a/cli/tests/testdata/websocket_server_multi_field_connection_header_test.ts b/cli/tests/testdata/run/websocket_server_multi_field_connection_header_test.ts
index a662ce9ef..709419a6a 100644
--- a/cli/tests/testdata/websocket_server_multi_field_connection_header_test.ts
+++ b/cli/tests/testdata/run/websocket_server_multi_field_connection_header_test.ts
@@ -1,4 +1,4 @@
-import { deferred } from "../unit/test_util.ts";
+import { deferred } from "../../unit/test_util.ts";
 
 const promise = deferred();
 const listener = Deno.listen({ port: 4319 });
diff --git a/cli/tests/testdata/websocket_test.ts b/cli/tests/testdata/run/websocket_test.ts
index 1572e0e67..e557a3cb2 100644
--- a/cli/tests/testdata/websocket_test.ts
+++ b/cli/tests/testdata/run/websocket_test.ts
@@ -4,8 +4,8 @@ import {
   assertEquals,
   assertThrows,
   fail,
-} from "../../../test_util/std/testing/asserts.ts";
-import { deferred } from "../../../test_util/std/async/deferred.ts";
+} from "../../../../test_util/std/testing/asserts.ts";
+import { deferred } from "../../../../test_util/std/async/deferred.ts";
 
 Deno.test("invalid scheme", () => {
   assertThrows(() => new WebSocket("foo://localhost:4242"));
diff --git a/cli/tests/testdata/websocketstream_ping_test.ts b/cli/tests/testdata/run/websocketstream_ping_test.ts
index 12f847cd8..12f847cd8 100644
--- a/cli/tests/testdata/websocketstream_ping_test.ts
+++ b/cli/tests/testdata/run/websocketstream_ping_test.ts
diff --git a/cli/tests/testdata/websocketstream_test.ts b/cli/tests/testdata/run/websocketstream_test.ts
index 71969314e..74d8e5d9a 100644
--- a/cli/tests/testdata/websocketstream_test.ts
+++ b/cli/tests/testdata/run/websocketstream_test.ts
@@ -7,7 +7,7 @@ import {
   assertRejects,
   assertThrows,
   unreachable,
-} from "../../../test_util/std/testing/asserts.ts";
+} from "../../../../test_util/std/testing/asserts.ts";
 
 Deno.test("fragment", () => {
   assertThrows(() => new WebSocketStream("ws://localhost:4242/#"));
diff --git a/cli/tests/testdata/webstorage/config_a.jsonc b/cli/tests/testdata/run/webstorage/config_a.jsonc
index 875cb6001..875cb6001 100644
--- a/cli/tests/testdata/webstorage/config_a.jsonc
+++ b/cli/tests/testdata/run/webstorage/config_a.jsonc
diff --git a/cli/tests/testdata/webstorage/config_b.jsonc b/cli/tests/testdata/run/webstorage/config_b.jsonc
index 875cb6001..875cb6001 100644
--- a/cli/tests/testdata/webstorage/config_b.jsonc
+++ b/cli/tests/testdata/run/webstorage/config_b.jsonc
diff --git a/cli/tests/testdata/webstorage/fixture.ts b/cli/tests/testdata/run/webstorage/fixture.ts
index cf4bd9f1f..cf4bd9f1f 100644
--- a/cli/tests/testdata/webstorage/fixture.ts
+++ b/cli/tests/testdata/run/webstorage/fixture.ts
diff --git a/cli/tests/testdata/webstorage/logger.ts b/cli/tests/testdata/run/webstorage/logger.ts
index 3898c4445..3898c4445 100644
--- a/cli/tests/testdata/webstorage/logger.ts
+++ b/cli/tests/testdata/run/webstorage/logger.ts
diff --git a/cli/tests/testdata/webstorage/serialization.ts b/cli/tests/testdata/run/webstorage/serialization.ts
index f3791d355..f3791d355 100644
--- a/cli/tests/testdata/webstorage/serialization.ts
+++ b/cli/tests/testdata/run/webstorage/serialization.ts
diff --git a/cli/tests/testdata/webstorage/serialization.ts.out b/cli/tests/testdata/run/webstorage/serialization.ts.out
index fea76aa43..fea76aa43 100644
--- a/cli/tests/testdata/webstorage/serialization.ts.out
+++ b/cli/tests/testdata/run/webstorage/serialization.ts.out
diff --git a/cli/tests/testdata/webstorage/setter.ts b/cli/tests/testdata/run/webstorage/setter.ts
index ec6d474f5..ec6d474f5 100644
--- a/cli/tests/testdata/webstorage/setter.ts
+++ b/cli/tests/testdata/run/webstorage/setter.ts
diff --git a/cli/tests/testdata/worker_close_in_wasm_reactions.js b/cli/tests/testdata/run/worker_close_in_wasm_reactions.js
index ed57fa053..8238aaa14 100644
--- a/cli/tests/testdata/worker_close_in_wasm_reactions.js
+++ b/cli/tests/testdata/run/worker_close_in_wasm_reactions.js
@@ -5,6 +5,6 @@
 // WASM async operation.
 
 new Worker(
-  import.meta.resolve("./workers/close_in_wasm_reactions.js"),
+  import.meta.resolve("../workers/close_in_wasm_reactions.js"),
   { type: "module" },
 );
diff --git a/cli/tests/testdata/worker_close_in_wasm_reactions.js.out b/cli/tests/testdata/run/worker_close_in_wasm_reactions.js.out
index 6485c620e..6485c620e 100644
--- a/cli/tests/testdata/worker_close_in_wasm_reactions.js.out
+++ b/cli/tests/testdata/run/worker_close_in_wasm_reactions.js.out
diff --git a/cli/tests/testdata/worker_close_nested.js b/cli/tests/testdata/run/worker_close_nested.js
index 865022faa..b39dfd4c0 100644
--- a/cli/tests/testdata/worker_close_nested.js
+++ b/cli/tests/testdata/run/worker_close_nested.js
@@ -6,7 +6,7 @@
 console.log("Starting the main thread");
 
 const worker = new Worker(
-  import.meta.resolve("./workers/close_nested_parent.js"),
+  import.meta.resolve("../workers/close_nested_parent.js"),
   { type: "module" },
 );
 
diff --git a/cli/tests/testdata/worker_close_nested.js.out b/cli/tests/testdata/run/worker_close_nested.js.out
index 496bc6251..496bc6251 100644
--- a/cli/tests/testdata/worker_close_nested.js.out
+++ b/cli/tests/testdata/run/worker_close_nested.js.out
diff --git a/cli/tests/testdata/worker_close_race.js b/cli/tests/testdata/run/worker_close_race.js
index ff2b0eb8f..1b369c5d3 100644
--- a/cli/tests/testdata/worker_close_race.js
+++ b/cli/tests/testdata/run/worker_close_race.js
@@ -5,7 +5,7 @@
 // `Worker.prototype.terminate()`.
 
 const worker = new Worker(
-  import.meta.resolve("./workers/close_race_worker.js"),
+  import.meta.resolve("../workers/close_race_worker.js"),
   { type: "module" },
 );
 
diff --git a/cli/tests/testdata/worker_close_race.js.out b/cli/tests/testdata/run/worker_close_race.js.out
index e69de29bb..e69de29bb 100644
--- a/cli/tests/testdata/worker_close_race.js.out
+++ b/cli/tests/testdata/run/worker_close_race.js.out
diff --git a/cli/tests/testdata/worker_drop_handle_race.js b/cli/tests/testdata/run/worker_drop_handle_race.js
index 78f2d6cab..5ad918314 100644
--- a/cli/tests/testdata/worker_drop_handle_race.js
+++ b/cli/tests/testdata/run/worker_drop_handle_race.js
@@ -7,6 +7,6 @@
 // The exception thrown in the worker will not terminate the worker, but it will
 // propagate to the main thread and cause it to exit.
 new Worker(
-  import.meta.resolve("./workers/drop_handle_race.js"),
+  import.meta.resolve("../workers/drop_handle_race.js"),
   { type: "module" },
 );
diff --git a/cli/tests/testdata/worker_drop_handle_race.js.out b/cli/tests/testdata/run/worker_drop_handle_race.js.out
index a81684bfa..a81684bfa 100644
--- a/cli/tests/testdata/worker_drop_handle_race.js.out
+++ b/cli/tests/testdata/run/worker_drop_handle_race.js.out
diff --git a/cli/tests/testdata/worker_drop_handle_race_terminate.js b/cli/tests/testdata/run/worker_drop_handle_race_terminate.js
index 93c324fdf..93c324fdf 100644
--- a/cli/tests/testdata/worker_drop_handle_race_terminate.js
+++ b/cli/tests/testdata/run/worker_drop_handle_race_terminate.js
diff --git a/cli/tests/testdata/worker_drop_handle_race_terminate.js.out b/cli/tests/testdata/run/worker_drop_handle_race_terminate.js.out
index 5ec1e7ff8..5ec1e7ff8 100644
--- a/cli/tests/testdata/worker_drop_handle_race_terminate.js.out
+++ b/cli/tests/testdata/run/worker_drop_handle_race_terminate.js.out
diff --git a/cli/tests/testdata/worker_event_handler_test.js b/cli/tests/testdata/run/worker_event_handler_test.js
index c4e816a4d..a91b0ec0b 100644
--- a/cli/tests/testdata/worker_event_handler_test.js
+++ b/cli/tests/testdata/run/worker_event_handler_test.js
@@ -1,5 +1,5 @@
 const w = new Worker(
-  import.meta.resolve("./workers/worker_event_handlers.js"),
+  import.meta.resolve("../workers/worker_event_handlers.js"),
   { type: "module" },
 );
 w.postMessage({});
diff --git a/cli/tests/testdata/worker_event_handler_test.js.out b/cli/tests/testdata/run/worker_event_handler_test.js.out
index b3eed7f6c..b3eed7f6c 100644
--- a/cli/tests/testdata/worker_event_handler_test.js.out
+++ b/cli/tests/testdata/run/worker_event_handler_test.js.out
diff --git a/cli/tests/testdata/worker_message_before_close.js b/cli/tests/testdata/run/worker_message_before_close.js
index a5769af60..569388b9b 100644
--- a/cli/tests/testdata/worker_message_before_close.js
+++ b/cli/tests/testdata/run/worker_message_before_close.js
@@ -2,7 +2,7 @@ const messagesReceived = new Set();
 
 for (let i = 0; i < 4; i++) {
   const worker = new Worker(
-    import.meta.resolve("./workers/message_before_close.js"),
+    import.meta.resolve("../workers/message_before_close.js"),
     { type: "module", name: String(i) },
   );
 
diff --git a/cli/tests/testdata/worker_message_before_close.js.out b/cli/tests/testdata/run/worker_message_before_close.js.out
index f91b7b4cb..f91b7b4cb 100644
--- a/cli/tests/testdata/worker_message_before_close.js.out
+++ b/cli/tests/testdata/run/worker_message_before_close.js.out
diff --git a/cli/tests/testdata/esm_imports_a.js b/cli/tests/testdata/runtime/esm_imports_a.js
index 673cd9aa3..673cd9aa3 100644
--- a/cli/tests/testdata/esm_imports_a.js
+++ b/cli/tests/testdata/runtime/esm_imports_a.js
diff --git a/cli/tests/testdata/esm_imports_b.js b/cli/tests/testdata/runtime/esm_imports_b.js
index 840121368..840121368 100644
--- a/cli/tests/testdata/esm_imports_b.js
+++ b/cli/tests/testdata/runtime/esm_imports_b.js
diff --git a/cli/tests/testdata/standalone_dynamic_imports.ts b/cli/tests/testdata/standalone_dynamic_imports.ts
deleted file mode 100644
index d4dc55152..000000000
--- a/cli/tests/testdata/standalone_dynamic_imports.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-(async () => {
-  const { returnsHi, returnsFoo2, printHello3 } = await import(
-    "./subdir/mod1.ts"
-  );
-
-  printHello3();
-
-  if (returnsHi() !== "Hi") {
-    throw Error("Unexpected");
-  }
-
-  if (returnsFoo2() !== "Foo") {
-    throw Error("Unexpected");
-  }
-})();
diff --git a/cli/tests/testdata/standalone_import.ts b/cli/tests/testdata/standalone_import.ts
deleted file mode 100644
index 804102a53..000000000
--- a/cli/tests/testdata/standalone_import.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-console.log("start");
-await import("./001_hello.js");
diff --git a/cli/tests/testdata/standalone_import_map.json b/cli/tests/testdata/standalone_import_map.json
deleted file mode 100644
index 6f978d6be..000000000
--- a/cli/tests/testdata/standalone_import_map.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "imports": {
-    "hello": "./001_hello.js"
-  }
-}
diff --git a/cli/tests/testdata/std_lint.out b/cli/tests/testdata/std_lint.out
deleted file mode 100644
index 9d62fcc67..000000000
--- a/cli/tests/testdata/std_lint.out
+++ /dev/null
@@ -1,3 +0,0 @@
-[WILDCARD]
-
-Found [WILDCARD] problems
\ No newline at end of file
diff --git a/cli/tests/testdata/test/resource_sanitizer.ts b/cli/tests/testdata/test/resource_sanitizer.ts
index c1291b89a..93c9222c5 100644
--- a/cli/tests/testdata/test/resource_sanitizer.ts
+++ b/cli/tests/testdata/test/resource_sanitizer.ts
@@ -1,4 +1,4 @@
 Deno.test("leak", function () {
-  Deno.openSync("001_hello.js");
+  Deno.openSync("run/001_hello.js");
   Deno.stdin.close();
 });
diff --git a/cli/tests/testdata/ts_import_from_js.js b/cli/tests/testdata/ts_import_from_js.js
deleted file mode 100644
index f912c2723..000000000
--- a/cli/tests/testdata/ts_import_from_js.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { printHello } from "./ts_import_from_js.deps.js";
-printHello();
-console.log("success");
diff --git a/cli/tests/testdata/ts_with_generic.ts b/cli/tests/testdata/ts_with_generic.ts
deleted file mode 100644
index 1e3591f40..000000000
--- a/cli/tests/testdata/ts_with_generic.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// deno-lint-ignore-file
-
-const foo = { delete<S>() {} };
diff --git a/cli/tests/testdata/type_definitions.ts b/cli/tests/testdata/type_definitions.ts
deleted file mode 100644
index a1bb37a65..000000000
--- a/cli/tests/testdata/type_definitions.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// deno-lint-ignore-file
-
-// @deno-types="./type_definitions/foo.d.ts"
-import { foo } from "./type_definitions/foo.js";
-// @deno-types="./type_definitions/fizz.d.ts"
-import "./type_definitions/fizz.js";
-
-import * as qat from "./type_definitions/qat.ts";
-
-console.log(foo);
-console.log(fizz);
-console.log(qat.qat);
diff --git a/cli/tests/testdata/type_directives_02.ts b/cli/tests/testdata/type_directives_02.ts
deleted file mode 100644
index f7274bf26..000000000
--- a/cli/tests/testdata/type_directives_02.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as foo from "./subdir/type_reference.js";
-
-console.log(foo.foo);
diff --git a/cli/tests/testdata/type_directives_js_main.js b/cli/tests/testdata/type_directives_js_main.js
deleted file mode 100644
index f7274bf26..000000000
--- a/cli/tests/testdata/type_directives_js_main.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as foo from "./subdir/type_reference.js";
-
-console.log(foo.foo);
diff --git a/cli/tests/testdata/type_directives_redirect.ts b/cli/tests/testdata/type_directives_redirect.ts
deleted file mode 100644
index 1756d5af9..000000000
--- a/cli/tests/testdata/type_directives_redirect.ts
+++ /dev/null
@@ -1 +0,0 @@
-import "http://localhost:4545/type_directives_redirect.js";
diff --git a/cli/tests/testdata/type_headers_deno_types.ts.out b/cli/tests/testdata/type_headers_deno_types.ts.out
deleted file mode 100644
index f1e4ca1f8..000000000
--- a/cli/tests/testdata/type_headers_deno_types.ts.out
+++ /dev/null
@@ -1,5 +0,0 @@
-Download http://[WILDCARD]:4545/type_headers_deno_types.foo.js
-Download http://[WILDCARD]:4545/type_headers_deno_types.foo.d.ts
-Download http://[WILDCARD]:4545/type_headers_deno_types.d.ts
-Check [WILDCARD]/type_headers_deno_types.ts
-hello
diff --git a/cli/tests/testdata/types.out b/cli/tests/testdata/types/types.out
index 089a9381f..089a9381f 100644
--- a/cli/tests/testdata/types.out
+++ b/cli/tests/testdata/types/types.out
diff --git a/cli/tests/testdata/unhandled_rejection.ts.out b/cli/tests/testdata/unhandled_rejection.ts.out
deleted file mode 100644
index 6addab20a..000000000
--- a/cli/tests/testdata/unhandled_rejection.ts.out
+++ /dev/null
@@ -1,9 +0,0 @@
-[WILDCARD]
-unhandled rejection at: Promise {
-  <rejected> Error: bar not available
-    at new Foo (file:///[WILDCARD]/testdata/unhandled_rejection.ts:8:20)
-    at file:///[WILDCARD]/testdata/unhandled_rejection.ts:12:1
-} reason: Error: bar not available
-    at new Foo (file:///[WILDCARD]/testdata/unhandled_rejection.ts:8:20)
-    at file:///[WILDCARD]/testdata/unhandled_rejection.ts:12:1
-unhandled rejection at: Promise { <rejected> undefined } reason: undefined
diff --git a/cli/tests/testdata/unhandled_rejection_sync_error.ts.out b/cli/tests/testdata/unhandled_rejection_sync_error.ts.out
deleted file mode 100644
index 270319824..000000000
--- a/cli/tests/testdata/unhandled_rejection_sync_error.ts.out
+++ /dev/null
@@ -1,6 +0,0 @@
-[WILDCARD]
-unhandled rejection at: Promise {
-  <rejected> Error: boom!
-    at file:///[WILDCARD]testdata/unhandled_rejection_sync_error.ts:6:7
-} reason: Error: boom!
-    at file:///[WILDCARD]testdata/unhandled_rejection_sync_error.ts:6:7
diff --git a/cli/tests/testdata/webgpu_computepass_shader.wgsl b/cli/tests/testdata/webgpu/computepass_shader.wgsl
index 41af4363a..41af4363a 100644
--- a/cli/tests/testdata/webgpu_computepass_shader.wgsl
+++ b/cli/tests/testdata/webgpu/computepass_shader.wgsl
diff --git a/cli/tests/testdata/webgpu_hellotriangle.out b/cli/tests/testdata/webgpu/hellotriangle.out
index 91454dbfc..91454dbfc 100644
--- a/cli/tests/testdata/webgpu_hellotriangle.out
+++ b/cli/tests/testdata/webgpu/hellotriangle.out
diff --git a/cli/tests/testdata/webgpu_hellotriangle_shader.wgsl b/cli/tests/testdata/webgpu/hellotriangle_shader.wgsl
index f84ccfe94..f84ccfe94 100644
--- a/cli/tests/testdata/webgpu_hellotriangle_shader.wgsl
+++ b/cli/tests/testdata/webgpu/hellotriangle_shader.wgsl
diff --git a/cli/tests/testdata/084_worker_custom_inspect.ts.out b/cli/tests/testdata/workers/custom_inspect/main.out
index b34300c40..b34300c40 100644
--- a/cli/tests/testdata/084_worker_custom_inspect.ts.out
+++ b/cli/tests/testdata/workers/custom_inspect/main.out
diff --git a/cli/tests/testdata/workers/custom_inspect/main.ts b/cli/tests/testdata/workers/custom_inspect/main.ts
new file mode 100644
index 000000000..93d4eec2d
--- /dev/null
+++ b/cli/tests/testdata/workers/custom_inspect/main.ts
@@ -0,0 +1,4 @@
+new Worker(
+  import.meta.resolve("./worker.ts"),
+  { type: "module" },
+);
diff --git a/cli/tests/testdata/084_worker_custom_inspect_worker.ts b/cli/tests/testdata/workers/custom_inspect/worker.ts
index 5be82724e..5be82724e 100644
--- a/cli/tests/testdata/084_worker_custom_inspect_worker.ts
+++ b/cli/tests/testdata/workers/custom_inspect/worker.ts
diff --git a/cli/tests/testdata/workers/error_worker_permissions_local.ts b/cli/tests/testdata/workers/error_worker_permissions_local.ts
new file mode 100644
index 000000000..1a4b4c0a9
--- /dev/null
+++ b/cli/tests/testdata/workers/error_worker_permissions_local.ts
@@ -0,0 +1,4 @@
+new Worker(
+  import.meta.resolve("../subdir/worker_types.ts"),
+  { type: "module" },
+);
diff --git a/cli/tests/testdata/error_worker_permissions_local.ts.out b/cli/tests/testdata/workers/error_worker_permissions_local.ts.out
index e6404e8e3..e6404e8e3 100644
--- a/cli/tests/testdata/error_worker_permissions_local.ts.out
+++ b/cli/tests/testdata/workers/error_worker_permissions_local.ts.out
diff --git a/cli/tests/testdata/error_worker_permissions_remote.ts b/cli/tests/testdata/workers/error_worker_permissions_remote.ts
index 878c7080a..878c7080a 100644
--- a/cli/tests/testdata/error_worker_permissions_remote.ts
+++ b/cli/tests/testdata/workers/error_worker_permissions_remote.ts
diff --git a/cli/tests/testdata/error_worker_permissions_remote.ts.out b/cli/tests/testdata/workers/error_worker_permissions_remote.ts.out
index 74c7c3974..74c7c3974 100644
--- a/cli/tests/testdata/error_worker_permissions_remote.ts.out
+++ b/cli/tests/testdata/workers/error_worker_permissions_remote.ts.out