chore: move test files to testdata directory (#11601)

1089 files changed, 1150 insertions, 1160 deletions

diff --git a/.dprint.json b/.dprint.json
index aaf191b77..91c827fc1 100644
--- a/.dprint.json
+++ b/.dprint.json
@@ -21,10 +21,10 @@
     "cli/dts/lib.scripthost.d.ts",
     "cli/dts/lib.webworker*.d.ts",
     "cli/dts/typescript.d.ts",
-    "cli/tests/encoding",
-    "cli/tests/inline_js_source_map*",
-    "cli/tests/badly_formatted.md",
-    "cli/tests/badly_formatted.json",
+    "cli/tests/testdata/encoding",
+    "cli/tests/testdata/inline_js_source_map*",
+    "cli/tests/testdata/badly_formatted.md",
+    "cli/tests/testdata/badly_formatted.json",
     "cli/tsc/*typescript.js",
     "test_util/std",
     "test_util/wpt",
diff --git a/.gitattributes b/.gitattributes
index 00d74b784..08ef3b672 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,11 +2,11 @@
 * text=auto eol=lf
 *.png -text
 
-/cli/tests/encoding/* -text
+/cli/tests/testdata/encoding/* -text
 
 # Tell git which symlinks point to files, and which ones point to directories.
 # This is relevant for Windows only, and requires git >= 2.19.2 to work.
-/cli/tests/symlink_to_subdir symlink=dir
+/cli/tests/testdata/symlink_to_subdir symlink=dir
 
 # Tell github these are vendored files.
 # Doesn't include them in the language statistics.
diff --git a/cli/bench/main.rs b/cli/bench/main.rs
index e6d735397..06e2d59bb 100644
--- a/cli/bench/main.rs
+++ b/cli/bench/main.rs
@@ -36,29 +36,46 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option<i32>)] = &[
   // invalidating that cache.
   (
     "cold_hello",
-    &["run", "--reload", "cli/tests/002_hello.ts"],
+    &["run", "--reload", "cli/tests/testdata/002_hello.ts"],
     None,
   ),
   (
     "cold_relative_import",
-    &["run", "--reload", "cli/tests/003_relative_import.ts"],
+    &[
+      "run",
+      "--reload",
+      "cli/tests/testdata/003_relative_import.ts",
+    ],
     None,
   ),
-  ("hello", &["run", "cli/tests/002_hello.ts"], None),
+  ("hello", &["run", "cli/tests/testdata/002_hello.ts"], None),
   (
     "relative_import",
-    &["run", "cli/tests/003_relative_import.ts"],
+    &["run", "cli/tests/testdata/003_relative_import.ts"],
     None,
   ),
-  ("error_001", &["run", "cli/tests/error_001.ts"], Some(1)),
+  (
+    "error_001",
+    &["run", "cli/tests/testdata/error_001.ts"],
+    Some(1),
+  ),
   (
     "no_check_hello",
-    &["run", "--reload", "--no-check", "cli/tests/002_hello.ts"],
+    &[
+      "run",
+      "--reload",
+      "--no-check",
+      "cli/tests/testdata/002_hello.ts",
+    ],
     None,
   ),
   (
     "workers_startup",
-    &["run", "--allow-read", "cli/tests/workers/bench_startup.ts"],
+    &[
+      "run",
+      "--allow-read",
+      "cli/tests/testdata/workers/bench_startup.ts",
+    ],
     None,
   ),
   (
@@ -66,7 +83,7 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option<i32>)] = &[
     &[
       "run",
       "--allow-read",
-      "cli/tests/workers/bench_round_robin.ts",
+      "cli/tests/testdata/workers/bench_round_robin.ts",
     ],
     None,
   ),
@@ -75,23 +92,23 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option<i32>)] = &[
     &[
       "run",
       "--allow-read",
-      "cli/tests/workers/bench_large_message.ts",
+      "cli/tests/testdata/workers/bench_large_message.ts",
     ],
     None,
   ),
   (
     "text_decoder",
-    &["run", "cli/tests/text_decoder_perf.js"],
+    &["run", "cli/tests/testdata/text_decoder_perf.js"],
     None,
   ),
   (
     "text_encoder",
-    &["run", "cli/tests/text_encoder_perf.js"],
+    &["run", "cli/tests/testdata/text_encoder_perf.js"],
     None,
   ),
   (
     "text_encoder_into",
-    &["run", "cli/tests/text_encoder_into_perf.js"],
+    &["run", "cli/tests/testdata/text_encoder_into_perf.js"],
     None,
   ),
   (
diff --git a/cli/bench/throughput.rs b/cli/bench/throughput.rs
index de18089bb..0420889ef 100644
--- a/cli/bench/throughput.rs
+++ b/cli/bench/throughput.rs
@@ -14,7 +14,7 @@ const CLIENT_ADDR: &str = "127.0.0.1 4544";
 pub(crate) fn cat(deno_exe: &Path, megs: usize) -> f64 {
   let size = megs * MB;
   let shell_cmd = format!(
-    "{} run --allow-read cli/tests/cat.ts /dev/zero | head -c {}",
+    "{} run --allow-read cli/tests/testdata/cat.ts /dev/zero | head -c {}",
     deno_exe.to_str().unwrap(),
     size
   );
@@ -47,12 +47,8 @@ pub(crate) fn tcp(deno_exe: &Path, megs: usize) -> Result<f64> {
 
   // Run deno echo server in the background.
   let mut echo_server = Command::new(deno_exe.to_str().unwrap())
-    .args(&[
-      "run",
-      "--allow-net",
-      "cli/tests/echo_server.ts",
-      SERVER_ADDR,
-    ])
+    .args(&["run", "--allow-net", "echo_server.ts", SERVER_ADDR])
+    .current_dir(test_util::testdata_path())
     .spawn()?;
 
   std::thread::sleep(Duration::from_secs(5)); // wait for deno to wake up. TODO racy.
diff --git a/cli/config_file.rs b/cli/config_file.rs
index 5ea92447b..e366be77c 100644
--- a/cli/config_file.rs
+++ b/cli/config_file.rs
@@ -279,12 +279,12 @@ pub struct ConfigFile {
 }
 
 impl ConfigFile {
-  pub fn read(path_str: &str) -> Result<Self, AnyError> {
-    let path = Path::new(path_str);
+  pub fn read(path_ref: impl AsRef<Path>) -> Result<Self, AnyError> {
+    let path = Path::new(path_ref.as_ref());
     let config_file = if path.is_absolute() {
       path.to_path_buf()
     } else {
-      std::env::current_dir()?.join(path_str)
+      std::env::current_dir()?.join(path_ref)
     };
 
     let config_path = canonicalize_path(&config_file).map_err(|_| {
@@ -349,16 +349,15 @@ mod tests {
 
   #[test]
   fn read_config_file_relative() {
-    let config_file = ConfigFile::read("tests/module_graph/tsconfig.json")
-      .expect("Failed to load config file");
+    let config_file =
+      ConfigFile::read("tests/testdata/module_graph/tsconfig.json")
+        .expect("Failed to load config file");
     assert!(config_file.json.compiler_options.is_some());
   }
 
   #[test]
   fn read_config_file_absolute() {
-    let path = std::env::current_dir()
-      .unwrap()
-      .join("tests/module_graph/tsconfig.json");
+    let path = test_util::testdata_path().join("module_graph/tsconfig.json");
     let config_file = ConfigFile::read(path.to_str().unwrap())
       .expect("Failed to load config file");
     assert!(config_file.json.compiler_options.is_some());
diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs
index 7029b9620..41c645c3a 100644
--- a/cli/file_fetcher.rs
+++ b/cli/file_fetcher.rs
@@ -663,8 +663,7 @@ mod tests {
     charset: &str,
     expected: &str,
   ) {
-    let url_str =
-      format!("http://127.0.0.1:4545/cli/tests/encoding/{}", fixture);
+    let url_str = format!("http://127.0.0.1:4545/encoding/{}", fixture);
     let specifier = resolve_url(&url_str).unwrap();
     let (file, headers) = test_fetch_remote(&specifier).await;
     assert_eq!(file.source, expected);
@@ -676,8 +675,7 @@ mod tests {
   }
 
   async fn test_fetch_local_encoded(charset: &str, expected: String) {
-    let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-      .join(format!("tests/encoding/{}.ts", charset));
+    let p = test_util::testdata_path().join(format!("encoding/{}.ts", charset));
     let specifier = resolve_url_or_path(p.to_str().unwrap()).unwrap();
     let (file, _) = test_fetch(&specifier).await;
     assert_eq!(file.source, expected);
@@ -910,10 +908,9 @@ mod tests {
   async fn test_get_source() {
     let _http_server_guard = test_util::http_server();
     let (file_fetcher, _) = setup(CacheSetting::Use, None);
-    let specifier = resolve_url(
-      "http://localhost:4548/cli/tests/subdir/redirects/redirect1.js",
-    )
-    .unwrap();
+    let specifier =
+      resolve_url("http://localhost:4548/subdir/redirects/redirect1.js")
+        .unwrap();
 
     let result = file_fetcher
       .fetch(&specifier, &mut Permissions::allow_all())
@@ -926,10 +923,8 @@ mod tests {
     assert_eq!(file.source, "export const redirect = 1;\n");
     assert_eq!(
       file.specifier,
-      resolve_url(
-        "http://localhost:4545/cli/tests/subdir/redirects/redirect1.js"
-      )
-      .unwrap()
+      resolve_url("http://localhost:4545/subdir/redirects/redirect1.js")
+        .unwrap()
     );
   }
 
@@ -999,8 +994,7 @@ mod tests {
     let (file_fetcher_01, _) = setup(CacheSetting::Use, Some(temp_dir.clone()));
     let (file_fetcher_02, _) = setup(CacheSetting::Use, Some(temp_dir.clone()));
     let specifier =
-      resolve_url_or_path("http://localhost:4545/cli/tests/subdir/mod2.ts")
-        .unwrap();
+      resolve_url_or_path("http://localhost:4545/subdir/mod2.ts").unwrap();
 
     let result = file_fetcher
       .fetch(&specifier, &mut Permissions::allow_all())
@@ -1098,8 +1092,7 @@ mod tests {
     )
     .expect("could not create file fetcher");
     let specifier =
-      resolve_url("http://localhost:4545/cli/tests/subdir/mismatch_ext.ts")
-        .unwrap();
+      resolve_url("http://localhost:4545/subdir/mismatch_ext.ts").unwrap();
     let cache_filename = file_fetcher_01
       .http_cache
       .get_cache_filename(&specifier)
@@ -1148,18 +1141,16 @@ mod tests {
   async fn test_fetch_redirected() {
     let _http_server_guard = test_util::http_server();
     let (file_fetcher, _) = setup(CacheSetting::Use, None);
-    let specifier = resolve_url(
-      "http://localhost:4546/cli/tests/subdir/redirects/redirect1.js",
-    )
-    .unwrap();
+    let specifier =
+      resolve_url("http://localhost:4546/subdir/redirects/redirect1.js")
+        .unwrap();
     let cached_filename = file_fetcher
       .http_cache
       .get_cache_filename(&specifier)
       .unwrap();
-    let redirected_specifier = resolve_url(
-      "http://localhost:4545/cli/tests/subdir/redirects/redirect1.js",
-    )
-    .unwrap();
+    let redirected_specifier =
+      resolve_url("http://localhost:4545/subdir/redirects/redirect1.js")
+        .unwrap();
     let redirected_cached_filename = file_fetcher
       .http_cache
       .get_cache_filename(&redirected_specifier)
@@ -1183,7 +1174,7 @@ mod tests {
       .expect("could not get file");
     assert_eq!(
       headers.get("location").unwrap(),
-      "http://localhost:4545/cli/tests/subdir/redirects/redirect1.js"
+      "http://localhost:4545/subdir/redirects/redirect1.js"
     );
 
     assert_eq!(
@@ -1201,26 +1192,23 @@ mod tests {
   async fn test_fetch_multiple_redirects() {
     let _http_server_guard = test_util::http_server();
     let (file_fetcher, _) = setup(CacheSetting::Use, None);
-    let specifier = resolve_url(
-      "http://localhost:4548/cli/tests/subdir/redirects/redirect1.js",
-    )
-    .unwrap();
+    let specifier =
+      resolve_url("http://localhost:4548/subdir/redirects/redirect1.js")
+        .unwrap();
     let cached_filename = file_fetcher
       .http_cache
       .get_cache_filename(&specifier)
       .unwrap();
-    let redirected_01_specifier = resolve_url(
-      "http://localhost:4546/cli/tests/subdir/redirects/redirect1.js",
-    )
-    .unwrap();
+    let redirected_01_specifier =
+      resolve_url("http://localhost:4546/subdir/redirects/redirect1.js")
+        .unwrap();
     let redirected_01_cached_filename = file_fetcher
       .http_cache
       .get_cache_filename(&redirected_01_specifier)
       .unwrap();
-    let redirected_02_specifier = resolve_url(
-      "http://localhost:4545/cli/tests/subdir/redirects/redirect1.js",
-    )
-    .unwrap();
+    let redirected_02_specifier =
+      resolve_url("http://localhost:4545/subdir/redirects/redirect1.js")
+        .unwrap();
     let redirected_02_cached_filename = file_fetcher
       .http_cache
       .get_cache_filename(&redirected_02_specifier)
@@ -1244,7 +1232,7 @@ mod tests {
       .expect("could not get file");
     assert_eq!(
       headers.get("location").unwrap(),
-      "http://localhost:4546/cli/tests/subdir/redirects/redirect1.js"
+      "http://localhost:4546/subdir/redirects/redirect1.js"
     );
 
     assert_eq!(
@@ -1258,7 +1246,7 @@ mod tests {
       .expect("could not get file");
     assert_eq!(
       headers.get("location").unwrap(),
-      "http://localhost:4545/cli/tests/subdir/redirects/redirect1.js"
+      "http://localhost:4545/subdir/redirects/redirect1.js"
     );
 
     assert_eq!(
@@ -1289,11 +1277,9 @@ mod tests {
     )
     .expect("could not create file fetcher");
     let specifier =
-      resolve_url("http://localhost:4548/cli/tests/subdir/mismatch_ext.ts")
-        .unwrap();
+      resolve_url("http://localhost:4548/subdir/mismatch_ext.ts").unwrap();
     let redirected_specifier =
-      resolve_url("http://localhost:4546/cli/tests/subdir/mismatch_ext.ts")
-        .unwrap();
+      resolve_url("http://localhost:4546/subdir/mismatch_ext.ts").unwrap();
     let redirected_cache_filename = file_fetcher_01
       .http_cache
       .get_cache_filename(&redirected_specifier)
@@ -1342,10 +1328,9 @@ mod tests {
   async fn test_fetcher_limits_redirects() {
     let _http_server_guard = test_util::http_server();
     let (file_fetcher, _) = setup(CacheSetting::Use, None);
-    let specifier = resolve_url(
-      "http://localhost:4548/cli/tests/subdir/redirects/redirect1.js",
-    )
-    .unwrap();
+    let specifier =
+      resolve_url("http://localhost:4548/subdir/redirects/redirect1.js")
+        .unwrap();
 
     let result = file_fetcher
       .fetch_remote(&specifier, &mut Permissions::allow_all(), 2)
@@ -1369,17 +1354,16 @@ mod tests {
     let _http_server_guard = test_util::http_server();
     let (file_fetcher, _) = setup(CacheSetting::Use, None);
     let specifier = resolve_url(
-      "http://localhost:4550/REDIRECT/cli/tests/subdir/redirects/redirect1.js",
+      "http://localhost:4550/REDIRECT/subdir/redirects/redirect1.js",
     )
     .unwrap();
     let cached_filename = file_fetcher
       .http_cache
       .get_cache_filename(&specifier)
       .unwrap();
-    let redirected_specifier = resolve_url(
-      "http://localhost:4550/cli/tests/subdir/redirects/redirect1.js",
-    )
-    .unwrap();
+    let redirected_specifier =
+      resolve_url("http://localhost:4550/subdir/redirects/redirect1.js")
+        .unwrap();
     let redirected_cached_filename = file_fetcher
       .http_cache
       .get_cache_filename(&redirected_specifier)
@@ -1403,7 +1387,7 @@ mod tests {
       .expect("could not get file");
     assert_eq!(
       headers.get("location").unwrap(),
-      "/cli/tests/subdir/redirects/redirect1.js"
+      "/subdir/redirects/redirect1.js"
     );
 
     assert_eq!(
@@ -1431,8 +1415,7 @@ mod tests {
       None,
     )
     .expect("could not create file fetcher");
-    let specifier =
-      resolve_url("http://localhost:4545/cli/tests/002_hello.ts").unwrap();
+    let specifier = resolve_url("http://localhost:4545/002_hello.ts").unwrap();
 
     let result = file_fetcher
       .fetch(&specifier, &mut Permissions::allow_all())
@@ -1440,7 +1423,7 @@ mod tests {
     assert!(result.is_err());
     let err = result.unwrap_err();
     assert_eq!(get_custom_error_class(&err), Some("NoRemote"));
-    assert_eq!(err.to_string(), "A remote specifier was requested: \"http://localhost:4545/cli/tests/002_hello.ts\", but --no-remote is specified.");
+    assert_eq!(err.to_string(), "A remote specifier was requested: \"http://localhost:4545/002_hello.ts\", but --no-remote is specified.");
   }
 
   #[tokio::test]
@@ -1468,8 +1451,7 @@ mod tests {
       None,
     )
     .expect("could not create file fetcher");
-    let specifier =
-      resolve_url("http://localhost:4545/cli/tests/002_hello.ts").unwrap();
+    let specifier = resolve_url("http://localhost:4545/002_hello.ts").unwrap();
 
     let result = file_fetcher_01
       .fetch(&specifier, &mut Permissions::allow_all())
@@ -1477,7 +1459,7 @@ mod tests {
     assert!(result.is_err());
     let err = result.unwrap_err();
     assert_eq!(get_custom_error_class(&err), Some("NotFound"));
-    assert_eq!(err.to_string(), "Specifier not found in cache: \"http://localhost:4545/cli/tests/002_hello.ts\", --cached-only is specified.");
+    assert_eq!(err.to_string(), "Specifier not found in cache: \"http://localhost:4545/002_hello.ts\", --cached-only is specified.");
 
     let result = file_fetcher_02
       .fetch(&specifier, &mut Permissions::allow_all())
diff --git a/cli/fs_util.rs b/cli/fs_util.rs
index 4fcae38f4..6103a0833 100644
--- a/cli/fs_util.rs
+++ b/cli/fs_util.rs
@@ -234,8 +234,8 @@ mod tests {
     assert!(!is_supported_ext(Path::new("tests/subdir/redirects")));
     assert!(!is_supported_ext(Path::new("README.md")));
     assert!(is_supported_ext(Path::new("lib/typescript.d.ts")));
-    assert!(is_supported_ext(Path::new("cli/tests/001_hello.js")));
-    assert!(is_supported_ext(Path::new("cli/tests/002_hello.ts")));
+    assert!(is_supported_ext(Path::new("testdata/001_hello.js")));
+    assert!(is_supported_ext(Path::new("testdata/002_hello.ts")));
     assert!(is_supported_ext(Path::new("foo.jsx")));
     assert!(is_supported_ext(Path::new("foo.tsx")));
     assert!(is_supported_ext(Path::new("foo.TS")));
@@ -252,8 +252,8 @@ mod tests {
     assert!(is_supported_ext_fmt(Path::new("README.md")));
     assert!(is_supported_ext_fmt(Path::new("readme.MD")));
     assert!(is_supported_ext_fmt(Path::new("lib/typescript.d.ts")));
-    assert!(is_supported_ext_fmt(Path::new("cli/tests/001_hello.js")));
-    assert!(is_supported_ext_fmt(Path::new("cli/tests/002_hello.ts")));
+    assert!(is_supported_ext_fmt(Path::new("testdata/001_hello.js")));
+    assert!(is_supported_ext_fmt(Path::new("testdata/002_hello.ts")));
     assert!(is_supported_ext_fmt(Path::new("foo.jsx")));
     assert!(is_supported_ext_fmt(Path::new("foo.tsx")));
     assert!(is_supported_ext_fmt(Path::new("foo.TS")));
diff --git a/cli/http_util.rs b/cli/http_util.rs
index 89ba4fb93..46ec73cc7 100644
--- a/cli/http_util.rs
+++ b/cli/http_util.rs
@@ -152,8 +152,7 @@ mod tests {
   async fn test_fetch_string() {
     let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
-    let url =
-      Url::parse("http://127.0.0.1:4545/cli/tests/fixture.json").unwrap();
+    let url = Url::parse("http://127.0.0.1:4545/fixture.json").unwrap();
     let client = create_test_client(None);
     let result = fetch_once(FetchOnceArgs {
       client,
@@ -176,10 +175,8 @@ mod tests {
   async fn test_fetch_gzip() {
     let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
-    let url = Url::parse(
-      "http://127.0.0.1:4545/cli/tests/053_import_compression/gziped",
-    )
-    .unwrap();
+    let url = Url::parse("http://127.0.0.1:4545/053_import_compression/gziped")
+      .unwrap();
     let client = create_test_client(None);
     let result = fetch_once(FetchOnceArgs {
       client,
@@ -239,10 +236,8 @@ mod tests {
   async fn test_fetch_brotli() {
     let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
-    let url = Url::parse(
-      "http://127.0.0.1:4545/cli/tests/053_import_compression/brotli",
-    )
-    .unwrap();
+    let url = Url::parse("http://127.0.0.1:4545/053_import_compression/brotli")
+      .unwrap();
     let client = create_test_client(None);
     let result = fetch_once(FetchOnceArgs {
       client,
@@ -269,11 +264,9 @@ mod tests {
   async fn test_fetch_once_with_redirect() {
     let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
-    let url =
-      Url::parse("http://127.0.0.1:4546/cli/tests/fixture.json").unwrap();
+    let url = Url::parse("http://127.0.0.1:4546/fixture.json").unwrap();
     // Dns resolver substitutes `127.0.0.1` with `localhost`
-    let target_url =
-      Url::parse("http://localhost:4545/cli/tests/fixture.json").unwrap();
+    let target_url = Url::parse("http://localhost:4545/fixture.json").unwrap();
     let client = create_test_client(None);
     let result = fetch_once(FetchOnceArgs {
       client,
@@ -331,16 +324,15 @@ mod tests {
   async fn test_fetch_with_cafile_string() {
     let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
-    let url =
-      Url::parse("https://localhost:5545/cli/tests/fixture.json").unwrap();
+    let url = Url::parse("https://localhost:5545/fixture.json").unwrap();
 
     let client = create_http_client(
       version::get_user_agent(),
       None,
       Some(
         read(
-          test_util::root_path()
-            .join("cli/tests/tls/RootCA.pem")
+          test_util::testdata_path()
+            .join("tls/RootCA.pem")
             .to_str()
             .unwrap(),
         )
@@ -431,17 +423,16 @@ mod tests {
   async fn test_fetch_with_cafile_gzip() {
     let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
-    let url = Url::parse(
-      "https://localhost:5545/cli/tests/053_import_compression/gziped",
-    )
-    .unwrap();
+    let url =
+      Url::parse("https://localhost:5545/053_import_compression/gziped")
+        .unwrap();
     let client = create_http_client(
       version::get_user_agent(),
       None,
       Some(
         read(
-          test_util::root_path()
-            .join("cli/tests/tls/RootCA.pem")
+          test_util::testdata_path()
+            .join("tls/RootCA.pem")
             .to_str()
             .unwrap(),
         )
@@ -480,8 +471,8 @@ mod tests {
       None,
       Some(
         read(
-          test_util::root_path()
-            .join("cli/tests/tls/RootCA.pem")
+          test_util::testdata_path()
+            .join("tls/RootCA.pem")
             .to_str()
             .unwrap(),
         )
@@ -525,17 +516,16 @@ mod tests {
   async fn test_fetch_with_cafile_brotli() {
     let _http_server_guard = test_util::http_server();
     // Relies on external http server. See target/debug/test_server
-    let url = Url::parse(
-      "https://localhost:5545/cli/tests/053_import_compression/brotli",
-    )
-    .unwrap();
+    let url =
+      Url::parse("https://localhost:5545/053_import_compression/brotli")
+        .unwrap();
     let client = create_http_client(
       version::get_user_agent(),
       None,
       Some(
         read(
-          test_util::root_path()
-            .join("cli/tests/tls/RootCA.pem")
+          test_util::testdata_path()
+            .join("tls/RootCA.pem")
             .to_str()
             .unwrap(),
         )
diff --git a/cli/lsp/sources.rs b/cli/lsp/sources.rs
index 8be1420d4..a3f0ae750 100644
--- a/cli/lsp/sources.rs
+++ b/cli/lsp/sources.rs
@@ -575,7 +575,6 @@ mod tests {
   use deno_core::resolve_path;
   use deno_core::resolve_url;
   use deno_core::serde_json::json;
-  use std::env;
   use tempfile::TempDir;
 
   fn setup() -> (Sources, PathBuf) {
@@ -588,8 +587,7 @@ mod tests {
   #[test]
   fn test_sources_get_script_version() {
     let (sources, _) = setup();
-    let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
-    let tests = c.join("tests");
+    let tests = test_util::testdata_path();
     let specifier =
       resolve_path(&tests.join("001_hello.js").to_string_lossy()).unwrap();
     let actual = sources.get_script_version(&specifier);
@@ -599,8 +597,7 @@ mod tests {
   #[test]
   fn test_sources_get_text() {
     let (sources, _) = setup();
-    let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
-    let tests = c.join("tests");
+    let tests = test_util::testdata_path();
     let specifier =
       resolve_path(&tests.join("001_hello.js").to_string_lossy()).unwrap();
     let actual = sources.get_source(&specifier);
diff --git a/cli/module_graph.rs b/cli/module_graph.rs
index 26c20f21d..44939e68f 100644
--- a/cli/module_graph.rs
+++ b/cli/module_graph.rs
@@ -2069,7 +2069,6 @@ pub mod tests {
   use crate::specifier_handler::MemoryHandler;
   use deno_core::futures::future;
   use deno_core::parking_lot::Mutex;
-  use std::env;
   use std::fs;
   use std::path::PathBuf;
 
@@ -2190,8 +2189,7 @@ pub mod tests {
   async fn setup(
     specifier: ModuleSpecifier,
   ) -> (Graph, Arc<Mutex<MockSpecifierHandler>>) {
-    let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
-    let fixtures = c.join("tests/module_graph");
+    let fixtures = test_util::testdata_path().join("module_graph");
     let handler = Arc::new(Mutex::new(MockSpecifierHandler {
       fixtures,
       ..MockSpecifierHandler::default()
@@ -2314,8 +2312,7 @@ pub mod tests {
       ("file:///tests/fixture14.ts", "fixture14.out"),
       ("file:///tests/fixture15.ts", "fixture15.out"),
     ];
-    let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
-    let fixtures = c.join("tests/bundle");
+    let fixtures = test_util::testdata_path().join("bundle");
 
     for (specifier, expected_str) in tests {
       let specifier = resolve_url_or_path(specifier).unwrap();
@@ -2474,8 +2471,10 @@ pub mod tests {
     let specifier = resolve_url_or_path("file:///tests/checkwithconfig.ts")
       .expect("could not resolve module");
     let (graph, handler) = setup(specifier.clone()).await;
-    let config_file =
-      ConfigFile::read("tests/module_graph/tsconfig_01.json").unwrap();
+    let config_file = ConfigFile::read(
+      test_util::testdata_path().join("module_graph/tsconfig_01.json"),
+    )
+    .unwrap();
     let result_info = graph
       .check(CheckOptions {
         debug: false,
@@ -2496,8 +2495,10 @@ pub mod tests {
 
     // let's do it all over again to ensure that the versions are determinstic
     let (graph, handler) = setup(specifier).await;
-    let config_file =
-      ConfigFile::read("tests/module_graph/tsconfig_01.json").unwrap();
+    let config_file = ConfigFile::read(
+      test_util::testdata_path().join("module_graph/tsconfig_01.json"),
+    )
+    .unwrap();
     let result_info = graph
       .check(CheckOptions {
         debug: false,
@@ -2651,8 +2652,7 @@ pub mod tests {
   async fn test_graph_import_json() {
     let specifier = resolve_url_or_path("file:///tests/importjson.ts")
       .expect("could not resolve module");
-    let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
-    let fixtures = c.join("tests/module_graph");
+    let fixtures = test_util::testdata_path().join("module_graph");
     let handler = Arc::new(Mutex::new(MockSpecifierHandler {
       fixtures,
       ..MockSpecifierHandler::default()
@@ -2726,8 +2726,10 @@ pub mod tests {
     let specifier = resolve_url_or_path("https://deno.land/x/transpile.tsx")
       .expect("could not resolve module");
     let (mut graph, handler) = setup(specifier).await;
-    let config_file =
-      ConfigFile::read("tests/module_graph/tsconfig.json").unwrap();
+    let config_file = ConfigFile::read(
+      test_util::testdata_path().join("module_graph/tsconfig.json"),
+    )
+    .unwrap();
     let result_info = graph
       .transpile(TranspileOptions {
         debug: false,
@@ -2756,8 +2758,7 @@ pub mod tests {
 
   #[tokio::test]
   async fn test_graph_import_map_remote_to_local() {
-    let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
-    let fixtures = c.join("tests/module_graph");
+    let fixtures = test_util::testdata_path().join("module_graph");
     let maybe_import_map = Some(
       ImportMap::from_json(
         "file:///tests/importmap.json",
@@ -2783,8 +2784,7 @@ pub mod tests {
 
   #[tokio::test]
   async fn test_graph_with_lockfile() {
-    let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
-    let fixtures = c.join("tests/module_graph");
+    let fixtures = test_util::testdata_path().join("module_graph");
     let lockfile_path = fixtures.join("lockfile.json");
     let lockfile =
       Lockfile::new(lockfile_path, false).expect("could not load lockfile");
diff --git a/cli/specifier_handler.rs b/cli/specifier_handler.rs
index ddc3adc7e..cd785f015 100644
--- a/cli/specifier_handler.rs
+++ b/cli/specifier_handler.rs
@@ -572,7 +572,6 @@ pub mod tests {
   use crate::http_cache::HttpCache;
   use deno_core::resolve_url_or_path;
   use deno_runtime::deno_web::BlobStore;
-  use std::env;
   use tempfile::TempDir;
 
   macro_rules! map (
@@ -618,8 +617,7 @@ pub mod tests {
     let _http_server_guard = test_util::http_server();
     let (_, mut file_fetcher) = setup();
     let specifier =
-      resolve_url_or_path("http://localhost:4545/cli/tests/subdir/mod2.ts")
-        .unwrap();
+      resolve_url_or_path("http://localhost:4545/subdir/mod2.ts").unwrap();
     let cached_module: CachedModule = file_fetcher
       .fetch(specifier.clone(), None, false)
       .await
@@ -639,8 +637,7 @@ pub mod tests {
     let _http_server_guard = test_util::http_server();
     let (_, mut file_fetcher) = setup();
     let specifier =
-      resolve_url_or_path("http://localhost:4545/cli/tests/subdir/mod2.ts")
-        .unwrap();
+      resolve_url_or_path("http://localhost:4545/subdir/mod2.ts").unwrap();
     let cached_module: CachedModule = file_fetcher
       .fetch(specifier.clone(), None, false)
       .await
@@ -665,14 +662,16 @@ pub mod tests {
     let _http_server_guard = test_util::http_server();
     let (_, mut file_fetcher) = setup();
     let specifier =
-      resolve_url_or_path("http://localhost:4545/cli/tests/subdir/mod2.ts")
-        .unwrap();
+      resolve_url_or_path("http://localhost:4545/subdir/mod2.ts").unwrap();
     let cached_module: CachedModule =
       file_fetcher.fetch(specifier, None, false).await.unwrap();
     assert!(cached_module.is_remote);
-    let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
     let specifier = resolve_url_or_path(
-      c.join("tests/subdir/mod1.ts").as_os_str().to_str().unwrap(),
+      test_util::testdata_path()
+        .join("subdir/mod1.ts")
+        .as_os_str()
+        .to_str()
+        .unwrap(),
     )
     .unwrap();
     let cached_module: CachedModule =
diff --git a/cli/tests/006_url_imports.ts b/cli/tests/006_url_imports.ts
deleted file mode 100644
index 109cb603e..000000000
--- a/cli/tests/006_url_imports.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { printHello } from "http://localhost:4545/cli/tests/subdir/mod2.ts";
-printHello();
-console.log("success");
diff --git a/cli/tests/019_media_types.ts b/cli/tests/019_media_types.ts
deleted file mode 100644
index 523639be4..000000000
--- a/cli/tests/019_media_types.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// When run against the test HTTP server, it will serve different media types
-// based on the URL containing `.t#.` strings, which exercises the different
-// mapping of media types end to end.
-
-import { loaded as loadedTs1 } from "http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts";
-import { loaded as loadedTs2 } from "http://localhost:4545/cli/tests/subdir/mt_video_vdn.t2.ts";
-import { loaded as loadedTs3 } from "http://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts";
-import { loaded as loadedTs4 } from "http://localhost:4545/cli/tests/subdir/mt_application_x_typescript.t4.ts";
-import { loaded as loadedJs1 } from "http://localhost:4545/cli/tests/subdir/mt_text_javascript.j1.js";
-import { loaded as loadedJs2 } from "http://localhost:4545/cli/tests/subdir/mt_application_ecmascript.j2.js";
-import { loaded as loadedJs3 } from "http://localhost:4545/cli/tests/subdir/mt_text_ecmascript.j3.js";
-import { loaded as loadedJs4 } from "http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js";
-
-console.log(
-  "success",
-  loadedTs1,
-  loadedTs2,
-  loadedTs3,
-  loadedTs4,
-  loadedJs1,
-  loadedJs2,
-  loadedJs3,
-  loadedJs4,
-);
diff --git a/cli/tests/022_info_flag_script.out b/cli/tests/022_info_flag_script.out
deleted file mode 100644
index 878b0fa08..000000000
--- a/cli/tests/022_info_flag_script.out
+++ /dev/null
@@ -1,14 +0,0 @@
-[WILDCARD]
-local: [WILDCARD]http[WILDCARD]127.0.0.1_PORT4545[WILDCARD]
-type: TypeScript
-dependencies: 8 unique (total [WILDCARD])
-
-http://127.0.0.1:4545/cli/tests/019_media_types.ts ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_application_ecmascript.j2.js ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_application_x_typescript.t4.ts ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_text_ecmascript.j3.js ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_text_javascript.j1.js ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts ([WILDCARD])
-└── http://localhost:4545/cli/tests/subdir/mt_video_vdn.t2.ts ([WILDCARD])
diff --git a/cli/tests/035_cached_only_flag.out b/cli/tests/035_cached_only_flag.out
deleted file mode 100644
index 0c4992799..000000000
--- a/cli/tests/035_cached_only_flag.out
+++ /dev/null
@@ -1 +0,0 @@
-error: Specifier not found in cache: "http://127.0.0.1:4545/cli/tests/019_media_types.ts", --cached-only is specified.
diff --git a/cli/tests/037_fetch_multiple.out b/cli/tests/037_fetch_multiple.out
deleted file mode 100644
index 2497cfa76..000000000
--- a/cli/tests/037_fetch_multiple.out
+++ /dev/null
@@ -1,5 +0,0 @@
-Download http://localhost:4545/cli/tests/subdir/mod2.ts
-Download http://localhost:4545/cli/tests/subdir/print_hello.ts
-Check [WILDCARD]/fetch/test.ts
-Download http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts
-Check [WILDCARD]/fetch/other.ts
diff --git a/cli/tests/045_proxy_test.ts.out b/cli/tests/045_proxy_test.ts.out
deleted file mode 100644
index 4957c9307..000000000
--- a/cli/tests/045_proxy_test.ts.out
+++ /dev/null
@@ -1,6 +0,0 @@
-Proxy server listening on [WILDCARD]
-Proxy request to: http://localhost:4545/test_util/std/examples/colors.ts
-Proxy request to: http://localhost:4545/test_util/std/examples/colors.ts
-Proxy request to: http://localhost:4545/test_util/std/fmt/colors.ts
-Proxy request to: http://localhost:4545/test_util/std/examples/colors.ts
-proxy-authorization: Basic dXNlcm5hbWU6cGFzc3dvcmQ=
diff --git a/cli/tests/048_media_types_jsx.ts b/cli/tests/048_media_types_jsx.ts
deleted file mode 100644
index 044963000..000000000
--- a/cli/tests/048_media_types_jsx.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// When run against the test HTTP server, it will serve different media types
-// based on the URL containing `.t#.` strings, which exercises the different
-// mapping of media types end to end.
-import { loaded as loadedTsx1 } from "http://localhost:4545/cli/tests/subdir/mt_text_typescript_tsx.t1.tsx";
-import { loaded as loadedTsx2 } from "http://localhost:4545/cli/tests/subdir/mt_video_vdn_tsx.t2.tsx";
-import { loaded as loadedTsx3 } from "http://localhost:4545/cli/tests/subdir/mt_video_mp2t_tsx.t3.tsx";
-import { loaded as loadedTsx4 } from "http://localhost:4545/cli/tests/subdir/mt_application_x_typescript_tsx.t4.tsx";
-import { loaded as loadedJsx1 } from "http://localhost:4545/cli/tests/subdir/mt_text_javascript_jsx.j1.jsx";
-import { loaded as loadedJsx2 } from "http://localhost:4545/cli/tests/subdir/mt_application_ecmascript_jsx.j2.jsx";
-import { loaded as loadedJsx3 } from "http://localhost:4545/cli/tests/subdir/mt_text_ecmascript_jsx.j3.jsx";
-import { loaded as loadedJsx4 } from "http://localhost:4545/cli/tests/subdir/mt_application_x_javascript_jsx.j4.jsx";
-
-declare global {
-  namespace JSX {
-    interface IntrinsicElements {
-      // deno-lint-ignore no-explicit-any
-      [elemName: string]: any;
-    }
-  }
-}
-
-console.log(
-  "success",
-  loadedTsx1,
-  loadedTsx2,
-  loadedTsx3,
-  loadedTsx4,
-  loadedJsx1,
-  loadedJsx2,
-  loadedJsx3,
-  loadedJsx4,
-);
diff --git a/cli/tests/049_info_flag_script_jsx.out b/cli/tests/049_info_flag_script_jsx.out
deleted file mode 100644
index 0ad6608d4..000000000
--- a/cli/tests/049_info_flag_script_jsx.out
+++ /dev/null
@@ -1,14 +0,0 @@
-[WILDCARD]
-local: [WILDCARD]http[WILDCARD]127.0.0.1_PORT4545[WILDCARD]
-type: TypeScript
-dependencies: 8 unique (total [WILDCARD])
-
-http://127.0.0.1:4545/cli/tests/048_media_types_jsx.ts ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_application_ecmascript_jsx.j2.jsx ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_application_x_javascript_jsx.j4.jsx ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_application_x_typescript_tsx.t4.tsx ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_text_ecmascript_jsx.j3.jsx ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_text_javascript_jsx.j1.jsx ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_text_typescript_tsx.t1.tsx ([WILDCARD])
-├── http://localhost:4545/cli/tests/subdir/mt_video_mp2t_tsx.t3.tsx ([WILDCARD])
-└── http://localhost:4545/cli/tests/subdir/mt_video_vdn_tsx.t2.tsx ([WILDCARD])
diff --git a/cli/tests/053_import_compression/main.ts b/cli/tests/053_import_compression/main.ts
deleted file mode 100644
index 5b2199483..000000000
--- a/cli/tests/053_import_compression/main.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import "http://127.0.0.1:4545/cli/tests/053_import_compression/gziped";
-import "http://127.0.0.1:4545/cli/tests/053_import_compression/brotli";
-
-console.log(
-  await fetch(
-    "http://127.0.0.1:4545/cli/tests/053_import_compression/gziped",
-  ).then((res) => res.text()),
-);
-console.log(
-  await fetch(
-    "http://127.0.0.1:4545/cli/tests/053_import_compression/brotli",
-  ).then((res) => res.text()),
-);
diff --git a/cli/tests/060_deno_doc_displays_all_overloads_in_details_view.ts.out b/cli/tests/060_deno_doc_displays_all_overloads_in_details_view.ts.out
deleted file mode 100644
index b7b4076f9..000000000
--- a/cli/tests/060_deno_doc_displays_all_overloads_in_details_view.ts.out
+++ /dev/null
@@ -1,12 +0,0 @@
-Defined in [WILDCARD]/cli/tests/060_deno_doc_displays_all_overloads_in_details_view.ts:3:2 
-
-function test(name: string, fn: Function): void
-
-Defined in [WILDCARD]/cli/tests/060_deno_doc_displays_all_overloads_in_details_view.ts:4:2 
-
-function test(options: object): void
-
-Defined in [WILDCARD]cli/tests/060_deno_doc_displays_all_overloads_in_details_view.ts:5:2 
-
-function test(name: string | object, fn?: Function): void
-
diff --git a/cli/tests/README.md b/cli/tests/README.md
deleted file mode 100644
index 831d2750f..000000000
--- a/cli/tests/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Integration Tests
-
-This path contains integration tests. See integration_tests.rs for the index.
diff --git a/cli/tests/bundle_dynamic_import.ts b/cli/tests/bundle_dynamic_import.ts
deleted file mode 100644
index 754831632..000000000
--- a/cli/tests/bundle_dynamic_import.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-const mod1 = await import("http://localhost:4545/cli/tests/subdir/mod1.ts");
-
-mod1.printHello3();
diff --git a/cli/tests/cache_extensionless.out b/cli/tests/cache_extensionless.out
deleted file mode 100644
index 6e3569689..000000000
--- a/cli/tests/cache_extensionless.out
+++ /dev/null
@@ -1,2 +0,0 @@
-[WILDCARD]
-Check http://localhost:4545/cli/tests/subdir/no_js_ext
diff --git a/cli/tests/cache_random_extension.out b/cli/tests/cache_random_extension.out
deleted file mode 100644
index c508fbc60..000000000
--- a/cli/tests/cache_random_extension.out
+++ /dev/null
@@ -1,2 +0,0 @@
-[WILDCARD]
-Check http://localhost:4545/cli/tests/subdir/no_js_ext@1.0.0
diff --git a/cli/tests/cafile_info.ts b/cli/tests/cafile_info.ts
deleted file mode 100644
index cd92a42f6..000000000
--- a/cli/tests/cafile_info.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// When run against the test HTTP server, it will serve different media types
-// based on the URL containing `.t#.` strings, which exercises the different
-// mapping of media types end to end.
-
-import { loaded as loadedTs1 } from "https://localhost:5545/cli/tests/subdir/mt_text_typescript.t1.ts";
-import { loaded as loadedTs2 } from "https://localhost:5545/cli/tests/subdir/mt_video_vdn.t2.ts";
-import { loaded as loadedTs3 } from "https://localhost:5545/cli/tests/subdir/mt_video_mp2t.t3.ts";
-import { loaded as loadedTs4 } from "https://localhost:5545/cli/tests/subdir/mt_application_x_typescript.t4.ts";
-import { loaded as loadedJs1 } from "https://localhost:5545/cli/tests/subdir/mt_text_javascript.j1.js";
-import { loaded as loadedJs2 } from "https://localhost:5545/cli/tests/subdir/mt_application_ecmascript.j2.js";
-import { loaded as loadedJs3 } from "https://localhost:5545/cli/tests/subdir/mt_text_ecmascript.j3.js";
-import { loaded as loadedJs4 } from "https://localhost:5545/cli/tests/subdir/mt_application_x_javascript.j4.js";
-
-console.log(
-  "success",
-  loadedTs1,
-  loadedTs2,
-  loadedTs3,
-  loadedTs4,
-  loadedJs1,
-  loadedJs2,
-  loadedJs3,
-  loadedJs4,
-);
diff --git a/cli/tests/cafile_info.ts.out b/cli/tests/cafile_info.ts.out
deleted file mode 100644
index 35575f8d6..000000000
--- a/cli/tests/cafile_info.ts.out
+++ /dev/null
@@ -1,13 +0,0 @@
-local: [WILDCARD]https[WILDCARD]localhost_PORT5545[WILDCARD]
-type: TypeScript
-dependencies: 8 unique (total [WILDCARD])
-
-https://localhost:5545/cli/tests/cafile_info.ts ([WILDCARD])
-├── https://localhost:5545/cli/tests/subdir/mt_application_ecmascript.j2.js ([WILDCARD])
-├── https://localhost:5545/cli/tests/subdir/mt_application_x_javascript.j4.js ([WILDCARD])
-├── https://localhost:5545/cli/tests/subdir/mt_application_x_typescript.t4.ts ([WILDCARD])
-├── https://localhost:5545/cli/tests/subdir/mt_text_ecmascript.j3.js ([WILDCARD])
-├── https://localhost:5545/cli/tests/subdir/mt_text_javascript.j1.js ([WILDCARD])
-├── https://localhost:5545/cli/tests/subdir/mt_text_typescript.t1.ts ([WILDCARD])
-├── https://localhost:5545/cli/tests/subdir/mt_video_mp2t.t3.ts ([WILDCARD])
-└── https://localhost:5545/cli/tests/subdir/mt_video_vdn.t2.ts ([WILDCARD])
diff --git a/cli/tests/cafile_url_imports.ts b/cli/tests/cafile_url_imports.ts
deleted file mode 100644
index f781f32f5..000000000
--- a/cli/tests/cafile_url_imports.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { printHello } from "https://localhost:5545/cli/tests/subdir/mod2.ts";
-printHello();
-console.log("success");
diff --git a/cli/tests/config_types_remote.tsconfig.json b/cli/tests/config_types_remote.tsconfig.json
deleted file mode 100644
index 745bb7b20..000000000
--- a/cli/tests/config_types_remote.tsconfig.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "compilerOptions": {
-    "types": [
-      "http://localhost:4545/cli/tests/subdir/types.d.ts"
-    ]
-  }
-}
diff --git a/cli/tests/disallow_http_from_https_js.out b/cli/tests/disallow_http_from_https_js.out
deleted file mode 100644
index 405859e4d..000000000
--- a/cli/tests/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/cli/tests/001_hello.js
-    at https://localhost:5545/cli/tests/disallow_http_from_https.js:2:0
diff --git a/cli/tests/disallow_http_from_https_ts.out b/cli/tests/disallow_http_from_https_ts.out
deleted file mode 100644
index b63ba0c67..000000000
--- a/cli/tests/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/cli/tests/001_hello.js
-    at https://localhost:5545/cli/tests/disallow_http_from_https.ts:2:0
diff --git a/cli/tests/dynamic_import/permissions_remote_remote.ts b/cli/tests/dynamic_import/permissions_remote_remote.ts
deleted file mode 100644
index 99de3f46f..000000000
--- a/cli/tests/dynamic_import/permissions_remote_remote.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-await import(
-  "http://localhost:4545/cli/tests/dynamic_import/static_remote.ts"
-);
diff --git a/cli/tests/dynamic_import/permissions_remote_remote.ts.out b/cli/tests/dynamic_import/permissions_remote_remote.ts.out
deleted file mode 100644
index ae8113899..000000000
--- a/cli/tests/dynamic_import/permissions_remote_remote.ts.out
+++ /dev/null
@@ -1,5 +0,0 @@
-error: Uncaught (in promise) TypeError: Requires net access to "example.com", run again with the --allow-net flag
-    at http://localhost:4545/cli/tests/dynamic_import/static_remote.ts:2:0
-await import(
-^
-    at async file:///[WILDCARD]/cli/tests/dynamic_import/permissions_remote_remote.ts:1:1
diff --git a/cli/tests/error_001.ts.out b/cli/tests/error_001.ts.out
deleted file mode 100644
index d4103349a..000000000
--- a/cli/tests/error_001.ts.out
+++ /dev/null
@@ -1,6 +0,0 @@
-[WILDCARD]error: Uncaught Error: bad
-  throw Error("bad");
-        ^
-    at foo ([WILDCARD]tests/error_001.ts:2:9)
-    at bar ([WILDCARD]tests/error_001.ts:6:3)
-    at [WILDCARD]tests/error_001.ts:9:1
diff --git a/cli/tests/error_002.ts.out b/cli/tests/error_002.ts.out
deleted file mode 100644
index 2aae770f8..000000000
--- a/cli/tests/error_002.ts.out
+++ /dev/null
@@ -1,6 +0,0 @@
-[WILDCARD]error: Uncaught Error: exception from mod1
-  throw Error("exception from mod1");
-        ^
-    at throwsError ([WILDCARD]tests/subdir/mod1.ts:16:9)
-    at foo ([WILDCARD]tests/error_002.ts:4:3)
-    at [WILDCARD]tests/error_002.ts:7:1
diff --git a/cli/tests/error_004_missing_module.ts.out b/cli/tests/error_004_missing_module.ts.out
deleted file mode 100644
index 474fdf8ed..000000000
--- a/cli/tests/error_004_missing_module.ts.out
+++ /dev/null
@@ -1,2 +0,0 @@
-[WILDCARD]error: Cannot resolve module "file:///[WILDCARD]cli/tests/bad-module.ts" from "file:///[WILDCARD]cli/tests/error_004_missing_module.ts".
-    at file:///[WILDCARD]cli/tests/error_004_missing_module.ts:1:0
diff --git a/cli/tests/error_015_dynamic_import_permissions.js b/cli/tests/error_015_dynamic_import_permissions.js
deleted file mode 100644
index 197339c5e..000000000
--- a/cli/tests/error_015_dynamic_import_permissions.js
+++ /dev/null
@@ -1,3 +0,0 @@
-(async () => {
-  await import("http://localhost:4545/cli/tests/subdir/mod4.js");
-})();
diff --git a/cli/tests/error_019_stack_function.ts.out b/cli/tests/error_019_stack_function.ts.out
deleted file mode 100644
index 66e37bce9..000000000
--- a/cli/tests/error_019_stack_function.ts.out
+++ /dev/null
@@ -1,8 +0,0 @@
-[WILDCARD]Error: function
-    at foo ([WILDCARD]tests/error_019_stack_function.ts:[WILDCARD])
-    at [WILDCARD]tests/error_019_stack_function.ts:[WILDCARD]
-error: Uncaught Error: function
-  throw new Error("function");
-        ^
-    at foo ([WILDCARD]tests/error_019_stack_function.ts:[WILDCARD])
-    at [WILDCARD]tests/error_019_stack_function.ts:[WILDCARD]
diff --git a/cli/tests/error_020_stack_constructor.ts.out b/cli/tests/error_020_stack_constructor.ts.out
deleted file mode 100644
index 96a243e74..000000000
--- a/cli/tests/error_020_stack_constructor.ts.out
+++ /dev/null
@@ -1,8 +0,0 @@
-[WILDCARD]Error: constructor
-    at new A ([WILDCARD]tests/error_020_stack_constructor.ts:[WILDCARD])
-    at [WILDCARD]tests/error_020_stack_constructor.ts:[WILDCARD]
-error: Uncaught Error: constructor
-    throw new Error("constructor");
-          ^
-    at new A ([WILDCARD]tests/error_020_stack_constructor.ts:[WILDCARD])
-    at [WILDCARD]tests/error_020_stack_constructor.ts:[WILDCARD]
diff --git a/cli/tests/error_021_stack_method.ts.out b/cli/tests/error_021_stack_method.ts.out
deleted file mode 100644
index 1f9a24aed..000000000
--- a/cli/tests/error_021_stack_method.ts.out
+++ /dev/null
@@ -1,8 +0,0 @@
-[WILDCARD]Error: method
-    at A.m ([WILDCARD]tests/error_021_stack_method.ts:[WILDCARD])
-    at [WILDCARD]tests/error_021_stack_method.ts:[WILDCARD]
-error: Uncaught Error: method
-    throw new Error("method");
-          ^
-    at A.m ([WILDCARD]tests/error_021_stack_method.ts:[WILDCARD])
-    at [WILDCARD]tests/error_021_stack_method.ts:[WILDCARD]
diff --git a/cli/tests/error_022_stack_custom_error.ts.out b/cli/tests/error_022_stack_custom_error.ts.out
deleted file mode 100644
index d95783d06..000000000
--- a/cli/tests/error_022_stack_custom_error.ts.out
+++ /dev/null
@@ -1,6 +0,0 @@
-[WILDCARD]CustomError: custom error
-    at [WILDCARD]tests/error_022_stack_custom_error.ts:[WILDCARD]
-error: Uncaught CustomError: custom error
-const error = new CustomError();
-              ^
-    at [WILDCARD]tests/error_022_stack_custom_error.ts:[WILDCARD]
diff --git a/cli/tests/error_023_stack_async.ts.out b/cli/tests/error_023_stack_async.ts.out
deleted file mode 100644
index 2f4ffd2f3..000000000
--- a/cli/tests/error_023_stack_async.ts.out
+++ /dev/null
@@ -1,10 +0,0 @@
-[WILDCARD]Error: async
-    at [WILDCARD]tests/error_023_stack_async.ts:[WILDCARD]
-    at async [WILDCARD]tests/error_023_stack_async.ts:[WILDCARD]
-    at async [WILDCARD]tests/error_023_stack_async.ts:[WILDCARD]
-error: Uncaught Error: async
-    throw new Error("async");
-          ^
-    at [WILDCARD]tests/error_023_stack_async.ts:[WILDCARD]
-    at async [WILDCARD]tests/error_023_stack_async.ts:[WILDCARD]
-    at async [WILDCARD]tests/error_023_stack_async.ts:[WILDCARD]
diff --git a/cli/tests/error_024_stack_promise_all.ts.out b/cli/tests/error_024_stack_promise_all.ts.out
deleted file mode 100644
index 31e15c372..000000000
--- a/cli/tests/error_024_stack_promise_all.ts.out
+++ /dev/null
@@ -1,10 +0,0 @@
-[WILDCARD]Error: Promise.all()
-    at [WILDCARD]tests/error_024_stack_promise_all.ts:[WILDCARD]
-    at async Promise.all (index 1)
-    at async [WILDCARD]tests/error_024_stack_promise_all.ts:[WILDCARD]
-error: Uncaught Error: Promise.all()
-    throw new Error("Promise.all()");
-          ^
-    at [WILDCARD]tests/error_024_stack_promise_all.ts:[WILDCARD]
-    at async Promise.all (index 1)
-    at async [WILDCARD]tests/error_024_stack_promise_all.ts:[WILDCARD]
diff --git a/cli/tests/error_025_tab_indent.out b/cli/tests/error_025_tab_indent.out
deleted file mode 100644
index 7b339c48f..000000000
--- a/cli/tests/error_025_tab_indent.out
+++ /dev/null
@@ -1,6 +0,0 @@
-[WILDCARD]error: Uncaught Error: bad
-	throw Error("bad");
-	      ^
-    at foo ([WILDCARD]tests/error_025_tab_indent:2:8)
-    at bar ([WILDCARD]tests/error_025_tab_indent:6:2)
-    at [WILDCARD]tests/error_025_tab_indent:9:1
diff --git a/cli/tests/error_026_remote_import_error.ts b/cli/tests/error_026_remote_import_error.ts
deleted file mode 100644
index 1ab600cfa..000000000
--- a/cli/tests/error_026_remote_import_error.ts
+++ /dev/null
@@ -1 +0,0 @@
-import "http://localhost:4545/cli/tests/error_001.ts";
diff --git a/cli/tests/error_026_remote_import_error.ts.out b/cli/tests/error_026_remote_import_error.ts.out
deleted file mode 100644
index e2d6545ef..000000000
--- a/cli/tests/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/cli/tests/error_001.ts:2:9)
-    at bar (http://localhost:4545/cli/tests/error_001.ts:6:3)
-    at http://localhost:4545/cli/tests/error_001.ts:9:1
-[WILDCARD]
diff --git a/cli/tests/error_missing_module_named_import.ts.out b/cli/tests/error_missing_module_named_import.ts.out
deleted file mode 100644
index 4da7c2885..000000000
--- a/cli/tests/error_missing_module_named_import.ts.out
+++ /dev/null
@@ -1,2 +0,0 @@
-error: Cannot resolve module "[WILDCARD]cli/tests/does_not_exist.js" from "[WILDCARD]cli/tests/error_missing_module_named_import.ts".
-    at [WILDCARD]cli/tests/error_missing_module_named_import.ts:1:0
diff --git a/cli/tests/error_syntax.js.out b/cli/tests/error_syntax.js.out
deleted file mode 100644
index d458bae49..000000000
--- a/cli/tests/error_syntax.js.out
+++ /dev/null
@@ -1 +0,0 @@
-error: Expected ,, got following at [WILDCARD]tests/error_syntax.js:3:5
diff --git a/cli/tests/error_syntax_empty_trailing_line.mjs.out b/cli/tests/error_syntax_empty_trailing_line.mjs.out
deleted file mode 100644
index 3b78a23a6..000000000
--- a/cli/tests/error_syntax_empty_trailing_line.mjs.out
+++ /dev/null
@@ -1 +0,0 @@
-error: Unexpected eof at [WILDCARD]tests/error_syntax_empty_trailing_line.mjs:2:21
diff --git a/cli/tests/error_worker_permissions_remote.ts b/cli/tests/error_worker_permissions_remote.ts
deleted file mode 100644
index 9fd1ba5a8..000000000
--- a/cli/tests/error_worker_permissions_remote.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-new Worker(
-  "http://localhost:4545/cli/tests/subdir/worker_types.ts",
-  { type: "module" },
-);
diff --git a/cli/tests/fetch/other.ts b/cli/tests/fetch/other.ts
deleted file mode 100644
index ab85b226f..000000000
--- a/cli/tests/fetch/other.ts
+++ /dev/null
@@ -1 +0,0 @@
-import "http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts";
diff --git a/cli/tests/fetch/test.ts b/cli/tests/fetch/test.ts
deleted file mode 100644
index 1b49a76c8..000000000
--- a/cli/tests/fetch/test.ts
+++ /dev/null
@@ -1 +0,0 @@
-import "http://localhost:4545/cli/tests/subdir/mod2.ts";
diff --git a/cli/tests/https_import.ts b/cli/tests/https_import.ts
deleted file mode 100644
index e78a342a0..000000000
--- a/cli/tests/https_import.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { printHello } from "https://localhost:5545/cli/tests/subdir/print_hello.ts";
-
-printHello();
diff --git a/cli/tests/import_file_with_colon.ts b/cli/tests/import_file_with_colon.ts
deleted file mode 100644
index 5a2bbceb6..000000000
--- a/cli/tests/import_file_with_colon.ts
+++ /dev/null
@@ -1 +0,0 @@
-import "http://localhost:4545/cli/tests/subdir/file_with_:_in_name.ts";
diff --git a/cli/tests/info_missing_module.out b/cli/tests/info_missing_module.out
deleted file mode 100644
index e01cd098e..000000000
--- a/cli/tests/info_missing_module.out
+++ /dev/null
@@ -1,6 +0,0 @@
-local: [WILDCARD]error_009_missing_js_module.js
-type: JavaScript
-dependencies: 1 unique (total 26B)
-
-file://[WILDCARD]/cli/tests/error_009_missing_js_module.js (26B)
-└── file://[WILDCARD]/cli/tests/bad-module.js (error)
diff --git a/cli/tests/info_recursive_imports_test.out b/cli/tests/info_recursive_imports_test.out
deleted file mode 100644
index 7b53ed89b..000000000
--- a/cli/tests/info_recursive_imports_test.out
+++ /dev/null
@@ -1,12 +0,0 @@
-local: [WILDCARD]info_recursive_imports_test.ts
-type: TypeScript
-dependencies: 4 unique (total [WILDCARD])
-
-file://[WILDCARD]cli/tests/info_recursive_imports_test.ts ([WILDCARD])
-└─┬ file://[WILDCARD]cli/tests/recursive_imports/A.ts ([WILDCARD])
-  ├─┬ file://[WILDCARD]cli/tests/recursive_imports/B.ts ([WILDCARD])
-  │ ├─┬ file://[WILDCARD]cli/tests/recursive_imports/C.ts ([WILDCARD])
-  │ │ ├── file://[WILDCARD]cli/tests/recursive_imports/A.ts *
-  │ │ └── file://[WILDCARD]cli/tests/recursive_imports/common.ts ([WILDCARD])
-  │ └── file://[WILDCARD]cli/tests/recursive_imports/common.ts *
-  └── file://[WILDCARD]cli/tests/recursive_imports/common.ts *
diff --git a/cli/tests/inline_js_source_map_2.js b/cli/tests/inline_js_source_map_2.js
deleted file mode 100644
index 199ff7bb0..000000000
--- a/cli/tests/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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaHR0cDovL2xvY2FsaG9zdDo0NTQ1L2NsaS90ZXN0cy9pbmxpbmVfanNfc291cmNlX21hcF8yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxDQUFDLEdBQUMsQ0FBQyxDQUFDO0FBS0osTUFBTSxJQUFJLEtBQUssQ0FBQyxjQUErQixDQUFDLENBQUMifQ==
\ No newline at end of file
diff --git a/cli/tests/inline_js_source_map_2.js.out b/cli/tests/inline_js_source_map_2.js.out
deleted file mode 100644
index 13e50bac4..000000000
--- a/cli/tests/inline_js_source_map_2.js.out
+++ /dev/null
@@ -1,2 +0,0 @@
-error: Uncaught Error: Hello world!
-    at http://localhost:4545/cli/tests/inline_js_source_map_2.ts:6:7
diff --git a/cli/tests/inline_js_source_map_2_with_inline_contents.js b/cli/tests/inline_js_source_map_2_with_inline_contents.js
deleted file mode 100644
index a225b3975..000000000
--- a/cli/tests/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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaHR0cDovL2xvY2FsaG9zdDo0NTQ1L2NsaS90ZXN0cy9pbmxpbmVfanNfc291cmNlX21hcF8yLnRzIl0sInNvdXJjZXNDb250ZW50IjpbIjErMTtcbmludGVyZmFjZSBUZXN0IHtcbiAgaGVsbG86IHN0cmluZztcbn1cblxudGhyb3cgbmV3IEVycm9yKFwiSGVsbG8gd29ybGQhXCIgYXMgdW5rbm93biBhcyBzdHJpbmcpO1xuIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxDQUFDLEdBQUMsQ0FBQyxDQUFDO0FBS0osTUFBTSxJQUFJLEtBQUssQ0FBQyxjQUErQixDQUFDLENBQUMifQ==
\ No newline at end of file
diff --git a/cli/tests/inline_js_source_map_with_contents_from_graph.js b/cli/tests/inline_js_source_map_with_contents_from_graph.js
deleted file mode 100644
index 5324e0ed2..000000000
--- a/cli/tests/inline_js_source_map_with_contents_from_graph.js
+++ /dev/null
@@ -1,4 +0,0 @@
-"use strict";
-import "http://localhost:4545/cli/tests/inline_js_source_map.ts";
-throw new Error("Hello world!");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaHR0cDovL2xvY2FsaG9zdDo0NTQ1L2NsaS90ZXN0cy9pbmxpbmVfanNfc291cmNlX21hcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsQ0FBQyxHQUFDLENBQUMsQ0FBQztBQUtKLE1BQU0sSUFBSSxLQUFLLENBQUMsY0FBK0IsQ0FBQyxDQUFDIn0=
\ No newline at end of file
diff --git a/cli/tests/integration/bundle_tests.rs b/cli/tests/integration/bundle_tests.rs
index 1ef1a39f5..4e68af0b1 100644
--- a/cli/tests/integration/bundle_tests.rs
+++ b/cli/tests/integration/bundle_tests.rs
@@ -7,12 +7,12 @@ use test_util as util;
 #[test]
 fn bundle_exports() {
   // First we have to generate a bundle of some module that has exports.
-  let mod1 = util::root_path().join("cli/tests/subdir/mod1.ts");
+  let mod1 = util::testdata_path().join("subdir/mod1.ts");
   assert!(mod1.is_file());
   let t = TempDir::new().expect("tempdir fail");
   let bundle = t.path().join("mod1.bundle.js");
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("bundle")
     .arg(mod1)
     .arg(&bundle)
@@ -33,7 +33,7 @@ fn bundle_exports() {
   .expect("error writing file");
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(&test)
     .output()
@@ -49,12 +49,12 @@ fn bundle_exports() {
 #[test]
 fn bundle_exports_no_check() {
   // First we have to generate a bundle of some module that has exports.
-  let mod1 = util::root_path().join("cli/tests/subdir/mod1.ts");
+  let mod1 = util::testdata_path().join("subdir/mod1.ts");
   assert!(mod1.is_file());
   let t = TempDir::new().expect("tempdir fail");
   let bundle = t.path().join("mod1.bundle.js");
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("bundle")
     .arg("--no-check")
     .arg(mod1)
@@ -76,7 +76,7 @@ fn bundle_exports_no_check() {
   .expect("error writing file");
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(&test)
     .output()
@@ -92,12 +92,12 @@ fn bundle_exports_no_check() {
 #[test]
 fn bundle_circular() {
   // First we have to generate a bundle of some module that has exports.
-  let circular1 = util::root_path().join("cli/tests/subdir/circular1.ts");
+  let circular1 = util::testdata_path().join("subdir/circular1.ts");
   assert!(circular1.is_file());
   let t = TempDir::new().expect("tempdir fail");
   let bundle = t.path().join("circular1.bundle.js");
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("bundle")
     .arg(circular1)
     .arg(&bundle)
@@ -108,7 +108,7 @@ fn bundle_circular() {
   assert!(bundle.is_file());
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(&bundle)
     .output()
@@ -124,13 +124,12 @@ fn bundle_circular() {
 #[test]
 fn bundle_single_module() {
   // First we have to generate a bundle of some module that has exports.
-  let single_module =
-    util::root_path().join("cli/tests/subdir/single_module.ts");
+  let single_module = util::testdata_path().join("subdir/single_module.ts");
   assert!(single_module.is_file());
   let t = TempDir::new().expect("tempdir fail");
   let bundle = t.path().join("single_module.bundle.js");
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("bundle")
     .arg(single_module)
     .arg(&bundle)
@@ -141,7 +140,7 @@ fn bundle_single_module() {
   assert!(bundle.is_file());
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(&bundle)
     .output()
@@ -157,12 +156,12 @@ fn bundle_single_module() {
 #[test]
 fn bundle_tla() {
   // First we have to generate a bundle of some module that has exports.
-  let tla_import = util::root_path().join("cli/tests/subdir/tla.ts");
+  let tla_import = util::testdata_path().join("subdir/tla.ts");
   assert!(tla_import.is_file());
   let t = tempfile::TempDir::new().expect("tempdir fail");
   let bundle = t.path().join("tla.bundle.js");
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("bundle")
     .arg(tla_import)
     .arg(&bundle)
@@ -183,7 +182,7 @@ fn bundle_tla() {
   .expect("error writing file");
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(&test)
     .output()
@@ -199,12 +198,12 @@ fn bundle_tla() {
 #[test]
 fn bundle_js() {
   // First we have to generate a bundle of some module that has exports.
-  let mod6 = util::root_path().join("cli/tests/subdir/mod6.js");
+  let mod6 = util::testdata_path().join("subdir/mod6.js");
   assert!(mod6.is_file());
   let t = TempDir::new().expect("tempdir fail");
   let bundle = t.path().join("mod6.bundle.js");
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("bundle")
     .arg(mod6)
     .arg(&bundle)
@@ -215,7 +214,7 @@ fn bundle_js() {
   assert!(bundle.is_file());
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(&bundle)
     .output()
@@ -227,13 +226,12 @@ fn bundle_js() {
 #[test]
 fn bundle_dynamic_import() {
   let _g = util::http_server();
-  let dynamic_import =
-    util::root_path().join("cli/tests/bundle_dynamic_import.ts");
+  let dynamic_import = util::testdata_path().join("bundle_dynamic_import.ts");
   assert!(dynamic_import.is_file());
   let t = TempDir::new().expect("tempdir fail");
   let bundle = t.path().join("bundle_dynamic_import.bundle.js");
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("bundle")
     .arg(dynamic_import)
     .arg(&bundle)
@@ -244,7 +242,7 @@ fn bundle_dynamic_import() {
   assert!(bundle.is_file());
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg("--allow-net")
     .arg("--quiet")
@@ -261,13 +259,13 @@ fn bundle_dynamic_import() {
 
 #[test]
 fn bundle_import_map() {
-  let import = util::root_path().join("cli/tests/bundle_im.ts");
-  let import_map_path = util::root_path().join("cli/tests/bundle_im.json");
+  let import = util::testdata_path().join("bundle_im.ts");
+  let import_map_path = util::testdata_path().join("bundle_im.json");
   assert!(import.is_file());
   let t = TempDir::new().expect("tempdir fail");
   let bundle = t.path().join("import_map.bundle.js");
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("bundle")
     .arg("--import-map")
     .arg(import_map_path)
@@ -290,7 +288,7 @@ fn bundle_import_map() {
   .expect("error writing file");
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(&test)
     .output()
@@ -305,13 +303,13 @@ fn bundle_import_map() {
 
 #[test]
 fn bundle_import_map_no_check() {
-  let import = util::root_path().join("cli/tests/bundle_im.ts");
-  let import_map_path = util::root_path().join("cli/tests/bundle_im.json");
+  let import = util::testdata_path().join("bundle_im.ts");
+  let import_map_path = util::testdata_path().join("bundle_im.json");
   assert!(import.is_file());
   let t = TempDir::new().expect("tempdir fail");
   let bundle = t.path().join("import_map.bundle.js");
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("bundle")
     .arg("--no-check")
     .arg("--import-map")
@@ -335,7 +333,7 @@ fn bundle_import_map_no_check() {
   .expect("error writing file");
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(&test)
     .output()
@@ -349,7 +347,7 @@ fn bundle_import_map_no_check() {
 }
 
 itest!(lock_check_err_with_bundle {
-  args: "bundle --lock=lock_check_err_with_bundle.json http://127.0.0.1:4545/cli/tests/subdir/mod1.ts",
+  args: "bundle --lock=lock_check_err_with_bundle.json http://127.0.0.1:4545/subdir/mod1.ts",
   output: "lock_check_err_with_bundle.out",
   exit_code: 10,
   http_server: true,
diff --git a/cli/tests/integration/cache_tests.rs b/cli/tests/integration/cache_tests.rs
index c97741a13..1fc035b9b 100644
--- a/cli/tests/integration/cache_tests.rs
+++ b/cli/tests/integration/cache_tests.rs
@@ -21,13 +21,13 @@ itest!(_095_cache_with_bare_import {
 });
 
 itest!(cache_extensionless {
-  args: "cache --reload http://localhost:4545/cli/tests/subdir/no_js_ext",
+  args: "cache --reload http://localhost:4545/subdir/no_js_ext",
   output: "cache_extensionless.out",
   http_server: true,
 });
 
 itest!(cache_random_extension {
-  args: "cache --reload http://localhost:4545/cli/tests/subdir/no_js_ext@1.0.0",
+  args: "cache --reload http://localhost:4545/subdir/no_js_ext@1.0.0",
   output: "cache_random_extension.out",
   http_server: true,
 });
@@ -39,7 +39,7 @@ itest!(performance_stats {
 
 itest!(redirect_cache {
   http_server: true,
-  args: "cache --reload http://localhost:4548/cli/tests/subdir/redirects/a.ts",
+  args: "cache --reload http://localhost:4548/subdir/redirects/a.ts",
   output: "redirect_cache.out",
 });
 
diff --git a/cli/tests/integration/compile_tests.rs b/cli/tests/integration/compile_tests.rs
index 0748821dd..067f6b9eb 100644
--- a/cli/tests/integration/compile_tests.rs
+++ b/cli/tests/integration/compile_tests.rs
@@ -71,12 +71,12 @@ fn standalone_args() {
     dir.path().join("args")
   };
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("compile")
     .arg("--unstable")
     .arg("--output")
     .arg(&exe)
-    .arg("./cli/tests/028_args.ts")
+    .arg("./028_args.ts")
     .arg("a")
     .arg("b")
     .stdout(std::process::Stdio::piped())
@@ -107,12 +107,12 @@ fn standalone_error() {
     dir.path().join("error")
   };
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("compile")
     .arg("--unstable")
     .arg("--output")
     .arg(&exe)
-    .arg("./cli/tests/standalone_error.ts")
+    .arg("./standalone_error.ts")
     .stdout(std::process::Stdio::piped())
     .spawn()
     .unwrap()
@@ -143,12 +143,12 @@ fn standalone_no_module_load() {
     dir.path().join("hello")
   };
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("compile")
     .arg("--unstable")
     .arg("--output")
     .arg(&exe)
-    .arg("./cli/tests/standalone_import.ts")
+    .arg("./standalone_import.ts")
     .stdout(std::process::Stdio::piped())
     .spawn()
     .unwrap()
@@ -178,12 +178,12 @@ fn standalone_load_datauri() {
     dir.path().join("load_datauri")
   };
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("compile")
     .arg("--unstable")
     .arg("--output")
     .arg(&exe)
-    .arg("./cli/tests/standalone_import_datauri.ts")
+    .arg("./standalone_import_datauri.ts")
     .stdout(std::process::Stdio::piped())
     .spawn()
     .unwrap()
@@ -210,12 +210,12 @@ fn standalone_compiler_ops() {
     dir.path().join("standalone_compiler_ops")
   };
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("compile")
     .arg("--unstable")
     .arg("--output")
     .arg(&exe)
-    .arg("./cli/tests/standalone_compiler_ops.ts")
+    .arg("./standalone_compiler_ops.ts")
     .stdout(std::process::Stdio::piped())
     .spawn()
     .unwrap()
@@ -243,12 +243,12 @@ fn compile_with_directory_exists_error() {
   };
   std::fs::create_dir(&exe).expect("cannot create directory");
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("compile")
     .arg("--unstable")
     .arg("--output")
     .arg(&exe)
-    .arg("./cli/tests/028_args.ts")
+    .arg("./028_args.ts")
     .stderr(std::process::Stdio::piped())
     .spawn()
     .unwrap()
@@ -272,12 +272,12 @@ fn compile_with_conflict_file_exists_error() {
   std::fs::write(&exe, b"SHOULD NOT BE OVERWRITTEN")
     .expect("cannot create file");
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("compile")
     .arg("--unstable")
     .arg("--output")
     .arg(&exe)
-    .arg("./cli/tests/028_args.ts")
+    .arg("./028_args.ts")
     .stderr(std::process::Stdio::piped())
     .spawn()
     .unwrap()
@@ -303,12 +303,12 @@ fn compile_and_overwrite_file() {
     dir.path().join("args")
   };
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("compile")
     .arg("--unstable")
     .arg("--output")
     .arg(&exe)
-    .arg("./cli/tests/028_args.ts")
+    .arg("./028_args.ts")
     .stderr(std::process::Stdio::piped())
     .spawn()
     .unwrap()
@@ -318,12 +318,12 @@ fn compile_and_overwrite_file() {
   assert!(&exe.exists());
 
   let recompile_output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("compile")
     .arg("--unstable")
     .arg("--output")
     .arg(&exe)
-    .arg("./cli/tests/028_args.ts")
+    .arg("./028_args.ts")
     .stderr(std::process::Stdio::piped())
     .spawn()
     .unwrap()
@@ -341,7 +341,7 @@ fn standalone_runtime_flags() {
     dir.path().join("flags")
   };
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("compile")
     .arg("--unstable")
     .arg("--allow-read")
@@ -349,7 +349,7 @@ fn standalone_runtime_flags() {
     .arg("1")
     .arg("--output")
     .arg(&exe)
-    .arg("./cli/tests/standalone_runtime_flags.ts")
+    .arg("./standalone_runtime_flags.ts")
     .stdout(std::process::Stdio::piped())
     .spawn()
     .unwrap()
diff --git a/cli/tests/integration/coverage_tests.rs b/cli/tests/integration/coverage_tests.rs
index dce3fb38c..4580b5cec 100644
--- a/cli/tests/integration/coverage_tests.rs
+++ b/cli/tests/integration/coverage_tests.rs
@@ -9,12 +9,12 @@ fn branch() {
   let tempdir = TempDir::new().expect("tempdir fail");
   let tempdir = tempdir.path().join("cov");
   let status = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("test")
     .arg("--quiet")
     .arg("--unstable")
     .arg(format!("--coverage={}", tempdir.to_str().unwrap()))
-    .arg("cli/tests/coverage/branch_test.ts")
+    .arg("coverage/branch_test.ts")
     .stdout(std::process::Stdio::piped())
     .stderr(std::process::Stdio::inherit())
     .status()
@@ -23,7 +23,7 @@ fn branch() {
   assert!(status.success());
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("coverage")
     .arg("--quiet")
     .arg("--unstable")
@@ -38,7 +38,7 @@ fn branch() {
       .to_string();
 
   let expected = fs::read_to_string(
-    util::root_path().join("cli/tests/coverage/expected_branch.out"),
+    util::testdata_path().join("coverage/expected_branch.out"),
   )
   .unwrap();
 
@@ -51,7 +51,7 @@ fn branch() {
   assert!(output.status.success());
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("coverage")
     .arg("--quiet")
     .arg("--unstable")
@@ -67,7 +67,7 @@ fn branch() {
       .to_string();
 
   let expected = fs::read_to_string(
-    util::root_path().join("cli/tests/coverage/expected_branch.lcov"),
+    util::testdata_path().join("coverage/expected_branch.lcov"),
   )
   .unwrap();
 
@@ -84,12 +84,12 @@ fn branch() {
 fn complex() {
   let tempdir = TempDir::new().expect("tempdir fail");
   let status = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("test")
     .arg("--quiet")
     .arg("--unstable")
     .arg(format!("--coverage={}", tempdir.path().to_str().unwrap()))
-    .arg("cli/tests/coverage/complex_test.ts")
+    .arg("coverage/complex_test.ts")
     .stdout(std::process::Stdio::piped())
     .stderr(std::process::Stdio::inherit())
     .status()
@@ -98,7 +98,7 @@ fn complex() {
   assert!(status.success());
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("coverage")
     .arg("--quiet")
     .arg("--unstable")
@@ -113,7 +113,7 @@ fn complex() {
       .to_string();
 
   let expected = fs::read_to_string(
-    util::root_path().join("cli/tests/coverage/expected_complex.out"),
+    util::testdata_path().join("coverage/expected_complex.out"),
   )
   .unwrap();
 
@@ -126,7 +126,7 @@ fn complex() {
   assert!(output.status.success());
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("coverage")
     .arg("--quiet")
     .arg("--unstable")
@@ -142,7 +142,7 @@ fn complex() {
       .to_string();
 
   let expected = fs::read_to_string(
-    util::root_path().join("cli/tests/coverage/expected_complex.lcov"),
+    util::testdata_path().join("coverage/expected_complex.lcov"),
   )
   .unwrap();
 
diff --git a/cli/tests/integration/fmt_tests.rs b/cli/tests/integration/fmt_tests.rs
index 4aab38fcf..00565a5d0 100644
--- a/cli/tests/integration/fmt_tests.rs
+++ b/cli/tests/integration/fmt_tests.rs
@@ -7,33 +7,32 @@ use test_util as util;
 #[test]
 fn fmt_test() {
   let t = TempDir::new().expect("tempdir fail");
-  let fixed_js = util::root_path().join("cli/tests/badly_formatted_fixed.js");
+  let fixed_js = util::testdata_path().join("badly_formatted_fixed.js");
   let badly_formatted_original_js =
-    util::root_path().join("cli/tests/badly_formatted.mjs");
+    util::testdata_path().join("badly_formatted.mjs");
   let badly_formatted_js = t.path().join("badly_formatted.js");
   let badly_formatted_js_str = badly_formatted_js.to_str().unwrap();
   std::fs::copy(&badly_formatted_original_js, &badly_formatted_js)
     .expect("Failed to copy file");
 
-  let fixed_md = util::root_path().join("cli/tests/badly_formatted_fixed.md");
+  let fixed_md = util::testdata_path().join("badly_formatted_fixed.md");
   let badly_formatted_original_md =
-    util::root_path().join("cli/tests/badly_formatted.md");
+    util::testdata_path().join("badly_formatted.md");
   let badly_formatted_md = t.path().join("badly_formatted.md");
   let badly_formatted_md_str = badly_formatted_md.to_str().unwrap();
   std::fs::copy(&badly_formatted_original_md, &badly_formatted_md)
     .expect("Failed to copy file");
 
-  let fixed_json =
-    util::root_path().join("cli/tests/badly_formatted_fixed.json");
+  let fixed_json = util::testdata_path().join("badly_formatted_fixed.json");
   let badly_formatted_original_json =
-    util::root_path().join("cli/tests/badly_formatted.json");
+    util::testdata_path().join("badly_formatted.json");
   let badly_formatted_json = t.path().join("badly_formatted.json");
   let badly_formatted_json_str = badly_formatted_json.to_str().unwrap();
   std::fs::copy(&badly_formatted_original_json, &badly_formatted_json)
     .expect("Failed to copy file");
   // First, check formatting by ignoring the badly formatted file.
   let status = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("fmt")
     .arg(format!(
       "--ignore={},{},{}",
@@ -52,7 +51,7 @@ fn fmt_test() {
 
   // Check without ignore.
   let status = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("fmt")
     .arg("--check")
     .arg(badly_formatted_js_str)
@@ -66,7 +65,7 @@ fn fmt_test() {
 
   // Format the source file.
   let status = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("fmt")
     .arg(badly_formatted_js_str)
     .arg(badly_formatted_md_str)
@@ -91,7 +90,7 @@ fn fmt_test() {
 fn fmt_stdin_error() {
   use std::io::Write;
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("fmt")
     .arg("-")
     .stdin(std::process::Stdio::piped())
@@ -112,7 +111,7 @@ fn fmt_stdin_error() {
 #[test]
 fn fmt_ignore_unexplicit_files() {
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .env("NO_COLOR", "1")
     .arg("fmt")
     .arg("--check")
diff --git a/cli/tests/integration/info_tests.rs b/cli/tests/integration/info_tests.rs
index af0f259ea..9e7dbda5b 100644
--- a/cli/tests/integration/info_tests.rs
+++ b/cli/tests/integration/info_tests.rs
@@ -7,12 +7,12 @@ use test_util as util;
 #[test]
 fn info_with_compiled_source() {
   let _g = util::http_server();
-  let module_path = "http://127.0.0.1:4545/cli/tests/048_media_types_jsx.ts";
+  let module_path = "http://127.0.0.1:4545/048_media_types_jsx.ts";
   let t = TempDir::new().expect("tempdir fail");
 
   let mut deno = util::deno_cmd()
     .env("DENO_DIR", t.path())
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("cache")
     .arg(&module_path)
     .spawn()
@@ -23,7 +23,7 @@ fn info_with_compiled_source() {
   let output = util::deno_cmd()
     .env("DENO_DIR", t.path())
     .env("NO_COLOR", "1")
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("info")
     .arg(&module_path)
     .output()
@@ -37,7 +37,7 @@ fn info_with_compiled_source() {
 }
 
 itest!(_022_info_flag_script {
-  args: "info http://127.0.0.1:4545/cli/tests/019_media_types.ts",
+  args: "info http://127.0.0.1:4545/019_media_types.ts",
   output: "022_info_flag_script.out",
   http_server: true,
 });
@@ -68,7 +68,7 @@ itest!(info_json_location {
 });
 
 itest!(_049_info_flag_script_jsx {
-  args: "info http://127.0.0.1:4545/cli/tests/048_media_types_jsx.ts",
+  args: "info http://127.0.0.1:4545/048_media_types_jsx.ts",
   output: "049_info_flag_script_jsx.out",
   http_server: true,
 });
diff --git a/cli/tests/integration/inspector_tests.rs b/cli/tests/integration/inspector_tests.rs
index edc18b8d7..520a5b4f7 100644
--- a/cli/tests/integration/inspector_tests.rs
+++ b/cli/tests/integration/inspector_tests.rs
@@ -30,7 +30,7 @@ fn extract_ws_url_from_stderr(
 
 #[tokio::test]
 async fn inspector_connect() {
-  let script = util::tests_path().join("inspector1.js");
+  let script = util::testdata_path().join("inspector1.js");
   let mut child = util::deno_cmd()
     .arg("run")
     .arg(inspect_flag_with_unique_port("--inspect"))
@@ -64,7 +64,7 @@ enum TestStep {
 
 #[tokio::test]
 async fn inspector_break_on_first_line() {
-  let script = util::tests_path().join("inspector2.js");
+  let script = util::testdata_path().join("inspector2.js");
   let mut child = util::deno_cmd()
     .arg("run")
     .arg(inspect_flag_with_unique_port("--inspect-brk"))
@@ -132,7 +132,7 @@ async fn inspector_break_on_first_line() {
 
 #[tokio::test]
 async fn inspector_pause() {
-  let script = util::tests_path().join("inspector1.js");
+  let script = util::testdata_path().join("inspector1.js");
   let mut child = util::deno_cmd()
     .arg("run")
     .arg(inspect_flag_with_unique_port("--inspect"))
@@ -202,7 +202,7 @@ async fn inspector_port_collision() {
     return;
   }
 
-  let script = util::tests_path().join("inspector1.js");
+  let script = util::testdata_path().join("inspector1.js");
   let inspect_flag = inspect_flag_with_unique_port("--inspect");
 
   let mut child1 = util::deno_cmd()
@@ -242,7 +242,7 @@ async fn inspector_port_collision() {
 
 #[tokio::test]
 async fn inspector_does_not_hang() {
-  let script = util::tests_path().join("inspector3.js");
+  let script = util::testdata_path().join("inspector3.js");
   let mut child = util::deno_cmd()
     .arg("run")
     .arg(inspect_flag_with_unique_port("--inspect-brk"))
@@ -330,7 +330,7 @@ async fn inspector_does_not_hang() {
 
 #[tokio::test]
 async fn inspector_without_brk_runs_code() {
-  let script = util::tests_path().join("inspector4.js");
+  let script = util::testdata_path().join("inspector4.js");
   let mut child = util::deno_cmd()
     .arg("run")
     .arg(inspect_flag_with_unique_port("--inspect"))
@@ -438,7 +438,7 @@ async fn inspector_runtime_evaluate_does_not_crash() {
 
 #[tokio::test]
 async fn inspector_json() {
-  let script = util::tests_path().join("inspector1.js");
+  let script = util::testdata_path().join("inspector1.js");
   let mut child = util::deno_cmd()
     .arg("run")
     .arg(inspect_flag_with_unique_port("--inspect"))
@@ -467,7 +467,7 @@ async fn inspector_json() {
 
 #[tokio::test]
 async fn inspector_json_list() {
-  let script = util::tests_path().join("inspector1.js");
+  let script = util::testdata_path().join("inspector1.js");
   let mut child = util::deno_cmd()
     .arg("run")
     .arg(inspect_flag_with_unique_port("--inspect"))
@@ -498,7 +498,7 @@ async fn inspector_json_list() {
 async fn inspector_connect_non_ws() {
   // https://github.com/denoland/deno/issues/11449
   // Verify we don't panic if non-WS connection is being established
-  let script = util::tests_path().join("inspector1.js");
+  let script = util::testdata_path().join("inspector1.js");
   let mut child = util::deno_cmd()
     .arg("run")
     .arg(inspect_flag_with_unique_port("--inspect"))
diff --git a/cli/tests/integration/install_tests.rs b/cli/tests/integration/install_tests.rs
index e5229df8f..ff93c157f 100644
--- a/cli/tests/integration/install_tests.rs
+++ b/cli/tests/integration/install_tests.rs
@@ -16,7 +16,7 @@ fn installer_test_local_module_run() {
     .arg("echo_test")
     .arg("--root")
     .arg(temp_dir.path())
-    .arg(util::tests_path().join("echo.ts"))
+    .arg(util::testdata_path().join("echo.ts"))
     .arg("hello")
     .spawn()
     .unwrap()
@@ -47,13 +47,13 @@ fn installer_test_remote_module_run() {
   let bin_dir = temp_dir.path().join("bin");
   std::fs::create_dir(&bin_dir).unwrap();
   let status = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("install")
     .arg("--name")
     .arg("echo_test")
     .arg("--root")
     .arg(temp_dir.path())
-    .arg("http://localhost:4545/cli/tests/echo.ts")
+    .arg("http://localhost:4545/echo.ts")
     .arg("hello")
     .spawn()
     .unwrap()
diff --git a/cli/tests/integration/lsp_tests.rs b/cli/tests/integration/lsp_tests.rs
index 518dfe850..f0cb6d4b8 100644
--- a/cli/tests/integration/lsp_tests.rs
+++ b/cli/tests/integration/lsp_tests.rs
@@ -12,17 +12,17 @@ use tempfile::TempDir;
 use test_util::deno_exe_path;
 use test_util::http_server;
 use test_util::lsp::LspClient;
-use test_util::root_path;
+use test_util::testdata_path;
 
 fn load_fixture(path: &str) -> Value {
-  let fixtures_path = root_path().join("cli/tests/lsp");
+  let fixtures_path = testdata_path().join("lsp");
   let path = fixtures_path.join(path);
   let fixture_str = fs::read_to_string(path).unwrap();
   serde_json::from_str(&fixture_str).unwrap()
 }
 
 fn load_fixture_str(path: &str) -> String {
-  let fixtures_path = root_path().join("cli/tests/lsp");
+  let fixtures_path = testdata_path().join("lsp");
   let path = fixtures_path.join(path);
   fs::read_to_string(path).unwrap()
 }
@@ -921,7 +921,7 @@ fn lsp_hover_dependency() {
     Some(json!({
       "contents": {
         "kind": "markdown",
-        "value": "**Resolved Dependency**\n\n**Code**: http&#8203;://127.0.0.1:4545/cli/tests/subdir/type_reference.js\n"
+        "value": "**Resolved Dependency**\n\n**Code**: http&#8203;://127.0.0.1:4545/subdir/type_reference.js\n"
       },
       "range": {
         "start": {
@@ -930,7 +930,7 @@ fn lsp_hover_dependency() {
         },
         "end":{
           "line": 3,
-          "character": 76
+          "character": 66
         }
       }
     }))
@@ -955,7 +955,7 @@ fn lsp_hover_dependency() {
     Some(json!({
       "contents": {
         "kind": "markdown",
-        "value": "**Resolved Dependency**\n\n**Code**: http&#8203;://127.0.0.1:4545/cli/tests/subdir/mod1.ts\n"
+        "value": "**Resolved Dependency**\n\n**Code**: http&#8203;://127.0.0.1:4545/subdir/mod1.ts\n"
       },
       "range": {
         "start": {
@@ -964,7 +964,7 @@ fn lsp_hover_dependency() {
         },
         "end":{
           "line": 4,
-          "character": 66
+          "character": 56
         }
       }
     }))
@@ -2713,7 +2713,7 @@ fn lsp_diagnostics_warn() {
         "uri": "file:///a/file.ts",
         "languageId": "typescript",
         "version": 1,
-        "text": "import * as a from \"http://127.0.0.1:4545/cli/tests/x_deno_warning.js\";\n\nconsole.log(a)\n",
+        "text": "import * as a from \"http://127.0.0.1:4545/x_deno_warning.js\";\n\nconsole.log(a)\n",
       },
     }),
   );
@@ -2726,7 +2726,7 @@ fn lsp_diagnostics_warn() {
         },
         "uris": [
           {
-            "uri": "http://127.0.0.1:4545/cli/tests/x_deno_warning.js",
+            "uri": "http://127.0.0.1:4545/x_deno_warning.js",
           }
         ],
       }),
@@ -2755,7 +2755,7 @@ fn lsp_diagnostics_warn() {
           },
           end: lsp::Position {
             line: 0,
-            character: 70
+            character: 60
           }
         },
         severity: Some(lsp::DiagnosticSeverity::Warning),
diff --git a/cli/tests/integration/mod.rs b/cli/tests/integration/mod.rs
index b8917fc91..1d6555ff7 100644
--- a/cli/tests/integration/mod.rs
+++ b/cli/tests/integration/mod.rs
@@ -74,7 +74,7 @@ mod worker;
 #[test]
 fn help_flag() {
   let status = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("--help")
     .spawn()
     .unwrap()
@@ -86,7 +86,7 @@ fn help_flag() {
 #[test]
 fn version_short_flag() {
   let status = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("-V")
     .spawn()
     .unwrap()
@@ -98,7 +98,7 @@ fn version_short_flag() {
 #[test]
 fn version_long_flag() {
   let status = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("--version")
     .spawn()
     .unwrap()
@@ -117,11 +117,10 @@ fn cache_test() {
   let _g = util::http_server();
   let deno_dir = TempDir::new().expect("tempdir fail");
   let module_url =
-    url::Url::parse("http://localhost:4545/cli/tests/006_url_imports.ts")
-      .unwrap();
+    url::Url::parse("http://localhost:4545/006_url_imports.ts").unwrap();
   let output = Command::new(util::deno_exe_path())
     .env("DENO_DIR", deno_dir.path())
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("cache")
     .arg("-L")
     .arg("debug")
@@ -141,7 +140,7 @@ fn cache_test() {
     .env("DENO_DIR", deno_dir.path())
     .env("HTTP_PROXY", "http://nil")
     .env("NO_COLOR", "1")
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(module_url.to_string())
     .output()
@@ -149,8 +148,7 @@ fn cache_test() {
 
   let str_output = std::str::from_utf8(&output.stdout).unwrap();
 
-  let module_output_path =
-    util::root_path().join("cli/tests/006_url_imports.ts.out");
+  let module_output_path = util::testdata_path().join("006_url_imports.ts.out");
   let mut module_output = String::new();
   let mut module_output_file = fs::File::open(module_output_path).unwrap();
   module_output_file
@@ -173,7 +171,7 @@ fn cache_invalidation_test() {
   }
   let output = Command::new(util::deno_exe_path())
     .env("DENO_DIR", deno_dir.path())
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(fixture_path.to_str().unwrap())
     .output()
@@ -190,7 +188,7 @@ fn cache_invalidation_test() {
   }
   let output = Command::new(util::deno_exe_path())
     .env("DENO_DIR", deno_dir.path())
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(fixture_path.to_str().unwrap())
     .output()
@@ -213,7 +211,7 @@ fn cache_invalidation_test_no_check() {
   }
   let output = Command::new(util::deno_exe_path())
     .env("DENO_DIR", deno_dir.path())
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg("--no-check")
     .arg(fixture_path.to_str().unwrap())
@@ -231,7 +229,7 @@ fn cache_invalidation_test_no_check() {
   }
   let output = Command::new(util::deno_exe_path())
     .env("DENO_DIR", deno_dir.path())
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg("--no-check")
     .arg(fixture_path.to_str().unwrap())
@@ -269,7 +267,7 @@ fn ts_dependency_recompilation() {
   .unwrap();
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .env("NO_COLOR", "1")
     .arg("run")
     .arg(&ats)
@@ -291,7 +289,7 @@ fn ts_dependency_recompilation() {
   .expect("error writing file");
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .env("NO_COLOR", "1")
     .arg("run")
     .arg(&ats)
@@ -312,12 +310,12 @@ fn ts_no_recheck_on_redirect() {
   let deno_dir = util::new_deno_dir();
   let e = util::deno_exe_path();
 
-  let redirect_ts = util::root_path().join("cli/tests/017_import_redirect.ts");
+  let redirect_ts = util::testdata_path().join("017_import_redirect.ts");
   assert!(redirect_ts.is_file());
   let mut cmd = Command::new(e.clone());
   cmd.env("DENO_DIR", deno_dir.path());
   let mut initial = cmd
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(redirect_ts.clone())
     .spawn()
@@ -329,7 +327,7 @@ fn ts_no_recheck_on_redirect() {
   let mut cmd = Command::new(e);
   cmd.env("DENO_DIR", deno_dir.path());
   let output = cmd
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(redirect_ts)
     .output()
@@ -340,12 +338,12 @@ fn ts_no_recheck_on_redirect() {
 
 #[test]
 fn ts_reload() {
-  let hello_ts = util::root_path().join("cli/tests/002_hello.ts");
+  let hello_ts = util::testdata_path().join("002_hello.ts");
   assert!(hello_ts.is_file());
 
   let deno_dir = TempDir::new().expect("tempdir fail");
   let mut initial = util::deno_cmd_with_deno_dir(deno_dir.path())
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("cache")
     .arg(&hello_ts)
     .spawn()
@@ -355,7 +353,7 @@ fn ts_reload() {
   assert!(status_initial.success());
 
   let output = util::deno_cmd_with_deno_dir(deno_dir.path())
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("cache")
     .arg("--reload")
     .arg("-L")
@@ -391,7 +389,7 @@ console.log("finish");
 "#;
 
   let mut p = util::deno_cmd()
-    .current_dir(util::tests_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg("-")
     .stdin(std::process::Stdio::piped())
@@ -411,7 +409,7 @@ console.log("finish");
 #[test]
 fn compiler_api() {
   let status = util::deno_cmd()
-    .current_dir(util::tests_path())
+    .current_dir(util::testdata_path())
     .arg("test")
     .arg("--unstable")
     .arg("--reload")
@@ -431,7 +429,7 @@ fn broken_stdout() {
   drop(reader);
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("eval")
     .arg("console.log(3.14)")
     .stdout(writer)
@@ -461,14 +459,14 @@ itest!(cafile_ts_fetch {
 });
 
 itest!(cafile_eval {
-  args: "eval --cert tls/RootCA.pem fetch('https://localhost:5545/cli/tests/cafile_ts_fetch.ts.out').then(r=>r.text()).then(t=>console.log(t.trimEnd()))",
+  args: "eval --cert tls/RootCA.pem fetch('https://localhost:5545/cafile_ts_fetch.ts.out').then(r=>r.text()).then(t=>console.log(t.trimEnd()))",
   output: "cafile_ts_fetch.ts.out",
   http_server: true,
 });
 
 itest!(cafile_info {
   args:
-    "info --quiet --cert tls/RootCA.pem https://localhost:5545/cli/tests/cafile_info.ts",
+    "info --quiet --cert tls/RootCA.pem https://localhost:5545/cafile_info.ts",
   output: "cafile_info.ts.out",
   http_server: true,
 });
@@ -506,13 +504,12 @@ fn cafile_env_fetch() {
   let _g = util::http_server();
   let deno_dir = TempDir::new().expect("tempdir fail");
   let module_url =
-    Url::parse("https://localhost:5545/cli/tests/cafile_url_imports.ts")
-      .unwrap();
-  let cafile = util::root_path().join("cli/tests/tls/RootCA.pem");
+    Url::parse("https://localhost:5545/cafile_url_imports.ts").unwrap();
+  let cafile = util::testdata_path().join("tls/RootCA.pem");
   let output = Command::new(util::deno_exe_path())
     .env("DENO_DIR", deno_dir.path())
     .env("DENO_CERT", cafile)
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("cache")
     .arg(module_url.to_string())
     .output()
@@ -526,12 +523,11 @@ fn cafile_fetch() {
   let _g = util::http_server();
   let deno_dir = TempDir::new().expect("tempdir fail");
   let module_url =
-    Url::parse("http://localhost:4545/cli/tests/cafile_url_imports.ts")
-      .unwrap();
-  let cafile = util::root_path().join("cli/tests/tls/RootCA.pem");
+    Url::parse("http://localhost:4545/cafile_url_imports.ts").unwrap();
+  let cafile = util::testdata_path().join("tls/RootCA.pem");
   let output = Command::new(util::deno_exe_path())
     .env("DENO_DIR", deno_dir.path())
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("cache")
     .arg("--cert")
     .arg(cafile)
@@ -550,11 +546,11 @@ fn cafile_install_remote_module() {
   let bin_dir = temp_dir.path().join("bin");
   std::fs::create_dir(&bin_dir).unwrap();
   let deno_dir = TempDir::new().expect("tempdir fail");
-  let cafile = util::root_path().join("cli/tests/tls/RootCA.pem");
+  let cafile = util::testdata_path().join("tls/RootCA.pem");
 
   let install_output = Command::new(util::deno_exe_path())
     .env("DENO_DIR", deno_dir.path())
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("install")
     .arg("--cert")
     .arg(cafile)
@@ -562,7 +558,7 @@ fn cafile_install_remote_module() {
     .arg(temp_dir.path())
     .arg("-n")
     .arg("echo_test")
-    .arg("https://localhost:5545/cli/tests/echo.ts")
+    .arg("https://localhost:5545/echo.ts")
     .output()
     .expect("Failed to spawn script");
   println!("{}", std::str::from_utf8(&install_output.stdout).unwrap());
@@ -590,12 +586,12 @@ fn cafile_bundle_remote_exports() {
   let _g = util::http_server();
 
   // First we have to generate a bundle of some remote module that has exports.
-  let mod1 = "https://localhost:5545/cli/tests/subdir/mod1.ts";
-  let cafile = util::root_path().join("cli/tests/tls/RootCA.pem");
+  let mod1 = "https://localhost:5545/subdir/mod1.ts";
+  let cafile = util::testdata_path().join("tls/RootCA.pem");
   let t = TempDir::new().expect("tempdir fail");
   let bundle = t.path().join("mod1.bundle.js");
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("bundle")
     .arg("--cert")
     .arg(cafile)
@@ -618,7 +614,7 @@ fn cafile_bundle_remote_exports() {
   .expect("error writing file");
 
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(&test)
     .output()
@@ -635,8 +631,8 @@ fn cafile_bundle_remote_exports() {
 fn websocket() {
   let _g = util::http_server();
 
-  let script = util::tests_path().join("websocket_test.ts");
-  let root_ca = util::tests_path().join("tls/RootCA.pem");
+  let script = util::testdata_path().join("websocket_test.ts");
+  let root_ca = util::testdata_path().join("tls/RootCA.pem");
   let status = util::deno_cmd()
     .arg("test")
     .arg("--unstable")
@@ -656,8 +652,8 @@ fn websocket() {
 fn websocketstream() {
   let _g = util::http_server();
 
-  let script = util::tests_path().join("websocketstream_test.ts");
-  let root_ca = util::tests_path().join("tls/RootCA.pem");
+  let script = util::testdata_path().join("websocketstream_test.ts");
+  let root_ca = util::testdata_path().join("tls/RootCA.pem");
   let status = util::deno_cmd()
     .arg("test")
     .arg("--unstable")
@@ -872,7 +868,7 @@ async fn test_resolve_dns() {
   // Pass: `--allow-net`
   {
     let output = util::deno_cmd()
-      .current_dir(util::tests_path())
+      .current_dir(util::testdata_path())
       .env("NO_COLOR", "1")
       .arg("run")
       .arg("--allow-net")
@@ -890,7 +886,7 @@ async fn test_resolve_dns() {
     assert!(err.starts_with("Check file"));
 
     let expected =
-      std::fs::read_to_string(util::tests_path().join("resolve_dns.ts.out"))
+      std::fs::read_to_string(util::testdata_path().join("resolve_dns.ts.out"))
         .unwrap();
     assert_eq!(expected, out);
   }
@@ -898,7 +894,7 @@ async fn test_resolve_dns() {
   // Pass: `--allow-net=127.0.0.1:4553`
   {
     let output = util::deno_cmd()
-      .current_dir(util::tests_path())
+      .current_dir(util::testdata_path())
       .env("NO_COLOR", "1")
       .arg("run")
       .arg("--allow-net=127.0.0.1:4553")
@@ -916,7 +912,7 @@ async fn test_resolve_dns() {
     assert!(err.starts_with("Check file"));
 
     let expected =
-      std::fs::read_to_string(util::tests_path().join("resolve_dns.ts.out"))
+      std::fs::read_to_string(util::testdata_path().join("resolve_dns.ts.out"))
         .unwrap();
     assert_eq!(expected, out);
   }
@@ -924,7 +920,7 @@ async fn test_resolve_dns() {
   // Permission error: `--allow-net=deno.land`
   {
     let output = util::deno_cmd()
-      .current_dir(util::tests_path())
+      .current_dir(util::testdata_path())
       .env("NO_COLOR", "1")
       .arg("run")
       .arg("--allow-net=deno.land")
@@ -947,7 +943,7 @@ async fn test_resolve_dns() {
   // Permission error: no permission specified
   {
     let output = util::deno_cmd()
-      .current_dir(util::tests_path())
+      .current_dir(util::testdata_path())
       .env("NO_COLOR", "1")
       .arg("run")
       .arg("--unstable")
@@ -1001,7 +997,7 @@ fn js_unit_tests_lint() {
   let status = util::deno_cmd()
     .arg("lint")
     .arg("--unstable")
-    .arg(util::root_path().join("cli/tests/unit"))
+    .arg(util::tests_path().join("unit"))
     .spawn()
     .unwrap()
     .wait()
@@ -1022,7 +1018,7 @@ fn js_unit_tests() {
     .arg("--unstable")
     .arg("--location=http://js-unit-tests/foo/bar")
     .arg("-A")
-    .arg("cli/tests/unit")
+    .arg(util::tests_path().join("unit"))
     .spawn()
     .expect("failed to spawn script");
 
@@ -1038,13 +1034,13 @@ async fn listen_tls_alpn() {
   LocalSet::new()
     .run_until(async {
       let mut child = util::deno_cmd()
-        .current_dir(util::root_path())
+        .current_dir(util::testdata_path())
         .arg("run")
         .arg("--unstable")
         .arg("--quiet")
         .arg("--allow-net")
         .arg("--allow-read")
-        .arg("./cli/tests/listen_tls_alpn.ts")
+        .arg("./listen_tls_alpn.ts")
         .arg("4504")
         .stdout(std::process::Stdio::piped())
         .spawn()
@@ -1057,8 +1053,9 @@ async fn listen_tls_alpn() {
       assert_eq!(msg, "READY");
 
       let mut cfg = rustls::ClientConfig::new();
-      let reader =
-        &mut BufReader::new(Cursor::new(include_bytes!("../tls/RootCA.crt")));
+      let reader = &mut BufReader::new(Cursor::new(include_bytes!(
+        "../testdata/tls/RootCA.crt"
+      )));
       cfg.root_store.add_pem_file(reader).unwrap();
       cfg.alpn_protocols.push("foobar".as_bytes().to_vec());
       let cfg = Arc::new(cfg);
@@ -1090,13 +1087,13 @@ async fn listen_tls_alpn_fail() {
   LocalSet::new()
     .run_until(async {
       let mut child = util::deno_cmd()
-        .current_dir(util::root_path())
+        .current_dir(util::testdata_path())
         .arg("run")
         .arg("--unstable")
         .arg("--quiet")
         .arg("--allow-net")
         .arg("--allow-read")
-        .arg("./cli/tests/listen_tls_alpn.ts")
+        .arg("./listen_tls_alpn.ts")
         .arg("4505")
         .stdout(std::process::Stdio::piped())
         .spawn()
@@ -1109,8 +1106,9 @@ async fn listen_tls_alpn_fail() {
       assert_eq!(msg, "READY");
 
       let mut cfg = rustls::ClientConfig::new();
-      let reader =
-        &mut BufReader::new(Cursor::new(include_bytes!("../tls/RootCA.crt")));
+      let reader = &mut BufReader::new(Cursor::new(include_bytes!(
+        "../testdata/tls/RootCA.crt"
+      )));
       cfg.root_store.add_pem_file(reader).unwrap();
       cfg.alpn_protocols.push("boofar".as_bytes().to_vec());
       let cfg = Arc::new(cfg);
diff --git a/cli/tests/integration/repl_tests.rs b/cli/tests/integration/repl_tests.rs
index 7ce91d406..20dfccb7e 100644
--- a/cli/tests/integration/repl_tests.rs
+++ b/cli/tests/integration/repl_tests.rs
@@ -549,8 +549,7 @@ fn lexical_scoped_variable() {
 fn missing_deno_dir() {
   use std::fs::{read_dir, remove_dir_all};
   const DENO_DIR: &str = "nonexistent";
-  let test_deno_dir =
-    util::root_path().join("cli").join("tests").join(DENO_DIR);
+  let test_deno_dir = test_util::testdata_path().join(DENO_DIR);
   let (out, err) = util::run_and_collect_output(
     true,
     "repl",
diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs
index 4ca0616f7..f5ac82e9c 100644
--- a/cli/tests/integration/run_tests.rs
+++ b/cli/tests/integration/run_tests.rs
@@ -144,7 +144,7 @@ itest!(_033_import_map {
 
 itest!(_033_import_map_remote {
   args:
-    "run --quiet --reload --import-map=http://127.0.0.1:4545/cli/tests/import_maps/import_map_remote.json --unstable import_maps/test_remote.ts",
+    "run --quiet --reload --import-map=http://127.0.0.1:4545/import_maps/import_map_remote.json --unstable import_maps/test_remote.ts",
   output: "033_import_map_remote.out",
   http_server: true,
 });
@@ -155,8 +155,7 @@ itest!(_034_onload {
 });
 
 itest!(_035_cached_only_flag {
-  args:
-    "run --reload --cached-only http://127.0.0.1:4545/cli/tests/019_media_types.ts",
+  args: "run --reload --cached-only http://127.0.0.1:4545/019_media_types.ts",
   output: "035_cached_only_flag.out",
   exit_code: 1,
   http_server: true,
@@ -203,8 +202,7 @@ itest!(_048_media_types_jsx {
 });
 
 itest!(_052_no_remote_flag {
-  args:
-    "run --reload --no-remote http://127.0.0.1:4545/cli/tests/019_media_types.ts",
+  args: "run --reload --no-remote http://127.0.0.1:4545/019_media_types.ts",
   output: "052_no_remote_flag.out",
   exit_code: 1,
   http_server: true,
@@ -239,7 +237,7 @@ itest!(_071_location_unset {
 });
 
 itest!(_072_location_relative_fetch {
-    args: "run --location http://127.0.0.1:4545/cli/tests/ --allow-net 072_location_relative_fetch.ts",
+    args: "run --location http://127.0.0.1:4545/ --allow-net 072_location_relative_fetch.ts",
     output: "072_location_relative_fetch.ts.out",
     http_server: true,
   });
@@ -288,18 +286,17 @@ itest!(_082_prepare_stack_trace_throw {
 fn _083_legacy_external_source_map() {
   let _g = util::http_server();
   let deno_dir = TempDir::new().expect("tempdir fail");
-  let module_url = url::Url::parse(
-    "http://localhost:4545/cli/tests/083_legacy_external_source_map.ts",
-  )
-  .unwrap();
+  let module_url =
+    url::Url::parse("http://localhost:4545/083_legacy_external_source_map.ts")
+      .unwrap();
   // Write a faulty old external source map.
   let faulty_map_path = deno_dir.path().join("gen/http/localhost_PORT4545/9576bd5febd0587c5c4d88d57cb3ac8ebf2600c529142abe3baa9a751d20c334.js.map");
   std::fs::create_dir_all(faulty_map_path.parent().unwrap())
     .expect("Failed to create faulty source map dir.");
-  std::fs::write(faulty_map_path, "{\"version\":3,\"file\":\"\",\"sourceRoot\":\"\",\"sources\":[\"http://localhost:4545/cli/tests/083_legacy_external_source_map.ts\"],\"names\":[],\"mappings\":\";AAAA,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC\"}").expect("Failed to write faulty source map.");
+  std::fs::write(faulty_map_path, "{\"version\":3,\"file\":\"\",\"sourceRoot\":\"\",\"sources\":[\"http://localhost:4545/083_legacy_external_source_map.ts\"],\"names\":[],\"mappings\":\";AAAA,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC\"}").expect("Failed to write faulty source map.");
   let output = Command::new(util::deno_exe_path())
     .env("DENO_DIR", deno_dir.path())
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg(module_url.to_string())
     .output()
@@ -394,10 +391,11 @@ itest!(lock_write_fetch {
 });
 
 itest!(lock_check_ok {
-    args: "run --lock=lock_check_ok.json http://127.0.0.1:4545/cli/tests/003_relative_import.ts",
-    output: "003_relative_import.ts.out",
-    http_server: true,
-  });
+  args:
+    "run --lock=lock_check_ok.json http://127.0.0.1:4545/003_relative_import.ts",
+  output: "003_relative_import.ts.out",
+  http_server: true,
+});
 
 itest!(lock_check_ok2 {
   args: "run --lock=lock_check_ok2.json 019_media_types.ts",
@@ -406,14 +404,14 @@ itest!(lock_check_ok2 {
 });
 
 itest!(lock_dynamic_imports {
-  args: "run --lock=lock_dynamic_imports.json --allow-read --allow-net http://127.0.0.1:4545/cli/tests/013_dynamic_import.ts",
+  args: "run --lock=lock_dynamic_imports.json --allow-read --allow-net http://127.0.0.1:4545/013_dynamic_import.ts",
   output: "lock_dynamic_imports.out",
   exit_code: 10,
   http_server: true,
 });
 
 itest!(lock_check_err {
-  args: "run --lock=lock_check_err.json http://127.0.0.1:4545/cli/tests/003_relative_import.ts",
+  args: "run --lock=lock_check_err.json http://127.0.0.1:4545/003_relative_import.ts",
   output: "lock_check_err.out",
   exit_code: 10,
   http_server: true,
@@ -452,7 +450,7 @@ itest!(config_types_remote {
 
 itest!(empty_typescript {
   args: "run --reload subdir/empty.ts",
-  output_str: Some("Check file:[WILDCARD]tests/subdir/empty.ts\n"),
+  output_str: Some("Check file:[WILDCARD]/subdir/empty.ts\n"),
 });
 
 itest!(error_001 {
@@ -649,14 +647,14 @@ itest!(error_type_definitions {
 });
 
 itest!(error_local_static_import_from_remote_ts {
-    args: "run --reload http://localhost:4545/cli/tests/error_local_static_import_from_remote.ts",
+    args: "run --reload http://localhost:4545/error_local_static_import_from_remote.ts",
     exit_code: 1,
     http_server: true,
     output: "error_local_static_import_from_remote.ts.out",
   });
 
 itest!(error_local_static_import_from_remote_js {
-    args: "run --reload http://localhost:4545/cli/tests/error_local_static_import_from_remote.js",
+    args: "run --reload http://localhost:4545/error_local_static_import_from_remote.js",
     exit_code: 1,
     http_server: true,
     output: "error_local_static_import_from_remote.js.out",
@@ -938,14 +936,14 @@ itest!(_053_import_compression {
 });
 
 itest!(disallow_http_from_https_js {
-  args: "run --quiet --reload --cert tls/RootCA.pem https://localhost:5545/cli/tests/disallow_http_from_https.js",
+  args: "run --quiet --reload --cert tls/RootCA.pem https://localhost:5545/disallow_http_from_https.js",
   output: "disallow_http_from_https_js.out",
   http_server: true,
   exit_code: 1,
 });
 
 itest!(disallow_http_from_https_ts {
-  args: "run --quiet --reload --cert tls/RootCA.pem https://localhost:5545/cli/tests/disallow_http_from_https.ts",
+  args: "run --quiet --reload --cert tls/RootCA.pem https://localhost:5545/disallow_http_from_https.ts",
   output: "disallow_http_from_https_ts.out",
   http_server: true,
   exit_code: 1,
@@ -1175,9 +1173,9 @@ itest!(worker_close_race {
 #[test]
 fn no_validate_asm() {
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
-    .arg("cli/tests/no_validate_asm.js")
+    .arg("no_validate_asm.js")
     .stderr(std::process::Stdio::piped())
     .stdout(std::process::Stdio::piped())
     .spawn()
@@ -1192,10 +1190,10 @@ fn no_validate_asm() {
 #[test]
 fn exec_path() {
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg("--allow-read")
-    .arg("cli/tests/exec_path.ts")
+    .arg("exec_path.ts")
     .stdout(std::process::Stdio::piped())
     .spawn()
     .unwrap()
@@ -1223,7 +1221,7 @@ fn run_deno_script_constrained(
   script_path: std::path::PathBuf,
   constraints: WinProcConstraints,
 ) -> Result<(), i64> {
-  let file_path = "cli/tests/DenoWinRunner.ps1";
+  let file_path = "DenoWinRunner.ps1";
   let constraints = match constraints {
     WinProcConstraints::NoStdIn => "1",
     WinProcConstraints::NoStdOut => "2",
@@ -1244,7 +1242,7 @@ fn run_deno_script_constrained(
 #[test]
 fn should_not_panic_on_no_stdin() {
   let output = run_deno_script_constrained(
-    util::tests_path().join("echo.ts"),
+    util::testdata_path().join("echo.ts"),
     WinProcConstraints::NoStdIn,
   );
   output.unwrap();
@@ -1254,7 +1252,7 @@ fn should_not_panic_on_no_stdin() {
 #[test]
 fn should_not_panic_on_no_stdout() {
   let output = run_deno_script_constrained(
-    util::tests_path().join("echo.ts"),
+    util::testdata_path().join("echo.ts"),
     WinProcConstraints::NoStdOut,
   );
   output.unwrap();
@@ -1264,7 +1262,7 @@ fn should_not_panic_on_no_stdout() {
 #[test]
 fn should_not_panic_on_no_stderr() {
   let output = run_deno_script_constrained(
-    util::tests_path().join("echo.ts"),
+    util::testdata_path().join("echo.ts"),
     WinProcConstraints::NoStdErr,
   );
   output.unwrap();
@@ -1274,9 +1272,9 @@ fn should_not_panic_on_no_stderr() {
 #[test]
 fn should_not_panic_on_undefined_home_environment_variable() {
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
-    .arg("cli/tests/echo.ts")
+    .arg("echo.ts")
     .env_remove("HOME")
     .spawn()
     .unwrap()
@@ -1288,9 +1286,9 @@ fn should_not_panic_on_undefined_home_environment_variable() {
 #[test]
 fn should_not_panic_on_undefined_deno_dir_environment_variable() {
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
-    .arg("cli/tests/echo.ts")
+    .arg("echo.ts")
     .env_remove("DENO_DIR")
     .spawn()
     .unwrap()
@@ -1303,9 +1301,9 @@ fn should_not_panic_on_undefined_deno_dir_environment_variable() {
 #[test]
 fn should_not_panic_on_undefined_deno_dir_and_home_environment_variables() {
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
-    .arg("cli/tests/echo.ts")
+    .arg("echo.ts")
     .env_remove("DENO_DIR")
     .env_remove("HOME")
     .spawn()
@@ -1319,9 +1317,9 @@ fn should_not_panic_on_undefined_deno_dir_and_home_environment_variables() {
 fn rust_log() {
   // Without RUST_LOG the stderr is empty.
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
-    .arg("cli/tests/001_hello.js")
+    .arg("001_hello.js")
     .stderr(std::process::Stdio::piped())
     .spawn()
     .unwrap()
@@ -1332,9 +1330,9 @@ fn rust_log() {
 
   // With RUST_LOG the stderr is not empty.
   let output = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
-    .arg("cli/tests/001_hello.js")
+    .arg("001_hello.js")
     .env("RUST_LOG", "debug")
     .stderr(std::process::Stdio::piped())
     .spawn()
@@ -1352,7 +1350,7 @@ mod permissions {
   fn with_allow() {
     for permission in &util::PERMISSION_VARIANTS {
       let status = util::deno_cmd()
-        .current_dir(&util::tests_path())
+        .current_dir(&util::testdata_path())
         .arg("run")
         .arg(format!("--allow-{0}", permission))
         .arg("permission_test.ts")
@@ -1384,12 +1382,15 @@ mod permissions {
     const PERMISSION_VARIANTS: [&str; 2] = ["read", "write"];
     for permission in &PERMISSION_VARIANTS {
       let status = util::deno_cmd()
-        .current_dir(&util::tests_path())
+        .current_dir(&util::testdata_path())
         .arg("run")
         .arg(format!(
           "--allow-{0}={1}",
           permission,
-          util::root_path().into_os_string().into_string().unwrap()
+          util::testdata_path()
+            .into_os_string()
+            .into_string()
+            .unwrap()
         ))
         .arg("complex_permissions_test.ts")
         .arg(permission)
@@ -1411,9 +1412,7 @@ mod permissions {
         &format!(
           "run --allow-{0}={1} complex_permissions_test.ts {0} {2}",
           permission,
-          util::root_path()
-            .join("cli")
-            .join("tests")
+          util::testdata_path()
             .into_os_string()
             .into_string()
             .unwrap(),
@@ -1436,14 +1435,12 @@ mod permissions {
     const PERMISSION_VARIANTS: [&str; 2] = ["read", "write"];
     for permission in &PERMISSION_VARIANTS {
       let status = util::deno_cmd()
-        .current_dir(&util::tests_path())
+        .current_dir(&util::testdata_path())
         .arg("run")
         .arg(format!(
           "--allow-{0}={1}",
           permission,
-          util::root_path()
-            .join("cli")
-            .join("tests")
+          util::testdata_path()
             .into_os_string()
             .into_string()
             .unwrap()
@@ -1462,9 +1459,7 @@ mod permissions {
   #[test]
   fn rw_outside_test_and_js_dir() {
     const PERMISSION_VARIANTS: [&str; 2] = ["read", "write"];
-    let test_dir = util::root_path()
-      .join("cli")
-      .join("tests")
+    let test_dir = util::testdata_path()
       .into_os_string()
       .into_string()
       .unwrap();
@@ -1498,9 +1493,7 @@ mod permissions {
   #[test]
   fn rw_inside_test_and_js_dir() {
     const PERMISSION_VARIANTS: [&str; 2] = ["read", "write"];
-    let test_dir = util::root_path()
-      .join("cli")
-      .join("tests")
+    let test_dir = util::testdata_path()
       .into_os_string()
       .into_string()
       .unwrap();
@@ -1511,7 +1504,7 @@ mod permissions {
       .unwrap();
     for permission in &PERMISSION_VARIANTS {
       let status = util::deno_cmd()
-        .current_dir(&util::tests_path())
+        .current_dir(&util::testdata_path())
         .arg("run")
         .arg(format!("--allow-{0}={1},{2}", permission, test_dir, js_dir))
         .arg("complex_permissions_test.ts")
@@ -1530,7 +1523,7 @@ mod permissions {
     const PERMISSION_VARIANTS: [&str; 2] = ["read", "write"];
     for permission in &PERMISSION_VARIANTS {
       let status = util::deno_cmd()
-        .current_dir(&util::tests_path())
+        .current_dir(&util::testdata_path())
         .arg("run")
         .arg(format!("--allow-{0}=.", permission))
         .arg("complex_permissions_test.ts")
@@ -1549,7 +1542,7 @@ mod permissions {
     const PERMISSION_VARIANTS: [&str; 2] = ["read", "write"];
     for permission in &PERMISSION_VARIANTS {
       let status = util::deno_cmd()
-        .current_dir(&util::tests_path())
+        .current_dir(&util::testdata_path())
         .arg("run")
         .arg(format!("--allow-{0}=tls/../", permission))
         .arg("complex_permissions_test.ts")
diff --git a/cli/tests/integration/watcher_tests.rs b/cli/tests/integration/watcher_tests.rs
index ed574a0bf..8b03ae470 100644
--- a/cli/tests/integration/watcher_tests.rs
+++ b/cli/tests/integration/watcher_tests.rs
@@ -50,15 +50,15 @@ fn wait_for_process_failed(
 #[test]
 fn fmt_watch_test() {
   let t = TempDir::new().expect("tempdir fail");
-  let fixed = util::root_path().join("cli/tests/badly_formatted_fixed.js");
+  let fixed = util::testdata_path().join("badly_formatted_fixed.js");
   let badly_formatted_original =
-    util::root_path().join("cli/tests/badly_formatted.mjs");
+    util::testdata_path().join("badly_formatted.mjs");
   let badly_formatted = t.path().join("badly_formatted.js");
   std::fs::copy(&badly_formatted_original, &badly_formatted)
     .expect("Failed to copy file");
 
   let mut child = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("fmt")
     .arg(&badly_formatted)
     .arg("--watch")
@@ -109,7 +109,7 @@ fn bundle_js_watch() {
   let t = TempDir::new().expect("tempdir fail");
   let bundle = t.path().join("mod6.bundle.js");
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("bundle")
     .arg(&file_to_watch)
     .arg(&bundle)
@@ -173,7 +173,7 @@ fn bundle_watch_not_exit() {
   let target_file = t.path().join("target.js");
 
   let mut deno = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("bundle")
     .arg(&file_to_watch)
     .arg(&target_file)
@@ -224,7 +224,7 @@ fn run_watch() {
     .expect("error writing file");
 
   let mut child = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg("--watch")
     .arg("--unstable")
@@ -330,7 +330,7 @@ fn run_watch_not_exit() {
     .expect("error writing file");
 
   let mut child = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg("--watch")
     .arg("--unstable")
@@ -377,14 +377,14 @@ fn run_watch_with_import_map_and_relative_paths() {
     let absolute_path = directory.path().join(filename);
     std::fs::write(&absolute_path, filecontent).expect("error writing file");
     let relative_path = absolute_path
-      .strip_prefix(util::root_path())
+      .strip_prefix(util::testdata_path())
       .expect("unable to create relative temporary file")
       .to_owned();
     assert!(relative_path.is_relative());
     relative_path
   }
   let temp_directory =
-    TempDir::new_in(util::root_path()).expect("tempdir fail");
+    TempDir::new_in(util::testdata_path()).expect("tempdir fail");
   let file_to_watch = create_relative_tmp_file(
     &temp_directory,
     "file_to_watch.js",
@@ -397,7 +397,7 @@ fn run_watch_with_import_map_and_relative_paths() {
   );
 
   let mut child = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("run")
     .arg("--unstable")
     .arg("--watch")
@@ -443,7 +443,7 @@ fn test_watch() {
   let t = TempDir::new().expect("tempdir fail");
 
   let mut child = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("test")
     .arg("--watch")
     .arg("--unstable")
@@ -612,7 +612,7 @@ fn test_watch_doc() {
   let t = TempDir::new().expect("tempdir fail");
 
   let mut child = util::deno_cmd()
-    .current_dir(util::root_path())
+    .current_dir(util::testdata_path())
     .arg("test")
     .arg("--watch")
     .arg("--doc")
diff --git a/cli/tests/integration/worker_tests.rs b/cli/tests/integration/worker_tests.rs
index 2340fa705..c158776ee 100644
--- a/cli/tests/integration/worker_tests.rs
+++ b/cli/tests/integration/worker_tests.rs
@@ -3,7 +3,7 @@
 use crate::itest;
 
 itest!(workers {
-  args: "test --reload --location http://127.0.0.1:4545/cli/tests/ --allow-net --allow-read --unstable workers/test.ts",
+  args: "test --reload --location http://127.0.0.1:4545/ --allow-net --allow-read --unstable workers/test.ts",
   output: "workers/test.ts.out",
   http_server: true,
 });
diff --git a/cli/tests/localhost_unsafe_ssl.ts.out b/cli/tests/localhost_unsafe_ssl.ts.out
deleted file mode 100644
index 9ea991a64..000000000
--- a/cli/tests/localhost_unsafe_ssl.ts.out
+++ /dev/null
@@ -1,3 +0,0 @@
-DANGER: TLS certificate validation is disabled for: deno.land
-error: error sending request for url (https://localhost:5545/cli/tests/subdir/mod2.ts): error trying to connect: invalid certificate: UnknownIssuer
-    at [WILDCARD]tests/cafile_url_imports.ts:1:0
diff --git a/cli/tests/lock_check_err.json b/cli/tests/lock_check_err.json
deleted file mode 100644
index 0a1380dfc..000000000
--- a/cli/tests/lock_check_err.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "http://127.0.0.1:4545/cli/tests/subdir/print_hello.ts": "fa6692c8f9ff3fb107e773c3ece5274e9d08be282867a1e3ded1d9c00fcaa63c",
-  "http://127.0.0.1:4545/cli/tests/003_relative_import.ts": "bad"
-}
diff --git a/cli/tests/lock_check_err2.json b/cli/tests/lock_check_err2.json
deleted file mode 100644
index b26c1f0ae..000000000
--- a/cli/tests/lock_check_err2.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "http://localhost:4545/cli/tests/subdir/mt_application_ecmascript.j2.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_application_x_typescript.t4.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_text_ecmascript.j3.js": "bad",
-  "http://localhost:4545/cli/tests/subdir/mt_text_javascript.j1.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_video_vdn.t2.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18"
-}
diff --git a/cli/tests/lock_check_err_with_bundle.json b/cli/tests/lock_check_err_with_bundle.json
deleted file mode 100644
index 9c6a2e5f6..000000000
--- a/cli/tests/lock_check_err_with_bundle.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "http://127.0.0.1:4545/cli/tests/subdir/mod1.ts": "bfc1037b02c99abc20367f739bca7455813a5950066abd77965bff33b6eece0f",
-  "http://127.0.0.1:4545/cli/tests/subdir/print_hello.ts": "fa6692c8f9ff3fb107e773c3ece5274e9d08be282867a1e3ded1d9c00fcaa63c",
-  "http://127.0.0.1:4545/cli/tests/subdir/subdir2/mod2.ts": "bad"
-}
diff --git a/cli/tests/lock_check_ok.json b/cli/tests/lock_check_ok.json
deleted file mode 100644
index e0ee0a17e..000000000
--- a/cli/tests/lock_check_ok.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "http://127.0.0.1:4545/cli/tests/subdir/print_hello.ts": "fa6692c8f9ff3fb107e773c3ece5274e9d08be282867a1e3ded1d9c00fcaa63c",
-  "http://127.0.0.1:4545/cli/tests/003_relative_import.ts": "aa9e16de824f81871a1c7164d5bd6857df7db2e18621750bd66b0bde4df07f21"
-}
diff --git a/cli/tests/lock_check_ok2.json b/cli/tests/lock_check_ok2.json
deleted file mode 100644
index 38b450f86..000000000
--- a/cli/tests/lock_check_ok2.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "http://localhost:4545/cli/tests/subdir/mt_application_ecmascript.j2.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_application_x_typescript.t4.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_text_ecmascript.j3.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_text_javascript.j1.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_text_typescript.t1.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
-  "http://localhost:4545/cli/tests/subdir/mt_video_vdn.t2.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18"
-}
diff --git a/cli/tests/lock_dynamic_imports.json b/cli/tests/lock_dynamic_imports.json
deleted file mode 100644
index fb822f64e..000000000
--- a/cli/tests/lock_dynamic_imports.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "http://127.0.0.1:4545/cli/tests/013_dynamic_import.ts": "f0d2d108c100e769cda9f26b74326f21e44cab81611aa7f6cd2b731d4cbc1995",
-  "http://127.0.0.1:4545/cli/tests/subdir/mod1.ts": "bfc1037b02c99abc20367f739bca7455813a5950066abd77965bff33b6eece0f",
-  "http://127.0.0.1:4545/cli/tests/subdir/print_hello.ts": "fa6692c8f9ff3fb107e773c3ece5274e9d08be282867a1e3ded1d9c00fcaa63c",
-  "http://127.0.0.1:4545/cli/tests/subdir/subdir2/mod2.ts": "bad"
-}
diff --git a/cli/tests/lsp/did_open_params_import_hover.json b/cli/tests/lsp/did_open_params_import_hover.json
deleted file mode 100644
index 260e304d1..000000000
--- a/cli/tests/lsp/did_open_params_import_hover.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "textDocument": {
-    "uri": "file:///a/file.ts",
-    "languageId": "typescript",
-    "version": 1,
-    "text": "import * as a from \"http://127.0.0.1:4545/xTypeScriptTypes.js\";\n// @deno-types=\"http://127.0.0.1:4545/cli/tests/type_definitions/foo.d.ts\"\nimport * as b from \"http://127.0.0.1:4545/cli/tests/type_definitions/foo.js\";\nimport * as c from \"http://127.0.0.1:4545/cli/tests/subdir/type_reference.js\";\nimport * as d from \"http://127.0.0.1:4545/cli/tests/subdir/mod1.ts\";\nimport * as e from \"data:application/typescript;base64,ZXhwb3J0IGNvbnN0IGEgPSAiYSI7CgpleHBvcnQgZW51bSBBIHsKICBBLAogIEIsCiAgQywKfQo=\";\nimport * as f from \"./file_01.ts\";\n\nconsole.log(a, b, c, d, e, f);\n"
-  }
-}
diff --git a/cli/tests/lsp/did_open_params_large.json b/cli/tests/lsp/did_open_params_large.json
deleted file mode 100644
index b78d6e799..000000000
--- a/cli/tests/lsp/did_open_params_large.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "textDocument": {
-    "uri": "file:///a/file.ts",
-    "languageId": "javascript",
-    "version": 1,
-    "text": "// Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.\n\n// @ts-check\n/// <reference path=\"./compiler.d.ts\" />\n// deno-lint-ignore-file no-undef\n\n// This module is the entry point for \"compiler\" isolate, ie. the one\n// that is created when Deno needs to type check TypeScript, and in some\n// instances convert TypeScript to JavaScript.\n\n// Removes the `__proto__` for security reasons.  This intentionally makes\n// Deno non compliant with ECMA-262 Annex B.2.2.1\ndelete Object.prototype.__proto__;\n\n((window) => {\n  /** @type {DenoCore} */\n  const core = window.Deno.core;\n\n  let logDebug = false;\n  let logSource = \"JS\";\n\n  function setLogDebug(debug, source) {\n    logDebug = debug;\n    if (source) {\n      logSource = source;\n    }\n  }\n\n  function debug(...args) {\n    if (logDebug) {\n      const stringifiedArgs = args.map((arg) =>\n        typeof arg === \"string\" ? arg : JSON.stringify(arg)\n      ).join(\" \");\n      // adding a non-zero integer value to the end of the debug string causes\n      // the message to be printed to stderr instead of stdout, which is better\n      // aligned to the behaviour of debug messages\n      core.print(`DEBUG ${logSource} - ${stringifiedArgs}\\n`, 1);\n    }\n  }\n\n  function error(...args) {\n    const stringifiedArgs = args.map((arg) =>\n      typeof arg === \"string\" || arg instanceof Error\n        ? String(arg)\n        : JSON.stringify(arg)\n    ).join(\" \");\n    core.print(`ERROR ${logSource} = ${stringifiedArgs}\\n`, 1);\n  }\n\n  class AssertionError extends Error {\n    constructor(msg) {\n      super(msg);\n      this.name = \"AssertionError\";\n    }\n  }\n\n  function assert(cond, msg = \"Assertion failed.\") {\n    if (!cond) {\n      throw new AssertionError(msg);\n    }\n  }\n\n  /** @type {Map<string, ts.SourceFile>} */\n  const sourceFileCache = new Map();\n\n  /** @param {ts.DiagnosticRelatedInformation} diagnostic */\n  function fromRelatedInformation({\n    start,\n    length,\n    file,\n    messageText: msgText,\n    ...ri\n  }) {\n    let messageText;\n    let messageChain;\n    if (typeof msgText === \"object\") {\n      messageChain = msgText;\n    } else {\n      messageText = msgText;\n    }\n    if (start !== undefined && length !== undefined && file) {\n      const startPos = file.getLineAndCharacterOfPosition(start);\n      const sourceLine = file.getFullText().split(\"\\n\")[startPos.line];\n      const fileName = file.fileName;\n      return {\n        start: startPos,\n        end: file.getLineAndCharacterOfPosition(start + length),\n        fileName,\n        messageChain,\n        messageText,\n        sourceLine,\n        ...ri,\n      };\n    } else {\n      return {\n        messageChain,\n        messageText,\n        ...ri,\n      };\n    }\n  }\n\n  /** @param {ts.Diagnostic[]} diagnostics */\n  function fromTypeScriptDiagnostic(diagnostics) {\n    return diagnostics.map(({ relatedInformation: ri, source, ...diag }) => {\n      /** @type {any} */\n      const value = fromRelatedInformation(diag);\n      value.relatedInformation = ri\n        ? ri.map(fromRelatedInformation)\n        : undefined;\n      value.source = source;\n      return value;\n    });\n  }\n\n  // Using incremental compile APIs requires that all\n  // paths must be either relative or absolute. Since\n  // analysis in Rust operates on fully resolved URLs,\n  // it makes sense to use the same scheme here.\n  const ASSETS = \"asset:///\";\n  const CACHE = \"cache:///\";\n\n  /** Diagnostics that are intentionally ignored when compiling TypeScript in\n   * Deno, as they provide misleading or incorrect information. */\n  const IGNORED_DIAGNOSTICS = [\n    // TS1208: All files must be modules when the '--isolatedModules' flag is\n    // provided.  We can ignore because we guarantee that all files are\n    // modules.\n    1208,\n    // TS1375: 'await' expressions are only allowed at the top level of a file\n    // when that file is a module, but this file has no imports or exports.\n    // Consider adding an empty 'export {}' to make this file a module.\n    1375,\n    // TS1103: 'for-await-of' statement is only allowed within an async function\n    // or async generator.\n    1103,\n    // TS2306: File 'file:///Users/rld/src/deno/cli/tests/subdir/amd_like.js' is\n    // not a module.\n    2306,\n    // TS2691: An import path cannot end with a '.ts' extension. Consider\n    // importing 'bad-module' instead.\n    2691,\n    // TS2792: Cannot find module. Did you mean to set the 'moduleResolution'\n    // option to 'node', or to add aliases to the 'paths' option?\n    2792,\n    // TS5009: Cannot find the common subdirectory path for the input files.\n    5009,\n    // TS5055: Cannot write file\n    // 'http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js'\n    // because it would overwrite input file.\n    5055,\n    // TypeScript is overly opinionated that only CommonJS modules kinds can\n    // support JSON imports.  Allegedly this was fixed in\n    // Microsoft/TypeScript#26825 but that doesn't seem to be working here,\n    // so we will ignore complaints about this compiler setting.\n    5070,\n    // TS7016: Could not find a declaration file for module '...'. '...'\n    // implicitly has an 'any' type.  This is due to `allowJs` being off by\n    // default but importing of a JavaScript module.\n    7016,\n  ];\n\n  const SNAPSHOT_COMPILE_OPTIONS = {\n    esModuleInterop: true,\n    jsx: ts.JsxEmit.React,\n    module: ts.ModuleKind.ESNext,\n    noEmit: true,\n    strict: true,\n    target: ts.ScriptTarget.ESNext,\n  };\n\n  class ScriptSnapshot {\n    /** @type {string} */\n    specifier;\n    /** @type {string} */\n    version;\n    /**\n     * @param {string} specifier\n     * @param {string} version \n     */\n    constructor(specifier, version) {\n      this.specifier = specifier;\n      this.version = version;\n    }\n    /**\n     * @param {number} start \n     * @param {number} end \n     * @returns {string}\n     */\n    getText(start, end) {\n      const { specifier, version } = this;\n      debug(\n        `snapshot.getText(${start}, ${end}) specifier: ${specifier} version: ${version}`,\n      );\n      return core.jsonOpSync(\"op_get_text\", { specifier, version, start, end });\n    }\n    /**\n     * @returns {number}\n     */\n    getLength() {\n      const { specifier, version } = this;\n      debug(`snapshot.getLength() specifier: ${specifier} version: ${version}`);\n      return core.jsonOpSync(\"op_get_length\", { specifier, version });\n    }\n    /**\n     * @param {ScriptSnapshot} oldSnapshot\n     * @returns {ts.TextChangeRange | undefined}\n     */\n    getChangeRange(oldSnapshot) {\n      const { specifier, version } = this;\n      const { version: oldVersion } = oldSnapshot;\n      const oldLength = oldSnapshot.getLength();\n      debug(\n        `snapshot.getLength() specifier: ${specifier} oldVersion: ${oldVersion} version: ${version}`,\n      );\n      return core.jsonOpSync(\n        \"op_get_change_range\",\n        { specifier, oldLength, oldVersion, version },\n      );\n    }\n    dispose() {\n      const { specifier, version } = this;\n      debug(`snapshot.dispose() specifier: ${specifier} version: ${version}`);\n      core.jsonOpSync(\"op_dispose\", { specifier, version });\n    }\n  }\n\n  /** @type {ts.CompilerOptions} */\n  let compilationSettings = {};\n\n  /** @type {ts.LanguageService} */\n  let languageService;\n\n  /** An object literal of the incremental compiler host, which provides the\n   * specific \"bindings\" to the Deno environment that tsc needs to work.\n   *\n   * @type {ts.CompilerHost & ts.LanguageServiceHost} */\n  const host = {\n    fileExists(fileName) {\n      debug(`host.fileExists(\"${fileName}\")`);\n      return false;\n    },\n    readFile(specifier) {\n      debug(`host.readFile(\"${specifier}\")`);\n      return core.jsonOpSync(\"op_load\", { specifier }).data;\n    },\n    getSourceFile(\n      specifier,\n      languageVersion,\n      _onError,\n      _shouldCreateNewSourceFile,\n    ) {\n      debug(\n        `host.getSourceFile(\"${specifier}\", ${\n          ts.ScriptTarget[languageVersion]\n        })`,\n      );\n      let sourceFile = sourceFileCache.get(specifier);\n      if (sourceFile) {\n        return sourceFile;\n      }\n\n      /** @type {{ data: string; hash?: string; scriptKind: ts.ScriptKind }} */\n      const { data, hash, scriptKind } = core.jsonOpSync(\n        \"op_load\",\n        { specifier },\n      );\n      assert(\n        data != null,\n        `\"data\" is unexpectedly null for \"${specifier}\".`,\n      );\n      sourceFile = ts.createSourceFile(\n        specifier,\n        data,\n        languageVersion,\n        false,\n        scriptKind,\n      );\n      sourceFile.moduleName = specifier;\n      sourceFile.version = hash;\n      sourceFileCache.set(specifier, sourceFile);\n      return sourceFile;\n    },\n    getDefaultLibFileName() {\n      return `${ASSETS}/lib.esnext.d.ts`;\n    },\n    getDefaultLibLocation() {\n      return ASSETS;\n    },\n    writeFile(fileName, data, _writeByteOrderMark, _onError, sourceFiles) {\n      debug(`host.writeFile(\"${fileName}\")`);\n      let maybeSpecifiers;\n      if (sourceFiles) {\n        maybeSpecifiers = sourceFiles.map((sf) => sf.moduleName);\n      }\n      return core.jsonOpSync(\n        \"op_emit\",\n        { maybeSpecifiers, fileName, data },\n      );\n    },\n    getCurrentDirectory() {\n      return CACHE;\n    },\n    getCanonicalFileName(fileName) {\n      return fileName;\n    },\n    useCaseSensitiveFileNames() {\n      return true;\n    },\n    getNewLine() {\n      return \"\\n\";\n    },\n    resolveModuleNames(specifiers, base) {\n      debug(`host.resolveModuleNames()`);\n      debug(`  base: ${base}`);\n      debug(`  specifiers: ${specifiers.join(\", \")}`);\n      /** @type {Array<[string, ts.Extension] | undefined>} */\n      const resolved = core.jsonOpSync(\"op_resolve\", {\n        specifiers,\n        base,\n      });\n      if (resolved) {\n        const result = resolved.map((item) => {\n          if (item) {\n            const [resolvedFileName, extension] = item;\n            return {\n              resolvedFileName,\n              extension,\n              isExternalLibraryImport: false,\n            };\n          }\n          return undefined;\n        });\n        result.length = specifiers.length;\n        return result;\n      } else {\n        return new Array(specifiers.length);\n      }\n    },\n    createHash(data) {\n      return core.jsonOpSync(\"op_create_hash\", { data }).hash;\n    },\n\n    // LanguageServiceHost\n    getCompilationSettings() {\n      debug(\"host.getCompilationSettings()\");\n      return compilationSettings;\n    },\n    getScriptFileNames() {\n      debug(\"host.getScriptFileNames()\");\n      return core.jsonOpSync(\"op_script_names\", undefined);\n    },\n    getScriptVersion(specifier) {\n      debug(`host.getScriptVersion(\"${specifier}\")`);\n      const sourceFile = sourceFileCache.get(specifier);\n      if (sourceFile) {\n        return sourceFile.version ?? \"1\";\n      }\n      return core.jsonOpSync(\"op_script_version\", { specifier });\n    },\n    getScriptSnapshot(specifier) {\n      debug(`host.getScriptSnapshot(\"${specifier}\")`);\n      const sourceFile = sourceFileCache.get(specifier);\n      if (sourceFile) {\n        return {\n          getText(start, end) {\n            return sourceFile.text.substring(start, end);\n          },\n          getLength() {\n            return sourceFile.text.length;\n          },\n          getChangeRange() {\n            return undefined;\n          },\n        };\n      }\n      /** @type {string | undefined} */\n      const version = core.jsonOpSync(\"op_script_version\", { specifier });\n      if (version != null) {\n        return new ScriptSnapshot(specifier, version);\n      }\n      return undefined;\n    },\n  };\n\n  /** @type {Array<[string, number]>} */\n  const stats = [];\n  let statsStart = 0;\n\n  function performanceStart() {\n    stats.length = 0;\n    statsStart = Date.now();\n    ts.performance.enable();\n  }\n\n  /**\n   * @param {{ program: ts.Program | ts.EmitAndSemanticDiagnosticsBuilderProgram, fileCount?: number }} options \n   */\n  function performanceProgram({ program, fileCount }) {\n    if (program) {\n      if (\"getProgram\" in program) {\n        program = program.getProgram();\n      }\n      stats.push([\"Files\", program.getSourceFiles().length]);\n      stats.push([\"Nodes\", program.getNodeCount()]);\n      stats.push([\"Identifiers\", program.getIdentifierCount()]);\n      stats.push([\"Symbols\", program.getSymbolCount()]);\n      stats.push([\"Types\", program.getTypeCount()]);\n      stats.push([\"Instantiations\", program.getInstantiationCount()]);\n    } else if (fileCount != null) {\n      stats.push([\"Files\", fileCount]);\n    }\n    const programTime = ts.performance.getDuration(\"Program\");\n    const bindTime = ts.performance.getDuration(\"Bind\");\n    const checkTime = ts.performance.getDuration(\"Check\");\n    const emitTime = ts.performance.getDuration(\"Emit\");\n    stats.push([\"Parse time\", programTime]);\n    stats.push([\"Bind time\", bindTime]);\n    stats.push([\"Check time\", checkTime]);\n    stats.push([\"Emit time\", emitTime]);\n    stats.push(\n      [\"Total TS time\", programTime + bindTime + checkTime + emitTime],\n    );\n  }\n\n  function performanceEnd() {\n    const duration = Date.now() - statsStart;\n    stats.push([\"Compile time\", duration]);\n    return stats;\n  }\n\n  /**\n   * @typedef {object} Request\n   * @property {Record<string, any>} config\n   * @property {boolean} debug\n   * @property {string[]} rootNames\n   */\n\n  /** The API that is called by Rust when executing a request.\n   * @param {Request} request\n   */\n  function exec({ config, debug: debugFlag, rootNames }) {\n    setLogDebug(debugFlag, \"TS\");\n    performanceStart();\n    debug(\">>> exec start\", { rootNames });\n    debug(config);\n\n    const { options, errors: configFileParsingDiagnostics } = ts\n      .convertCompilerOptionsFromJson(config, \"\");\n    // The `allowNonTsExtensions` is a \"hidden\" compiler option used in VSCode\n    // which is not allowed to be passed in JSON, we need it to allow special\n    // URLs which Deno supports. So we need to either ignore the diagnostic, or\n    // inject it ourselves.\n    Object.assign(options, { allowNonTsExtensions: true });\n    const program = ts.createIncrementalProgram({\n      rootNames,\n      options,\n      host,\n      configFileParsingDiagnostics,\n    });\n\n    const { diagnostics: emitDiagnostics } = program.emit();\n\n    const diagnostics = [\n      ...program.getConfigFileParsingDiagnostics(),\n      ...program.getSyntacticDiagnostics(),\n      ...program.getOptionsDiagnostics(),\n      ...program.getGlobalDiagnostics(),\n      ...program.getSemanticDiagnostics(),\n      ...emitDiagnostics,\n    ].filter(({ code }) => !IGNORED_DIAGNOSTICS.includes(code));\n    performanceProgram({ program });\n\n    core.jsonOpSync(\"op_respond\", {\n      diagnostics: fromTypeScriptDiagnostic(diagnostics),\n      stats: performanceEnd(),\n    });\n    debug(\"<<< exec stop\");\n  }\n\n  /**\n   * @param {number} id \n   * @param {any} data \n   */\n  function respond(id, data = null) {\n    core.jsonOpSync(\"op_respond\", { id, data });\n  }\n\n  /**\n   * @param {LanguageServerRequest} request \n   */\n  function serverRequest({ id, ...request }) {\n    debug(`serverRequest()`, { id, ...request });\n    switch (request.method) {\n      case \"configure\": {\n        const { options, errors } = ts\n          .convertCompilerOptionsFromJson(request.compilerOptions, \"\");\n        Object.assign(options, { allowNonTsExtensions: true });\n        if (errors.length) {\n          debug(ts.formatDiagnostics(errors, host));\n        }\n        compilationSettings = options;\n        return respond(id, true);\n      }\n      case \"getAsset\": {\n        const sourceFile = host.getSourceFile(\n          request.specifier,\n          ts.ScriptTarget.ESNext,\n        );\n        return respond(id, sourceFile && sourceFile.text);\n      }\n      case \"getDiagnostics\": {\n        try {\n          /** @type {Record<string, any[]>} */\n          const diagnosticMap = {};\n          for (const specifier of request.specifiers) {\n            diagnosticMap[specifier] = fromTypeScriptDiagnostic([\n              ...languageService.getSemanticDiagnostics(specifier),\n              ...languageService.getSuggestionDiagnostics(specifier),\n              ...languageService.getSyntacticDiagnostics(specifier),\n            ].filter(({ code }) => !IGNORED_DIAGNOSTICS.includes(code)));\n          }\n          return respond(id, diagnosticMap);\n        } catch (e) {\n          if (\"stack\" in e) {\n            error(e.stack);\n          } else {\n            error(e);\n          }\n          return respond(id, {});\n        }\n      }\n      case \"getQuickInfo\": {\n        return respond(\n          id,\n          languageService.getQuickInfoAtPosition(\n            request.specifier,\n            request.position,\n          ),\n        );\n      }\n      case \"getCompletions\": {\n        return respond(\n          id,\n          languageService.getCompletionsAtPosition(\n            request.specifier,\n            request.position,\n            request.preferences,\n          ),\n        );\n      }\n      case \"getDocumentHighlights\": {\n        return respond(\n          id,\n          languageService.getDocumentHighlights(\n            request.specifier,\n            request.position,\n            request.filesToSearch,\n          ),\n        );\n      }\n      case \"getReferences\": {\n        return respond(\n          id,\n          languageService.getReferencesAtPosition(\n            request.specifier,\n            request.position,\n          ),\n        );\n      }\n      case \"getDefinition\": {\n        return respond(\n          id,\n          languageService.getDefinitionAndBoundSpan(\n            request.specifier,\n            request.position,\n          ),\n        );\n      }\n      case \"getImplementation\": {\n        return respond(\n          id,\n          languageService.getImplementationAtPosition(\n            request.specifier,\n            request.position,\n          ),\n        );\n      }\n      case \"findRenameLocations\": {\n        return respond(\n          id,\n          languageService.findRenameLocations(\n            request.specifier,\n            request.position,\n            request.findInStrings,\n            request.findInComments,\n            request.providePrefixAndSuffixTextForRename,\n          ),\n        );\n      }\n      default:\n        throw new TypeError(\n          // @ts-ignore exhausted case statement sets type to never\n          `Invalid request method for request: \"${request.method}\" (${id})`,\n        );\n    }\n  }\n\n  /** @param {{ debug: boolean; }} init */\n  function serverInit({ debug: debugFlag }) {\n    if (hasStarted) {\n      throw new Error(\"The language server has already been initialized.\");\n    }\n    hasStarted = true;\n    languageService = ts.createLanguageService(host);\n    core.ops();\n    setLogDebug(debugFlag, \"TSLS\");\n    debug(\"serverInit()\");\n  }\n\n  let hasStarted = false;\n\n  /** Startup the runtime environment, setting various flags.\n   * @param {{ debugFlag?: boolean; legacyFlag?: boolean; }} msg\n   */\n  function startup({ debugFlag = false }) {\n    if (hasStarted) {\n      throw new Error(\"The compiler runtime already started.\");\n    }\n    hasStarted = true;\n    core.ops();\n    setLogDebug(!!debugFlag, \"TS\");\n  }\n\n  // Setup the compiler runtime during the build process.\n  core.ops();\n  core.registerErrorClass(\"Error\", Error);\n\n  // A build time only op that provides some setup information that is used to\n  // ensure the snapshot is setup properly.\n  /** @type {{ buildSpecifier: string; libs: string[] }} */\n  const { buildSpecifier, libs } = core.jsonOpSync(\"op_build_info\", {});\n  for (const lib of libs) {\n    const specifier = `lib.${lib}.d.ts`;\n    // we are using internal APIs here to \"inject\" our custom libraries into\n    // tsc, so things like `\"lib\": [ \"deno.ns\" ]` are supported.\n    if (!ts.libs.includes(lib)) {\n      ts.libs.push(lib);\n      ts.libMap.set(lib, `lib.${lib}.d.ts`);\n    }\n    // we are caching in memory common type libraries that will be re-used by\n    // tsc on when the snapshot is restored\n    assert(\n      host.getSourceFile(`${ASSETS}${specifier}`, ts.ScriptTarget.ESNext),\n    );\n  }\n  // this helps ensure as much as possible is in memory that is re-usable\n  // before the snapshotting is done, which helps unsure fast \"startup\" for\n  // subsequent uses of tsc in Deno.\n  const TS_SNAPSHOT_PROGRAM = ts.createProgram({\n    rootNames: [buildSpecifier],\n    options: SNAPSHOT_COMPILE_OPTIONS,\n    host,\n  });\n  ts.getPreEmitDiagnostics(TS_SNAPSHOT_PROGRAM);\n\n  // exposes the two functions that are called by `tsc::exec()` when type\n  // checking TypeScript.\n  globalThis.startup = startup;\n  globalThis.exec = exec;\n\n  // exposes the functions that are called when the compiler is used as a\n  // language service.\n  globalThis.serverInit = serverInit;\n  globalThis.serverRequest = serverRequest;\n})(this);\n"
-  }
-}
diff --git a/cli/tests/main_module.ts.out b/cli/tests/main_module.ts.out
deleted file mode 100644
index 31adb20cb..000000000
--- a/cli/tests/main_module.ts.out
+++ /dev/null
@@ -1,2 +0,0 @@
-main_module2 [WILDCARD]tests/main_module.ts
-main_module [WILDCARD]tests/main_module.ts
diff --git a/cli/tests/redirect_cache.out b/cli/tests/redirect_cache.out
deleted file mode 100644
index 609e523f7..000000000
--- a/cli/tests/redirect_cache.out
+++ /dev/null
@@ -1,5 +0,0 @@
-Download http://localhost:4548/cli/tests/subdir/redirects/a.ts
-Download http://localhost:4546/cli/tests/subdir/redirects/a.ts
-Download http://localhost:4545/cli/tests/subdir/redirects/a.ts
-Download http://localhost:4545/cli/tests/subdir/redirects/b.ts
-Check http://localhost:4548/cli/tests/subdir/redirects/a.ts
diff --git a/cli/tests/reference_types_remote.ts b/cli/tests/reference_types_remote.ts
deleted file mode 100644
index 2e7a80098..000000000
--- a/cli/tests/reference_types_remote.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-/// <reference types="http://localhost:4545/cli/tests/subdir/types.d.ts" />
-
-console.log(globalThis.a);
diff --git a/cli/tests/001_hello.js b/cli/tests/testdata/001_hello.js
index accefceba..accefceba 100644
--- a/cli/tests/001_hello.js
+++ b/cli/tests/testdata/001_hello.js
diff --git a/cli/tests/001_hello.js.out b/cli/tests/testdata/001_hello.js.out
index 557db03de..557db03de 100644
--- a/cli/tests/001_hello.js.out
+++ b/cli/tests/testdata/001_hello.js.out
diff --git a/cli/tests/002_hello.ts b/cli/tests/testdata/002_hello.ts
index accefceba..accefceba 100644
--- a/cli/tests/002_hello.ts
+++ b/cli/tests/testdata/002_hello.ts
diff --git a/cli/tests/002_hello.ts.out b/cli/tests/testdata/002_hello.ts.out
index 557db03de..557db03de 100644
--- a/cli/tests/002_hello.ts.out
+++ b/cli/tests/testdata/002_hello.ts.out
diff --git a/cli/tests/003_relative_import.ts b/cli/tests/testdata/003_relative_import.ts
index 01d5d7faa..01d5d7faa 100644
--- a/cli/tests/003_relative_import.ts
+++ b/cli/tests/testdata/003_relative_import.ts
diff --git a/cli/tests/003_relative_import.ts.out b/cli/tests/testdata/003_relative_import.ts.out
index 699b756ed..699b756ed 100644
--- a/cli/tests/003_relative_import.ts.out
+++ b/cli/tests/testdata/003_relative_import.ts.out
diff --git a/cli/tests/004_set_timeout.ts b/cli/tests/testdata/004_set_timeout.ts
index 214b25086..214b25086 100644
--- a/cli/tests/004_set_timeout.ts
+++ b/cli/tests/testdata/004_set_timeout.ts
diff --git a/cli/tests/004_set_timeout.ts.out b/cli/tests/testdata/004_set_timeout.ts.out
index f9264f7fb..f9264f7fb 100644
--- a/cli/tests/004_set_timeout.ts.out
+++ b/cli/tests/testdata/004_set_timeout.ts.out
diff --git a/cli/tests/005_more_imports.ts b/cli/tests/testdata/005_more_imports.ts
index 0266bf46c..0266bf46c 100644
--- a/cli/tests/005_more_imports.ts
+++ b/cli/tests/testdata/005_more_imports.ts
diff --git a/cli/tests/005_more_imports.ts.out b/cli/tests/testdata/005_more_imports.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/005_more_imports.ts.out
+++ b/cli/tests/testdata/005_more_imports.ts.out
diff --git a/cli/tests/testdata/006_url_imports.ts b/cli/tests/testdata/006_url_imports.ts
new file mode 100644
index 000000000..4036f27ed
--- /dev/null
+++ b/cli/tests/testdata/006_url_imports.ts
@@ -0,0 +1,3 @@
+import { printHello } from "http://localhost:4545/subdir/mod2.ts";
+printHello();
+console.log("success");
diff --git a/cli/tests/006_url_imports.ts.out b/cli/tests/testdata/006_url_imports.ts.out
index 989ce33e9..989ce33e9 100644
--- a/cli/tests/006_url_imports.ts.out
+++ b/cli/tests/testdata/006_url_imports.ts.out
diff --git a/cli/tests/012_async.ts b/cli/tests/testdata/012_async.ts
index 536197b68..536197b68 100644
--- a/cli/tests/012_async.ts
+++ b/cli/tests/testdata/012_async.ts
diff --git a/cli/tests/012_async.ts.out b/cli/tests/testdata/012_async.ts.out
index 01e79c32a..01e79c32a 100644
--- a/cli/tests/012_async.ts.out
+++ b/cli/tests/testdata/012_async.ts.out
diff --git a/cli/tests/013_dynamic_import.ts b/cli/tests/testdata/013_dynamic_import.ts
index d4dc55152..d4dc55152 100644
--- a/cli/tests/013_dynamic_import.ts
+++ b/cli/tests/testdata/013_dynamic_import.ts
diff --git a/cli/tests/013_dynamic_import.ts.out b/cli/tests/testdata/013_dynamic_import.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/013_dynamic_import.ts.out
+++ b/cli/tests/testdata/013_dynamic_import.ts.out
diff --git a/cli/tests/014_duplicate_import.ts b/cli/tests/testdata/014_duplicate_import.ts
index 88f934526..88f934526 100644
--- a/cli/tests/014_duplicate_import.ts
+++ b/cli/tests/testdata/014_duplicate_import.ts
diff --git a/cli/tests/014_duplicate_import.ts.out b/cli/tests/testdata/014_duplicate_import.ts.out
index 4effa19f4..4effa19f4 100644
--- a/cli/tests/014_duplicate_import.ts.out
+++ b/cli/tests/testdata/014_duplicate_import.ts.out
diff --git a/cli/tests/015_duplicate_parallel_import.js b/cli/tests/testdata/015_duplicate_parallel_import.js
index 172eeaf53..172eeaf53 100644
--- a/cli/tests/015_duplicate_parallel_import.js
+++ b/cli/tests/testdata/015_duplicate_parallel_import.js
diff --git a/cli/tests/015_duplicate_parallel_import.js.out b/cli/tests/testdata/015_duplicate_parallel_import.js.out
index e965047ad..e965047ad 100644
--- a/cli/tests/015_duplicate_parallel_import.js.out
+++ b/cli/tests/testdata/015_duplicate_parallel_import.js.out
diff --git a/cli/tests/016_double_await.ts b/cli/tests/testdata/016_double_await.ts
index 457a53ff3..457a53ff3 100644
--- a/cli/tests/016_double_await.ts
+++ b/cli/tests/testdata/016_double_await.ts
diff --git a/cli/tests/016_double_await.ts.out b/cli/tests/testdata/016_double_await.ts.out
index da29283aa..da29283aa 100644
--- a/cli/tests/016_double_await.ts.out
+++ b/cli/tests/testdata/016_double_await.ts.out
diff --git a/cli/tests/017_import_redirect.ts b/cli/tests/testdata/017_import_redirect.ts
index 1265dd4ed..1265dd4ed 100644
--- a/cli/tests/017_import_redirect.ts
+++ b/cli/tests/testdata/017_import_redirect.ts
diff --git a/cli/tests/017_import_redirect.ts.out b/cli/tests/testdata/017_import_redirect.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/017_import_redirect.ts.out
+++ b/cli/tests/testdata/017_import_redirect.ts.out
diff --git a/cli/tests/017_import_redirect_info.out b/cli/tests/testdata/017_import_redirect_info.out
index 662b237a4..d3a2e86fc 100644
--- a/cli/tests/017_import_redirect_info.out
+++ b/cli/tests/testdata/017_import_redirect_info.out
@@ -2,5 +2,5 @@ local: [WILDCARD]017_import_redirect.ts
 type: TypeScript
 dependencies: 1 unique (total 278B)
 
-file:///[WILDCARD]cli/tests/017_import_redirect.ts ([WILDCARD])
+file:///[WILDCARD]/017_import_redirect.ts ([WILDCARD])
 └── https://gist.githubusercontent.com/ry/f12b2aa3409e6b52645bc346a9e22929/raw/79318f239f51d764384a8bded8d7c6a833610dde/print_hello.ts ([WILDCARD])
diff --git a/cli/tests/018_async_catch.ts b/cli/tests/testdata/018_async_catch.ts
index ac43a52e8..ac43a52e8 100644
--- a/cli/tests/018_async_catch.ts
+++ b/cli/tests/testdata/018_async_catch.ts
diff --git a/cli/tests/018_async_catch.ts.out b/cli/tests/testdata/018_async_catch.ts.out
index 4fc219973..4fc219973 100644
--- a/cli/tests/018_async_catch.ts.out
+++ b/cli/tests/testdata/018_async_catch.ts.out
diff --git a/cli/tests/testdata/019_media_types.ts b/cli/tests/testdata/019_media_types.ts
new file mode 100644
index 000000000..d985bd249
--- /dev/null
+++ b/cli/tests/testdata/019_media_types.ts
@@ -0,0 +1,24 @@
+// When run against the test HTTP server, it will serve different media types
+// based on the URL containing `.t#.` strings, which exercises the different
+// mapping of media types end to end.
+
+import { loaded as loadedTs1 } from "http://localhost:4545/subdir/mt_text_typescript.t1.ts";
+import { loaded as loadedTs2 } from "http://localhost:4545/subdir/mt_video_vdn.t2.ts";
+import { loaded as loadedTs3 } from "http://localhost:4545/subdir/mt_video_mp2t.t3.ts";
+import { loaded as loadedTs4 } from "http://localhost:4545/subdir/mt_application_x_typescript.t4.ts";
+import { loaded as loadedJs1 } from "http://localhost:4545/subdir/mt_text_javascript.j1.js";
+import { loaded as loadedJs2 } from "http://localhost:4545/subdir/mt_application_ecmascript.j2.js";
+import { loaded as loadedJs3 } from "http://localhost:4545/subdir/mt_text_ecmascript.j3.js";
+import { loaded as loadedJs4 } from "http://localhost:4545/subdir/mt_application_x_javascript.j4.js";
+
+console.log(
+  "success",
+  loadedTs1,
+  loadedTs2,
+  loadedTs3,
+  loadedTs4,
+  loadedJs1,
+  loadedJs2,
+  loadedJs3,
+  loadedJs4,
+);
diff --git a/cli/tests/019_media_types.ts.out b/cli/tests/testdata/019_media_types.ts.out
index b3e94678c..b3e94678c 100644
--- a/cli/tests/019_media_types.ts.out
+++ b/cli/tests/testdata/019_media_types.ts.out
diff --git a/cli/tests/020_json_modules.ts b/cli/tests/testdata/020_json_modules.ts
index fdc85c440..fdc85c440 100644
--- a/cli/tests/020_json_modules.ts
+++ b/cli/tests/testdata/020_json_modules.ts
diff --git a/cli/tests/020_json_modules.ts.out b/cli/tests/testdata/020_json_modules.ts.out
index a89bd2ad6..bfb7c80cf 100644
--- a/cli/tests/020_json_modules.ts.out
+++ b/cli/tests/testdata/020_json_modules.ts.out
@@ -1,5 +1,5 @@
 [WILDCARD]
 error: An unsupported media type was attempted to be imported as a module.
-  Specifier: [WILDCARD]cli/tests/subdir/config.json
+  Specifier: [WILDCARD]/subdir/config.json
   MediaType: Json
 [WILDCARD]
\ No newline at end of file
diff --git a/cli/tests/021_mjs_modules.ts b/cli/tests/testdata/021_mjs_modules.ts
index 6052b9081..6052b9081 100644
--- a/cli/tests/021_mjs_modules.ts
+++ b/cli/tests/testdata/021_mjs_modules.ts
diff --git a/cli/tests/021_mjs_modules.ts.out b/cli/tests/testdata/021_mjs_modules.ts.out
index 27ba77dda..27ba77dda 100644
--- a/cli/tests/021_mjs_modules.ts.out
+++ b/cli/tests/testdata/021_mjs_modules.ts.out
diff --git a/cli/tests/testdata/022_info_flag_script.out b/cli/tests/testdata/022_info_flag_script.out
new file mode 100644
index 000000000..e86b7dda4
--- /dev/null
+++ b/cli/tests/testdata/022_info_flag_script.out
@@ -0,0 +1,14 @@
+[WILDCARD]
+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://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])
+├── http://localhost:4545/subdir/mt_text_ecmascript.j3.js ([WILDCARD])
+├── http://localhost:4545/subdir/mt_text_javascript.j1.js ([WILDCARD])
+├── http://localhost:4545/subdir/mt_text_typescript.t1.ts ([WILDCARD])
+├── http://localhost:4545/subdir/mt_video_mp2t.t3.ts ([WILDCARD])
+└── http://localhost:4545/subdir/mt_video_vdn.t2.ts ([WILDCARD])
diff --git a/cli/tests/023_no_ext b/cli/tests/testdata/023_no_ext
index 0dcfb6209..0dcfb6209 100644
--- a/cli/tests/023_no_ext
+++ b/cli/tests/testdata/023_no_ext
diff --git a/cli/tests/023_no_ext.out b/cli/tests/testdata/023_no_ext.out
index 27ba77dda..27ba77dda 100644
--- a/cli/tests/023_no_ext.out
+++ b/cli/tests/testdata/023_no_ext.out
diff --git a/cli/tests/024_import_no_ext_with_headers.ts b/cli/tests/testdata/024_import_no_ext_with_headers.ts
index c8621d0e6..c8621d0e6 100644
--- a/cli/tests/024_import_no_ext_with_headers.ts
+++ b/cli/tests/testdata/024_import_no_ext_with_headers.ts
diff --git a/cli/tests/024_import_no_ext_with_headers.ts.out b/cli/tests/testdata/024_import_no_ext_with_headers.ts.out
index e427984d4..e427984d4 100644
--- a/cli/tests/024_import_no_ext_with_headers.ts.out
+++ b/cli/tests/testdata/024_import_no_ext_with_headers.ts.out
diff --git a/cli/tests/025_hrtime.ts b/cli/tests/testdata/025_hrtime.ts
index b69d61488..b69d61488 100644
--- a/cli/tests/025_hrtime.ts
+++ b/cli/tests/testdata/025_hrtime.ts
diff --git a/cli/tests/025_hrtime.ts.out b/cli/tests/testdata/025_hrtime.ts.out
index bb101b641..bb101b641 100644
--- a/cli/tests/025_hrtime.ts.out
+++ b/cli/tests/testdata/025_hrtime.ts.out
diff --git a/cli/tests/025_reload_js_type_error.js b/cli/tests/testdata/025_reload_js_type_error.js
index 3b7c23cc9..3b7c23cc9 100644
--- a/cli/tests/025_reload_js_type_error.js
+++ b/cli/tests/testdata/025_reload_js_type_error.js
diff --git a/cli/tests/025_reload_js_type_error.js.out b/cli/tests/testdata/025_reload_js_type_error.js.out
index ce0136250..ce0136250 100644
--- a/cli/tests/025_reload_js_type_error.js.out
+++ b/cli/tests/testdata/025_reload_js_type_error.js.out
diff --git a/cli/tests/026_redirect_javascript.js b/cli/tests/testdata/026_redirect_javascript.js
index 226a6b622..226a6b622 100644
--- a/cli/tests/026_redirect_javascript.js
+++ b/cli/tests/testdata/026_redirect_javascript.js
diff --git a/cli/tests/026_redirect_javascript.js.out b/cli/tests/testdata/026_redirect_javascript.js.out
index 290864299..290864299 100644
--- a/cli/tests/026_redirect_javascript.js.out
+++ b/cli/tests/testdata/026_redirect_javascript.js.out
diff --git a/cli/tests/027_redirect_typescript.ts b/cli/tests/testdata/027_redirect_typescript.ts
index 584341975..584341975 100644
--- a/cli/tests/027_redirect_typescript.ts
+++ b/cli/tests/testdata/027_redirect_typescript.ts
diff --git a/cli/tests/027_redirect_typescript.ts.out b/cli/tests/testdata/027_redirect_typescript.ts.out
index 480d4e8ca..480d4e8ca 100644
--- a/cli/tests/027_redirect_typescript.ts.out
+++ b/cli/tests/testdata/027_redirect_typescript.ts.out
diff --git a/cli/tests/028_args.ts b/cli/tests/testdata/028_args.ts
index ec41d52f9..ec41d52f9 100644
--- a/cli/tests/028_args.ts
+++ b/cli/tests/testdata/028_args.ts
diff --git a/cli/tests/028_args.ts.out b/cli/tests/testdata/028_args.ts.out
index 0f1b5c59e..0f1b5c59e 100644
--- a/cli/tests/028_args.ts.out
+++ b/cli/tests/testdata/028_args.ts.out
diff --git a/cli/tests/029_eval.out b/cli/tests/testdata/029_eval.out
index ce0136250..ce0136250 100644
--- a/cli/tests/029_eval.out
+++ b/cli/tests/testdata/029_eval.out
diff --git a/cli/tests/030_eval_ts.out b/cli/tests/testdata/030_eval_ts.out
index 190a18037..190a18037 100644
--- a/cli/tests/030_eval_ts.out
+++ b/cli/tests/testdata/030_eval_ts.out
diff --git a/cli/tests/031_info_ts_error.out b/cli/tests/testdata/031_info_ts_error.out
index 2dc7bb4e8..2dc7bb4e8 100644
--- a/cli/tests/031_info_ts_error.out
+++ b/cli/tests/testdata/031_info_ts_error.out
diff --git a/cli/tests/031_info_ts_error.ts b/cli/tests/testdata/031_info_ts_error.ts
index 9b7492dbe..9b7492dbe 100644
--- a/cli/tests/031_info_ts_error.ts
+++ b/cli/tests/testdata/031_info_ts_error.ts
diff --git a/cli/tests/033_import_map.out b/cli/tests/testdata/033_import_map.out
index e9b9160e9..e9b9160e9 100644
--- a/cli/tests/033_import_map.out
+++ b/cli/tests/testdata/033_import_map.out
diff --git a/cli/tests/033_import_map_remote.out b/cli/tests/testdata/033_import_map_remote.out
index 804fa0d57..804fa0d57 100644
--- a/cli/tests/033_import_map_remote.out
+++ b/cli/tests/testdata/033_import_map_remote.out
diff --git a/cli/tests/034_onload.out b/cli/tests/testdata/034_onload.out
index 9b1f454c9..9b1f454c9 100644
--- a/cli/tests/034_onload.out
+++ b/cli/tests/testdata/034_onload.out
diff --git a/cli/tests/034_onload/imported.ts b/cli/tests/testdata/034_onload/imported.ts
index 3c7a0aae2..bac6cf5fa 100644
--- a/cli/tests/034_onload/imported.ts
+++ b/cli/tests/testdata/034_onload/imported.ts
@@ -1,4 +1,4 @@
-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/034_onload/main.ts b/cli/tests/testdata/034_onload/main.ts
index 7696ec122..42df21c16 100644
--- a/cli/tests/034_onload/main.ts
+++ b/cli/tests/testdata/034_onload/main.ts
@@ -1,4 +1,4 @@
-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/034_onload/nest_imported.ts b/cli/tests/testdata/034_onload/nest_imported.ts
index 8ca668de9..259e505a2 100644
--- a/cli/tests/034_onload/nest_imported.ts
+++ b/cli/tests/testdata/034_onload/nest_imported.ts
@@ -1,4 +1,4 @@
-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/035_cached_only_flag.out b/cli/tests/testdata/035_cached_only_flag.out
new file mode 100644
index 000000000..aad3f2fbc
--- /dev/null
+++ b/cli/tests/testdata/035_cached_only_flag.out
@@ -0,0 +1 @@
+error: Specifier not found in cache: "http://127.0.0.1:4545/019_media_types.ts", --cached-only is specified.
diff --git a/cli/tests/036_import_map_fetch.out b/cli/tests/testdata/036_import_map_fetch.out
index e69de29bb..e69de29bb 100644
--- a/cli/tests/036_import_map_fetch.out
+++ b/cli/tests/testdata/036_import_map_fetch.out
diff --git a/cli/tests/testdata/037_fetch_multiple.out b/cli/tests/testdata/037_fetch_multiple.out
new file mode 100644
index 000000000..09c6c0f60
--- /dev/null
+++ b/cli/tests/testdata/037_fetch_multiple.out
@@ -0,0 +1,5 @@
+Download http://localhost:4545/subdir/mod2.ts
+Download http://localhost:4545/subdir/print_hello.ts
+Check [WILDCARD]/fetch/test.ts
+Download http://localhost:4545/subdir/mt_text_typescript.t1.ts
+Check [WILDCARD]/fetch/other.ts
diff --git a/cli/tests/038_checkjs.js b/cli/tests/testdata/038_checkjs.js
index f0856d94c..f0856d94c 100644
--- a/cli/tests/038_checkjs.js
+++ b/cli/tests/testdata/038_checkjs.js
diff --git a/cli/tests/038_checkjs.js.out b/cli/tests/testdata/038_checkjs.js.out
index bd3fc3548..4ea473e4f 100644
--- a/cli/tests/038_checkjs.js.out
+++ b/cli/tests/testdata/038_checkjs.js.out
@@ -2,7 +2,7 @@
 error: TS2552 [ERROR]: Cannot find name 'consol'. Did you mean 'console'?
 consol.log("hello world!");
 ~~~~~~
-    at [WILDCARD]tests/038_checkjs.js:2:1
+    at [WILDCARD]/038_checkjs.js:2:1
 
     'console' is declared here.
     declare var console: Console;
@@ -12,11 +12,11 @@ consol.log("hello world!");
 TS2552 [ERROR]: Cannot find name 'Foo'. Did you mean 'foo'?
 const foo = new Foo();
                 ~~~
-    at [WILDCARD]tests/038_checkjs.js:5:17
+    at [WILDCARD]/038_checkjs.js:5:17
 
     'foo' is declared here.
     const foo = new Foo();
           ~~~
-        at [WILDCARD]tests/038_checkjs.js:5:7
+        at [WILDCARD]/038_checkjs.js:5:7
 
 Found 2 errors.
diff --git a/cli/tests/038_checkjs.tsconfig.json b/cli/tests/testdata/038_checkjs.tsconfig.json
index 46d96db9e..46d96db9e 100644
--- a/cli/tests/038_checkjs.tsconfig.json
+++ b/cli/tests/testdata/038_checkjs.tsconfig.json
diff --git a/cli/tests/041_dyn_import_eval.out b/cli/tests/testdata/041_dyn_import_eval.out
index 12a45b8da..12a45b8da 100644
--- a/cli/tests/041_dyn_import_eval.out
+++ b/cli/tests/testdata/041_dyn_import_eval.out
diff --git a/cli/tests/041_info_flag.out b/cli/tests/testdata/041_info_flag.out
index ded795339..ded795339 100644
--- a/cli/tests/041_info_flag.out
+++ b/cli/tests/testdata/041_info_flag.out
diff --git a/cli/tests/041_info_flag_location.out b/cli/tests/testdata/041_info_flag_location.out
index 207065012..207065012 100644
--- a/cli/tests/041_info_flag_location.out
+++ b/cli/tests/testdata/041_info_flag_location.out
diff --git a/cli/tests/042_dyn_import_evalcontext.ts b/cli/tests/testdata/042_dyn_import_evalcontext.ts
index ccda3a972..ccda3a972 100644
--- a/cli/tests/042_dyn_import_evalcontext.ts
+++ b/cli/tests/testdata/042_dyn_import_evalcontext.ts
diff --git a/cli/tests/042_dyn_import_evalcontext.ts.out b/cli/tests/testdata/042_dyn_import_evalcontext.ts.out
index 12a45b8da..12a45b8da 100644
--- a/cli/tests/042_dyn_import_evalcontext.ts.out
+++ b/cli/tests/testdata/042_dyn_import_evalcontext.ts.out
diff --git a/cli/tests/044_bad_resource.ts b/cli/tests/testdata/044_bad_resource.ts
index 05e1354dc..05e1354dc 100644
--- a/cli/tests/044_bad_resource.ts
+++ b/cli/tests/testdata/044_bad_resource.ts
diff --git a/cli/tests/044_bad_resource.ts.out b/cli/tests/testdata/044_bad_resource.ts.out
index 33c95fc44..33c95fc44 100644
--- a/cli/tests/044_bad_resource.ts.out
+++ b/cli/tests/testdata/044_bad_resource.ts.out
diff --git a/cli/tests/testdata/045_mod.ts b/cli/tests/testdata/045_mod.ts
new file mode 100644
index 000000000..b5f2a0b5b
--- /dev/null
+++ b/cli/tests/testdata/045_mod.ts
@@ -0,0 +1,5 @@
+import { output } from "./045_output.ts";
+
+if (import.meta.main) {
+  output("Hello!");
+}
diff --git a/cli/tests/testdata/045_output.ts b/cli/tests/testdata/045_output.ts
new file mode 100644
index 000000000..398760ca0
--- /dev/null
+++ b/cli/tests/testdata/045_output.ts
@@ -0,0 +1,3 @@
+export function output(text: string) {
+  console.log(text);
+}
diff --git a/cli/tests/045_programmatic_proxy_client.ts b/cli/tests/testdata/045_programmatic_proxy_client.ts
index 50884407d..cd6659978 100644
--- a/cli/tests/045_programmatic_proxy_client.ts
+++ b/cli/tests/testdata/045_programmatic_proxy_client.ts
@@ -8,7 +8,7 @@ const client = Deno.createHttpClient({
 });
 
 const res = await fetch(
-  "http://localhost:4545/test_util/std/examples/colors.ts",
+  "http://localhost:4545/045_mod.ts",
   { client },
 );
 console.log(`Response http: ${await res.text()}`);
diff --git a/cli/tests/045_proxy_client.ts b/cli/tests/testdata/045_proxy_client.ts
index 316f0bf85..fe9129312 100644
--- a/cli/tests/045_proxy_client.ts
+++ b/cli/tests/testdata/045_proxy_client.ts
@@ -1,5 +1,5 @@
 // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
 const res = await fetch(
-  "http://localhost:4545/test_util/std/examples/colors.ts",
+  "http://localhost:4545/045_mod.ts",
 );
 console.log(`Response http: ${await res.text()}`);
diff --git a/cli/tests/045_proxy_test.ts b/cli/tests/testdata/045_proxy_test.ts
index db6f00876..6d8359518 100644
--- a/cli/tests/045_proxy_test.ts
+++ b/cli/tests/testdata/045_proxy_test.ts
@@ -1,6 +1,6 @@
 // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
-import { serve, ServerRequest } from "../../test_util/std/http/server.ts";
-import { assertEquals } from "../../test_util/std/testing/asserts.ts";
+import { serve, ServerRequest } from "../../../test_util/std/http/server.ts";
+import { assertEquals } from "../../../test_util/std/testing/asserts.ts";
 
 const addr = Deno.args[1] || "127.0.0.1:4555";
 
@@ -59,7 +59,7 @@ async function testModuleDownload() {
       "cache",
       "--reload",
       "--quiet",
-      "http://localhost:4545/test_util/std/examples/colors.ts",
+      "http://localhost:4545/045_mod.ts",
     ],
     stdout: "piped",
     env: {
@@ -101,7 +101,7 @@ async function testModuleDownloadNoProxy() {
       "cache",
       "--reload",
       "--quiet",
-      "http://localhost:4545/test_util/std/examples/colors.ts",
+      "http://localhost:4545/045_mod.ts",
     ],
     stdout: "piped",
     env: {
diff --git a/cli/tests/testdata/045_proxy_test.ts.out b/cli/tests/testdata/045_proxy_test.ts.out
new file mode 100644
index 000000000..4ebf97dee
--- /dev/null
+++ b/cli/tests/testdata/045_proxy_test.ts.out
@@ -0,0 +1,6 @@
+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/046_jsx_test.tsx b/cli/tests/testdata/046_jsx_test.tsx
index a96e90baf..a96e90baf 100644
--- a/cli/tests/046_jsx_test.tsx
+++ b/cli/tests/testdata/046_jsx_test.tsx
diff --git a/cli/tests/046_jsx_test.tsx.out b/cli/tests/testdata/046_jsx_test.tsx.out
index 85cfe824b..85cfe824b 100644
--- a/cli/tests/046_jsx_test.tsx.out
+++ b/cli/tests/testdata/046_jsx_test.tsx.out
diff --git a/cli/tests/047_jsx_test.jsx b/cli/tests/testdata/047_jsx_test.jsx
index 4c2314072..4c2314072 100644
--- a/cli/tests/047_jsx_test.jsx
+++ b/cli/tests/testdata/047_jsx_test.jsx
diff --git a/cli/tests/047_jsx_test.jsx.out b/cli/tests/testdata/047_jsx_test.jsx.out
index 85cfe824b..85cfe824b 100644
--- a/cli/tests/047_jsx_test.jsx.out
+++ b/cli/tests/testdata/047_jsx_test.jsx.out
diff --git a/cli/tests/testdata/048_media_types_jsx.ts b/cli/tests/testdata/048_media_types_jsx.ts
new file mode 100644
index 000000000..8dcd0ad68
--- /dev/null
+++ b/cli/tests/testdata/048_media_types_jsx.ts
@@ -0,0 +1,32 @@
+// When run against the test HTTP server, it will serve different media types
+// based on the URL containing `.t#.` strings, which exercises the different
+// mapping of media types end to end.
+import { loaded as loadedTsx1 } from "http://localhost:4545/subdir/mt_text_typescript_tsx.t1.tsx";
+import { loaded as loadedTsx2 } from "http://localhost:4545/subdir/mt_video_vdn_tsx.t2.tsx";
+import { loaded as loadedTsx3 } from "http://localhost:4545/subdir/mt_video_mp2t_tsx.t3.tsx";
+import { loaded as loadedTsx4 } from "http://localhost:4545/subdir/mt_application_x_typescript_tsx.t4.tsx";
+import { loaded as loadedJsx1 } from "http://localhost:4545/subdir/mt_text_javascript_jsx.j1.jsx";
+import { loaded as loadedJsx2 } from "http://localhost:4545/subdir/mt_application_ecmascript_jsx.j2.jsx";
+import { loaded as loadedJsx3 } from "http://localhost:4545/subdir/mt_text_ecmascript_jsx.j3.jsx";
+import { loaded as loadedJsx4 } from "http://localhost:4545/subdir/mt_application_x_javascript_jsx.j4.jsx";
+
+declare global {
+  namespace JSX {
+    interface IntrinsicElements {
+      // deno-lint-ignore no-explicit-any
+      [elemName: string]: any;
+    }
+  }
+}
+
+console.log(
+  "success",
+  loadedTsx1,
+  loadedTsx2,
+  loadedTsx3,
+  loadedTsx4,
+  loadedJsx1,
+  loadedJsx2,
+  loadedJsx3,
+  loadedJsx4,
+);
diff --git a/cli/tests/048_media_types_jsx.ts.out b/cli/tests/testdata/048_media_types_jsx.ts.out
index 266cc5741..266cc5741 100644
--- a/cli/tests/048_media_types_jsx.ts.out
+++ b/cli/tests/testdata/048_media_types_jsx.ts.out
diff --git a/cli/tests/testdata/049_info_flag_script_jsx.out b/cli/tests/testdata/049_info_flag_script_jsx.out
new file mode 100644
index 000000000..860d127fe
--- /dev/null
+++ b/cli/tests/testdata/049_info_flag_script_jsx.out
@@ -0,0 +1,14 @@
+[WILDCARD]
+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://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])
+├── http://localhost:4545/subdir/mt_text_ecmascript_jsx.j3.jsx ([WILDCARD])
+├── http://localhost:4545/subdir/mt_text_javascript_jsx.j1.jsx ([WILDCARD])
+├── http://localhost:4545/subdir/mt_text_typescript_tsx.t1.tsx ([WILDCARD])
+├── http://localhost:4545/subdir/mt_video_mp2t_tsx.t3.tsx ([WILDCARD])
+└── http://localhost:4545/subdir/mt_video_vdn_tsx.t2.tsx ([WILDCARD])
diff --git a/cli/tests/052_no_remote_flag.out b/cli/tests/testdata/052_no_remote_flag.out
index 9fefc4b92..c1f9f4e13 100644
--- a/cli/tests/052_no_remote_flag.out
+++ b/cli/tests/testdata/052_no_remote_flag.out
@@ -1 +1 @@
-error: A remote specifier was requested: "http://127.0.0.1:4545/cli/tests/019_media_types.ts", but --no-remote is specified.
+error: 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/053_import_compression.out b/cli/tests/testdata/053_import_compression.out
index 371994979..371994979 100644
--- a/cli/tests/053_import_compression.out
+++ b/cli/tests/testdata/053_import_compression.out
diff --git a/cli/tests/053_import_compression/brotli b/cli/tests/testdata/053_import_compression/brotli
index 65f679d57..65f679d57 100644
--- a/cli/tests/053_import_compression/brotli
+++ b/cli/tests/testdata/053_import_compression/brotli
diff --git a/cli/tests/053_import_compression/gziped b/cli/tests/testdata/053_import_compression/gziped
index 9f9a7bc69..9f9a7bc69 100644
--- a/cli/tests/053_import_compression/gziped
+++ b/cli/tests/testdata/053_import_compression/gziped
diff --git a/cli/tests/testdata/053_import_compression/main.ts b/cli/tests/testdata/053_import_compression/main.ts
new file mode 100644
index 000000000..1ff1b0c83
--- /dev/null
+++ b/cli/tests/testdata/053_import_compression/main.ts
@@ -0,0 +1,13 @@
+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/054_info_local_imports.out b/cli/tests/testdata/054_info_local_imports.out
index cde5ff3ab..cde5ff3ab 100644
--- a/cli/tests/054_info_local_imports.out
+++ b/cli/tests/testdata/054_info_local_imports.out
diff --git a/cli/tests/055_info_file_json.out b/cli/tests/testdata/055_info_file_json.out
index 070668922..4753ef0ef 100644
--- a/cli/tests/055_info_file_json.out
+++ b/cli/tests/testdata/055_info_file_json.out
@@ -1,12 +1,12 @@
 {
-  "root": "file://[WILDCARD]/cli/tests/005_more_imports.ts",
+  "root": "file://[WILDCARD]/005_more_imports.ts",
   "modules": [
     {
-      "specifier": "file://[WILDCARD]/cli/tests/005_more_imports.ts",
+      "specifier": "file://[WILDCARD]/005_more_imports.ts",
       "dependencies": [
         {
           "specifier": "./subdir/mod1.ts",
-          "code": "file://[WILDCARD]/cli/tests/subdir/mod1.ts"
+          "code": "file://[WILDCARD]/subdir/mod1.ts"
         }
       ],
       "size": 211,
@@ -15,11 +15,11 @@
       [WILDCARD]
     },
     {
-      "specifier": "file://[WILDCARD]/cli/tests/subdir/mod1.ts",
+      "specifier": "file://[WILDCARD]/subdir/mod1.ts",
       "dependencies": [
         {
           "specifier": "./subdir2/mod2.ts",
-          "code": "file://[WILDCARD]/cli/tests/subdir/subdir2/mod2.ts"
+          "code": "file://[WILDCARD]/subdir/subdir2/mod2.ts"
         }
       ],
       "size": 308,
@@ -28,7 +28,7 @@
       [WILDCARD]
     },
     {
-      "specifier": "file://[WILDCARD]/cli/tests/subdir/print_hello.ts",
+      "specifier": "file://[WILDCARD]/subdir/print_hello.ts",
       "dependencies": [],
       "size": 57,
       "mediaType": "TypeScript",
@@ -36,11 +36,11 @@
       [WILDCARD]
     },
     {
-      "specifier": "file://[WILDCARD]/cli/tests/subdir/subdir2/mod2.ts",
+      "specifier": "file://[WILDCARD]/subdir/subdir2/mod2.ts",
       "dependencies": [
         {
           "specifier": "../print_hello.ts",
-          "code": "file://[WILDCARD]/cli/tests/subdir/print_hello.ts"
+          "code": "file://[WILDCARD]/subdir/print_hello.ts"
         }
       ],
       "size": 157,
diff --git a/cli/tests/056_make_temp_file_write_perm.out b/cli/tests/testdata/056_make_temp_file_write_perm.out
index c56aae43f..c56aae43f 100644
--- a/cli/tests/056_make_temp_file_write_perm.out
+++ b/cli/tests/testdata/056_make_temp_file_write_perm.out
diff --git a/cli/tests/056_make_temp_file_write_perm.ts b/cli/tests/testdata/056_make_temp_file_write_perm.ts
index c0deda8a2..c0deda8a2 100644
--- a/cli/tests/056_make_temp_file_write_perm.ts
+++ b/cli/tests/testdata/056_make_temp_file_write_perm.ts
diff --git a/cli/tests/058_tasks_microtasks_close.ts b/cli/tests/testdata/058_tasks_microtasks_close.ts
index 11de55a38..11de55a38 100644
--- a/cli/tests/058_tasks_microtasks_close.ts
+++ b/cli/tests/testdata/058_tasks_microtasks_close.ts
diff --git a/cli/tests/058_tasks_microtasks_close.ts.out b/cli/tests/testdata/058_tasks_microtasks_close.ts.out
index 218273cab..218273cab 100644
--- a/cli/tests/058_tasks_microtasks_close.ts.out
+++ b/cli/tests/testdata/058_tasks_microtasks_close.ts.out
diff --git a/cli/tests/059_fs_relative_path_perm.ts b/cli/tests/testdata/059_fs_relative_path_perm.ts
index 26630fe1c..26630fe1c 100644
--- a/cli/tests/059_fs_relative_path_perm.ts
+++ b/cli/tests/testdata/059_fs_relative_path_perm.ts
diff --git a/cli/tests/059_fs_relative_path_perm.ts.out b/cli/tests/testdata/059_fs_relative_path_perm.ts.out
index b55412137..b55412137 100644
--- a/cli/tests/059_fs_relative_path_perm.ts.out
+++ b/cli/tests/testdata/059_fs_relative_path_perm.ts.out
diff --git a/cli/tests/060_deno_doc_displays_all_overloads_in_details_view.ts b/cli/tests/testdata/060_deno_doc_displays_all_overloads_in_details_view.ts
index 854c1b464..854c1b464 100644
--- a/cli/tests/060_deno_doc_displays_all_overloads_in_details_view.ts
+++ b/cli/tests/testdata/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/060_deno_doc_displays_all_overloads_in_details_view.ts.out
new file mode 100644
index 000000000..f1a5077d8
--- /dev/null
+++ b/cli/tests/testdata/060_deno_doc_displays_all_overloads_in_details_view.ts.out
@@ -0,0 +1,12 @@
+Defined in [WILDCARD]/060_deno_doc_displays_all_overloads_in_details_view.ts:3:2 
+
+function test(name: string, fn: Function): void
+
+Defined in [WILDCARD]/060_deno_doc_displays_all_overloads_in_details_view.ts:4:2 
+
+function test(options: object): void
+
+Defined in [WILDCARD]/060_deno_doc_displays_all_overloads_in_details_view.ts:5:2 
+
+function test(name: string | object, fn?: Function): void
+
diff --git a/cli/tests/061_permissions_request.ts b/cli/tests/testdata/061_permissions_request.ts
index c31e7ac42..c31e7ac42 100644
--- a/cli/tests/061_permissions_request.ts
+++ b/cli/tests/testdata/061_permissions_request.ts
diff --git a/cli/tests/061_permissions_request.ts.out b/cli/tests/testdata/061_permissions_request.ts.out
index 362425876..362425876 100644
--- a/cli/tests/061_permissions_request.ts.out
+++ b/cli/tests/testdata/061_permissions_request.ts.out
diff --git a/cli/tests/062_permissions_request_global.ts b/cli/tests/testdata/062_permissions_request_global.ts
index e431bc31b..e431bc31b 100644
--- a/cli/tests/062_permissions_request_global.ts
+++ b/cli/tests/testdata/062_permissions_request_global.ts
diff --git a/cli/tests/062_permissions_request_global.ts.out b/cli/tests/testdata/062_permissions_request_global.ts.out
index 57b5aa7d8..57b5aa7d8 100644
--- a/cli/tests/062_permissions_request_global.ts.out
+++ b/cli/tests/testdata/062_permissions_request_global.ts.out
diff --git a/cli/tests/063_permissions_revoke.ts b/cli/tests/testdata/063_permissions_revoke.ts
index a81eee7cb..a81eee7cb 100644
--- a/cli/tests/063_permissions_revoke.ts
+++ b/cli/tests/testdata/063_permissions_revoke.ts
diff --git a/cli/tests/063_permissions_revoke.ts.out b/cli/tests/testdata/063_permissions_revoke.ts.out
index bbd64c557..bbd64c557 100644
--- a/cli/tests/063_permissions_revoke.ts.out
+++ b/cli/tests/testdata/063_permissions_revoke.ts.out
diff --git a/cli/tests/064_permissions_revoke_global.ts b/cli/tests/testdata/064_permissions_revoke_global.ts
index a9b1fcd40..a9b1fcd40 100644
--- a/cli/tests/064_permissions_revoke_global.ts
+++ b/cli/tests/testdata/064_permissions_revoke_global.ts
diff --git a/cli/tests/064_permissions_revoke_global.ts.out b/cli/tests/testdata/064_permissions_revoke_global.ts.out
index f7e389a76..f7e389a76 100644
--- a/cli/tests/064_permissions_revoke_global.ts.out
+++ b/cli/tests/testdata/064_permissions_revoke_global.ts.out
diff --git a/cli/tests/065_import_map_info.out b/cli/tests/testdata/065_import_map_info.out
index 8771d0594..8771d0594 100644
--- a/cli/tests/065_import_map_info.out
+++ b/cli/tests/testdata/065_import_map_info.out
diff --git a/cli/tests/066_prompt.ts b/cli/tests/testdata/066_prompt.ts
index e3daa7ac0..e3daa7ac0 100644
--- a/cli/tests/066_prompt.ts
+++ b/cli/tests/testdata/066_prompt.ts
diff --git a/cli/tests/066_prompt.ts.out b/cli/tests/testdata/066_prompt.ts.out
index 7defc51e5..7defc51e5 100644
--- a/cli/tests/066_prompt.ts.out
+++ b/cli/tests/testdata/066_prompt.ts.out
diff --git a/cli/tests/070_location.ts b/cli/tests/testdata/070_location.ts
index 61256dcbc..61256dcbc 100644
--- a/cli/tests/070_location.ts
+++ b/cli/tests/testdata/070_location.ts
diff --git a/cli/tests/070_location.ts.out b/cli/tests/testdata/070_location.ts.out
index e05561e58..e05561e58 100644
--- a/cli/tests/070_location.ts.out
+++ b/cli/tests/testdata/070_location.ts.out
diff --git a/cli/tests/071_location_unset.ts b/cli/tests/testdata/071_location_unset.ts
index bb60df8c4..bb60df8c4 100644
--- a/cli/tests/071_location_unset.ts
+++ b/cli/tests/testdata/071_location_unset.ts
diff --git a/cli/tests/071_location_unset.ts.out b/cli/tests/testdata/071_location_unset.ts.out
index 43308f3bd..43308f3bd 100644
--- a/cli/tests/071_location_unset.ts.out
+++ b/cli/tests/testdata/071_location_unset.ts.out
diff --git a/cli/tests/072_location_relative_fetch.ts b/cli/tests/testdata/072_location_relative_fetch.ts
index d4764bf7f..d4764bf7f 100644
--- a/cli/tests/072_location_relative_fetch.ts
+++ b/cli/tests/testdata/072_location_relative_fetch.ts
diff --git a/cli/tests/072_location_relative_fetch.ts.out b/cli/tests/testdata/072_location_relative_fetch.ts.out
index 8151f6f88..8151f6f88 100644
--- a/cli/tests/072_location_relative_fetch.ts.out
+++ b/cli/tests/testdata/072_location_relative_fetch.ts.out
diff --git a/cli/tests/075_import_local_query_hash.ts b/cli/tests/testdata/075_import_local_query_hash.ts
index 99c7ceab4..99c7ceab4 100644
--- a/cli/tests/075_import_local_query_hash.ts
+++ b/cli/tests/testdata/075_import_local_query_hash.ts
diff --git a/cli/tests/075_import_local_query_hash.ts.out b/cli/tests/testdata/075_import_local_query_hash.ts.out
index 340777742..340777742 100644
--- a/cli/tests/075_import_local_query_hash.ts.out
+++ b/cli/tests/testdata/075_import_local_query_hash.ts.out
diff --git a/cli/tests/076_info_json_deps_order.out b/cli/tests/testdata/076_info_json_deps_order.out
index f8b26057d..bcb2c70ed 100644
--- a/cli/tests/076_info_json_deps_order.out
+++ b/cli/tests/testdata/076_info_json_deps_order.out
@@ -1,12 +1,12 @@
 {
-  "root": "file://[WILDCARD]/cli/tests/076_info_json_deps_order.ts",
+  "root": "file://[WILDCARD]/076_info_json_deps_order.ts",
   "modules": [
     {
-      "specifier": "file://[WILDCARD]/cli/tests/076_info_json_deps_order.ts",
+      "specifier": "file://[WILDCARD]/076_info_json_deps_order.ts",
       "dependencies": [
         {
           "specifier": "./recursive_imports/A.ts",
-          "code": "file://[WILDCARD]/cli/tests/recursive_imports/A.ts"
+          "code": "file://[WILDCARD]/recursive_imports/A.ts"
         }
       ],
       "size": 81,
@@ -15,15 +15,15 @@
       "checksum": "5dd40fe33e5924cca513489ce568e86c9b9fe318a87975403c8923629018680d"
     },
     {
-      "specifier": "file://[WILDCARD]/cli/tests/recursive_imports/A.ts",
+      "specifier": "file://[WILDCARD]/recursive_imports/A.ts",
       "dependencies": [
         {
           "specifier": "./B.ts",
-          "code": "file://[WILDCARD]/cli/tests/recursive_imports/B.ts"
+          "code": "file://[WILDCARD]/recursive_imports/B.ts"
         },
         {
           "specifier": "./common.ts",
-          "code": "file://[WILDCARD]/cli/tests/recursive_imports/common.ts"
+          "code": "file://[WILDCARD]/recursive_imports/common.ts"
         }
       ],
       "size": 108,
@@ -32,15 +32,15 @@
       "checksum": "3b45a105d892584298490cb73372b2cac57118e1e42a677a1d5cacea704d8d3a"
     },
     {
-      "specifier": "file://[WILDCARD]/cli/tests/recursive_imports/B.ts",
+      "specifier": "file://[WILDCARD]/recursive_imports/B.ts",
       "dependencies": [
         {
           "specifier": "./C.ts",
-          "code": "file://[WILDCARD]/cli/tests/recursive_imports/C.ts"
+          "code": "file://[WILDCARD]/recursive_imports/C.ts"
         },
         {
           "specifier": "./common.ts",
-          "code": "file://[WILDCARD]/cli/tests/recursive_imports/common.ts"
+          "code": "file://[WILDCARD]/recursive_imports/common.ts"
         }
       ],
       "size": 108,
@@ -49,15 +49,15 @@
       "checksum": "b12b0437ef9a91c4a4b1f66e8e4339f986b60bd8134031ccb296ce49df15b54e"
     },
     {
-      "specifier": "file://[WILDCARD]/cli/tests/recursive_imports/C.ts",
+      "specifier": "file://[WILDCARD]/recursive_imports/C.ts",
       "dependencies": [
         {
           "specifier": "./A.ts",
-          "code": "file://[WILDCARD]/cli/tests/recursive_imports/A.ts"
+          "code": "file://[WILDCARD]/recursive_imports/A.ts"
         },
         {
           "specifier": "./common.ts",
-          "code": "file://[WILDCARD]/cli/tests/recursive_imports/common.ts"
+          "code": "file://[WILDCARD]/recursive_imports/common.ts"
         }
       ],
       "size": 126,
@@ -66,7 +66,7 @@
       "checksum": "605875a410741bfaeeade28cbccf45f219ad99d987ea695e35eda75d2c53a658"
     },
     {
-      "specifier": "file://[WILDCARD]/cli/tests/recursive_imports/common.ts",
+      "specifier": "file://[WILDCARD]/recursive_imports/common.ts",
       "dependencies": [],
       "size": 28,
       "mediaType": "TypeScript",
diff --git a/cli/tests/076_info_json_deps_order.ts b/cli/tests/testdata/076_info_json_deps_order.ts
index b1ae75e68..b1ae75e68 100644
--- a/cli/tests/076_info_json_deps_order.ts
+++ b/cli/tests/testdata/076_info_json_deps_order.ts
diff --git a/cli/tests/077_fetch_empty.ts b/cli/tests/testdata/077_fetch_empty.ts
index b10a9094e..b10a9094e 100644
--- a/cli/tests/077_fetch_empty.ts
+++ b/cli/tests/testdata/077_fetch_empty.ts
diff --git a/cli/tests/077_fetch_empty.ts.out b/cli/tests/testdata/077_fetch_empty.ts.out
index e546cfcec..e546cfcec 100644
--- a/cli/tests/077_fetch_empty.ts.out
+++ b/cli/tests/testdata/077_fetch_empty.ts.out
diff --git a/cli/tests/078_unload_on_exit.ts b/cli/tests/testdata/078_unload_on_exit.ts
index 43d33eb25..43d33eb25 100644
--- a/cli/tests/078_unload_on_exit.ts
+++ b/cli/tests/testdata/078_unload_on_exit.ts
diff --git a/cli/tests/078_unload_on_exit.ts.out b/cli/tests/testdata/078_unload_on_exit.ts.out
index e213f9632..e213f9632 100644
--- a/cli/tests/078_unload_on_exit.ts.out
+++ b/cli/tests/testdata/078_unload_on_exit.ts.out
diff --git a/cli/tests/079_location_authentication.ts b/cli/tests/testdata/079_location_authentication.ts
index 4989312ac..4989312ac 100644
--- a/cli/tests/079_location_authentication.ts
+++ b/cli/tests/testdata/079_location_authentication.ts
diff --git a/cli/tests/079_location_authentication.ts.out b/cli/tests/testdata/079_location_authentication.ts.out
index bb2458497..bb2458497 100644
--- a/cli/tests/079_location_authentication.ts.out
+++ b/cli/tests/testdata/079_location_authentication.ts.out
diff --git a/cli/tests/080_deno_emit_permissions.ts b/cli/tests/testdata/080_deno_emit_permissions.ts
index dc550cffb..dc550cffb 100644
--- a/cli/tests/080_deno_emit_permissions.ts
+++ b/cli/tests/testdata/080_deno_emit_permissions.ts
diff --git a/cli/tests/080_deno_emit_permissions.ts.out b/cli/tests/testdata/080_deno_emit_permissions.ts.out
index 4eb4fd1c1..4eb4fd1c1 100644
--- a/cli/tests/080_deno_emit_permissions.ts.out
+++ b/cli/tests/testdata/080_deno_emit_permissions.ts.out
diff --git a/cli/tests/081_location_relative_fetch_redirect.ts b/cli/tests/testdata/081_location_relative_fetch_redirect.ts
index 742ef0afb..742ef0afb 100644
--- a/cli/tests/081_location_relative_fetch_redirect.ts
+++ b/cli/tests/testdata/081_location_relative_fetch_redirect.ts
diff --git a/cli/tests/081_location_relative_fetch_redirect.ts.out b/cli/tests/testdata/081_location_relative_fetch_redirect.ts.out
index f62b93195..f62b93195 100644
--- a/cli/tests/081_location_relative_fetch_redirect.ts.out
+++ b/cli/tests/testdata/081_location_relative_fetch_redirect.ts.out
diff --git a/cli/tests/082_prepare_stack_trace_throw.js b/cli/tests/testdata/082_prepare_stack_trace_throw.js
index 8137bfdc8..8137bfdc8 100644
--- a/cli/tests/082_prepare_stack_trace_throw.js
+++ b/cli/tests/testdata/082_prepare_stack_trace_throw.js
diff --git a/cli/tests/082_prepare_stack_trace_throw.js.out b/cli/tests/testdata/082_prepare_stack_trace_throw.js.out
index 751b7c971..751b7c971 100644
--- a/cli/tests/082_prepare_stack_trace_throw.js.out
+++ b/cli/tests/testdata/082_prepare_stack_trace_throw.js.out
diff --git a/cli/tests/083_legacy_external_source_map.ts b/cli/tests/testdata/083_legacy_external_source_map.ts
index 73d267b87..73d267b87 100644
--- a/cli/tests/083_legacy_external_source_map.ts
+++ b/cli/tests/testdata/083_legacy_external_source_map.ts
diff --git a/cli/tests/084_worker_custom_inspect.ts b/cli/tests/testdata/084_worker_custom_inspect.ts
index 2e7b86a4e..2e7b86a4e 100644
--- a/cli/tests/084_worker_custom_inspect.ts
+++ b/cli/tests/testdata/084_worker_custom_inspect.ts
diff --git a/cli/tests/084_worker_custom_inspect.ts.out b/cli/tests/testdata/084_worker_custom_inspect.ts.out
index b34300c40..b34300c40 100644
--- a/cli/tests/084_worker_custom_inspect.ts.out
+++ b/cli/tests/testdata/084_worker_custom_inspect.ts.out
diff --git a/cli/tests/084_worker_custom_inspect_worker.ts b/cli/tests/testdata/084_worker_custom_inspect_worker.ts
index 5be82724e..5be82724e 100644
--- a/cli/tests/084_worker_custom_inspect_worker.ts
+++ b/cli/tests/testdata/084_worker_custom_inspect_worker.ts
diff --git a/cli/tests/085_dynamic_import_async_error.ts b/cli/tests/testdata/085_dynamic_import_async_error.ts
index aa5ff7277..aa5ff7277 100644
--- a/cli/tests/085_dynamic_import_async_error.ts
+++ b/cli/tests/testdata/085_dynamic_import_async_error.ts
diff --git a/cli/tests/085_dynamic_import_async_error.ts.out b/cli/tests/testdata/085_dynamic_import_async_error.ts.out
index 974c2e426..974c2e426 100644
--- a/cli/tests/085_dynamic_import_async_error.ts.out
+++ b/cli/tests/testdata/085_dynamic_import_async_error.ts.out
diff --git a/cli/tests/086_dynamic_import_already_rejected.ts b/cli/tests/testdata/086_dynamic_import_already_rejected.ts
index 359db670c..359db670c 100644
--- a/cli/tests/086_dynamic_import_already_rejected.ts
+++ b/cli/tests/testdata/086_dynamic_import_already_rejected.ts
diff --git a/cli/tests/086_dynamic_import_already_rejected.ts.out b/cli/tests/testdata/086_dynamic_import_already_rejected.ts.out
index c3eb66f9e..c3eb66f9e 100644
--- a/cli/tests/086_dynamic_import_already_rejected.ts.out
+++ b/cli/tests/testdata/086_dynamic_import_already_rejected.ts.out
diff --git a/cli/tests/087_hello.ts b/cli/tests/testdata/087_hello.ts
index 1a9d8f114..1a9d8f114 100644
--- a/cli/tests/087_hello.ts
+++ b/cli/tests/testdata/087_hello.ts
diff --git a/cli/tests/087_no_check_imports_not_used_as_values.ts b/cli/tests/testdata/087_no_check_imports_not_used_as_values.ts
index 64a13f9b1..64a13f9b1 100644
--- a/cli/tests/087_no_check_imports_not_used_as_values.ts
+++ b/cli/tests/testdata/087_no_check_imports_not_used_as_values.ts
diff --git a/cli/tests/087_no_check_imports_not_used_as_values.ts.out b/cli/tests/testdata/087_no_check_imports_not_used_as_values.ts.out
index f744c4183..f744c4183 100644
--- a/cli/tests/087_no_check_imports_not_used_as_values.ts.out
+++ b/cli/tests/testdata/087_no_check_imports_not_used_as_values.ts.out
diff --git a/cli/tests/088_dynamic_import_already_evaluating.ts b/cli/tests/testdata/088_dynamic_import_already_evaluating.ts
index 272163a5d..272163a5d 100644
--- a/cli/tests/088_dynamic_import_already_evaluating.ts
+++ b/cli/tests/testdata/088_dynamic_import_already_evaluating.ts
diff --git a/cli/tests/088_dynamic_import_already_evaluating.ts.out b/cli/tests/testdata/088_dynamic_import_already_evaluating.ts.out
index a36dd11e7..a36dd11e7 100644
--- a/cli/tests/088_dynamic_import_already_evaluating.ts.out
+++ b/cli/tests/testdata/088_dynamic_import_already_evaluating.ts.out
diff --git a/cli/tests/088_dynamic_import_target.ts b/cli/tests/testdata/088_dynamic_import_target.ts
index 226f1851a..226f1851a 100644
--- a/cli/tests/088_dynamic_import_target.ts
+++ b/cli/tests/testdata/088_dynamic_import_target.ts
diff --git a/cli/tests/089_run_allow_list.ts b/cli/tests/testdata/089_run_allow_list.ts
index defb3196f..defb3196f 100644
--- a/cli/tests/089_run_allow_list.ts
+++ b/cli/tests/testdata/089_run_allow_list.ts
diff --git a/cli/tests/089_run_allow_list.ts.out b/cli/tests/testdata/089_run_allow_list.ts.out
index 68a4a2ac5..68a4a2ac5 100644
--- a/cli/tests/089_run_allow_list.ts.out
+++ b/cli/tests/testdata/089_run_allow_list.ts.out
diff --git a/cli/tests/090_run_permissions_request.ts b/cli/tests/testdata/090_run_permissions_request.ts
index 044bc6e8e..044bc6e8e 100644
--- a/cli/tests/090_run_permissions_request.ts
+++ b/cli/tests/testdata/090_run_permissions_request.ts
diff --git a/cli/tests/090_run_permissions_request.ts.out b/cli/tests/testdata/090_run_permissions_request.ts.out
index 362425876..362425876 100644
--- a/cli/tests/090_run_permissions_request.ts.out
+++ b/cli/tests/testdata/090_run_permissions_request.ts.out
diff --git a/cli/tests/091_use_define_for_class_fields.ts b/cli/tests/testdata/091_use_define_for_class_fields.ts
index 46be3ac0b..46be3ac0b 100644
--- a/cli/tests/091_use_define_for_class_fields.ts
+++ b/cli/tests/testdata/091_use_define_for_class_fields.ts
diff --git a/cli/tests/091_use_define_for_class_fields.ts.out b/cli/tests/testdata/091_use_define_for_class_fields.ts.out
index 08f94a967..08f94a967 100644
--- a/cli/tests/091_use_define_for_class_fields.ts.out
+++ b/cli/tests/testdata/091_use_define_for_class_fields.ts.out
diff --git a/cli/tests/092_import_map_unmapped_bare_specifier.ts b/cli/tests/testdata/092_import_map_unmapped_bare_specifier.ts
index 87684430d..87684430d 100644
--- a/cli/tests/092_import_map_unmapped_bare_specifier.ts
+++ b/cli/tests/testdata/092_import_map_unmapped_bare_specifier.ts
diff --git a/cli/tests/092_import_map_unmapped_bare_specifier.ts.out b/cli/tests/testdata/092_import_map_unmapped_bare_specifier.ts.out
index 1a55e352b..1a55e352b 100644
--- a/cli/tests/092_import_map_unmapped_bare_specifier.ts.out
+++ b/cli/tests/testdata/092_import_map_unmapped_bare_specifier.ts.out
diff --git a/cli/tests/095_cache_with_bare_import.ts b/cli/tests/testdata/095_cache_with_bare_import.ts
index c0748305d..c0748305d 100644
--- a/cli/tests/095_cache_with_bare_import.ts
+++ b/cli/tests/testdata/095_cache_with_bare_import.ts
diff --git a/cli/tests/095_cache_with_bare_import.ts.out b/cli/tests/testdata/095_cache_with_bare_import.ts.out
index f424f4c3e..f424f4c3e 100644
--- a/cli/tests/095_cache_with_bare_import.ts.out
+++ b/cli/tests/testdata/095_cache_with_bare_import.ts.out
diff --git a/cli/tests/Component.tsx b/cli/tests/testdata/Component.tsx
index 81dfd6957..81dfd6957 100644
--- a/cli/tests/Component.tsx
+++ b/cli/tests/testdata/Component.tsx
diff --git a/cli/tests/DenoWinRunner.cs b/cli/tests/testdata/DenoWinRunner.cs
index 2f9e9f89f..2f9e9f89f 100644
--- a/cli/tests/DenoWinRunner.cs
+++ b/cli/tests/testdata/DenoWinRunner.cs
diff --git a/cli/tests/DenoWinRunner.ps1 b/cli/tests/testdata/DenoWinRunner.ps1
index 203b5d36c..203b5d36c 100644
--- a/cli/tests/DenoWinRunner.ps1
+++ b/cli/tests/testdata/DenoWinRunner.ps1
diff --git a/cli/tests/async_error.ts b/cli/tests/testdata/async_error.ts
index b55c73aeb..b55c73aeb 100644
--- a/cli/tests/async_error.ts
+++ b/cli/tests/testdata/async_error.ts
diff --git a/cli/tests/async_error.ts.out b/cli/tests/testdata/async_error.ts.out
index 77406352c..b424f9072 100644
--- a/cli/tests/async_error.ts.out
+++ b/cli/tests/testdata/async_error.ts.out
@@ -4,5 +4,5 @@ world
 error: Uncaught (in promise) Error: error
   throw Error("error");
         ^
-    at foo ([WILDCARD]tests/async_error.ts:5:9)
-    at [WILDCARD]tests/async_error.ts:8:1
+    at foo ([WILDCARD]/async_error.ts:5:9)
+    at [WILDCARD]/async_error.ts:8:1
diff --git a/cli/tests/badly_formatted.json b/cli/tests/testdata/badly_formatted.json
index f2bacf73d..f2bacf73d 100644
--- a/cli/tests/badly_formatted.json
+++ b/cli/tests/testdata/badly_formatted.json
diff --git a/cli/tests/badly_formatted.md b/cli/tests/testdata/badly_formatted.md
index 26afe483b..26afe483b 100644
--- a/cli/tests/badly_formatted.md
+++ b/cli/tests/testdata/badly_formatted.md
diff --git a/cli/tests/badly_formatted.mjs b/cli/tests/testdata/badly_formatted.mjs
index bc515a330..bc515a330 100644
--- a/cli/tests/badly_formatted.mjs
+++ b/cli/tests/testdata/badly_formatted.mjs
diff --git a/cli/tests/badly_formatted_fixed.js b/cli/tests/testdata/badly_formatted_fixed.js
index e9062ba85..e9062ba85 100644
--- a/cli/tests/badly_formatted_fixed.js
+++ b/cli/tests/testdata/badly_formatted_fixed.js
diff --git a/cli/tests/badly_formatted_fixed.json b/cli/tests/testdata/badly_formatted_fixed.json
index 0d697a2c6..0d697a2c6 100644
--- a/cli/tests/badly_formatted_fixed.json
+++ b/cli/tests/testdata/badly_formatted_fixed.json
diff --git a/cli/tests/badly_formatted_fixed.md b/cli/tests/testdata/badly_formatted_fixed.md
index 8ba74cac3..8ba74cac3 100644
--- a/cli/tests/badly_formatted_fixed.md
+++ b/cli/tests/testdata/badly_formatted_fixed.md
diff --git a/cli/tests/blob_gc_finalization.js b/cli/tests/testdata/blob_gc_finalization.js
index 34c878513..34c878513 100644
--- a/cli/tests/blob_gc_finalization.js
+++ b/cli/tests/testdata/blob_gc_finalization.js
diff --git a/cli/tests/blob_gc_finalization.js.out b/cli/tests/testdata/blob_gc_finalization.js.out
index dcc4500f8..dcc4500f8 100644
--- a/cli/tests/blob_gc_finalization.js.out
+++ b/cli/tests/testdata/blob_gc_finalization.js.out
diff --git a/cli/tests/bundle.test.out b/cli/tests/testdata/bundle.test.out
index 030c09295..030c09295 100644
--- a/cli/tests/bundle.test.out
+++ b/cli/tests/testdata/bundle.test.out
diff --git a/cli/tests/bundle/file_tests-fixture01.ts b/cli/tests/testdata/bundle/file_tests-fixture01.ts
index 3598d0298..3598d0298 100644
--- a/cli/tests/bundle/file_tests-fixture01.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture01.ts
diff --git a/cli/tests/bundle/file_tests-fixture02.ts b/cli/tests/testdata/bundle/file_tests-fixture02.ts
index 0cd291329..0cd291329 100644
--- a/cli/tests/bundle/file_tests-fixture02.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture02.ts
diff --git a/cli/tests/bundle/file_tests-fixture03.ts b/cli/tests/testdata/bundle/file_tests-fixture03.ts
index 78365ce13..78365ce13 100644
--- a/cli/tests/bundle/file_tests-fixture03.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture03.ts
diff --git a/cli/tests/bundle/file_tests-fixture04.ts b/cli/tests/testdata/bundle/file_tests-fixture04.ts
index 590f4fef9..590f4fef9 100644
--- a/cli/tests/bundle/file_tests-fixture04.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture04.ts
diff --git a/cli/tests/bundle/file_tests-fixture05.ts b/cli/tests/testdata/bundle/file_tests-fixture05.ts
index 19541ce59..19541ce59 100644
--- a/cli/tests/bundle/file_tests-fixture05.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture05.ts
diff --git a/cli/tests/bundle/file_tests-fixture06.ts b/cli/tests/testdata/bundle/file_tests-fixture06.ts
index 3d94332df..3d94332df 100644
--- a/cli/tests/bundle/file_tests-fixture06.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture06.ts
diff --git a/cli/tests/bundle/file_tests-fixture07.ts b/cli/tests/testdata/bundle/file_tests-fixture07.ts
index 0475a6c53..0475a6c53 100644
--- a/cli/tests/bundle/file_tests-fixture07.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture07.ts
diff --git a/cli/tests/bundle/file_tests-fixture08.ts b/cli/tests/testdata/bundle/file_tests-fixture08.ts
index 6af5d172e..6af5d172e 100644
--- a/cli/tests/bundle/file_tests-fixture08.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture08.ts
diff --git a/cli/tests/bundle/file_tests-fixture09.ts b/cli/tests/testdata/bundle/file_tests-fixture09.ts
index 30ba983ee..30ba983ee 100644
--- a/cli/tests/bundle/file_tests-fixture09.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture09.ts
diff --git a/cli/tests/bundle/file_tests-fixture10.ts b/cli/tests/testdata/bundle/file_tests-fixture10.ts
index bec555da8..bec555da8 100644
--- a/cli/tests/bundle/file_tests-fixture10.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture10.ts
diff --git a/cli/tests/bundle/file_tests-fixture11.ts b/cli/tests/testdata/bundle/file_tests-fixture11.ts
index 1c361438f..1c361438f 100644
--- a/cli/tests/bundle/file_tests-fixture11.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture11.ts
diff --git a/cli/tests/bundle/file_tests-fixture12.ts b/cli/tests/testdata/bundle/file_tests-fixture12.ts
index 32b9566bd..32b9566bd 100644
--- a/cli/tests/bundle/file_tests-fixture12.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture12.ts
diff --git a/cli/tests/bundle/file_tests-fixture13.ts b/cli/tests/testdata/bundle/file_tests-fixture13.ts
index 7dc13534c..7dc13534c 100644
--- a/cli/tests/bundle/file_tests-fixture13.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture13.ts
diff --git a/cli/tests/bundle/file_tests-fixture14.ts b/cli/tests/testdata/bundle/file_tests-fixture14.ts
index aa8eef1b8..aa8eef1b8 100644
--- a/cli/tests/bundle/file_tests-fixture14.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture14.ts
diff --git a/cli/tests/bundle/file_tests-fixture15.ts b/cli/tests/testdata/bundle/file_tests-fixture15.ts
index c1dd3bc89..c1dd3bc89 100644
--- a/cli/tests/bundle/file_tests-fixture15.ts
+++ b/cli/tests/testdata/bundle/file_tests-fixture15.ts
diff --git a/cli/tests/bundle/file_tests-subdir-a.ts b/cli/tests/testdata/bundle/file_tests-subdir-a.ts
index 9233cce2f..9233cce2f 100644
--- a/cli/tests/bundle/file_tests-subdir-a.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-a.ts
diff --git a/cli/tests/bundle/file_tests-subdir-b.ts b/cli/tests/testdata/bundle/file_tests-subdir-b.ts
index 1cf751c22..1cf751c22 100644
--- a/cli/tests/bundle/file_tests-subdir-b.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-b.ts
diff --git a/cli/tests/bundle/file_tests-subdir-c.ts b/cli/tests/testdata/bundle/file_tests-subdir-c.ts
index 7cc01f993..7cc01f993 100644
--- a/cli/tests/bundle/file_tests-subdir-c.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-c.ts
diff --git a/cli/tests/bundle/file_tests-subdir-d.ts b/cli/tests/testdata/bundle/file_tests-subdir-d.ts
index 9f1ba7f67..9f1ba7f67 100644
--- a/cli/tests/bundle/file_tests-subdir-d.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-d.ts
diff --git a/cli/tests/bundle/file_tests-subdir-e.ts b/cli/tests/testdata/bundle/file_tests-subdir-e.ts
index 55e8e0e18..55e8e0e18 100644
--- a/cli/tests/bundle/file_tests-subdir-e.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-e.ts
diff --git a/cli/tests/bundle/file_tests-subdir-f.ts b/cli/tests/testdata/bundle/file_tests-subdir-f.ts
index 8bc8d9bf4..8bc8d9bf4 100644
--- a/cli/tests/bundle/file_tests-subdir-f.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-f.ts
diff --git a/cli/tests/bundle/file_tests-subdir-g.ts b/cli/tests/testdata/bundle/file_tests-subdir-g.ts
index 3eb4cd3cc..3eb4cd3cc 100644
--- a/cli/tests/bundle/file_tests-subdir-g.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-g.ts
diff --git a/cli/tests/bundle/file_tests-subdir-h.ts b/cli/tests/testdata/bundle/file_tests-subdir-h.ts
index 9c86dd5c5..9c86dd5c5 100644
--- a/cli/tests/bundle/file_tests-subdir-h.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-h.ts
diff --git a/cli/tests/bundle/file_tests-subdir-i.ts b/cli/tests/testdata/bundle/file_tests-subdir-i.ts
index 4ad9ce449..4ad9ce449 100644
--- a/cli/tests/bundle/file_tests-subdir-i.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-i.ts
diff --git a/cli/tests/bundle/file_tests-subdir-j.ts b/cli/tests/testdata/bundle/file_tests-subdir-j.ts
index ac7bce0ea..ac7bce0ea 100644
--- a/cli/tests/bundle/file_tests-subdir-j.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-j.ts
diff --git a/cli/tests/bundle/file_tests-subdir-k.ts b/cli/tests/testdata/bundle/file_tests-subdir-k.ts
index 1b8a533f1..1b8a533f1 100644
--- a/cli/tests/bundle/file_tests-subdir-k.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-k.ts
diff --git a/cli/tests/bundle/file_tests-subdir-l.ts b/cli/tests/testdata/bundle/file_tests-subdir-l.ts
index d767e6ad0..d767e6ad0 100644
--- a/cli/tests/bundle/file_tests-subdir-l.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-l.ts
diff --git a/cli/tests/bundle/file_tests-subdir-m.ts b/cli/tests/testdata/bundle/file_tests-subdir-m.ts
index 21e86d07c..21e86d07c 100644
--- a/cli/tests/bundle/file_tests-subdir-m.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-m.ts
diff --git a/cli/tests/bundle/file_tests-subdir-n.ts b/cli/tests/testdata/bundle/file_tests-subdir-n.ts
index ac3c37005..ac3c37005 100644
--- a/cli/tests/bundle/file_tests-subdir-n.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-n.ts
diff --git a/cli/tests/bundle/file_tests-subdir-o.ts b/cli/tests/testdata/bundle/file_tests-subdir-o.ts
index ab9753fea..ab9753fea 100644
--- a/cli/tests/bundle/file_tests-subdir-o.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-o.ts
diff --git a/cli/tests/bundle/file_tests-subdir-p.ts b/cli/tests/testdata/bundle/file_tests-subdir-p.ts
index 19b486f71..19b486f71 100644
--- a/cli/tests/bundle/file_tests-subdir-p.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-p.ts
diff --git a/cli/tests/bundle/file_tests-subdir-q.ts b/cli/tests/testdata/bundle/file_tests-subdir-q.ts
index eebe0a38b..eebe0a38b 100644
--- a/cli/tests/bundle/file_tests-subdir-q.ts
+++ b/cli/tests/testdata/bundle/file_tests-subdir-q.ts
diff --git a/cli/tests/bundle/fixture01.out b/cli/tests/testdata/bundle/fixture01.out
index a825140b7..a825140b7 100644
--- a/cli/tests/bundle/fixture01.out
+++ b/cli/tests/testdata/bundle/fixture01.out
diff --git a/cli/tests/bundle/fixture02.out b/cli/tests/testdata/bundle/fixture02.out
index 5c502e2f0..5c502e2f0 100644
--- a/cli/tests/bundle/fixture02.out
+++ b/cli/tests/testdata/bundle/fixture02.out
diff --git a/cli/tests/bundle/fixture03.out b/cli/tests/testdata/bundle/fixture03.out
index 524e77abb..524e77abb 100644
--- a/cli/tests/bundle/fixture03.out
+++ b/cli/tests/testdata/bundle/fixture03.out
diff --git a/cli/tests/bundle/fixture04.out b/cli/tests/testdata/bundle/fixture04.out
index 37869205b..37869205b 100644
--- a/cli/tests/bundle/fixture04.out
+++ b/cli/tests/testdata/bundle/fixture04.out
diff --git a/cli/tests/bundle/fixture05.out b/cli/tests/testdata/bundle/fixture05.out
index 1289cca5f..1289cca5f 100644
--- a/cli/tests/bundle/fixture05.out
+++ b/cli/tests/testdata/bundle/fixture05.out
diff --git a/cli/tests/bundle/fixture06.out b/cli/tests/testdata/bundle/fixture06.out
index 47288d5e4..47288d5e4 100644
--- a/cli/tests/bundle/fixture06.out
+++ b/cli/tests/testdata/bundle/fixture06.out
diff --git a/cli/tests/bundle/fixture07.out b/cli/tests/testdata/bundle/fixture07.out
index 39e6a11e8..39e6a11e8 100644
--- a/cli/tests/bundle/fixture07.out
+++ b/cli/tests/testdata/bundle/fixture07.out
diff --git a/cli/tests/bundle/fixture08.out b/cli/tests/testdata/bundle/fixture08.out
index bfe40aa37..bfe40aa37 100644
--- a/cli/tests/bundle/fixture08.out
+++ b/cli/tests/testdata/bundle/fixture08.out
diff --git a/cli/tests/bundle/fixture09.out b/cli/tests/testdata/bundle/fixture09.out
index e06cc92de..e06cc92de 100644
--- a/cli/tests/bundle/fixture09.out
+++ b/cli/tests/testdata/bundle/fixture09.out
diff --git a/cli/tests/bundle/fixture10.out b/cli/tests/testdata/bundle/fixture10.out
index 5491e5e7f..5491e5e7f 100644
--- a/cli/tests/bundle/fixture10.out
+++ b/cli/tests/testdata/bundle/fixture10.out
diff --git a/cli/tests/bundle/fixture11.out b/cli/tests/testdata/bundle/fixture11.out
index d143e8723..d143e8723 100644
--- a/cli/tests/bundle/fixture11.out
+++ b/cli/tests/testdata/bundle/fixture11.out
diff --git a/cli/tests/bundle/fixture12.out b/cli/tests/testdata/bundle/fixture12.out
index 64e2d6cdb..64e2d6cdb 100644
--- a/cli/tests/bundle/fixture12.out
+++ b/cli/tests/testdata/bundle/fixture12.out
diff --git a/cli/tests/bundle/fixture13.out b/cli/tests/testdata/bundle/fixture13.out
index 1c7a8c991..1c7a8c991 100644
--- a/cli/tests/bundle/fixture13.out
+++ b/cli/tests/testdata/bundle/fixture13.out
diff --git a/cli/tests/bundle/fixture14.out b/cli/tests/testdata/bundle/fixture14.out
index 392bb6478..392bb6478 100644
--- a/cli/tests/bundle/fixture14.out
+++ b/cli/tests/testdata/bundle/fixture14.out
diff --git a/cli/tests/bundle/fixture15.out b/cli/tests/testdata/bundle/fixture15.out
index dc72fdeff..dc72fdeff 100644
--- a/cli/tests/bundle/fixture15.out
+++ b/cli/tests/testdata/bundle/fixture15.out
diff --git a/cli/tests/bundle/https_deno.land-x-lib-a.ts b/cli/tests/testdata/bundle/https_deno.land-x-lib-a.ts
index a0a6f8e94..a0a6f8e94 100644
--- a/cli/tests/bundle/https_deno.land-x-lib-a.ts
+++ b/cli/tests/testdata/bundle/https_deno.land-x-lib-a.ts
diff --git a/cli/tests/bundle/https_deno.land-x-lib-b.js b/cli/tests/testdata/bundle/https_deno.land-x-lib-b.js
index 13cacdd8b..13cacdd8b 100644
--- a/cli/tests/bundle/https_deno.land-x-lib-b.js
+++ b/cli/tests/testdata/bundle/https_deno.land-x-lib-b.js
diff --git a/cli/tests/bundle/https_deno.land-x-lib-c.d.ts b/cli/tests/testdata/bundle/https_deno.land-x-lib-c.d.ts
index fac988e49..fac988e49 100644
--- a/cli/tests/bundle/https_deno.land-x-lib-c.d.ts
+++ b/cli/tests/testdata/bundle/https_deno.land-x-lib-c.d.ts
diff --git a/cli/tests/bundle/https_deno.land-x-lib-c.js b/cli/tests/testdata/bundle/https_deno.land-x-lib-c.js
index 620ca0b66..620ca0b66 100644
--- a/cli/tests/bundle/https_deno.land-x-lib-c.js
+++ b/cli/tests/testdata/bundle/https_deno.land-x-lib-c.js
diff --git a/cli/tests/bundle/https_deno.land-x-lib-mod.d.ts b/cli/tests/testdata/bundle/https_deno.land-x-lib-mod.d.ts
index 76ed81df0..76ed81df0 100644
--- a/cli/tests/bundle/https_deno.land-x-lib-mod.d.ts
+++ b/cli/tests/testdata/bundle/https_deno.land-x-lib-mod.d.ts
diff --git a/cli/tests/bundle/https_deno.land-x-lib-mod.js b/cli/tests/testdata/bundle/https_deno.land-x-lib-mod.js
index 505162094..505162094 100644
--- a/cli/tests/bundle/https_deno.land-x-lib-mod.js
+++ b/cli/tests/testdata/bundle/https_deno.land-x-lib-mod.js
diff --git a/cli/tests/testdata/bundle_dynamic_import.ts b/cli/tests/testdata/bundle_dynamic_import.ts
new file mode 100644
index 000000000..d8c7d08ec
--- /dev/null
+++ b/cli/tests/testdata/bundle_dynamic_import.ts
@@ -0,0 +1,3 @@
+const mod1 = await import("http://localhost:4545/subdir/mod1.ts");
+
+mod1.printHello3();
diff --git a/cli/tests/bundle_im.json b/cli/tests/testdata/bundle_im.json
index 8ebc00c5b..8ebc00c5b 100644
--- a/cli/tests/bundle_im.json
+++ b/cli/tests/testdata/bundle_im.json
diff --git a/cli/tests/bundle_im.ts b/cli/tests/testdata/bundle_im.ts
index 74834de20..74834de20 100644
--- a/cli/tests/bundle_im.ts
+++ b/cli/tests/testdata/bundle_im.ts
diff --git a/cli/tests/bundle_jsx.out b/cli/tests/testdata/bundle_jsx.out
index 44c9e4555..44c9e4555 100644
--- a/cli/tests/bundle_jsx.out
+++ b/cli/tests/testdata/bundle_jsx.out
diff --git a/cli/tests/testdata/cache_extensionless.out b/cli/tests/testdata/cache_extensionless.out
new file mode 100644
index 000000000..3694c67cb
--- /dev/null
+++ b/cli/tests/testdata/cache_extensionless.out
@@ -0,0 +1,2 @@
+[WILDCARD]
+Check http://localhost:4545/subdir/no_js_ext
diff --git a/cli/tests/testdata/cache_random_extension.out b/cli/tests/testdata/cache_random_extension.out
new file mode 100644
index 000000000..745a2e0e3
--- /dev/null
+++ b/cli/tests/testdata/cache_random_extension.out
@@ -0,0 +1,2 @@
+[WILDCARD]
+Check http://localhost:4545/subdir/no_js_ext@1.0.0
diff --git a/cli/tests/testdata/cafile_info.ts b/cli/tests/testdata/cafile_info.ts
new file mode 100644
index 000000000..b41873f73
--- /dev/null
+++ b/cli/tests/testdata/cafile_info.ts
@@ -0,0 +1,24 @@
+// When run against the test HTTP server, it will serve different media types
+// based on the URL containing `.t#.` strings, which exercises the different
+// mapping of media types end to end.
+
+import { loaded as loadedTs1 } from "https://localhost:5545/subdir/mt_text_typescript.t1.ts";
+import { loaded as loadedTs2 } from "https://localhost:5545/subdir/mt_video_vdn.t2.ts";
+import { loaded as loadedTs3 } from "https://localhost:5545/subdir/mt_video_mp2t.t3.ts";
+import { loaded as loadedTs4 } from "https://localhost:5545/subdir/mt_application_x_typescript.t4.ts";
+import { loaded as loadedJs1 } from "https://localhost:5545/subdir/mt_text_javascript.j1.js";
+import { loaded as loadedJs2 } from "https://localhost:5545/subdir/mt_application_ecmascript.j2.js";
+import { loaded as loadedJs3 } from "https://localhost:5545/subdir/mt_text_ecmascript.j3.js";
+import { loaded as loadedJs4 } from "https://localhost:5545/subdir/mt_application_x_javascript.j4.js";
+
+console.log(
+  "success",
+  loadedTs1,
+  loadedTs2,
+  loadedTs3,
+  loadedTs4,
+  loadedJs1,
+  loadedJs2,
+  loadedJs3,
+  loadedJs4,
+);
diff --git a/cli/tests/testdata/cafile_info.ts.out b/cli/tests/testdata/cafile_info.ts.out
new file mode 100644
index 000000000..3ce03961d
--- /dev/null
+++ b/cli/tests/testdata/cafile_info.ts.out
@@ -0,0 +1,13 @@
+local: [WILDCARD]https[WILDCARD]localhost_PORT5545[WILDCARD]
+type: TypeScript
+dependencies: 8 unique (total [WILDCARD])
+
+https://localhost:5545/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])
+├── https://localhost:5545/subdir/mt_text_ecmascript.j3.js ([WILDCARD])
+├── https://localhost:5545/subdir/mt_text_javascript.j1.js ([WILDCARD])
+├── https://localhost:5545/subdir/mt_text_typescript.t1.ts ([WILDCARD])
+├── https://localhost:5545/subdir/mt_video_mp2t.t3.ts ([WILDCARD])
+└── https://localhost:5545/subdir/mt_video_vdn.t2.ts ([WILDCARD])
diff --git a/cli/tests/cafile_ts_fetch.ts b/cli/tests/testdata/cafile_ts_fetch.ts
index 14f39ef97..03afb6d2f 100644
--- a/cli/tests/cafile_ts_fetch.ts
+++ b/cli/tests/testdata/cafile_ts_fetch.ts
@@ -1,3 +1,3 @@
-fetch("https://localhost:5545/cli/tests/cafile_ts_fetch.ts.out")
+fetch("https://localhost:5545/cafile_ts_fetch.ts.out")
   .then((r) => r.text())
   .then((t) => console.log(t.trimEnd()));
diff --git a/cli/tests/cafile_ts_fetch.ts.out b/cli/tests/testdata/cafile_ts_fetch.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/cafile_ts_fetch.ts.out
+++ b/cli/tests/testdata/cafile_ts_fetch.ts.out
diff --git a/cli/tests/cafile_ts_fetch_unsafe_ssl.ts.out b/cli/tests/testdata/cafile_ts_fetch_unsafe_ssl.ts.out
index 1dc61c837..1dc61c837 100644
--- a/cli/tests/cafile_ts_fetch_unsafe_ssl.ts.out
+++ b/cli/tests/testdata/cafile_ts_fetch_unsafe_ssl.ts.out
diff --git a/cli/tests/testdata/cafile_url_imports.ts b/cli/tests/testdata/cafile_url_imports.ts
new file mode 100644
index 000000000..2355a8628
--- /dev/null
+++ b/cli/tests/testdata/cafile_url_imports.ts
@@ -0,0 +1,3 @@
+import { printHello } from "https://localhost:5545/subdir/mod2.ts";
+printHello();
+console.log("success");
diff --git a/cli/tests/cafile_url_imports.ts.out b/cli/tests/testdata/cafile_url_imports.ts.out
index 989ce33e9..989ce33e9 100644
--- a/cli/tests/cafile_url_imports.ts.out
+++ b/cli/tests/testdata/cafile_url_imports.ts.out
diff --git a/cli/tests/cafile_url_imports_unsafe_ssl.ts.out b/cli/tests/testdata/cafile_url_imports_unsafe_ssl.ts.out
index daebcd766..daebcd766 100644
--- a/cli/tests/cafile_url_imports_unsafe_ssl.ts.out
+++ b/cli/tests/testdata/cafile_url_imports_unsafe_ssl.ts.out
diff --git a/cli/tests/cat.ts b/cli/tests/testdata/cat.ts
index 14ceec553..6d8f150e3 100644
--- a/cli/tests/cat.ts
+++ b/cli/tests/testdata/cat.ts
@@ -1,4 +1,4 @@
-import { copy } from "../../test_util/std/io/util.ts";
+import { copy } from "../../../test_util/std/io/util.ts";
 async function main() {
   for (let i = 1; i < Deno.args.length; i++) {
     const filename = Deno.args[i];
diff --git a/cli/tests/circular1.js b/cli/tests/testdata/circular1.js
index 8b2cc4960..8b2cc4960 100644
--- a/cli/tests/circular1.js
+++ b/cli/tests/testdata/circular1.js
diff --git a/cli/tests/circular1.js.out b/cli/tests/testdata/circular1.js.out
index 21f7fd585..21f7fd585 100644
--- a/cli/tests/circular1.js.out
+++ b/cli/tests/testdata/circular1.js.out
diff --git a/cli/tests/circular2.js b/cli/tests/testdata/circular2.js
index 62127e04d..62127e04d 100644
--- a/cli/tests/circular2.js
+++ b/cli/tests/testdata/circular2.js
diff --git a/cli/tests/cjs_imports.ts b/cli/tests/testdata/cjs_imports.ts
index d8b77c22e..d8b77c22e 100644
--- a/cli/tests/cjs_imports.ts
+++ b/cli/tests/testdata/cjs_imports.ts
diff --git a/cli/tests/cjs_imports.ts.out b/cli/tests/testdata/cjs_imports.ts.out
index 557db03de..557db03de 100644
--- a/cli/tests/cjs_imports.ts.out
+++ b/cli/tests/testdata/cjs_imports.ts.out
diff --git a/cli/tests/commonjs.cjs b/cli/tests/testdata/commonjs.cjs
index 7df7d571e..7df7d571e 100644
--- a/cli/tests/commonjs.cjs
+++ b/cli/tests/testdata/commonjs.cjs
diff --git a/cli/tests/compiler_api_test.ts b/cli/tests/testdata/compiler_api_test.ts
index 2e0a8820c..92eb4c519 100644
--- a/cli/tests/compiler_api_test.ts
+++ b/cli/tests/testdata/compiler_api_test.ts
@@ -4,7 +4,7 @@ import {
   assertEquals,
   assertStringIncludes,
   assertThrowsAsync,
-} from "../../test_util/std/testing/asserts.ts";
+} from "../../../test_util/std/testing/asserts.ts";
 
 Deno.test({
   name: "Deno.emit() - sources provided",
@@ -40,8 +40,8 @@ Deno.test({
     assertEquals(stats.length, 12);
     const keys = Object.keys(files).sort();
     assertEquals(keys.length, 6);
-    assert(keys[0].endsWith("cli/tests/subdir/mod1.ts.js"));
-    assert(keys[1].endsWith("cli/tests/subdir/mod1.ts.js.map"));
+    assert(keys[0].endsWith("subdir/mod1.ts.js"));
+    assert(keys[1].endsWith("subdir/mod1.ts.js.map"));
   },
 });
 
diff --git a/cli/tests/complex_permissions_test.ts b/cli/tests/testdata/complex_permissions_test.ts
index bae157246..bae157246 100644
--- a/cli/tests/complex_permissions_test.ts
+++ b/cli/tests/testdata/complex_permissions_test.ts
diff --git a/cli/tests/config.ts b/cli/tests/testdata/config.ts
index cd7a1b33f..cd7a1b33f 100644
--- a/cli/tests/config.ts
+++ b/cli/tests/testdata/config.ts
diff --git a/cli/tests/config.ts.out b/cli/tests/testdata/config.ts.out
index 99b4a7ea4..9f8a8ddd1 100644
--- a/cli/tests/config.ts.out
+++ b/cli/tests/testdata/config.ts.out
@@ -4,4 +4,4 @@
 error: TS1219 [ERROR]: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option in your 'tsconfig' or 'jsconfig' to remove this warning.
   a() {
   ^
-    at file:///[WILDCARD]cli/tests/config.ts:[WILDCARD]
+    at file:///[WILDCARD]/config.ts:[WILDCARD]
diff --git a/cli/tests/config.tsconfig.json b/cli/tests/testdata/config.tsconfig.json
index dcabb50a4..dcabb50a4 100644
--- a/cli/tests/config.tsconfig.json
+++ b/cli/tests/testdata/config.tsconfig.json
diff --git a/cli/tests/config_types.ts b/cli/tests/testdata/config_types.ts
index f1a8d6583..f1a8d6583 100644
--- a/cli/tests/config_types.ts
+++ b/cli/tests/testdata/config_types.ts
diff --git a/cli/tests/config_types.ts.out b/cli/tests/testdata/config_types.ts.out
index 417b7b537..417b7b537 100644
--- a/cli/tests/config_types.ts.out
+++ b/cli/tests/testdata/config_types.ts.out
diff --git a/cli/tests/config_types.tsconfig.json b/cli/tests/testdata/config_types.tsconfig.json
index 3810d4534..3810d4534 100644
--- a/cli/tests/config_types.tsconfig.json
+++ b/cli/tests/testdata/config_types.tsconfig.json
diff --git a/cli/tests/testdata/config_types_remote.tsconfig.json b/cli/tests/testdata/config_types_remote.tsconfig.json
new file mode 100644
index 000000000..f40d5b1c4
--- /dev/null
+++ b/cli/tests/testdata/config_types_remote.tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "types": [
+      "http://localhost:4545/subdir/types.d.ts"
+    ]
+  }
+}
diff --git a/cli/tests/coverage/branch.ts b/cli/tests/testdata/coverage/branch.ts
index 352167109..352167109 100644
--- a/cli/tests/coverage/branch.ts
+++ b/cli/tests/testdata/coverage/branch.ts
diff --git a/cli/tests/coverage/branch_test.ts b/cli/tests/testdata/coverage/branch_test.ts
index 2a44c8071..2a44c8071 100644
--- a/cli/tests/coverage/branch_test.ts
+++ b/cli/tests/testdata/coverage/branch_test.ts
diff --git a/cli/tests/coverage/complex.ts b/cli/tests/testdata/coverage/complex.ts
index 47d4ffa79..47d4ffa79 100644
--- a/cli/tests/coverage/complex.ts
+++ b/cli/tests/testdata/coverage/complex.ts
diff --git a/cli/tests/coverage/complex_test.ts b/cli/tests/testdata/coverage/complex_test.ts
index fda948bc3..fda948bc3 100644
--- a/cli/tests/coverage/complex_test.ts
+++ b/cli/tests/testdata/coverage/complex_test.ts
diff --git a/cli/tests/coverage/expected_branch.lcov b/cli/tests/testdata/coverage/expected_branch.lcov
index 07e29cca5..07e29cca5 100644
--- a/cli/tests/coverage/expected_branch.lcov
+++ b/cli/tests/testdata/coverage/expected_branch.lcov
diff --git a/cli/tests/coverage/expected_branch.out b/cli/tests/testdata/coverage/expected_branch.out
index 630ea93b2..630ea93b2 100644
--- a/cli/tests/coverage/expected_branch.out
+++ b/cli/tests/testdata/coverage/expected_branch.out
diff --git a/cli/tests/coverage/expected_complex.lcov b/cli/tests/testdata/coverage/expected_complex.lcov
index 962ebee96..962ebee96 100644
--- a/cli/tests/coverage/expected_complex.lcov
+++ b/cli/tests/testdata/coverage/expected_complex.lcov
diff --git a/cli/tests/coverage/expected_complex.out b/cli/tests/testdata/coverage/expected_complex.out
index e9f9a453f..e9f9a453f 100644
--- a/cli/tests/coverage/expected_complex.out
+++ b/cli/tests/testdata/coverage/expected_complex.out
diff --git a/cli/tests/delayed_error.ts b/cli/tests/testdata/delayed_error.ts
index 76057e627..76057e627 100644
--- a/cli/tests/delayed_error.ts
+++ b/cli/tests/testdata/delayed_error.ts
diff --git a/cli/tests/deno_doc.out b/cli/tests/testdata/deno_doc.out
index 86a77a9cc..86a77a9cc 100644
--- a/cli/tests/deno_doc.out
+++ b/cli/tests/testdata/deno_doc.out
diff --git a/cli/tests/deno_doc.ts b/cli/tests/testdata/deno_doc.ts
index fb3c50957..fb3c50957 100644
--- a/cli/tests/deno_doc.ts
+++ b/cli/tests/testdata/deno_doc.ts
diff --git a/cli/tests/deno_doc_builtin.out b/cli/tests/testdata/deno_doc_builtin.out
index b4a90d6bc..b4a90d6bc 100644
--- a/cli/tests/deno_doc_builtin.out
+++ b/cli/tests/testdata/deno_doc_builtin.out
diff --git a/cli/tests/deno_dom_0.1.3-alpha2.wasm b/cli/tests/testdata/deno_dom_0.1.3-alpha2.wasm
index 6dd9d0e91..6dd9d0e91 100644
--- a/cli/tests/deno_dom_0.1.3-alpha2.wasm
+++ b/cli/tests/testdata/deno_dom_0.1.3-alpha2.wasm
diff --git a/cli/tests/deno_land_unsafe_ssl.ts b/cli/tests/testdata/deno_land_unsafe_ssl.ts
index f5e8dcc80..f5e8dcc80 100644
--- a/cli/tests/deno_land_unsafe_ssl.ts
+++ b/cli/tests/testdata/deno_land_unsafe_ssl.ts
diff --git a/cli/tests/deno_land_unsafe_ssl.ts.out b/cli/tests/testdata/deno_land_unsafe_ssl.ts.out
index cbf52b076..cbf52b076 100644
--- a/cli/tests/deno_land_unsafe_ssl.ts.out
+++ b/cli/tests/testdata/deno_land_unsafe_ssl.ts.out
diff --git a/cli/tests/disallow_http_from_https.js b/cli/tests/testdata/disallow_http_from_https.js
index fd30a023d..bff407b5e 100644
--- a/cli/tests/disallow_http_from_https.js
+++ b/cli/tests/testdata/disallow_http_from_https.js
@@ -1,2 +1,2 @@
 // Trying to import "http://", while this file is accessed by "https://"
-import "http://localhost:4545/cli/tests/001_hello.js";
+import "http://localhost:4545/001_hello.js";
diff --git a/cli/tests/disallow_http_from_https.ts b/cli/tests/testdata/disallow_http_from_https.ts
index fd30a023d..bff407b5e 100644
--- a/cli/tests/disallow_http_from_https.ts
+++ b/cli/tests/testdata/disallow_http_from_https.ts
@@ -1,2 +1,2 @@
 // Trying to import "http://", while this file is accessed by "https://"
-import "http://localhost:4545/cli/tests/001_hello.js";
+import "http://localhost:4545/001_hello.js";
diff --git a/cli/tests/testdata/disallow_http_from_https_js.out b/cli/tests/testdata/disallow_http_from_https_js.out
new file mode 100644
index 000000000..3219b7d35
--- /dev/null
+++ b/cli/tests/testdata/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/001_hello.js
+    at https://localhost:5545/disallow_http_from_https.js:2:0
diff --git a/cli/tests/testdata/disallow_http_from_https_ts.out b/cli/tests/testdata/disallow_http_from_https_ts.out
new file mode 100644
index 000000000..d1ab64394
--- /dev/null
+++ b/cli/tests/testdata/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/001_hello.js
+    at https://localhost:5545/disallow_http_from_https.ts:2:0
diff --git a/cli/tests/doc/import_map.json b/cli/tests/testdata/doc/import_map.json
index 244a30296..244a30296 100644
--- a/cli/tests/doc/import_map.json
+++ b/cli/tests/testdata/doc/import_map.json
diff --git a/cli/tests/doc/invalid_url.out b/cli/tests/testdata/doc/invalid_url.out
index 8be787e90..8be787e90 100644
--- a/cli/tests/doc/invalid_url.out
+++ b/cli/tests/testdata/doc/invalid_url.out
diff --git a/cli/tests/doc/module/fun.js b/cli/tests/testdata/doc/module/fun.js
index 28901d945..28901d945 100644
--- a/cli/tests/doc/module/fun.js
+++ b/cli/tests/testdata/doc/module/fun.js
diff --git a/cli/tests/doc/types_header.out b/cli/tests/testdata/doc/types_header.out
index ccff1a373..ccff1a373 100644
--- a/cli/tests/doc/types_header.out
+++ b/cli/tests/testdata/doc/types_header.out
diff --git a/cli/tests/doc/types_header.ts b/cli/tests/testdata/doc/types_header.ts
index b64c8d000..b64c8d000 100644
--- a/cli/tests/doc/types_header.ts
+++ b/cli/tests/testdata/doc/types_header.ts
diff --git a/cli/tests/doc/types_hint.out b/cli/tests/testdata/doc/types_hint.out
index 7eb05faed..7eb05faed 100644
--- a/cli/tests/doc/types_hint.out
+++ b/cli/tests/testdata/doc/types_hint.out
diff --git a/cli/tests/doc/types_hint.ts b/cli/tests/testdata/doc/types_hint.ts
index bacea46db..bacea46db 100644
--- a/cli/tests/doc/types_hint.ts
+++ b/cli/tests/testdata/doc/types_hint.ts
diff --git a/cli/tests/doc/types_ref.js b/cli/tests/testdata/doc/types_ref.js
index 03d8b5570..03d8b5570 100644
--- a/cli/tests/doc/types_ref.js
+++ b/cli/tests/testdata/doc/types_ref.js
diff --git a/cli/tests/doc/types_ref.out b/cli/tests/testdata/doc/types_ref.out
index 7eb05faed..7eb05faed 100644
--- a/cli/tests/doc/types_ref.out
+++ b/cli/tests/testdata/doc/types_ref.out
diff --git a/cli/tests/doc/use_import_map.js b/cli/tests/testdata/doc/use_import_map.js
index 672a7a7bd..672a7a7bd 100644
--- a/cli/tests/doc/use_import_map.js
+++ b/cli/tests/testdata/doc/use_import_map.js
diff --git a/cli/tests/doc/use_import_map.out b/cli/tests/testdata/doc/use_import_map.out
index 0b27ccf18..0b27ccf18 100644
--- a/cli/tests/doc/use_import_map.out
+++ b/cli/tests/testdata/doc/use_import_map.out
diff --git a/cli/tests/dynamic_import/b.js b/cli/tests/testdata/dynamic_import/b.js
index 6ea50d360..6ea50d360 100644
--- a/cli/tests/dynamic_import/b.js
+++ b/cli/tests/testdata/dynamic_import/b.js
diff --git a/cli/tests/dynamic_import/c.js b/cli/tests/testdata/dynamic_import/c.js
index 20546455e..20546455e 100644
--- a/cli/tests/dynamic_import/c.js
+++ b/cli/tests/testdata/dynamic_import/c.js
diff --git a/cli/tests/dynamic_import/permissions_blob_local.ts b/cli/tests/testdata/dynamic_import/permissions_blob_local.ts
index 9ef4158ce..9ef4158ce 100644
--- a/cli/tests/dynamic_import/permissions_blob_local.ts
+++ b/cli/tests/testdata/dynamic_import/permissions_blob_local.ts
diff --git a/cli/tests/dynamic_import/permissions_blob_local.ts.out b/cli/tests/testdata/dynamic_import/permissions_blob_local.ts.out
index 5a2da0536..6dfa8e527 100644
--- a/cli/tests/dynamic_import/permissions_blob_local.ts.out
+++ b/cli/tests/testdata/dynamic_import/permissions_blob_local.ts.out
@@ -2,4 +2,4 @@ error: Uncaught (in promise) TypeError: Requires read access to "[WILDCARD]local
     at blob:null/[WILDCARD]:1:0
 await import(URL.createObjectURL(blob));
 ^
-    at async file:///[WILDCARD]/cli/tests/dynamic_import/permissions_blob_local.ts:6:1
+    at async file:///[WILDCARD]/dynamic_import/permissions_blob_local.ts:6:1
diff --git a/cli/tests/dynamic_import/permissions_blob_remote.ts b/cli/tests/testdata/dynamic_import/permissions_blob_remote.ts
index 1e2c8c21a..1e2c8c21a 100644
--- a/cli/tests/dynamic_import/permissions_blob_remote.ts
+++ b/cli/tests/testdata/dynamic_import/permissions_blob_remote.ts
diff --git a/cli/tests/dynamic_import/permissions_blob_remote.ts.out b/cli/tests/testdata/dynamic_import/permissions_blob_remote.ts.out
index 7992e0855..60d71ed6d 100644
--- a/cli/tests/dynamic_import/permissions_blob_remote.ts.out
+++ b/cli/tests/testdata/dynamic_import/permissions_blob_remote.ts.out
@@ -2,4 +2,4 @@ error: Uncaught (in promise) TypeError: Requires net access to "example.com", ru
     at blob:null/[WILDCARD]:1:0
 await import(URL.createObjectURL(blob));
 ^
-    at async file:///[WILDCARD]/cli/tests/dynamic_import/permissions_blob_remote.ts:4:1
+    at async file:///[WILDCARD]/dynamic_import/permissions_blob_remote.ts:4:1
diff --git a/cli/tests/dynamic_import/permissions_data_local.ts b/cli/tests/testdata/dynamic_import/permissions_data_local.ts
index be4fc1c34..be4fc1c34 100644
--- a/cli/tests/dynamic_import/permissions_data_local.ts
+++ b/cli/tests/testdata/dynamic_import/permissions_data_local.ts
diff --git a/cli/tests/dynamic_import/permissions_data_local.ts.out b/cli/tests/testdata/dynamic_import/permissions_data_local.ts.out
index 39686740a..c9fcb0a17 100644
--- a/cli/tests/dynamic_import/permissions_data_local.ts.out
+++ b/cli/tests/testdata/dynamic_import/permissions_data_local.ts.out
@@ -2,4 +2,4 @@ error: Uncaught (in promise) TypeError: Requires read access to "[WILDCARD]local
     at data:application/javascript;base64,[WILDCARD]:1:0
 await import(`data:application/javascript;base64,${btoa(code)}`);
 ^
-    at async file:///[WILDCARD]/cli/tests/dynamic_import/permissions_data_local.ts:5:1
+    at async file:///[WILDCARD]/dynamic_import/permissions_data_local.ts:5:1
diff --git a/cli/tests/dynamic_import/permissions_data_remote.ts b/cli/tests/testdata/dynamic_import/permissions_data_remote.ts
index b0a9540c3..b0a9540c3 100644
--- a/cli/tests/dynamic_import/permissions_data_remote.ts
+++ b/cli/tests/testdata/dynamic_import/permissions_data_remote.ts
diff --git a/cli/tests/dynamic_import/permissions_data_remote.ts.out b/cli/tests/testdata/dynamic_import/permissions_data_remote.ts.out
index 6bb137091..772f0b51e 100644
--- a/cli/tests/dynamic_import/permissions_data_remote.ts.out
+++ b/cli/tests/testdata/dynamic_import/permissions_data_remote.ts.out
@@ -2,4 +2,4 @@ error: Uncaught (in promise) TypeError: Requires net access to "example.com", ru
     at data:application/javascript;base64,aW1wb3J0ICJodHRwczovL2V4YW1wbGUuY29tL3NvbWUvZmlsZS50cyI7:1:0
 await import(`data:application/javascript;base64,${btoa(code)}`);
 ^
-    at async file:///[WILDCARD]/cli/tests/dynamic_import/permissions_data_remote.ts:3:1
+    at async file:///[WILDCARD]/dynamic_import/permissions_data_remote.ts:3:1
diff --git a/cli/tests/testdata/dynamic_import/permissions_remote_remote.ts b/cli/tests/testdata/dynamic_import/permissions_remote_remote.ts
new file mode 100644
index 000000000..0033bcccc
--- /dev/null
+++ b/cli/tests/testdata/dynamic_import/permissions_remote_remote.ts
@@ -0,0 +1,3 @@
+await import(
+  "http://localhost:4545/dynamic_import/static_remote.ts"
+);
diff --git a/cli/tests/testdata/dynamic_import/permissions_remote_remote.ts.out b/cli/tests/testdata/dynamic_import/permissions_remote_remote.ts.out
new file mode 100644
index 000000000..cd7f58bb9
--- /dev/null
+++ b/cli/tests/testdata/dynamic_import/permissions_remote_remote.ts.out
@@ -0,0 +1,5 @@
+error: Uncaught (in promise) TypeError: Requires net access to "example.com", run again with the --allow-net flag
+    at http://localhost:4545/dynamic_import/static_remote.ts:2:0
+await import(
+^
+    at async file:///[WILDCARD]/dynamic_import/permissions_remote_remote.ts:1:1
diff --git a/cli/tests/dynamic_import/static_remote.ts b/cli/tests/testdata/dynamic_import/static_remote.ts
index 2d6e820fd..2d6e820fd 100644
--- a/cli/tests/dynamic_import/static_remote.ts
+++ b/cli/tests/testdata/dynamic_import/static_remote.ts
diff --git a/cli/tests/dynamic_import_conditional.js b/cli/tests/testdata/dynamic_import_conditional.js
index 1b4193e3e..1b4193e3e 100644
--- a/cli/tests/dynamic_import_conditional.js
+++ b/cli/tests/testdata/dynamic_import_conditional.js
diff --git a/cli/tests/dynamic_import_conditional.js.out b/cli/tests/testdata/dynamic_import_conditional.js.out
index 27ba77dda..27ba77dda 100644
--- a/cli/tests/dynamic_import_conditional.js.out
+++ b/cli/tests/testdata/dynamic_import_conditional.js.out
diff --git a/cli/tests/echo.ts b/cli/tests/testdata/echo.ts
index 84a645433..84a645433 100644
--- a/cli/tests/echo.ts
+++ b/cli/tests/testdata/echo.ts
diff --git a/cli/tests/echo_server.ts b/cli/tests/testdata/echo_server.ts
index 84284bea1..b23867cdd 100644
--- a/cli/tests/echo_server.ts
+++ b/cli/tests/testdata/echo_server.ts
@@ -1,4 +1,4 @@
-import { copy } from "../../test_util/std/io/util.ts";
+import { copy } from "../../../test_util/std/io/util.ts";
 const addr = Deno.args[0] || "0.0.0.0:4544";
 const [hostname, port] = addr.split(":");
 const listener = Deno.listen({ hostname, port: Number(port) });
diff --git a/cli/tests/encoding/utf-16be.ts b/cli/tests/testdata/encoding/utf-16be.ts
index 3d0144d7c..3d0144d7c 100644
--- a/cli/tests/encoding/utf-16be.ts
+++ b/cli/tests/testdata/encoding/utf-16be.ts
diff --git a/cli/tests/encoding/utf-16le.ts b/cli/tests/testdata/encoding/utf-16le.ts
index 6f0e415f2..6f0e415f2 100644
--- a/cli/tests/encoding/utf-16le.ts
+++ b/cli/tests/testdata/encoding/utf-16le.ts
diff --git a/cli/tests/encoding/utf-8.ts b/cli/tests/testdata/encoding/utf-8.ts
index bf889aeb7..bf889aeb7 100644
--- a/cli/tests/encoding/utf-8.ts
+++ b/cli/tests/testdata/encoding/utf-8.ts
diff --git a/cli/tests/encoding/windows-1255 b/cli/tests/testdata/encoding/windows-1255
index ec5cad7fd..ec5cad7fd 100644
--- a/cli/tests/encoding/windows-1255
+++ b/cli/tests/testdata/encoding/windows-1255
diff --git a/cli/tests/error_001.ts b/cli/tests/testdata/error_001.ts
index b01068bc0..b01068bc0 100644
--- a/cli/tests/error_001.ts
+++ b/cli/tests/testdata/error_001.ts
diff --git a/cli/tests/testdata/error_001.ts.out b/cli/tests/testdata/error_001.ts.out
new file mode 100644
index 000000000..25664a9a4
--- /dev/null
+++ b/cli/tests/testdata/error_001.ts.out
@@ -0,0 +1,6 @@
+[WILDCARD]error: Uncaught Error: bad
+  throw Error("bad");
+        ^
+    at foo ([WILDCARD]/error_001.ts:2:9)
+    at bar ([WILDCARD]/error_001.ts:6:3)
+    at [WILDCARD]/error_001.ts:9:1
diff --git a/cli/tests/error_002.ts b/cli/tests/testdata/error_002.ts
index 6aa0fcc3b..6aa0fcc3b 100644
--- a/cli/tests/error_002.ts
+++ b/cli/tests/testdata/error_002.ts
diff --git a/cli/tests/testdata/error_002.ts.out b/cli/tests/testdata/error_002.ts.out
new file mode 100644
index 000000000..96b9e602a
--- /dev/null
+++ b/cli/tests/testdata/error_002.ts.out
@@ -0,0 +1,6 @@
+[WILDCARD]error: Uncaught Error: exception from mod1
+  throw Error("exception from mod1");
+        ^
+    at throwsError ([WILDCARD]/subdir/mod1.ts:16:9)
+    at foo ([WILDCARD]/error_002.ts:4:3)
+    at [WILDCARD]/error_002.ts:7:1
diff --git a/cli/tests/error_003_typescript.ts b/cli/tests/testdata/error_003_typescript.ts
index e1f882123..e1f882123 100644
--- a/cli/tests/error_003_typescript.ts
+++ b/cli/tests/testdata/error_003_typescript.ts
diff --git a/cli/tests/error_003_typescript.ts.out b/cli/tests/testdata/error_003_typescript.ts.out
index 49cd274f4..bbb2ec470 100644
--- a/cli/tests/error_003_typescript.ts.out
+++ b/cli/tests/testdata/error_003_typescript.ts.out
@@ -4,4 +4,4 @@ error: TS2322 [ERROR]: Type '{ a: { b: { c(): { d: number; }; }; }; }' is not as
     Type 'number' is not assignable to type 'string'.
 x = y;
 ^
-    at [WILDCARD]/tests/error_003_typescript.ts:20:1
+    at [WILDCARD]/error_003_typescript.ts:20:1
diff --git a/cli/tests/error_004_missing_module.ts b/cli/tests/testdata/error_004_missing_module.ts
index 82b281181..82b281181 100644
--- a/cli/tests/error_004_missing_module.ts
+++ b/cli/tests/testdata/error_004_missing_module.ts
diff --git a/cli/tests/testdata/error_004_missing_module.ts.out b/cli/tests/testdata/error_004_missing_module.ts.out
new file mode 100644
index 000000000..8521f4424
--- /dev/null
+++ b/cli/tests/testdata/error_004_missing_module.ts.out
@@ -0,0 +1,2 @@
+[WILDCARD]error: Cannot resolve module "file:///[WILDCARD]/bad-module.ts" from "file:///[WILDCARD]/error_004_missing_module.ts".
+    at file:///[WILDCARD]/error_004_missing_module.ts:1:0
diff --git a/cli/tests/error_005_missing_dynamic_import.ts b/cli/tests/testdata/error_005_missing_dynamic_import.ts
index 8ea8ff94e..8ea8ff94e 100644
--- a/cli/tests/error_005_missing_dynamic_import.ts
+++ b/cli/tests/testdata/error_005_missing_dynamic_import.ts
diff --git a/cli/tests/error_005_missing_dynamic_import.ts.out b/cli/tests/testdata/error_005_missing_dynamic_import.ts.out
index da680e195..e8647a44e 100644
--- a/cli/tests/error_005_missing_dynamic_import.ts.out
+++ b/cli/tests/testdata/error_005_missing_dynamic_import.ts.out
@@ -1,4 +1,4 @@
-error: Uncaught (in promise) TypeError: Cannot resolve module "[WILDCARD]/cli/tests/bad-module.ts".
+error: Uncaught (in promise) TypeError: Cannot resolve module "[WILDCARD]/bad-module.ts".
   const _badModule = await import("./bad-module.ts");
                      ^
     at async file://[WILDCARD]/error_005_missing_dynamic_import.ts:2:22
diff --git a/cli/tests/error_006_import_ext_failure.ts b/cli/tests/testdata/error_006_import_ext_failure.ts
index 3c32303a3..3c32303a3 100644
--- a/cli/tests/error_006_import_ext_failure.ts
+++ b/cli/tests/testdata/error_006_import_ext_failure.ts
diff --git a/cli/tests/error_006_import_ext_failure.ts.out b/cli/tests/testdata/error_006_import_ext_failure.ts.out
index 601e527cf..24d819e5d 100644
--- a/cli/tests/error_006_import_ext_failure.ts.out
+++ b/cli/tests/testdata/error_006_import_ext_failure.ts.out
@@ -1,2 +1,2 @@
 [WILDCARD]error: Cannot resolve module "[WILDCARD]/non-existent" from "[WILDCARD]/error_006_import_ext_failure.ts".
-    at file:///[WILDCARD]cli/tests/error_006_import_ext_failure.ts:1:0
+    at file:///[WILDCARD]/error_006_import_ext_failure.ts:1:0
diff --git a/cli/tests/error_007_any.ts b/cli/tests/testdata/error_007_any.ts
index 778886fcb..778886fcb 100644
--- a/cli/tests/error_007_any.ts
+++ b/cli/tests/testdata/error_007_any.ts
diff --git a/cli/tests/error_007_any.ts.out b/cli/tests/testdata/error_007_any.ts.out
index 45dbffd04..45dbffd04 100644
--- a/cli/tests/error_007_any.ts.out
+++ b/cli/tests/testdata/error_007_any.ts.out
diff --git a/cli/tests/error_008_checkjs.js b/cli/tests/testdata/error_008_checkjs.js
index f0856d94c..f0856d94c 100644
--- a/cli/tests/error_008_checkjs.js
+++ b/cli/tests/testdata/error_008_checkjs.js
diff --git a/cli/tests/error_008_checkjs.js.out b/cli/tests/testdata/error_008_checkjs.js.out
index 2d93ffd01..e43187382 100644
--- a/cli/tests/error_008_checkjs.js.out
+++ b/cli/tests/testdata/error_008_checkjs.js.out
@@ -1,4 +1,4 @@
 [WILDCARD]error: Uncaught ReferenceError: consol is not defined
 consol.log("hello world!");
 ^
-    at [WILDCARD]tests/error_008_checkjs.js:2:1
+    at [WILDCARD]/error_008_checkjs.js:2:1
diff --git a/cli/tests/error_009_extensions_error.js b/cli/tests/testdata/error_009_extensions_error.js
index 01b97ea38..01b97ea38 100644
--- a/cli/tests/error_009_extensions_error.js
+++ b/cli/tests/testdata/error_009_extensions_error.js
diff --git a/cli/tests/error_009_extensions_error.js.out b/cli/tests/testdata/error_009_extensions_error.js.out
index 8510980f6..8510980f6 100644
--- a/cli/tests/error_009_extensions_error.js.out
+++ b/cli/tests/testdata/error_009_extensions_error.js.out
diff --git a/cli/tests/error_009_missing_js_module.disabled b/cli/tests/testdata/error_009_missing_js_module.disabled
index 3156fc94b..3156fc94b 100644
--- a/cli/tests/error_009_missing_js_module.disabled
+++ b/cli/tests/testdata/error_009_missing_js_module.disabled
diff --git a/cli/tests/error_009_missing_js_module.js b/cli/tests/testdata/error_009_missing_js_module.js
index e6ca88934..e6ca88934 100644
--- a/cli/tests/error_009_missing_js_module.js
+++ b/cli/tests/testdata/error_009_missing_js_module.js
diff --git a/cli/tests/error_009_missing_js_module.js.out b/cli/tests/testdata/error_009_missing_js_module.js.out
index edb08da1c..edb08da1c 100644
--- a/cli/tests/error_009_missing_js_module.js.out
+++ b/cli/tests/testdata/error_009_missing_js_module.js.out
diff --git a/cli/tests/error_010_nonexistent_arg.disabled b/cli/tests/testdata/error_010_nonexistent_arg.disabled
index 9d183107c..9d183107c 100644
--- a/cli/tests/error_010_nonexistent_arg.disabled
+++ b/cli/tests/testdata/error_010_nonexistent_arg.disabled
diff --git a/cli/tests/error_010_nonexistent_arg.out b/cli/tests/testdata/error_010_nonexistent_arg.out
index ef4f7b041..ef4f7b041 100644
--- a/cli/tests/error_010_nonexistent_arg.out
+++ b/cli/tests/testdata/error_010_nonexistent_arg.out
diff --git a/cli/tests/error_011_bad_module_specifier.ts b/cli/tests/testdata/error_011_bad_module_specifier.ts
index 1c57e37a5..1c57e37a5 100644
--- a/cli/tests/error_011_bad_module_specifier.ts
+++ b/cli/tests/testdata/error_011_bad_module_specifier.ts
diff --git a/cli/tests/error_011_bad_module_specifier.ts.out b/cli/tests/testdata/error_011_bad_module_specifier.ts.out
index 713072191..713072191 100644
--- a/cli/tests/error_011_bad_module_specifier.ts.out
+++ b/cli/tests/testdata/error_011_bad_module_specifier.ts.out
diff --git a/cli/tests/error_012_bad_dynamic_import_specifier.ts b/cli/tests/testdata/error_012_bad_dynamic_import_specifier.ts
index 5f39f407c..5f39f407c 100644
--- a/cli/tests/error_012_bad_dynamic_import_specifier.ts
+++ b/cli/tests/testdata/error_012_bad_dynamic_import_specifier.ts
diff --git a/cli/tests/error_012_bad_dynamic_import_specifier.ts.out b/cli/tests/testdata/error_012_bad_dynamic_import_specifier.ts.out
index 0d0b168a4..0d0b168a4 100644
--- a/cli/tests/error_012_bad_dynamic_import_specifier.ts.out
+++ b/cli/tests/testdata/error_012_bad_dynamic_import_specifier.ts.out
diff --git a/cli/tests/error_013_missing_script.out b/cli/tests/testdata/error_013_missing_script.out
index d1c257bdb..d1c257bdb 100644
--- a/cli/tests/error_013_missing_script.out
+++ b/cli/tests/testdata/error_013_missing_script.out
diff --git a/cli/tests/error_014_catch_dynamic_import_error.js b/cli/tests/testdata/error_014_catch_dynamic_import_error.js
index 483be7b1a..483be7b1a 100644
--- a/cli/tests/error_014_catch_dynamic_import_error.js
+++ b/cli/tests/testdata/error_014_catch_dynamic_import_error.js
diff --git a/cli/tests/error_014_catch_dynamic_import_error.js.out b/cli/tests/testdata/error_014_catch_dynamic_import_error.js.out
index 60de400db..8f2d695f7 100644
--- a/cli/tests/error_014_catch_dynamic_import_error.js.out
+++ b/cli/tests/testdata/error_014_catch_dynamic_import_error.js.out
@@ -6,7 +6,7 @@ TypeError: Relative import path "does not exist either" not prefixed with / or .
     at async file:///[WILDCARD]/error_014_catch_dynamic_import_error.js:10:5
 Caught error thrown by dynamically imported module.
 Error: An error
-    at file:///[WILDCARD]tests/subdir/throws.js:6:7
+    at file:///[WILDCARD]/subdir/throws.js:6:7
 Caught error thrown indirectly by dynamically imported module.
 Error: An error
-    at file:///[WILDCARD]tests/subdir/throws.js:6:7
+    at file:///[WILDCARD]/subdir/throws.js:6:7
diff --git a/cli/tests/testdata/error_015_dynamic_import_permissions.js b/cli/tests/testdata/error_015_dynamic_import_permissions.js
new file mode 100644
index 000000000..73da56fd8
--- /dev/null
+++ b/cli/tests/testdata/error_015_dynamic_import_permissions.js
@@ -0,0 +1,3 @@
+(async () => {
+  await import("http://localhost:4545/subdir/mod4.js");
+})();
diff --git a/cli/tests/error_015_dynamic_import_permissions.out b/cli/tests/testdata/error_015_dynamic_import_permissions.out
index de6585dcd..a509cfdab 100644
--- a/cli/tests/error_015_dynamic_import_permissions.out
+++ b/cli/tests/testdata/error_015_dynamic_import_permissions.out
@@ -1,4 +1,4 @@
 error: Uncaught (in promise) TypeError: Requires net access to "localhost:4545", run again with the --allow-net flag
-  await import("http://localhost:4545/cli/tests/subdir/mod4.js");
+  await import("http://localhost:4545/subdir/mod4.js");
   ^
     at async file:///[WILDCARD]/error_015_dynamic_import_permissions.js:2:3
diff --git a/cli/tests/error_016_dynamic_import_permissions2.js b/cli/tests/testdata/error_016_dynamic_import_permissions2.js
index 34e1a43d2..f018d4a2e 100644
--- a/cli/tests/error_016_dynamic_import_permissions2.js
+++ b/cli/tests/testdata/error_016_dynamic_import_permissions2.js
@@ -1,5 +1,5 @@
 // If this is executed with --allow-net but not --allow-read the following
 // import should cause a permission denied error.
 (async () => {
-  await import("http://localhost:4545/cli/tests/subdir/evil_remote_import.js");
+  await import("http://localhost:4545/subdir/evil_remote_import.js");
 })();
diff --git a/cli/tests/error_016_dynamic_import_permissions2.out b/cli/tests/testdata/error_016_dynamic_import_permissions2.out
index f54b4a7fe..0b43c5b91 100644
--- a/cli/tests/error_016_dynamic_import_permissions2.out
+++ b/cli/tests/testdata/error_016_dynamic_import_permissions2.out
@@ -1,4 +1,4 @@
 [WILDCARD]
 error: Remote modules are not allowed to import local modules.  Consider using a dynamic import instead.
   Importing: file:///c:/etc/passwd
-    at http://localhost:4545/cli/tests/subdir/evil_remote_import.js:3:0
+    at http://localhost:4545/subdir/evil_remote_import.js:3:0
diff --git a/cli/tests/error_017_hide_long_source_ts.ts b/cli/tests/testdata/error_017_hide_long_source_ts.ts
index d61cb1277..d61cb1277 100644
--- a/cli/tests/error_017_hide_long_source_ts.ts
+++ b/cli/tests/testdata/error_017_hide_long_source_ts.ts
diff --git a/cli/tests/error_017_hide_long_source_ts.ts.out b/cli/tests/testdata/error_017_hide_long_source_ts.ts.out
index 52c2f7cc2..917061ab9 100644
--- a/cli/tests/error_017_hide_long_source_ts.ts.out
+++ b/cli/tests/testdata/error_017_hide_long_source_ts.ts.out
@@ -1,3 +1,3 @@
 [WILDCARD]
 error: TS2532 [ERROR]: Object is possibly 'undefined'.
-    at [WILDCARD]tests/error_017_hide_long_source_ts.ts:3:1
+    at [WILDCARD]/error_017_hide_long_source_ts.ts:3:1
diff --git a/cli/tests/error_018_hide_long_source_js.js b/cli/tests/testdata/error_018_hide_long_source_js.js
index d61cb1277..d61cb1277 100644
--- a/cli/tests/error_018_hide_long_source_js.js
+++ b/cli/tests/testdata/error_018_hide_long_source_js.js
diff --git a/cli/tests/error_018_hide_long_source_js.js.out b/cli/tests/testdata/error_018_hide_long_source_js.js.out
index c83778dc0..cc98669a7 100644
--- a/cli/tests/error_018_hide_long_source_js.js.out
+++ b/cli/tests/testdata/error_018_hide_long_source_js.js.out
@@ -1,2 +1,2 @@
 error: Uncaught TypeError: Cannot read properties of undefined (reading 'a')
-    at file:///[WILDCARD]cli/tests/error_018_hide_long_source_js.js:3:206
+    at file:///[WILDCARD]/error_018_hide_long_source_js.js:3:206
diff --git a/cli/tests/error_019_stack_function.ts b/cli/tests/testdata/error_019_stack_function.ts
index c5eeae8f4..c5eeae8f4 100644
--- a/cli/tests/error_019_stack_function.ts
+++ b/cli/tests/testdata/error_019_stack_function.ts
diff --git a/cli/tests/testdata/error_019_stack_function.ts.out b/cli/tests/testdata/error_019_stack_function.ts.out
new file mode 100644
index 000000000..03967d12b
--- /dev/null
+++ b/cli/tests/testdata/error_019_stack_function.ts.out
@@ -0,0 +1,8 @@
+[WILDCARD]Error: function
+    at foo ([WILDCARD]/error_019_stack_function.ts:[WILDCARD])
+    at [WILDCARD]/error_019_stack_function.ts:[WILDCARD]
+error: Uncaught Error: function
+  throw new Error("function");
+        ^
+    at foo ([WILDCARD]/error_019_stack_function.ts:[WILDCARD])
+    at [WILDCARD]/error_019_stack_function.ts:[WILDCARD]
diff --git a/cli/tests/error_020_stack_constructor.ts b/cli/tests/testdata/error_020_stack_constructor.ts
index 49988280b..49988280b 100644
--- a/cli/tests/error_020_stack_constructor.ts
+++ b/cli/tests/testdata/error_020_stack_constructor.ts
diff --git a/cli/tests/testdata/error_020_stack_constructor.ts.out b/cli/tests/testdata/error_020_stack_constructor.ts.out
new file mode 100644
index 000000000..01fdfb3c4
--- /dev/null
+++ b/cli/tests/testdata/error_020_stack_constructor.ts.out
@@ -0,0 +1,8 @@
+[WILDCARD]Error: constructor
+    at new A ([WILDCARD]/error_020_stack_constructor.ts:[WILDCARD])
+    at [WILDCARD]/error_020_stack_constructor.ts:[WILDCARD]
+error: Uncaught Error: constructor
+    throw new Error("constructor");
+          ^
+    at new A ([WILDCARD]/error_020_stack_constructor.ts:[WILDCARD])
+    at [WILDCARD]/error_020_stack_constructor.ts:[WILDCARD]
diff --git a/cli/tests/error_021_stack_method.ts b/cli/tests/testdata/error_021_stack_method.ts
index a52d00deb..a52d00deb 100644
--- a/cli/tests/error_021_stack_method.ts
+++ b/cli/tests/testdata/error_021_stack_method.ts
diff --git a/cli/tests/testdata/error_021_stack_method.ts.out b/cli/tests/testdata/error_021_stack_method.ts.out
new file mode 100644
index 000000000..999f0aaa0
--- /dev/null
+++ b/cli/tests/testdata/error_021_stack_method.ts.out
@@ -0,0 +1,8 @@
+[WILDCARD]Error: method
+    at A.m ([WILDCARD]/error_021_stack_method.ts:[WILDCARD])
+    at [WILDCARD]/error_021_stack_method.ts:[WILDCARD]
+error: Uncaught Error: method
+    throw new Error("method");
+          ^
+    at A.m ([WILDCARD]/error_021_stack_method.ts:[WILDCARD])
+    at [WILDCARD]/error_021_stack_method.ts:[WILDCARD]
diff --git a/cli/tests/error_022_stack_custom_error.ts b/cli/tests/testdata/error_022_stack_custom_error.ts
index b95743503..b95743503 100644
--- a/cli/tests/error_022_stack_custom_error.ts
+++ b/cli/tests/testdata/error_022_stack_custom_error.ts
diff --git a/cli/tests/testdata/error_022_stack_custom_error.ts.out b/cli/tests/testdata/error_022_stack_custom_error.ts.out
new file mode 100644
index 000000000..78b0dcaea
--- /dev/null
+++ b/cli/tests/testdata/error_022_stack_custom_error.ts.out
@@ -0,0 +1,6 @@
+[WILDCARD]CustomError: custom error
+    at [WILDCARD]/error_022_stack_custom_error.ts:[WILDCARD]
+error: Uncaught CustomError: custom error
+const error = new CustomError();
+              ^
+    at [WILDCARD]/error_022_stack_custom_error.ts:[WILDCARD]
diff --git a/cli/tests/error_023_stack_async.ts b/cli/tests/testdata/error_023_stack_async.ts
index 99e676e26..99e676e26 100644
--- a/cli/tests/error_023_stack_async.ts
+++ b/cli/tests/testdata/error_023_stack_async.ts
diff --git a/cli/tests/testdata/error_023_stack_async.ts.out b/cli/tests/testdata/error_023_stack_async.ts.out
new file mode 100644
index 000000000..95f0eae64
--- /dev/null
+++ b/cli/tests/testdata/error_023_stack_async.ts.out
@@ -0,0 +1,10 @@
+[WILDCARD]Error: async
+    at [WILDCARD]/error_023_stack_async.ts:[WILDCARD]
+    at async [WILDCARD]/error_023_stack_async.ts:[WILDCARD]
+    at async [WILDCARD]/error_023_stack_async.ts:[WILDCARD]
+error: Uncaught Error: async
+    throw new Error("async");
+          ^
+    at [WILDCARD]/error_023_stack_async.ts:[WILDCARD]
+    at async [WILDCARD]/error_023_stack_async.ts:[WILDCARD]
+    at async [WILDCARD]/error_023_stack_async.ts:[WILDCARD]
diff --git a/cli/tests/error_024_stack_promise_all.ts b/cli/tests/testdata/error_024_stack_promise_all.ts
index ddaf0dbaa..ddaf0dbaa 100644
--- a/cli/tests/error_024_stack_promise_all.ts
+++ b/cli/tests/testdata/error_024_stack_promise_all.ts
diff --git a/cli/tests/testdata/error_024_stack_promise_all.ts.out b/cli/tests/testdata/error_024_stack_promise_all.ts.out
new file mode 100644
index 000000000..6cd88715c
--- /dev/null
+++ b/cli/tests/testdata/error_024_stack_promise_all.ts.out
@@ -0,0 +1,10 @@
+[WILDCARD]Error: Promise.all()
+    at [WILDCARD]/error_024_stack_promise_all.ts:[WILDCARD]
+    at async Promise.all (index 1)
+    at async [WILDCARD]/error_024_stack_promise_all.ts:[WILDCARD]
+error: Uncaught Error: Promise.all()
+    throw new Error("Promise.all()");
+          ^
+    at [WILDCARD]/error_024_stack_promise_all.ts:[WILDCARD]
+    at async Promise.all (index 1)
+    at async [WILDCARD]/error_024_stack_promise_all.ts:[WILDCARD]
diff --git a/cli/tests/error_025_tab_indent b/cli/tests/testdata/error_025_tab_indent
index 35a25bcea..35a25bcea 100644
--- a/cli/tests/error_025_tab_indent
+++ b/cli/tests/testdata/error_025_tab_indent
diff --git a/cli/tests/testdata/error_025_tab_indent.out b/cli/tests/testdata/error_025_tab_indent.out
new file mode 100644
index 000000000..f1466ce3f
--- /dev/null
+++ b/cli/tests/testdata/error_025_tab_indent.out
@@ -0,0 +1,6 @@
+[WILDCARD]error: Uncaught Error: bad
+	throw Error("bad");
+	      ^
+    at foo ([WILDCARD]/error_025_tab_indent:2:8)
+    at bar ([WILDCARD]/error_025_tab_indent:6:2)
+    at [WILDCARD]/error_025_tab_indent:9:1
diff --git a/cli/tests/testdata/error_026_remote_import_error.ts b/cli/tests/testdata/error_026_remote_import_error.ts
new file mode 100644
index 000000000..2718e768a
--- /dev/null
+++ b/cli/tests/testdata/error_026_remote_import_error.ts
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..bec0cf1c5
--- /dev/null
+++ b/cli/tests/testdata/error_026_remote_import_error.ts.out
@@ -0,0 +1,7 @@
+[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/error_027_bundle_with_bare_import.ts b/cli/tests/testdata/error_027_bundle_with_bare_import.ts
index c0748305d..c0748305d 100644
--- a/cli/tests/error_027_bundle_with_bare_import.ts
+++ b/cli/tests/testdata/error_027_bundle_with_bare_import.ts
diff --git a/cli/tests/error_027_bundle_with_bare_import.ts.out b/cli/tests/testdata/error_027_bundle_with_bare_import.ts.out
index 3aa4a42a2..3aa4a42a2 100644
--- a/cli/tests/error_027_bundle_with_bare_import.ts.out
+++ b/cli/tests/testdata/error_027_bundle_with_bare_import.ts.out
diff --git a/cli/tests/error_import_map_unable_to_load.out b/cli/tests/testdata/error_import_map_unable_to_load.out
index 50760e438..50760e438 100644
--- a/cli/tests/error_import_map_unable_to_load.out
+++ b/cli/tests/testdata/error_import_map_unable_to_load.out
diff --git a/cli/tests/error_local_static_import_from_remote.js b/cli/tests/testdata/error_local_static_import_from_remote.js
index eb7fd23ba..eb7fd23ba 100644
--- a/cli/tests/error_local_static_import_from_remote.js
+++ b/cli/tests/testdata/error_local_static_import_from_remote.js
diff --git a/cli/tests/error_local_static_import_from_remote.js.out b/cli/tests/testdata/error_local_static_import_from_remote.js.out
index 071ca36d4..44b676532 100644
--- a/cli/tests/error_local_static_import_from_remote.js.out
+++ b/cli/tests/testdata/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/cli/tests/error_local_static_import_from_remote.js:1:0
+    at http://localhost:4545/error_local_static_import_from_remote.js:1:0
diff --git a/cli/tests/error_local_static_import_from_remote.ts b/cli/tests/testdata/error_local_static_import_from_remote.ts
index a831db0c4..a831db0c4 100644
--- a/cli/tests/error_local_static_import_from_remote.ts
+++ b/cli/tests/testdata/error_local_static_import_from_remote.ts
diff --git a/cli/tests/error_local_static_import_from_remote.ts.out b/cli/tests/testdata/error_local_static_import_from_remote.ts.out
index 38f4c02bc..f8f409de0 100644
--- a/cli/tests/error_local_static_import_from_remote.ts.out
+++ b/cli/tests/testdata/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/cli/tests/error_local_static_import_from_remote.ts:1:0
+    at http://localhost:4545/error_local_static_import_from_remote.ts:1:0
diff --git a/cli/tests/error_missing_module_named_import.ts b/cli/tests/testdata/error_missing_module_named_import.ts
index 9eb5239ff..9eb5239ff 100644
--- a/cli/tests/error_missing_module_named_import.ts
+++ b/cli/tests/testdata/error_missing_module_named_import.ts
diff --git a/cli/tests/testdata/error_missing_module_named_import.ts.out b/cli/tests/testdata/error_missing_module_named_import.ts.out
new file mode 100644
index 000000000..6f09f0c0d
--- /dev/null
+++ b/cli/tests/testdata/error_missing_module_named_import.ts.out
@@ -0,0 +1,2 @@
+error: Cannot resolve module "[WILDCARD]/does_not_exist.js" from "[WILDCARD]/error_missing_module_named_import.ts".
+    at [WILDCARD]/error_missing_module_named_import.ts:1:0
diff --git a/cli/tests/error_no_check.ts b/cli/tests/testdata/error_no_check.ts
index db9257a1d..db9257a1d 100644
--- a/cli/tests/error_no_check.ts
+++ b/cli/tests/testdata/error_no_check.ts
diff --git a/cli/tests/error_no_check.ts.out b/cli/tests/testdata/error_no_check.ts.out
index cac1367ba..cac1367ba 100644
--- a/cli/tests/error_no_check.ts.out
+++ b/cli/tests/testdata/error_no_check.ts.out
diff --git a/cli/tests/error_syntax.js b/cli/tests/testdata/error_syntax.js
index c0414c356..c0414c356 100644
--- a/cli/tests/error_syntax.js
+++ b/cli/tests/testdata/error_syntax.js
diff --git a/cli/tests/testdata/error_syntax.js.out b/cli/tests/testdata/error_syntax.js.out
new file mode 100644
index 000000000..4c2a007f1
--- /dev/null
+++ b/cli/tests/testdata/error_syntax.js.out
@@ -0,0 +1 @@
+error: Expected ,, got following at [WILDCARD]/error_syntax.js:3:5
diff --git a/cli/tests/error_syntax_empty_trailing_line.mjs b/cli/tests/testdata/error_syntax_empty_trailing_line.mjs
index 864dfb0c7..864dfb0c7 100644
--- a/cli/tests/error_syntax_empty_trailing_line.mjs
+++ b/cli/tests/testdata/error_syntax_empty_trailing_line.mjs
diff --git a/cli/tests/testdata/error_syntax_empty_trailing_line.mjs.out b/cli/tests/testdata/error_syntax_empty_trailing_line.mjs.out
new file mode 100644
index 000000000..daa37818d
--- /dev/null
+++ b/cli/tests/testdata/error_syntax_empty_trailing_line.mjs.out
@@ -0,0 +1 @@
+error: Unexpected eof at [WILDCARD]/error_syntax_empty_trailing_line.mjs:2:21
diff --git a/cli/tests/error_type_definitions.ts b/cli/tests/testdata/error_type_definitions.ts
index ceb11787e..ceb11787e 100644
--- a/cli/tests/error_type_definitions.ts
+++ b/cli/tests/testdata/error_type_definitions.ts
diff --git a/cli/tests/error_type_definitions.ts.out b/cli/tests/testdata/error_type_definitions.ts.out
index 304ec1bdf..304ec1bdf 100644
--- a/cli/tests/error_type_definitions.ts.out
+++ b/cli/tests/testdata/error_type_definitions.ts.out
diff --git a/cli/tests/error_worker_permissions_local.ts b/cli/tests/testdata/error_worker_permissions_local.ts
index b43c8fe94..b43c8fe94 100644
--- a/cli/tests/error_worker_permissions_local.ts
+++ b/cli/tests/testdata/error_worker_permissions_local.ts
diff --git a/cli/tests/error_worker_permissions_local.ts.out b/cli/tests/testdata/error_worker_permissions_local.ts.out
index e6404e8e3..e6404e8e3 100644
--- a/cli/tests/error_worker_permissions_local.ts.out
+++ b/cli/tests/testdata/error_worker_permissions_local.ts.out
diff --git a/cli/tests/testdata/error_worker_permissions_remote.ts b/cli/tests/testdata/error_worker_permissions_remote.ts
new file mode 100644
index 000000000..878c7080a
--- /dev/null
+++ b/cli/tests/testdata/error_worker_permissions_remote.ts
@@ -0,0 +1,4 @@
+new Worker(
+  "http://localhost:4545/subdir/worker_types.ts",
+  { type: "module" },
+);
diff --git a/cli/tests/error_worker_permissions_remote.ts.out b/cli/tests/testdata/error_worker_permissions_remote.ts.out
index 74c7c3974..74c7c3974 100644
--- a/cli/tests/error_worker_permissions_remote.ts.out
+++ b/cli/tests/testdata/error_worker_permissions_remote.ts.out
diff --git a/cli/tests/es_private_fields.js b/cli/tests/testdata/es_private_fields.js
index b5f83e39c..b5f83e39c 100644
--- a/cli/tests/es_private_fields.js
+++ b/cli/tests/testdata/es_private_fields.js
diff --git a/cli/tests/es_private_fields.js.out b/cli/tests/testdata/es_private_fields.js.out
index be1970b05..be1970b05 100644
--- a/cli/tests/es_private_fields.js.out
+++ b/cli/tests/testdata/es_private_fields.js.out
diff --git a/cli/tests/esm_imports_a.js b/cli/tests/testdata/esm_imports_a.js
index 673cd9aa3..673cd9aa3 100644
--- a/cli/tests/esm_imports_a.js
+++ b/cli/tests/testdata/esm_imports_a.js
diff --git a/cli/tests/esm_imports_b.js b/cli/tests/testdata/esm_imports_b.js
index 840121368..840121368 100644
--- a/cli/tests/esm_imports_b.js
+++ b/cli/tests/testdata/esm_imports_b.js
diff --git a/cli/tests/exec_path.ts b/cli/tests/testdata/exec_path.ts
index b70b23237..b70b23237 100644
--- a/cli/tests/exec_path.ts
+++ b/cli/tests/testdata/exec_path.ts
diff --git a/cli/tests/exit_error42.ts b/cli/tests/testdata/exit_error42.ts
index e4db41f3a..e4db41f3a 100644
--- a/cli/tests/exit_error42.ts
+++ b/cli/tests/testdata/exit_error42.ts
diff --git a/cli/tests/exit_error42.ts.out b/cli/tests/testdata/exit_error42.ts.out
index 90be1f305..90be1f305 100644
--- a/cli/tests/exit_error42.ts.out
+++ b/cli/tests/testdata/exit_error42.ts.out
diff --git a/cli/tests/export_type_def.ts b/cli/tests/testdata/export_type_def.ts
index e33b70a64..e33b70a64 100644
--- a/cli/tests/export_type_def.ts
+++ b/cli/tests/testdata/export_type_def.ts
diff --git a/cli/tests/fetch/hello.txt b/cli/tests/testdata/fetch/hello.txt
index af5626b4a..af5626b4a 100644
--- a/cli/tests/fetch/hello.txt
+++ b/cli/tests/testdata/fetch/hello.txt
diff --git a/cli/tests/testdata/fetch/other.ts b/cli/tests/testdata/fetch/other.ts
new file mode 100644
index 000000000..91fe376b3
--- /dev/null
+++ b/cli/tests/testdata/fetch/other.ts
@@ -0,0 +1 @@
+import "http://localhost:4545/subdir/mt_text_typescript.t1.ts";
diff --git a/cli/tests/testdata/fetch/test.ts b/cli/tests/testdata/fetch/test.ts
new file mode 100644
index 000000000..baa52775d
--- /dev/null
+++ b/cli/tests/testdata/fetch/test.ts
@@ -0,0 +1 @@
+import "http://localhost:4545/subdir/mod2.ts";
diff --git a/cli/tests/fetch_response_finalization.js b/cli/tests/testdata/fetch_response_finalization.js
index dd7c355eb..dd7c355eb 100644
--- a/cli/tests/fetch_response_finalization.js
+++ b/cli/tests/testdata/fetch_response_finalization.js
diff --git a/cli/tests/fetch_response_finalization.js.out b/cli/tests/testdata/fetch_response_finalization.js.out
index 844a4e4b2..844a4e4b2 100644
--- a/cli/tests/fetch_response_finalization.js.out
+++ b/cli/tests/testdata/fetch_response_finalization.js.out
diff --git a/cli/tests/file_exists.ts b/cli/tests/testdata/file_exists.ts
index 20de4d4f2..20de4d4f2 100644
--- a/cli/tests/file_exists.ts
+++ b/cli/tests/testdata/file_exists.ts
diff --git a/cli/tests/finalization_registry.js b/cli/tests/testdata/finalization_registry.js
index f75979358..f75979358 100644
--- a/cli/tests/finalization_registry.js
+++ b/cli/tests/testdata/finalization_registry.js
diff --git a/cli/tests/finalization_registry.js.out b/cli/tests/testdata/finalization_registry.js.out
index fee61413a..fee61413a 100644
--- a/cli/tests/finalization_registry.js.out
+++ b/cli/tests/testdata/finalization_registry.js.out
diff --git a/cli/tests/fix_dynamic_import_errors.js b/cli/tests/testdata/fix_dynamic_import_errors.js
index 317047ccb..317047ccb 100644
--- a/cli/tests/fix_dynamic_import_errors.js
+++ b/cli/tests/testdata/fix_dynamic_import_errors.js
diff --git a/cli/tests/fix_dynamic_import_errors.js.out b/cli/tests/testdata/fix_dynamic_import_errors.js.out
index e7856fb9c..e7856fb9c 100644
--- a/cli/tests/fix_dynamic_import_errors.js.out
+++ b/cli/tests/testdata/fix_dynamic_import_errors.js.out
diff --git a/cli/tests/fix_emittable_skipped.js b/cli/tests/testdata/fix_emittable_skipped.js
index f61907b06..f61907b06 100644
--- a/cli/tests/fix_emittable_skipped.js
+++ b/cli/tests/testdata/fix_emittable_skipped.js
diff --git a/cli/tests/fix_emittable_skipped.ts.out b/cli/tests/testdata/fix_emittable_skipped.ts.out
index 108c2d67f..108c2d67f 100644
--- a/cli/tests/fix_emittable_skipped.ts.out
+++ b/cli/tests/testdata/fix_emittable_skipped.ts.out
diff --git a/cli/tests/fix_exotic_specifiers.ts b/cli/tests/testdata/fix_exotic_specifiers.ts
index 101667b2a..101667b2a 100644
--- a/cli/tests/fix_exotic_specifiers.ts
+++ b/cli/tests/testdata/fix_exotic_specifiers.ts
diff --git a/cli/tests/fix_exotic_specifiers.ts.out b/cli/tests/testdata/fix_exotic_specifiers.ts.out
index 7afdb808d..7afdb808d 100644
--- a/cli/tests/fix_exotic_specifiers.ts.out
+++ b/cli/tests/testdata/fix_exotic_specifiers.ts.out
diff --git a/cli/tests/fix_js_import_js.ts b/cli/tests/testdata/fix_js_import_js.ts
index c9f341748..c9f341748 100644
--- a/cli/tests/fix_js_import_js.ts
+++ b/cli/tests/testdata/fix_js_import_js.ts
diff --git a/cli/tests/fix_js_import_js.ts.out b/cli/tests/testdata/fix_js_import_js.ts.out
index 27ba77dda..27ba77dda 100644
--- a/cli/tests/fix_js_import_js.ts.out
+++ b/cli/tests/testdata/fix_js_import_js.ts.out
diff --git a/cli/tests/fix_js_imports.ts b/cli/tests/testdata/fix_js_imports.ts
index 4770b1ab6..4770b1ab6 100644
--- a/cli/tests/fix_js_imports.ts
+++ b/cli/tests/testdata/fix_js_imports.ts
diff --git a/cli/tests/fix_js_imports.ts.out b/cli/tests/testdata/fix_js_imports.ts.out
index 5e45122de..5e45122de 100644
--- a/cli/tests/fix_js_imports.ts.out
+++ b/cli/tests/testdata/fix_js_imports.ts.out
diff --git a/cli/tests/fix_tsc_file_exists.out b/cli/tests/testdata/fix_tsc_file_exists.out
index ce0136250..ce0136250 100644
--- a/cli/tests/fix_tsc_file_exists.out
+++ b/cli/tests/testdata/fix_tsc_file_exists.out
diff --git a/cli/tests/fix_worker_dispatchevent.ts b/cli/tests/testdata/fix_worker_dispatchevent.ts
index 1b73b52dc..1b73b52dc 100644
--- a/cli/tests/fix_worker_dispatchevent.ts
+++ b/cli/tests/testdata/fix_worker_dispatchevent.ts
diff --git a/cli/tests/fix_worker_dispatchevent.ts.out b/cli/tests/testdata/fix_worker_dispatchevent.ts.out
index 2e9ba477f..2e9ba477f 100644
--- a/cli/tests/fix_worker_dispatchevent.ts.out
+++ b/cli/tests/testdata/fix_worker_dispatchevent.ts.out
diff --git a/cli/tests/fixture.json b/cli/tests/testdata/fixture.json
index 56e056b6a..56e056b6a 100644
--- a/cli/tests/fixture.json
+++ b/cli/tests/testdata/fixture.json
diff --git a/cli/tests/fmt/expected_fmt_check_formatted_files.out b/cli/tests/testdata/fmt/expected_fmt_check_formatted_files.out
index 5a4833dd4..5a4833dd4 100644
--- a/cli/tests/fmt/expected_fmt_check_formatted_files.out
+++ b/cli/tests/testdata/fmt/expected_fmt_check_formatted_files.out
diff --git a/cli/tests/fmt/expected_fmt_check_ignore.out b/cli/tests/testdata/fmt/expected_fmt_check_ignore.out
index 7c1e471b9..7c1e471b9 100644
--- a/cli/tests/fmt/expected_fmt_check_ignore.out
+++ b/cli/tests/testdata/fmt/expected_fmt_check_ignore.out
diff --git a/cli/tests/fmt/expected_fmt_check_tests_dir.out b/cli/tests/testdata/fmt/expected_fmt_check_tests_dir.out
index e2dc2b4ae..e2dc2b4ae 100644
--- a/cli/tests/fmt/expected_fmt_check_tests_dir.out
+++ b/cli/tests/testdata/fmt/expected_fmt_check_tests_dir.out
diff --git a/cli/tests/fmt/expected_fmt_check_verbose_formatted_files.out b/cli/tests/testdata/fmt/expected_fmt_check_verbose_formatted_files.out
index 158c556c2..158c556c2 100644
--- a/cli/tests/fmt/expected_fmt_check_verbose_formatted_files.out
+++ b/cli/tests/testdata/fmt/expected_fmt_check_verbose_formatted_files.out
diff --git a/cli/tests/fmt/expected_fmt_check_verbose_tests_dir.out b/cli/tests/testdata/fmt/expected_fmt_check_verbose_tests_dir.out
index 04cd5ec64..04cd5ec64 100644
--- a/cli/tests/fmt/expected_fmt_check_verbose_tests_dir.out
+++ b/cli/tests/testdata/fmt/expected_fmt_check_verbose_tests_dir.out
diff --git a/cli/tests/fmt/formatted1.js b/cli/tests/testdata/fmt/formatted1.js
index 587aa5b96..587aa5b96 100644
--- a/cli/tests/fmt/formatted1.js
+++ b/cli/tests/testdata/fmt/formatted1.js
diff --git a/cli/tests/fmt/formatted2.ts b/cli/tests/testdata/fmt/formatted2.ts
index 4a8036806..4a8036806 100644
--- a/cli/tests/fmt/formatted2.ts
+++ b/cli/tests/testdata/fmt/formatted2.ts
diff --git a/cli/tests/fmt/formatted3.md b/cli/tests/testdata/fmt/formatted3.md
index e6e616584..e6e616584 100644
--- a/cli/tests/fmt/formatted3.md
+++ b/cli/tests/testdata/fmt/formatted3.md
diff --git a/cli/tests/fmt/formatted4.jsonc b/cli/tests/testdata/fmt/formatted4.jsonc
index f0f72a6ed..f0f72a6ed 100644
--- a/cli/tests/fmt/formatted4.jsonc
+++ b/cli/tests/testdata/fmt/formatted4.jsonc
diff --git a/cli/tests/heapstats.js b/cli/tests/testdata/heapstats.js
index 675fac2d6..675fac2d6 100644
--- a/cli/tests/heapstats.js
+++ b/cli/tests/testdata/heapstats.js
diff --git a/cli/tests/heapstats.js.out b/cli/tests/testdata/heapstats.js.out
index b75a755f8..b75a755f8 100644
--- a/cli/tests/heapstats.js.out
+++ b/cli/tests/testdata/heapstats.js.out
diff --git a/cli/tests/hello.txt b/cli/tests/testdata/hello.txt
index 6769dd60b..6769dd60b 100644
--- a/cli/tests/hello.txt
+++ b/cli/tests/testdata/hello.txt
diff --git a/cli/tests/testdata/https_import.ts b/cli/tests/testdata/https_import.ts
new file mode 100644
index 000000000..3bcc90326
--- /dev/null
+++ b/cli/tests/testdata/https_import.ts
@@ -0,0 +1,3 @@
+import { printHello } from "https://localhost:5545/subdir/print_hello.ts";
+
+printHello();
diff --git a/cli/tests/https_import.ts.out b/cli/tests/testdata/https_import.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/https_import.ts.out
+++ b/cli/tests/testdata/https_import.ts.out
diff --git a/cli/tests/if_main.ts b/cli/tests/testdata/if_main.ts
index 4dcfecea0..4dcfecea0 100644
--- a/cli/tests/if_main.ts
+++ b/cli/tests/testdata/if_main.ts
diff --git a/cli/tests/if_main.ts.out b/cli/tests/testdata/if_main.ts.out
index ba2906d06..ba2906d06 100644
--- a/cli/tests/if_main.ts.out
+++ b/cli/tests/testdata/if_main.ts.out
diff --git a/cli/tests/ignore_require.js b/cli/tests/testdata/ignore_require.js
index a8ef15021..a8ef15021 100644
--- a/cli/tests/ignore_require.js
+++ b/cli/tests/testdata/ignore_require.js
diff --git a/cli/tests/import_blob_url.ts b/cli/tests/testdata/import_blob_url.ts
index 86bb634e1..86bb634e1 100644
--- a/cli/tests/import_blob_url.ts
+++ b/cli/tests/testdata/import_blob_url.ts
diff --git a/cli/tests/import_blob_url.ts.out b/cli/tests/testdata/import_blob_url.ts.out
index bfa0b9d94..bfa0b9d94 100644
--- a/cli/tests/import_blob_url.ts.out
+++ b/cli/tests/testdata/import_blob_url.ts.out
diff --git a/cli/tests/import_blob_url_error_stack.ts b/cli/tests/testdata/import_blob_url_error_stack.ts
index f9c4f2e9d..f9c4f2e9d 100644
--- a/cli/tests/import_blob_url_error_stack.ts
+++ b/cli/tests/testdata/import_blob_url_error_stack.ts
diff --git a/cli/tests/import_blob_url_error_stack.ts.out b/cli/tests/testdata/import_blob_url_error_stack.ts.out
index 18ca023e3..52b76fd5c 100644
--- a/cli/tests/import_blob_url_error_stack.ts.out
+++ b/cli/tests/testdata/import_blob_url_error_stack.ts.out
@@ -2,5 +2,5 @@
    throw new Error(`Hello ${A.C}`);
          ^
     at a (blob:null/[WILDCARD]:8:10)
-    at file:///[WILDCARD]/cli/tests/import_blob_url_error_stack.ts:13:1
+    at file:///[WILDCARD]/import_blob_url_error_stack.ts:13:1
 [WILDCARD]
diff --git a/cli/tests/import_blob_url_import_relative.ts b/cli/tests/testdata/import_blob_url_import_relative.ts
index ad130bdac..ad130bdac 100644
--- a/cli/tests/import_blob_url_import_relative.ts
+++ b/cli/tests/testdata/import_blob_url_import_relative.ts
diff --git a/cli/tests/import_blob_url_import_relative.ts.out b/cli/tests/testdata/import_blob_url_import_relative.ts.out
index 9d47ab719..77f399763 100644
--- a/cli/tests/import_blob_url_import_relative.ts.out
+++ b/cli/tests/testdata/import_blob_url_import_relative.ts.out
@@ -1,4 +1,4 @@
 error: Uncaught (in promise) TypeError: invalid URL: relative URL with a cannot-be-a-base base
 const a = await import(url);
           ^
-    at async file://[WILDCARD]/cli/tests/import_blob_url_import_relative.ts:6:11
+    at async file://[WILDCARD]/import_blob_url_import_relative.ts:6:11
diff --git a/cli/tests/import_blob_url_imports.ts b/cli/tests/testdata/import_blob_url_imports.ts
index 7c2b10865..a7c639152 100644
--- a/cli/tests/import_blob_url_imports.ts
+++ b/cli/tests/testdata/import_blob_url_imports.ts
@@ -1,6 +1,6 @@
 const blob = new Blob(
   [
-    'export { printHello } from "http://localhost:4545/cli/tests/subdir/mod2.ts"',
+    'export { printHello } from "http://localhost:4545/subdir/mod2.ts"',
   ],
   { type: "application/javascript" },
 );
diff --git a/cli/tests/import_blob_url_imports.ts.out b/cli/tests/testdata/import_blob_url_imports.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/import_blob_url_imports.ts.out
+++ b/cli/tests/testdata/import_blob_url_imports.ts.out
diff --git a/cli/tests/import_blob_url_jsx.ts b/cli/tests/testdata/import_blob_url_jsx.ts
index 8d645796a..8d645796a 100644
--- a/cli/tests/import_blob_url_jsx.ts
+++ b/cli/tests/testdata/import_blob_url_jsx.ts
diff --git a/cli/tests/import_blob_url_jsx.ts.out b/cli/tests/testdata/import_blob_url_jsx.ts.out
index c1c85f250..c1c85f250 100644
--- a/cli/tests/import_blob_url_jsx.ts.out
+++ b/cli/tests/testdata/import_blob_url_jsx.ts.out
diff --git a/cli/tests/import_data_url.ts b/cli/tests/testdata/import_data_url.ts
index 258514a5e..258514a5e 100644
--- a/cli/tests/import_data_url.ts
+++ b/cli/tests/testdata/import_data_url.ts
diff --git a/cli/tests/import_data_url.ts.out b/cli/tests/testdata/import_data_url.ts.out
index bfa0b9d94..bfa0b9d94 100644
--- a/cli/tests/import_data_url.ts.out
+++ b/cli/tests/testdata/import_data_url.ts.out
diff --git a/cli/tests/import_data_url_error_stack.ts b/cli/tests/testdata/import_data_url_error_stack.ts
index 022e49fe1..022e49fe1 100644
--- a/cli/tests/import_data_url_error_stack.ts
+++ b/cli/tests/testdata/import_data_url_error_stack.ts
diff --git a/cli/tests/import_data_url_error_stack.ts.out b/cli/tests/testdata/import_data_url_error_stack.ts.out
index 466c1beed..d456ad0ea 100644
--- a/cli/tests/import_data_url_error_stack.ts.out
+++ b/cli/tests/testdata/import_data_url_error_stack.ts.out
@@ -2,5 +2,5 @@
    throw new Error(`Hello ${A.C}`);
          ^
     at a (data:application/typescript;base64,ZW51bSBBIHsKICBBLAogIEIsCiAgQywKIH0KIAogZXhwb3J0IGZ1bmN0aW9uIGEoKSB7CiAgIHRocm93IG5ldyBFcnJvcihgSGVsbG8gJHtBLkN9YCk7CiB9CiA=:8:10)
-    at file:///[WILDCARD]/cli/tests/import_data_url_error_stack.ts:3:1
+    at file:///[WILDCARD]/import_data_url_error_stack.ts:3:1
 [WILDCARD]
diff --git a/cli/tests/import_data_url_import_relative.ts b/cli/tests/testdata/import_data_url_import_relative.ts
index 23947fe60..23947fe60 100644
--- a/cli/tests/import_data_url_import_relative.ts
+++ b/cli/tests/testdata/import_data_url_import_relative.ts
diff --git a/cli/tests/import_data_url_import_relative.ts.out b/cli/tests/testdata/import_data_url_import_relative.ts.out
index 1f4f3e9ef..1f4f3e9ef 100644
--- a/cli/tests/import_data_url_import_relative.ts.out
+++ b/cli/tests/testdata/import_data_url_import_relative.ts.out
diff --git a/cli/tests/import_data_url_imports.ts b/cli/tests/testdata/import_data_url_imports.ts
index f25c2c389..df7dae727 100644
--- a/cli/tests/import_data_url_imports.ts
+++ b/cli/tests/testdata/import_data_url_imports.ts
@@ -1,4 +1,4 @@
-// export { printHello } from "http://localhost:4545/cli/tests/subdir/mod2.ts";
-import { printHello } from "data:application/typescript;base64,ZXhwb3J0IHsgcHJpbnRIZWxsbyB9IGZyb20gImh0dHA6Ly9sb2NhbGhvc3Q6NDU0NS9jbGkvdGVzdHMvc3ViZGlyL21vZDIudHMiOwo=";
+// export { printHello } from "http://localhost:4545/subdir/mod2.ts";
+import { printHello } from "data:application/typescript;base64,ZXhwb3J0IHsgcHJpbnRIZWxsbyB9IGZyb20gImh0dHA6Ly9sb2NhbGhvc3Q6NDU0NS9zdWJkaXIvbW9kMi50cyI7";
 
 printHello();
diff --git a/cli/tests/import_data_url_imports.ts.out b/cli/tests/testdata/import_data_url_imports.ts.out
index e965047ad..e965047ad 100644
--- a/cli/tests/import_data_url_imports.ts.out
+++ b/cli/tests/testdata/import_data_url_imports.ts.out
diff --git a/cli/tests/import_data_url_jsx.ts b/cli/tests/testdata/import_data_url_jsx.ts
index 1881211f9..1881211f9 100644
--- a/cli/tests/import_data_url_jsx.ts
+++ b/cli/tests/testdata/import_data_url_jsx.ts
diff --git a/cli/tests/import_data_url_jsx.ts.out b/cli/tests/testdata/import_data_url_jsx.ts.out
index c1c85f250..c1c85f250 100644
--- a/cli/tests/import_data_url_jsx.ts.out
+++ b/cli/tests/testdata/import_data_url_jsx.ts.out
diff --git a/cli/tests/import_dynamic_data_url.ts b/cli/tests/testdata/import_dynamic_data_url.ts
index 53a0fbcd3..53a0fbcd3 100644
--- a/cli/tests/import_dynamic_data_url.ts
+++ b/cli/tests/testdata/import_dynamic_data_url.ts
diff --git a/cli/tests/import_dynamic_data_url.ts.out b/cli/tests/testdata/import_dynamic_data_url.ts.out
index bfa0b9d94..bfa0b9d94 100644
--- a/cli/tests/import_dynamic_data_url.ts.out
+++ b/cli/tests/testdata/import_dynamic_data_url.ts.out
diff --git a/cli/tests/testdata/import_file_with_colon.ts b/cli/tests/testdata/import_file_with_colon.ts
new file mode 100644
index 000000000..619bdd66d
--- /dev/null
+++ b/cli/tests/testdata/import_file_with_colon.ts
@@ -0,0 +1 @@
+import "http://localhost:4545/subdir/file_with_:_in_name.ts";
diff --git a/cli/tests/import_file_with_colon.ts.out b/cli/tests/testdata/import_file_with_colon.ts.out
index f60bbf4b1..f60bbf4b1 100644
--- a/cli/tests/import_file_with_colon.ts.out
+++ b/cli/tests/testdata/import_file_with_colon.ts.out
diff --git a/cli/tests/import_maps/import_map.json b/cli/tests/testdata/import_maps/import_map.json
index 601874aab..601874aab 100644
--- a/cli/tests/import_maps/import_map.json
+++ b/cli/tests/testdata/import_maps/import_map.json
diff --git a/cli/tests/import_maps/import_map_remote.json b/cli/tests/testdata/import_maps/import_map_remote.json
index 51f90f69c..51f90f69c 100644
--- a/cli/tests/import_maps/import_map_remote.json
+++ b/cli/tests/testdata/import_maps/import_map_remote.json
diff --git a/cli/tests/import_maps/lodash/lodash.ts b/cli/tests/testdata/import_maps/lodash/lodash.ts
index 2ec04ed3c..2ec04ed3c 100644
--- a/cli/tests/import_maps/lodash/lodash.ts
+++ b/cli/tests/testdata/import_maps/lodash/lodash.ts
diff --git a/cli/tests/import_maps/lodash/other_file.ts b/cli/tests/testdata/import_maps/lodash/other_file.ts
index 714adae3f..714adae3f 100644
--- a/cli/tests/import_maps/lodash/other_file.ts
+++ b/cli/tests/testdata/import_maps/lodash/other_file.ts
diff --git a/cli/tests/import_maps/moment/moment.ts b/cli/tests/testdata/import_maps/moment/moment.ts
index 2b54a431e..2b54a431e 100644
--- a/cli/tests/import_maps/moment/moment.ts
+++ b/cli/tests/testdata/import_maps/moment/moment.ts
diff --git a/cli/tests/import_maps/moment/other_file.ts b/cli/tests/testdata/import_maps/moment/other_file.ts
index 24f3a0226..24f3a0226 100644
--- a/cli/tests/import_maps/moment/other_file.ts
+++ b/cli/tests/testdata/import_maps/moment/other_file.ts
diff --git a/cli/tests/import_maps/scope/scoped.ts b/cli/tests/testdata/import_maps/scope/scoped.ts
index 9a0b5d8e3..9a0b5d8e3 100644
--- a/cli/tests/import_maps/scope/scoped.ts
+++ b/cli/tests/testdata/import_maps/scope/scoped.ts
diff --git a/cli/tests/import_maps/scoped_moment.ts b/cli/tests/testdata/import_maps/scoped_moment.ts
index 9f67f88d4..9f67f88d4 100644
--- a/cli/tests/import_maps/scoped_moment.ts
+++ b/cli/tests/testdata/import_maps/scoped_moment.ts
diff --git a/cli/tests/import_maps/test.ts b/cli/tests/testdata/import_maps/test.ts
index 9b09e9953..9b09e9953 100644
--- a/cli/tests/import_maps/test.ts
+++ b/cli/tests/testdata/import_maps/test.ts
diff --git a/cli/tests/import_maps/test_remote.ts b/cli/tests/testdata/import_maps/test_remote.ts
index 206bdbd5f..206bdbd5f 100644
--- a/cli/tests/import_maps/test_remote.ts
+++ b/cli/tests/testdata/import_maps/test_remote.ts
diff --git a/cli/tests/import_maps/vue.ts b/cli/tests/testdata/import_maps/vue.ts
index 76dbe1917..76dbe1917 100644
--- a/cli/tests/import_maps/vue.ts
+++ b/cli/tests/testdata/import_maps/vue.ts
diff --git a/cli/tests/import_meta.ts b/cli/tests/testdata/import_meta.ts
index d111059ea..d111059ea 100644
--- a/cli/tests/import_meta.ts
+++ b/cli/tests/testdata/import_meta.ts
diff --git a/cli/tests/import_meta.ts.out b/cli/tests/testdata/import_meta.ts.out
index f38aa98ea..f38aa98ea 100644
--- a/cli/tests/import_meta.ts.out
+++ b/cli/tests/testdata/import_meta.ts.out
diff --git a/cli/tests/import_meta2.ts b/cli/tests/testdata/import_meta2.ts
index 7f59a5a46..7f59a5a46 100644
--- a/cli/tests/import_meta2.ts
+++ b/cli/tests/testdata/import_meta2.ts
diff --git a/cli/tests/info/data_null_error/data_null_error.out b/cli/tests/testdata/info/data_null_error/data_null_error.out
index 89961be65..89961be65 100644
--- a/cli/tests/info/data_null_error/data_null_error.out
+++ b/cli/tests/testdata/info/data_null_error/data_null_error.out
diff --git a/cli/tests/info/data_null_error/mod.ts b/cli/tests/testdata/info/data_null_error/mod.ts
index 6e3e99bd4..6e3e99bd4 100644
--- a/cli/tests/info/data_null_error/mod.ts
+++ b/cli/tests/testdata/info/data_null_error/mod.ts
diff --git a/cli/tests/info/data_null_error/types.d.ts b/cli/tests/testdata/info/data_null_error/types.d.ts
index 6ecc85676..6ecc85676 100644
--- a/cli/tests/info/data_null_error/types.d.ts
+++ b/cli/tests/testdata/info/data_null_error/types.d.ts
diff --git a/cli/tests/info/types_header.out b/cli/tests/testdata/info/types_header.out
index d3b6e8c4e..d3b6e8c4e 100644
--- a/cli/tests/info/types_header.out
+++ b/cli/tests/testdata/info/types_header.out
diff --git a/cli/tests/info_json.out b/cli/tests/testdata/info_json.out
index 4ba5a95f4..4ba5a95f4 100644
--- a/cli/tests/info_json.out
+++ b/cli/tests/testdata/info_json.out
diff --git a/cli/tests/info_json_location.out b/cli/tests/testdata/info_json_location.out
index 6c4cddefb..6c4cddefb 100644
--- a/cli/tests/info_json_location.out
+++ b/cli/tests/testdata/info_json_location.out
diff --git a/cli/tests/testdata/info_missing_module.out b/cli/tests/testdata/info_missing_module.out
new file mode 100644
index 000000000..75b077407
--- /dev/null
+++ b/cli/tests/testdata/info_missing_module.out
@@ -0,0 +1,6 @@
+local: [WILDCARD]error_009_missing_js_module.js
+type: JavaScript
+dependencies: 1 unique (total 26B)
+
+file://[WILDCARD]/error_009_missing_js_module.js (26B)
+└── file://[WILDCARD]/bad-module.js (error)
diff --git a/cli/tests/testdata/info_recursive_imports_test.out b/cli/tests/testdata/info_recursive_imports_test.out
new file mode 100644
index 000000000..10ee54534
--- /dev/null
+++ b/cli/tests/testdata/info_recursive_imports_test.out
@@ -0,0 +1,12 @@
+local: [WILDCARD]info_recursive_imports_test.ts
+type: TypeScript
+dependencies: 4 unique (total [WILDCARD])
+
+file://[WILDCARD]/info_recursive_imports_test.ts ([WILDCARD])
+└─┬ file://[WILDCARD]/recursive_imports/A.ts ([WILDCARD])
+  ├─┬ file://[WILDCARD]/recursive_imports/B.ts ([WILDCARD])
+  │ ├─┬ file://[WILDCARD]/recursive_imports/C.ts ([WILDCARD])
+  │ │ ├── file://[WILDCARD]/recursive_imports/A.ts *
+  │ │ └── file://[WILDCARD]/recursive_imports/common.ts ([WILDCARD])
+  │ └── file://[WILDCARD]/recursive_imports/common.ts *
+  └── file://[WILDCARD]/recursive_imports/common.ts *
diff --git a/cli/tests/info_recursive_imports_test.ts b/cli/tests/testdata/info_recursive_imports_test.ts
index c9ba44755..c9ba44755 100644
--- a/cli/tests/info_recursive_imports_test.ts
+++ b/cli/tests/testdata/info_recursive_imports_test.ts
diff --git a/cli/tests/info_type_import.out b/cli/tests/testdata/info_type_import.out
index 6b9869f1f..6b9869f1f 100644
--- a/cli/tests/info_type_import.out
+++ b/cli/tests/testdata/info_type_import.out
diff --git a/cli/tests/info_type_import.ts b/cli/tests/testdata/info_type_import.ts
index eeef46c89..eeef46c89 100644
--- a/cli/tests/info_type_import.ts
+++ b/cli/tests/testdata/info_type_import.ts
diff --git a/cli/tests/inline_js_source_map.ts b/cli/tests/testdata/inline_js_source_map.ts
index 5ae7c226a..5ae7c226a 100644
--- a/cli/tests/inline_js_source_map.ts
+++ b/cli/tests/testdata/inline_js_source_map.ts
diff --git a/cli/tests/testdata/inline_js_source_map_2.js b/cli/tests/testdata/inline_js_source_map_2.js
new file mode 100644
index 000000000..036f351b9
--- /dev/null
+++ b/cli/tests/testdata/inline_js_source_map_2.js
@@ -0,0 +1,4 @@
+"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
new file mode 100644
index 000000000..4f9127da6
--- /dev/null
+++ b/cli/tests/testdata/inline_js_source_map_2.js.out
@@ -0,0 +1,2 @@
+error: Uncaught Error: Hello world!
+    at http://localhost:4545/inline_js_source_map_2.ts:6:7
diff --git a/cli/tests/inline_js_source_map_2.ts b/cli/tests/testdata/inline_js_source_map_2.ts
index fa50586e6..fa50586e6 100644
--- a/cli/tests/inline_js_source_map_2.ts
+++ b/cli/tests/testdata/inline_js_source_map_2.ts
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
new file mode 100644
index 000000000..5bea615b8
--- /dev/null
+++ b/cli/tests/testdata/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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaHR0cDovL2xvY2FsaG9zdDo0NTQ1L2lubGluZV9qc19zb3VyY2VfbWFwXzIudHMiXSwic291cmNlc0NvbnRlbnQiOlsiMSsxO1xuaW50ZXJmYWNlIFRlc3Qge1xuICBoZWxsbzogc3RyaW5nO1xufVxuXG50aHJvdyBuZXcgRXJyb3IoXCJIZWxsbyB3b3JsZCFcIiBhcyB1bmtub3duIGFzIHN0cmluZyk7XG4iXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLENBQUMsR0FBQyxDQUFDLENBQUM7QUFLSixNQUFNLElBQUksS0FBSyxDQUFDLGNBQStCLENBQUMsQ0FBQyJ9
\ No newline at end of file
diff --git a/cli/tests/inline_js_source_map_2_with_inline_contents.js.out b/cli/tests/testdata/inline_js_source_map_2_with_inline_contents.js.out
index c123de41e..9280361f7 100644
--- a/cli/tests/inline_js_source_map_2_with_inline_contents.js.out
+++ b/cli/tests/testdata/inline_js_source_map_2_with_inline_contents.js.out
@@ -1,4 +1,4 @@
 error: Uncaught Error: Hello world!
 throw new Error("Hello world!" as unknown as string);
       ^
-    at http://localhost:4545/cli/tests/inline_js_source_map_2.ts:6:7
+    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
new file mode 100644
index 000000000..decf47bdc
--- /dev/null
+++ b/cli/tests/testdata/inline_js_source_map_with_contents_from_graph.js
@@ -0,0 +1,4 @@
+"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/inline_js_source_map_with_contents_from_graph.js.out b/cli/tests/testdata/inline_js_source_map_with_contents_from_graph.js.out
index a0ba9fe98..7304fc5f6 100644
--- a/cli/tests/inline_js_source_map_with_contents_from_graph.js.out
+++ b/cli/tests/testdata/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/cli/tests/inline_js_source_map.ts:6:7
+    at http://localhost:4545/inline_js_source_map.ts:6:7
diff --git a/cli/tests/inspector1.js b/cli/tests/testdata/inspector1.js
index 5cb059def..5cb059def 100644
--- a/cli/tests/inspector1.js
+++ b/cli/tests/testdata/inspector1.js
diff --git a/cli/tests/inspector2.js b/cli/tests/testdata/inspector2.js
index 57f80ef94..57f80ef94 100644
--- a/cli/tests/inspector2.js
+++ b/cli/tests/testdata/inspector2.js
diff --git a/cli/tests/inspector3.js b/cli/tests/testdata/inspector3.js
index b1b00b5a0..b1b00b5a0 100644
--- a/cli/tests/inspector3.js
+++ b/cli/tests/testdata/inspector3.js
diff --git a/cli/tests/inspector4.js b/cli/tests/testdata/inspector4.js
index 1bf419650..1bf419650 100644
--- a/cli/tests/inspector4.js
+++ b/cli/tests/testdata/inspector4.js
diff --git a/cli/tests/js_import_detect.ts b/cli/tests/testdata/js_import_detect.ts
index 751741996..751741996 100644
--- a/cli/tests/js_import_detect.ts
+++ b/cli/tests/testdata/js_import_detect.ts
diff --git a/cli/tests/js_import_detect.ts.out b/cli/tests/testdata/js_import_detect.ts.out
index 9766475a4..9766475a4 100644
--- a/cli/tests/js_import_detect.ts.out
+++ b/cli/tests/testdata/js_import_detect.ts.out
diff --git a/cli/tests/jsx_import_from_ts.App.jsx b/cli/tests/testdata/jsx_import_from_ts.App.jsx
index 649230613..649230613 100644
--- a/cli/tests/jsx_import_from_ts.App.jsx
+++ b/cli/tests/testdata/jsx_import_from_ts.App.jsx
diff --git a/cli/tests/jsx_import_from_ts.ts b/cli/tests/testdata/jsx_import_from_ts.ts
index 3cc916698..3cc916698 100644
--- a/cli/tests/jsx_import_from_ts.ts
+++ b/cli/tests/testdata/jsx_import_from_ts.ts
diff --git a/cli/tests/jsx_import_from_ts.ts.out b/cli/tests/testdata/jsx_import_from_ts.ts.out
index d449b8c9a..d449b8c9a 100644
--- a/cli/tests/jsx_import_from_ts.ts.out
+++ b/cli/tests/testdata/jsx_import_from_ts.ts.out
diff --git a/cli/tests/lib_dom_asynciterable.ts b/cli/tests/testdata/lib_dom_asynciterable.ts
index d932011f4..d932011f4 100644
--- a/cli/tests/lib_dom_asynciterable.ts
+++ b/cli/tests/testdata/lib_dom_asynciterable.ts
diff --git a/cli/tests/lib_dom_asynciterable.ts.out b/cli/tests/testdata/lib_dom_asynciterable.ts.out
index 8b5e7adb6..8b5e7adb6 100644
--- a/cli/tests/lib_dom_asynciterable.ts.out
+++ b/cli/tests/testdata/lib_dom_asynciterable.ts.out
diff --git a/cli/tests/lib_ref.ts b/cli/tests/testdata/lib_ref.ts
index 2454f8b5d..2454f8b5d 100644
--- a/cli/tests/lib_ref.ts
+++ b/cli/tests/testdata/lib_ref.ts
diff --git a/cli/tests/lib_ref.ts.out b/cli/tests/testdata/lib_ref.ts.out
index 4e0f933fc..4e0f933fc 100644
--- a/cli/tests/lib_ref.ts.out
+++ b/cli/tests/testdata/lib_ref.ts.out
diff --git a/cli/tests/lib_runtime_api.ts b/cli/tests/testdata/lib_runtime_api.ts
index 450d9480b..450d9480b 100644
--- a/cli/tests/lib_runtime_api.ts
+++ b/cli/tests/testdata/lib_runtime_api.ts
diff --git a/cli/tests/lib_runtime_api.ts.out b/cli/tests/testdata/lib_runtime_api.ts.out
index 4e0f933fc..4e0f933fc 100644
--- a/cli/tests/lib_runtime_api.ts.out
+++ b/cli/tests/testdata/lib_runtime_api.ts.out
diff --git a/cli/tests/lint/expected.out b/cli/tests/testdata/lint/expected.out
index eb8a2651a..eb8a2651a 100644
--- a/cli/tests/lint/expected.out
+++ b/cli/tests/testdata/lint/expected.out
diff --git a/cli/tests/lint/expected_from_stdin.out b/cli/tests/testdata/lint/expected_from_stdin.out
index 90f455fdc..90f455fdc 100644
--- a/cli/tests/lint/expected_from_stdin.out
+++ b/cli/tests/testdata/lint/expected_from_stdin.out
diff --git a/cli/tests/lint/expected_from_stdin_json.out b/cli/tests/testdata/lint/expected_from_stdin_json.out
index 7ea40e957..7ea40e957 100644
--- a/cli/tests/lint/expected_from_stdin_json.out
+++ b/cli/tests/testdata/lint/expected_from_stdin_json.out
diff --git a/cli/tests/lint/expected_glob.out b/cli/tests/testdata/lint/expected_glob.out
index eb8a2651a..eb8a2651a 100644
--- a/cli/tests/lint/expected_glob.out
+++ b/cli/tests/testdata/lint/expected_glob.out
diff --git a/cli/tests/lint/expected_ignore.out b/cli/tests/testdata/lint/expected_ignore.out
index b5f78ee04..b5f78ee04 100644
--- a/cli/tests/lint/expected_ignore.out
+++ b/cli/tests/testdata/lint/expected_ignore.out
diff --git a/cli/tests/lint/expected_json.out b/cli/tests/testdata/lint/expected_json.out
index dbeb8039b..dbeb8039b 100644
--- a/cli/tests/lint/expected_json.out
+++ b/cli/tests/testdata/lint/expected_json.out
diff --git a/cli/tests/lint/expected_quiet.out b/cli/tests/testdata/lint/expected_quiet.out
index d7c9d7bb9..d7c9d7bb9 100644
--- a/cli/tests/lint/expected_quiet.out
+++ b/cli/tests/testdata/lint/expected_quiet.out
diff --git a/cli/tests/lint/expected_rules.out b/cli/tests/testdata/lint/expected_rules.out
index 4afab7b9b..4afab7b9b 100644
--- a/cli/tests/lint/expected_rules.out
+++ b/cli/tests/testdata/lint/expected_rules.out
diff --git a/cli/tests/lint/expected_verbose.out b/cli/tests/testdata/lint/expected_verbose.out
index eb8a2651a..eb8a2651a 100644
--- a/cli/tests/lint/expected_verbose.out
+++ b/cli/tests/testdata/lint/expected_verbose.out
diff --git a/cli/tests/lint/file1.js b/cli/tests/testdata/lint/file1.js
index 737f26818..737f26818 100644
--- a/cli/tests/lint/file1.js
+++ b/cli/tests/testdata/lint/file1.js
diff --git a/cli/tests/lint/file2.ts b/cli/tests/testdata/lint/file2.ts
index 73c612c35..73c612c35 100644
--- a/cli/tests/lint/file2.ts
+++ b/cli/tests/testdata/lint/file2.ts
diff --git a/cli/tests/lint/ignored_file.ts b/cli/tests/testdata/lint/ignored_file.ts
index 97befafa3..97befafa3 100644
--- a/cli/tests/lint/ignored_file.ts
+++ b/cli/tests/testdata/lint/ignored_file.ts
diff --git a/cli/tests/lint/malformed.js b/cli/tests/testdata/lint/malformed.js
index 5ad4650d6..5ad4650d6 100644
--- a/cli/tests/lint/malformed.js
+++ b/cli/tests/testdata/lint/malformed.js
diff --git a/cli/tests/listen_tls_alpn.ts b/cli/tests/testdata/listen_tls_alpn.ts
index 6aedf0e4f..5d58065d9 100644
--- a/cli/tests/listen_tls_alpn.ts
+++ b/cli/tests/testdata/listen_tls_alpn.ts
@@ -1,7 +1,7 @@
 const listener = Deno.listenTls({
   port: Number(Deno.args[0]),
-  certFile: "./cli/tests/tls/localhost.crt",
-  keyFile: "./cli/tests/tls/localhost.key",
+  certFile: "./tls/localhost.crt",
+  keyFile: "./tls/localhost.key",
   alpnProtocols: ["h2", "http/1.1", "foobar"],
 });
 
diff --git a/cli/tests/testdata/localhost_unsafe_ssl.ts.out b/cli/tests/testdata/localhost_unsafe_ssl.ts.out
new file mode 100644
index 000000000..c482bd81c
--- /dev/null
+++ b/cli/tests/testdata/localhost_unsafe_ssl.ts.out
@@ -0,0 +1,3 @@
+DANGER: TLS certificate validation is disabled for: deno.land
+error: error sending request for url (https://localhost:5545/subdir/mod2.ts): error trying to connect: invalid certificate: UnknownIssuer
+    at [WILDCARD]/cafile_url_imports.ts:1:0
diff --git a/cli/tests/testdata/lock_check_err.json b/cli/tests/testdata/lock_check_err.json
new file mode 100644
index 000000000..9bf52adca
--- /dev/null
+++ b/cli/tests/testdata/lock_check_err.json
@@ -0,0 +1,4 @@
+{
+  "http://127.0.0.1:4545/subdir/print_hello.ts": "fa6692c8f9ff3fb107e773c3ece5274e9d08be282867a1e3ded1d9c00fcaa63c",
+  "http://127.0.0.1:4545/003_relative_import.ts": "bad"
+}
diff --git a/cli/tests/lock_check_err.out b/cli/tests/testdata/lock_check_err.out
index c12f4af34..3c5eceb8c 100644
--- a/cli/tests/lock_check_err.out
+++ b/cli/tests/testdata/lock_check_err.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://127.0.0.1:4545/cli/tests/003_relative_import.ts
+  Specifier: http://127.0.0.1:4545/003_relative_import.ts
   Lock file: lock_check_err.json
diff --git a/cli/tests/testdata/lock_check_err2.json b/cli/tests/testdata/lock_check_err2.json
new file mode 100644
index 000000000..a59cbc9e3
--- /dev/null
+++ b/cli/tests/testdata/lock_check_err2.json
@@ -0,0 +1,10 @@
+{
+  "http://localhost:4545/subdir/mt_application_ecmascript.j2.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_application_x_javascript.j4.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_application_x_typescript.t4.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_text_ecmascript.j3.js": "bad",
+  "http://localhost:4545/subdir/mt_text_javascript.j1.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_text_typescript.t1.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_video_mp2t.t3.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_video_vdn.t2.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18"
+}
diff --git a/cli/tests/lock_check_err2.out b/cli/tests/testdata/lock_check_err2.out
index d3ccfc46e..958c01654 100644
--- a/cli/tests/lock_check_err2.out
+++ b/cli/tests/testdata/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/cli/tests/subdir/mt_text_ecmascript.j3.js
+  Specifier: http://localhost:4545/subdir/mt_text_ecmascript.j3.js
   Lock file: lock_check_err2.json
diff --git a/cli/tests/testdata/lock_check_err_with_bundle.json b/cli/tests/testdata/lock_check_err_with_bundle.json
new file mode 100644
index 000000000..a218d7000
--- /dev/null
+++ b/cli/tests/testdata/lock_check_err_with_bundle.json
@@ -0,0 +1,5 @@
+{
+  "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/lock_check_err_with_bundle.out b/cli/tests/testdata/lock_check_err_with_bundle.out
index d6eae26b1..a47cbc606 100644
--- a/cli/tests/lock_check_err_with_bundle.out
+++ b/cli/tests/testdata/lock_check_err_with_bundle.out
@@ -1,4 +1,4 @@
 [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/cli/tests/subdir/subdir2/mod2.ts
+  Specifier: http://127.0.0.1:4545/subdir/subdir2/mod2.ts
   Lock file: lock_check_err_with_bundle.json
diff --git a/cli/tests/testdata/lock_check_ok.json b/cli/tests/testdata/lock_check_ok.json
new file mode 100644
index 000000000..9dd5b0548
--- /dev/null
+++ b/cli/tests/testdata/lock_check_ok.json
@@ -0,0 +1,4 @@
+{
+  "http://127.0.0.1:4545/subdir/print_hello.ts": "fa6692c8f9ff3fb107e773c3ece5274e9d08be282867a1e3ded1d9c00fcaa63c",
+  "http://127.0.0.1:4545/003_relative_import.ts": "aa9e16de824f81871a1c7164d5bd6857df7db2e18621750bd66b0bde4df07f21"
+}
diff --git a/cli/tests/testdata/lock_check_ok2.json b/cli/tests/testdata/lock_check_ok2.json
new file mode 100644
index 000000000..162c755e2
--- /dev/null
+++ b/cli/tests/testdata/lock_check_ok2.json
@@ -0,0 +1,10 @@
+{
+  "http://localhost:4545/subdir/mt_application_ecmascript.j2.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_application_x_javascript.j4.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_application_x_typescript.t4.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_text_ecmascript.j3.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_text_javascript.j1.js": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_text_typescript.t1.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_video_mp2t.t3.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18",
+  "http://localhost:4545/subdir/mt_video_vdn.t2.ts": "3a3e002e2f92dc8f045bd4a7c66b4791453ad0417b038dd2b2d9d0f277c44f18"
+}
diff --git a/cli/tests/testdata/lock_dynamic_imports.json b/cli/tests/testdata/lock_dynamic_imports.json
new file mode 100644
index 000000000..57263bc85
--- /dev/null
+++ b/cli/tests/testdata/lock_dynamic_imports.json
@@ -0,0 +1,6 @@
+{
+  "http://127.0.0.1:4545/013_dynamic_import.ts": "f0d2d108c100e769cda9f26b74326f21e44cab81611aa7f6cd2b731d4cbc1995",
+  "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/lock_dynamic_imports.out b/cli/tests/testdata/lock_dynamic_imports.out
index 3bf6342c8..e5c76c8f0 100644
--- a/cli/tests/lock_dynamic_imports.out
+++ b/cli/tests/testdata/lock_dynamic_imports.out
@@ -1,4 +1,4 @@
 [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/cli/tests/subdir/subdir2/mod2.ts
+  Specifier: http://127.0.0.1:4545/subdir/subdir2/mod2.ts
   Lock file: lock_dynamic_imports.json
diff --git a/cli/tests/lock_write_fetch.ts b/cli/tests/testdata/lock_write_fetch.ts
index b6ecf4747..b6ecf4747 100644
--- a/cli/tests/lock_write_fetch.ts
+++ b/cli/tests/testdata/lock_write_fetch.ts
diff --git a/cli/tests/lock_write_fetch.ts.out b/cli/tests/testdata/lock_write_fetch.ts.out
index bfdb952f9..bfdb952f9 100644
--- a/cli/tests/lock_write_fetch.ts.out
+++ b/cli/tests/testdata/lock_write_fetch.ts.out
diff --git a/cli/tests/lock_write_requires_lock.out b/cli/tests/testdata/lock_write_requires_lock.out
index 7cc5906f6..7cc5906f6 100644
--- a/cli/tests/lock_write_requires_lock.out
+++ b/cli/tests/testdata/lock_write_requires_lock.out
diff --git a/cli/tests/lsp/a.d.ts b/cli/tests/testdata/lsp/a.d.ts
index 7f587e144..7f587e144 100644
--- a/cli/tests/lsp/a.d.ts
+++ b/cli/tests/testdata/lsp/a.d.ts
diff --git a/cli/tests/lsp/b.d.ts b/cli/tests/testdata/lsp/b.d.ts
index 9d4b96cb8..9d4b96cb8 100644
--- a/cli/tests/lsp/b.d.ts
+++ b/cli/tests/testdata/lsp/b.d.ts
diff --git a/cli/tests/lsp/code_action_ignore_lint_params.json b/cli/tests/testdata/lsp/code_action_ignore_lint_params.json
index 7711812fd..7711812fd 100644
--- a/cli/tests/lsp/code_action_ignore_lint_params.json
+++ b/cli/tests/testdata/lsp/code_action_ignore_lint_params.json
diff --git a/cli/tests/lsp/code_action_ignore_lint_response.json b/cli/tests/testdata/lsp/code_action_ignore_lint_response.json
index f5c24ec21..f5c24ec21 100644
--- a/cli/tests/lsp/code_action_ignore_lint_response.json
+++ b/cli/tests/testdata/lsp/code_action_ignore_lint_response.json
diff --git a/cli/tests/lsp/code_action_params.json b/cli/tests/testdata/lsp/code_action_params.json
index d026d61f6..d026d61f6 100644
--- a/cli/tests/lsp/code_action_params.json
+++ b/cli/tests/testdata/lsp/code_action_params.json
diff --git a/cli/tests/lsp/code_action_params_cache.json b/cli/tests/testdata/lsp/code_action_params_cache.json
index 61ae555a3..61ae555a3 100644
--- a/cli/tests/lsp/code_action_params_cache.json
+++ b/cli/tests/testdata/lsp/code_action_params_cache.json
diff --git a/cli/tests/lsp/code_action_params_deadlock.json b/cli/tests/testdata/lsp/code_action_params_deadlock.json
index be0e317e1..be0e317e1 100644
--- a/cli/tests/lsp/code_action_params_deadlock.json
+++ b/cli/tests/testdata/lsp/code_action_params_deadlock.json
diff --git a/cli/tests/lsp/code_action_params_imports.json b/cli/tests/testdata/lsp/code_action_params_imports.json
index 7a5824923..7a5824923 100644
--- a/cli/tests/lsp/code_action_params_imports.json
+++ b/cli/tests/testdata/lsp/code_action_params_imports.json
diff --git a/cli/tests/lsp/code_action_params_refactor.json b/cli/tests/testdata/lsp/code_action_params_refactor.json
index 121c400ed..121c400ed 100644
--- a/cli/tests/lsp/code_action_params_refactor.json
+++ b/cli/tests/testdata/lsp/code_action_params_refactor.json
diff --git a/cli/tests/lsp/code_action_resolve_params.json b/cli/tests/testdata/lsp/code_action_resolve_params.json
index 50c1f9a43..50c1f9a43 100644
--- a/cli/tests/lsp/code_action_resolve_params.json
+++ b/cli/tests/testdata/lsp/code_action_resolve_params.json
diff --git a/cli/tests/lsp/code_action_resolve_params_imports.json b/cli/tests/testdata/lsp/code_action_resolve_params_imports.json
index 60178bbfe..60178bbfe 100644
--- a/cli/tests/lsp/code_action_resolve_params_imports.json
+++ b/cli/tests/testdata/lsp/code_action_resolve_params_imports.json
diff --git a/cli/tests/lsp/code_action_resolve_params_refactor.json b/cli/tests/testdata/lsp/code_action_resolve_params_refactor.json
index d4bb3bd81..d4bb3bd81 100644
--- a/cli/tests/lsp/code_action_resolve_params_refactor.json
+++ b/cli/tests/testdata/lsp/code_action_resolve_params_refactor.json
diff --git a/cli/tests/lsp/code_action_resolve_response.json b/cli/tests/testdata/lsp/code_action_resolve_response.json
index e3f5b3f0e..e3f5b3f0e 100644
--- a/cli/tests/lsp/code_action_resolve_response.json
+++ b/cli/tests/testdata/lsp/code_action_resolve_response.json
diff --git a/cli/tests/lsp/code_action_resolve_response_imports.json b/cli/tests/testdata/lsp/code_action_resolve_response_imports.json
index 6621c501f..6621c501f 100644
--- a/cli/tests/lsp/code_action_resolve_response_imports.json
+++ b/cli/tests/testdata/lsp/code_action_resolve_response_imports.json
diff --git a/cli/tests/lsp/code_action_resolve_response_refactor.json b/cli/tests/testdata/lsp/code_action_resolve_response_refactor.json
index 721a76a6b..721a76a6b 100644
--- a/cli/tests/lsp/code_action_resolve_response_refactor.json
+++ b/cli/tests/testdata/lsp/code_action_resolve_response_refactor.json
diff --git a/cli/tests/lsp/code_action_response.json b/cli/tests/testdata/lsp/code_action_response.json
index ab30898f8..ab30898f8 100644
--- a/cli/tests/lsp/code_action_response.json
+++ b/cli/tests/testdata/lsp/code_action_response.json
diff --git a/cli/tests/lsp/code_action_response_cache.json b/cli/tests/testdata/lsp/code_action_response_cache.json
index c56b35023..c56b35023 100644
--- a/cli/tests/lsp/code_action_response_cache.json
+++ b/cli/tests/testdata/lsp/code_action_response_cache.json
diff --git a/cli/tests/lsp/code_action_response_imports.json b/cli/tests/testdata/lsp/code_action_response_imports.json
index e4d926bdd..e4d926bdd 100644
--- a/cli/tests/lsp/code_action_response_imports.json
+++ b/cli/tests/testdata/lsp/code_action_response_imports.json
diff --git a/cli/tests/lsp/code_action_response_no_disabled.json b/cli/tests/testdata/lsp/code_action_response_no_disabled.json
index c69bd1120..c69bd1120 100644
--- a/cli/tests/lsp/code_action_response_no_disabled.json
+++ b/cli/tests/testdata/lsp/code_action_response_no_disabled.json
diff --git a/cli/tests/lsp/code_action_response_refactor.json b/cli/tests/testdata/lsp/code_action_response_refactor.json
index a9fbd2827..a9fbd2827 100644
--- a/cli/tests/lsp/code_action_response_refactor.json
+++ b/cli/tests/testdata/lsp/code_action_response_refactor.json
diff --git a/cli/tests/lsp/code_lens_resolve_response.json b/cli/tests/testdata/lsp/code_lens_resolve_response.json
index 1400eb4e6..1400eb4e6 100644
--- a/cli/tests/lsp/code_lens_resolve_response.json
+++ b/cli/tests/testdata/lsp/code_lens_resolve_response.json
diff --git a/cli/tests/lsp/code_lens_resolve_response_impl.json b/cli/tests/testdata/lsp/code_lens_resolve_response_impl.json
index cabf2f833..cabf2f833 100644
--- a/cli/tests/lsp/code_lens_resolve_response_impl.json
+++ b/cli/tests/testdata/lsp/code_lens_resolve_response_impl.json
diff --git a/cli/tests/lsp/code_lens_response.json b/cli/tests/testdata/lsp/code_lens_response.json
index e3a87e4be..e3a87e4be 100644
--- a/cli/tests/lsp/code_lens_response.json
+++ b/cli/tests/testdata/lsp/code_lens_response.json
diff --git a/cli/tests/lsp/code_lens_response_changed.json b/cli/tests/testdata/lsp/code_lens_response_changed.json
index b0073a23f..b0073a23f 100644
--- a/cli/tests/lsp/code_lens_response_changed.json
+++ b/cli/tests/testdata/lsp/code_lens_response_changed.json
diff --git a/cli/tests/lsp/code_lens_response_impl.json b/cli/tests/testdata/lsp/code_lens_response_impl.json
index c6e5bd92d..c6e5bd92d 100644
--- a/cli/tests/lsp/code_lens_response_impl.json
+++ b/cli/tests/testdata/lsp/code_lens_response_impl.json
diff --git a/cli/tests/lsp/code_lens_response_test.json b/cli/tests/testdata/lsp/code_lens_response_test.json
index b2cb4588a..b2cb4588a 100644
--- a/cli/tests/lsp/code_lens_response_test.json
+++ b/cli/tests/testdata/lsp/code_lens_response_test.json
diff --git a/cli/tests/lsp/completion_request_params_optional.json b/cli/tests/testdata/lsp/completion_request_params_optional.json
index 1f3c079c7..1f3c079c7 100644
--- a/cli/tests/lsp/completion_request_params_optional.json
+++ b/cli/tests/testdata/lsp/completion_request_params_optional.json
diff --git a/cli/tests/lsp/completion_request_response_empty.json b/cli/tests/testdata/lsp/completion_request_response_empty.json
index 272dfb475..272dfb475 100644
--- a/cli/tests/lsp/completion_request_response_empty.json
+++ b/cli/tests/testdata/lsp/completion_request_response_empty.json
diff --git a/cli/tests/lsp/completion_resolve_params.json b/cli/tests/testdata/lsp/completion_resolve_params.json
index 26231036d..26231036d 100644
--- a/cli/tests/lsp/completion_resolve_params.json
+++ b/cli/tests/testdata/lsp/completion_resolve_params.json
diff --git a/cli/tests/lsp/completion_resolve_params_optional.json b/cli/tests/testdata/lsp/completion_resolve_params_optional.json
index cb99bf960..cb99bf960 100644
--- a/cli/tests/lsp/completion_resolve_params_optional.json
+++ b/cli/tests/testdata/lsp/completion_resolve_params_optional.json
diff --git a/cli/tests/lsp/completion_resolve_params_registry.json b/cli/tests/testdata/lsp/completion_resolve_params_registry.json
index 99a4a048e..99a4a048e 100644
--- a/cli/tests/lsp/completion_resolve_params_registry.json
+++ b/cli/tests/testdata/lsp/completion_resolve_params_registry.json
diff --git a/cli/tests/lsp/completion_resolve_response.json b/cli/tests/testdata/lsp/completion_resolve_response.json
index 0edbc14ef..0edbc14ef 100644
--- a/cli/tests/lsp/completion_resolve_response.json
+++ b/cli/tests/testdata/lsp/completion_resolve_response.json
diff --git a/cli/tests/lsp/completion_resolve_response_registry.json b/cli/tests/testdata/lsp/completion_resolve_response_registry.json
index 99a4a048e..99a4a048e 100644
--- a/cli/tests/lsp/completion_resolve_response_registry.json
+++ b/cli/tests/testdata/lsp/completion_resolve_response_registry.json
diff --git a/cli/tests/lsp/diagnostics_deno_deps.json b/cli/tests/testdata/lsp/diagnostics_deno_deps.json
index ec6cc4f51..ec6cc4f51 100644
--- a/cli/tests/lsp/diagnostics_deno_deps.json
+++ b/cli/tests/testdata/lsp/diagnostics_deno_deps.json
diff --git a/cli/tests/lsp/diagnostics_deno_types.json b/cli/tests/testdata/lsp/diagnostics_deno_types.json
index f33945a59..f33945a59 100644
--- a/cli/tests/lsp/diagnostics_deno_types.json
+++ b/cli/tests/testdata/lsp/diagnostics_deno_types.json
diff --git a/cli/tests/lsp/did_open_params_deno_types.json b/cli/tests/testdata/lsp/did_open_params_deno_types.json
index 6f085d045..6f085d045 100644
--- a/cli/tests/lsp/did_open_params_deno_types.json
+++ b/cli/tests/testdata/lsp/did_open_params_deno_types.json
diff --git a/cli/tests/lsp/did_open_params_doc_symbol.json b/cli/tests/testdata/lsp/did_open_params_doc_symbol.json
index c74877191..c74877191 100644
--- a/cli/tests/lsp/did_open_params_doc_symbol.json
+++ b/cli/tests/testdata/lsp/did_open_params_doc_symbol.json
diff --git a/cli/tests/testdata/lsp/did_open_params_import_hover.json b/cli/tests/testdata/lsp/did_open_params_import_hover.json
new file mode 100644
index 000000000..e054eef3e
--- /dev/null
+++ b/cli/tests/testdata/lsp/did_open_params_import_hover.json
@@ -0,0 +1,8 @@
+{
+  "textDocument": {
+    "uri": "file:///a/file.ts",
+    "languageId": "typescript",
+    "version": 1,
+    "text": "import * as a from \"http://127.0.0.1:4545/xTypeScriptTypes.js\";\n// @deno-types=\"http://127.0.0.1:4545/type_definitions/foo.d.ts\"\nimport * as b from \"http://127.0.0.1:4545/type_definitions/foo.js\";\nimport * as c from \"http://127.0.0.1:4545/subdir/type_reference.js\";\nimport * as d from \"http://127.0.0.1:4545/subdir/mod1.ts\";\nimport * as e from \"data:application/typescript;base64,ZXhwb3J0IGNvbnN0IGEgPSAiYSI7CgpleHBvcnQgZW51bSBBIHsKICBBLAogIEIsCiAgQywKfQo=\";\nimport * as f from \"./file_01.ts\";\n\nconsole.log(a, b, c, d, e, f);\n"
+  }
+}
diff --git a/cli/tests/testdata/lsp/did_open_params_large.json b/cli/tests/testdata/lsp/did_open_params_large.json
new file mode 100644
index 000000000..996434c0c
--- /dev/null
+++ b/cli/tests/testdata/lsp/did_open_params_large.json
@@ -0,0 +1,8 @@
+{
+  "textDocument": {
+    "uri": "file:///a/file.ts",
+    "languageId": "javascript",
+    "version": 1,
+    "text": "// Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.\n\n// @ts-check\n/// <reference path=\"./compiler.d.ts\" />\n// deno-lint-ignore-file no-undef\n\n// This module is the entry point for \"compiler\" isolate, ie. the one\n// that is created when Deno needs to type check TypeScript, and in some\n// instances convert TypeScript to JavaScript.\n\n// Removes the `__proto__` for security reasons.  This intentionally makes\n// Deno non compliant with ECMA-262 Annex B.2.2.1\ndelete Object.prototype.__proto__;\n\n((window) => {\n  /** @type {DenoCore} */\n  const core = window.Deno.core;\n\n  let logDebug = false;\n  let logSource = \"JS\";\n\n  function setLogDebug(debug, source) {\n    logDebug = debug;\n    if (source) {\n      logSource = source;\n    }\n  }\n\n  function debug(...args) {\n    if (logDebug) {\n      const stringifiedArgs = args.map((arg) =>\n        typeof arg === \"string\" ? arg : JSON.stringify(arg)\n      ).join(\" \");\n      // adding a non-zero integer value to the end of the debug string causes\n      // the message to be printed to stderr instead of stdout, which is better\n      // aligned to the behaviour of debug messages\n      core.print(`DEBUG ${logSource} - ${stringifiedArgs}\\n`, 1);\n    }\n  }\n\n  function error(...args) {\n    const stringifiedArgs = args.map((arg) =>\n      typeof arg === \"string\" || arg instanceof Error\n        ? String(arg)\n        : JSON.stringify(arg)\n    ).join(\" \");\n    core.print(`ERROR ${logSource} = ${stringifiedArgs}\\n`, 1);\n  }\n\n  class AssertionError extends Error {\n    constructor(msg) {\n      super(msg);\n      this.name = \"AssertionError\";\n    }\n  }\n\n  function assert(cond, msg = \"Assertion failed.\") {\n    if (!cond) {\n      throw new AssertionError(msg);\n    }\n  }\n\n  /** @type {Map<string, ts.SourceFile>} */\n  const sourceFileCache = new Map();\n\n  /** @param {ts.DiagnosticRelatedInformation} diagnostic */\n  function fromRelatedInformation({\n    start,\n    length,\n    file,\n    messageText: msgText,\n    ...ri\n  }) {\n    let messageText;\n    let messageChain;\n    if (typeof msgText === \"object\") {\n      messageChain = msgText;\n    } else {\n      messageText = msgText;\n    }\n    if (start !== undefined && length !== undefined && file) {\n      const startPos = file.getLineAndCharacterOfPosition(start);\n      const sourceLine = file.getFullText().split(\"\\n\")[startPos.line];\n      const fileName = file.fileName;\n      return {\n        start: startPos,\n        end: file.getLineAndCharacterOfPosition(start + length),\n        fileName,\n        messageChain,\n        messageText,\n        sourceLine,\n        ...ri,\n      };\n    } else {\n      return {\n        messageChain,\n        messageText,\n        ...ri,\n      };\n    }\n  }\n\n  /** @param {ts.Diagnostic[]} diagnostics */\n  function fromTypeScriptDiagnostic(diagnostics) {\n    return diagnostics.map(({ relatedInformation: ri, source, ...diag }) => {\n      /** @type {any} */\n      const value = fromRelatedInformation(diag);\n      value.relatedInformation = ri\n        ? ri.map(fromRelatedInformation)\n        : undefined;\n      value.source = source;\n      return value;\n    });\n  }\n\n  // Using incremental compile APIs requires that all\n  // paths must be either relative or absolute. Since\n  // analysis in Rust operates on fully resolved URLs,\n  // it makes sense to use the same scheme here.\n  const ASSETS = \"asset:///\";\n  const CACHE = \"cache:///\";\n\n  /** Diagnostics that are intentionally ignored when compiling TypeScript in\n   * Deno, as they provide misleading or incorrect information. */\n  const IGNORED_DIAGNOSTICS = [\n    // TS1208: All files must be modules when the '--isolatedModules' flag is\n    // provided.  We can ignore because we guarantee that all files are\n    // modules.\n    1208,\n    // TS1375: 'await' expressions are only allowed at the top level of a file\n    // when that file is a module, but this file has no imports or exports.\n    // Consider adding an empty 'export {}' to make this file a module.\n    1375,\n    // TS1103: 'for-await-of' statement is only allowed within an async function\n    // or async generator.\n    1103,\n    // TS2306: File 'file:///Users/rld/src/deno/subdir/amd_like.js' is\n    // not a module.\n    2306,\n    // TS2691: An import path cannot end with a '.ts' extension. Consider\n    // importing 'bad-module' instead.\n    2691,\n    // TS2792: Cannot find module. Did you mean to set the 'moduleResolution'\n    // option to 'node', or to add aliases to the 'paths' option?\n    2792,\n    // TS5009: Cannot find the common subdirectory path for the input files.\n    5009,\n    // TS5055: Cannot write file\n    // 'http://localhost:4545/subdir/mt_application_x_javascript.j4.js'\n    // because it would overwrite input file.\n    5055,\n    // TypeScript is overly opinionated that only CommonJS modules kinds can\n    // support JSON imports.  Allegedly this was fixed in\n    // Microsoft/TypeScript#26825 but that doesn't seem to be working here,\n    // so we will ignore complaints about this compiler setting.\n    5070,\n    // TS7016: Could not find a declaration file for module '...'. '...'\n    // implicitly has an 'any' type.  This is due to `allowJs` being off by\n    // default but importing of a JavaScript module.\n    7016,\n  ];\n\n  const SNAPSHOT_COMPILE_OPTIONS = {\n    esModuleInterop: true,\n    jsx: ts.JsxEmit.React,\n    module: ts.ModuleKind.ESNext,\n    noEmit: true,\n    strict: true,\n    target: ts.ScriptTarget.ESNext,\n  };\n\n  class ScriptSnapshot {\n    /** @type {string} */\n    specifier;\n    /** @type {string} */\n    version;\n    /**\n     * @param {string} specifier\n     * @param {string} version \n     */\n    constructor(specifier, version) {\n      this.specifier = specifier;\n      this.version = version;\n    }\n    /**\n     * @param {number} start \n     * @param {number} end \n     * @returns {string}\n     */\n    getText(start, end) {\n      const { specifier, version } = this;\n      debug(\n        `snapshot.getText(${start}, ${end}) specifier: ${specifier} version: ${version}`,\n      );\n      return core.jsonOpSync(\"op_get_text\", { specifier, version, start, end });\n    }\n    /**\n     * @returns {number}\n     */\n    getLength() {\n      const { specifier, version } = this;\n      debug(`snapshot.getLength() specifier: ${specifier} version: ${version}`);\n      return core.jsonOpSync(\"op_get_length\", { specifier, version });\n    }\n    /**\n     * @param {ScriptSnapshot} oldSnapshot\n     * @returns {ts.TextChangeRange | undefined}\n     */\n    getChangeRange(oldSnapshot) {\n      const { specifier, version } = this;\n      const { version: oldVersion } = oldSnapshot;\n      const oldLength = oldSnapshot.getLength();\n      debug(\n        `snapshot.getLength() specifier: ${specifier} oldVersion: ${oldVersion} version: ${version}`,\n      );\n      return core.jsonOpSync(\n        \"op_get_change_range\",\n        { specifier, oldLength, oldVersion, version },\n      );\n    }\n    dispose() {\n      const { specifier, version } = this;\n      debug(`snapshot.dispose() specifier: ${specifier} version: ${version}`);\n      core.jsonOpSync(\"op_dispose\", { specifier, version });\n    }\n  }\n\n  /** @type {ts.CompilerOptions} */\n  let compilationSettings = {};\n\n  /** @type {ts.LanguageService} */\n  let languageService;\n\n  /** An object literal of the incremental compiler host, which provides the\n   * specific \"bindings\" to the Deno environment that tsc needs to work.\n   *\n   * @type {ts.CompilerHost & ts.LanguageServiceHost} */\n  const host = {\n    fileExists(fileName) {\n      debug(`host.fileExists(\"${fileName}\")`);\n      return false;\n    },\n    readFile(specifier) {\n      debug(`host.readFile(\"${specifier}\")`);\n      return core.jsonOpSync(\"op_load\", { specifier }).data;\n    },\n    getSourceFile(\n      specifier,\n      languageVersion,\n      _onError,\n      _shouldCreateNewSourceFile,\n    ) {\n      debug(\n        `host.getSourceFile(\"${specifier}\", ${\n          ts.ScriptTarget[languageVersion]\n        })`,\n      );\n      let sourceFile = sourceFileCache.get(specifier);\n      if (sourceFile) {\n        return sourceFile;\n      }\n\n      /** @type {{ data: string; hash?: string; scriptKind: ts.ScriptKind }} */\n      const { data, hash, scriptKind } = core.jsonOpSync(\n        \"op_load\",\n        { specifier },\n      );\n      assert(\n        data != null,\n        `\"data\" is unexpectedly null for \"${specifier}\".`,\n      );\n      sourceFile = ts.createSourceFile(\n        specifier,\n        data,\n        languageVersion,\n        false,\n        scriptKind,\n      );\n      sourceFile.moduleName = specifier;\n      sourceFile.version = hash;\n      sourceFileCache.set(specifier, sourceFile);\n      return sourceFile;\n    },\n    getDefaultLibFileName() {\n      return `${ASSETS}/lib.esnext.d.ts`;\n    },\n    getDefaultLibLocation() {\n      return ASSETS;\n    },\n    writeFile(fileName, data, _writeByteOrderMark, _onError, sourceFiles) {\n      debug(`host.writeFile(\"${fileName}\")`);\n      let maybeSpecifiers;\n      if (sourceFiles) {\n        maybeSpecifiers = sourceFiles.map((sf) => sf.moduleName);\n      }\n      return core.jsonOpSync(\n        \"op_emit\",\n        { maybeSpecifiers, fileName, data },\n      );\n    },\n    getCurrentDirectory() {\n      return CACHE;\n    },\n    getCanonicalFileName(fileName) {\n      return fileName;\n    },\n    useCaseSensitiveFileNames() {\n      return true;\n    },\n    getNewLine() {\n      return \"\\n\";\n    },\n    resolveModuleNames(specifiers, base) {\n      debug(`host.resolveModuleNames()`);\n      debug(`  base: ${base}`);\n      debug(`  specifiers: ${specifiers.join(\", \")}`);\n      /** @type {Array<[string, ts.Extension] | undefined>} */\n      const resolved = core.jsonOpSync(\"op_resolve\", {\n        specifiers,\n        base,\n      });\n      if (resolved) {\n        const result = resolved.map((item) => {\n          if (item) {\n            const [resolvedFileName, extension] = item;\n            return {\n              resolvedFileName,\n              extension,\n              isExternalLibraryImport: false,\n            };\n          }\n          return undefined;\n        });\n        result.length = specifiers.length;\n        return result;\n      } else {\n        return new Array(specifiers.length);\n      }\n    },\n    createHash(data) {\n      return core.jsonOpSync(\"op_create_hash\", { data }).hash;\n    },\n\n    // LanguageServiceHost\n    getCompilationSettings() {\n      debug(\"host.getCompilationSettings()\");\n      return compilationSettings;\n    },\n    getScriptFileNames() {\n      debug(\"host.getScriptFileNames()\");\n      return core.jsonOpSync(\"op_script_names\", undefined);\n    },\n    getScriptVersion(specifier) {\n      debug(`host.getScriptVersion(\"${specifier}\")`);\n      const sourceFile = sourceFileCache.get(specifier);\n      if (sourceFile) {\n        return sourceFile.version ?? \"1\";\n      }\n      return core.jsonOpSync(\"op_script_version\", { specifier });\n    },\n    getScriptSnapshot(specifier) {\n      debug(`host.getScriptSnapshot(\"${specifier}\")`);\n      const sourceFile = sourceFileCache.get(specifier);\n      if (sourceFile) {\n        return {\n          getText(start, end) {\n            return sourceFile.text.substring(start, end);\n          },\n          getLength() {\n            return sourceFile.text.length;\n          },\n          getChangeRange() {\n            return undefined;\n          },\n        };\n      }\n      /** @type {string | undefined} */\n      const version = core.jsonOpSync(\"op_script_version\", { specifier });\n      if (version != null) {\n        return new ScriptSnapshot(specifier, version);\n      }\n      return undefined;\n    },\n  };\n\n  /** @type {Array<[string, number]>} */\n  const stats = [];\n  let statsStart = 0;\n\n  function performanceStart() {\n    stats.length = 0;\n    statsStart = Date.now();\n    ts.performance.enable();\n  }\n\n  /**\n   * @param {{ program: ts.Program | ts.EmitAndSemanticDiagnosticsBuilderProgram, fileCount?: number }} options \n   */\n  function performanceProgram({ program, fileCount }) {\n    if (program) {\n      if (\"getProgram\" in program) {\n        program = program.getProgram();\n      }\n      stats.push([\"Files\", program.getSourceFiles().length]);\n      stats.push([\"Nodes\", program.getNodeCount()]);\n      stats.push([\"Identifiers\", program.getIdentifierCount()]);\n      stats.push([\"Symbols\", program.getSymbolCount()]);\n      stats.push([\"Types\", program.getTypeCount()]);\n      stats.push([\"Instantiations\", program.getInstantiationCount()]);\n    } else if (fileCount != null) {\n      stats.push([\"Files\", fileCount]);\n    }\n    const programTime = ts.performance.getDuration(\"Program\");\n    const bindTime = ts.performance.getDuration(\"Bind\");\n    const checkTime = ts.performance.getDuration(\"Check\");\n    const emitTime = ts.performance.getDuration(\"Emit\");\n    stats.push([\"Parse time\", programTime]);\n    stats.push([\"Bind time\", bindTime]);\n    stats.push([\"Check time\", checkTime]);\n    stats.push([\"Emit time\", emitTime]);\n    stats.push(\n      [\"Total TS time\", programTime + bindTime + checkTime + emitTime],\n    );\n  }\n\n  function performanceEnd() {\n    const duration = Date.now() - statsStart;\n    stats.push([\"Compile time\", duration]);\n    return stats;\n  }\n\n  /**\n   * @typedef {object} Request\n   * @property {Record<string, any>} config\n   * @property {boolean} debug\n   * @property {string[]} rootNames\n   */\n\n  /** The API that is called by Rust when executing a request.\n   * @param {Request} request\n   */\n  function exec({ config, debug: debugFlag, rootNames }) {\n    setLogDebug(debugFlag, \"TS\");\n    performanceStart();\n    debug(\">>> exec start\", { rootNames });\n    debug(config);\n\n    const { options, errors: configFileParsingDiagnostics } = ts\n      .convertCompilerOptionsFromJson(config, \"\");\n    // The `allowNonTsExtensions` is a \"hidden\" compiler option used in VSCode\n    // which is not allowed to be passed in JSON, we need it to allow special\n    // URLs which Deno supports. So we need to either ignore the diagnostic, or\n    // inject it ourselves.\n    Object.assign(options, { allowNonTsExtensions: true });\n    const program = ts.createIncrementalProgram({\n      rootNames,\n      options,\n      host,\n      configFileParsingDiagnostics,\n    });\n\n    const { diagnostics: emitDiagnostics } = program.emit();\n\n    const diagnostics = [\n      ...program.getConfigFileParsingDiagnostics(),\n      ...program.getSyntacticDiagnostics(),\n      ...program.getOptionsDiagnostics(),\n      ...program.getGlobalDiagnostics(),\n      ...program.getSemanticDiagnostics(),\n      ...emitDiagnostics,\n    ].filter(({ code }) => !IGNORED_DIAGNOSTICS.includes(code));\n    performanceProgram({ program });\n\n    core.jsonOpSync(\"op_respond\", {\n      diagnostics: fromTypeScriptDiagnostic(diagnostics),\n      stats: performanceEnd(),\n    });\n    debug(\"<<< exec stop\");\n  }\n\n  /**\n   * @param {number} id \n   * @param {any} data \n   */\n  function respond(id, data = null) {\n    core.jsonOpSync(\"op_respond\", { id, data });\n  }\n\n  /**\n   * @param {LanguageServerRequest} request \n   */\n  function serverRequest({ id, ...request }) {\n    debug(`serverRequest()`, { id, ...request });\n    switch (request.method) {\n      case \"configure\": {\n        const { options, errors } = ts\n          .convertCompilerOptionsFromJson(request.compilerOptions, \"\");\n        Object.assign(options, { allowNonTsExtensions: true });\n        if (errors.length) {\n          debug(ts.formatDiagnostics(errors, host));\n        }\n        compilationSettings = options;\n        return respond(id, true);\n      }\n      case \"getAsset\": {\n        const sourceFile = host.getSourceFile(\n          request.specifier,\n          ts.ScriptTarget.ESNext,\n        );\n        return respond(id, sourceFile && sourceFile.text);\n      }\n      case \"getDiagnostics\": {\n        try {\n          /** @type {Record<string, any[]>} */\n          const diagnosticMap = {};\n          for (const specifier of request.specifiers) {\n            diagnosticMap[specifier] = fromTypeScriptDiagnostic([\n              ...languageService.getSemanticDiagnostics(specifier),\n              ...languageService.getSuggestionDiagnostics(specifier),\n              ...languageService.getSyntacticDiagnostics(specifier),\n            ].filter(({ code }) => !IGNORED_DIAGNOSTICS.includes(code)));\n          }\n          return respond(id, diagnosticMap);\n        } catch (e) {\n          if (\"stack\" in e) {\n            error(e.stack);\n          } else {\n            error(e);\n          }\n          return respond(id, {});\n        }\n      }\n      case \"getQuickInfo\": {\n        return respond(\n          id,\n          languageService.getQuickInfoAtPosition(\n            request.specifier,\n            request.position,\n          ),\n        );\n      }\n      case \"getCompletions\": {\n        return respond(\n          id,\n          languageService.getCompletionsAtPosition(\n            request.specifier,\n            request.position,\n            request.preferences,\n          ),\n        );\n      }\n      case \"getDocumentHighlights\": {\n        return respond(\n          id,\n          languageService.getDocumentHighlights(\n            request.specifier,\n            request.position,\n            request.filesToSearch,\n          ),\n        );\n      }\n      case \"getReferences\": {\n        return respond(\n          id,\n          languageService.getReferencesAtPosition(\n            request.specifier,\n            request.position,\n          ),\n        );\n      }\n      case \"getDefinition\": {\n        return respond(\n          id,\n          languageService.getDefinitionAndBoundSpan(\n            request.specifier,\n            request.position,\n          ),\n        );\n      }\n      case \"getImplementation\": {\n        return respond(\n          id,\n          languageService.getImplementationAtPosition(\n            request.specifier,\n            request.position,\n          ),\n        );\n      }\n      case \"findRenameLocations\": {\n        return respond(\n          id,\n          languageService.findRenameLocations(\n            request.specifier,\n            request.position,\n            request.findInStrings,\n            request.findInComments,\n            request.providePrefixAndSuffixTextForRename,\n          ),\n        );\n      }\n      default:\n        throw new TypeError(\n          // @ts-ignore exhausted case statement sets type to never\n          `Invalid request method for request: \"${request.method}\" (${id})`,\n        );\n    }\n  }\n\n  /** @param {{ debug: boolean; }} init */\n  function serverInit({ debug: debugFlag }) {\n    if (hasStarted) {\n      throw new Error(\"The language server has already been initialized.\");\n    }\n    hasStarted = true;\n    languageService = ts.createLanguageService(host);\n    core.ops();\n    setLogDebug(debugFlag, \"TSLS\");\n    debug(\"serverInit()\");\n  }\n\n  let hasStarted = false;\n\n  /** Startup the runtime environment, setting various flags.\n   * @param {{ debugFlag?: boolean; legacyFlag?: boolean; }} msg\n   */\n  function startup({ debugFlag = false }) {\n    if (hasStarted) {\n      throw new Error(\"The compiler runtime already started.\");\n    }\n    hasStarted = true;\n    core.ops();\n    setLogDebug(!!debugFlag, \"TS\");\n  }\n\n  // Setup the compiler runtime during the build process.\n  core.ops();\n  core.registerErrorClass(\"Error\", Error);\n\n  // A build time only op that provides some setup information that is used to\n  // ensure the snapshot is setup properly.\n  /** @type {{ buildSpecifier: string; libs: string[] }} */\n  const { buildSpecifier, libs } = core.jsonOpSync(\"op_build_info\", {});\n  for (const lib of libs) {\n    const specifier = `lib.${lib}.d.ts`;\n    // we are using internal APIs here to \"inject\" our custom libraries into\n    // tsc, so things like `\"lib\": [ \"deno.ns\" ]` are supported.\n    if (!ts.libs.includes(lib)) {\n      ts.libs.push(lib);\n      ts.libMap.set(lib, `lib.${lib}.d.ts`);\n    }\n    // we are caching in memory common type libraries that will be re-used by\n    // tsc on when the snapshot is restored\n    assert(\n      host.getSourceFile(`${ASSETS}${specifier}`, ts.ScriptTarget.ESNext),\n    );\n  }\n  // this helps ensure as much as possible is in memory that is re-usable\n  // before the snapshotting is done, which helps unsure fast \"startup\" for\n  // subsequent uses of tsc in Deno.\n  const TS_SNAPSHOT_PROGRAM = ts.createProgram({\n    rootNames: [buildSpecifier],\n    options: SNAPSHOT_COMPILE_OPTIONS,\n    host,\n  });\n  ts.getPreEmitDiagnostics(TS_SNAPSHOT_PROGRAM);\n\n  // exposes the two functions that are called by `tsc::exec()` when type\n  // checking TypeScript.\n  globalThis.startup = startup;\n  globalThis.exec = exec;\n\n  // exposes the functions that are called when the compiler is used as a\n  // language service.\n  globalThis.serverInit = serverInit;\n  globalThis.serverRequest = serverRequest;\n})(this);\n"
+  }
+}
diff --git a/cli/tests/lsp/did_open_params_semantic_tokens.json b/cli/tests/testdata/lsp/did_open_params_semantic_tokens.json
index 5cf48ae05..5cf48ae05 100644
--- a/cli/tests/lsp/did_open_params_semantic_tokens.json
+++ b/cli/tests/testdata/lsp/did_open_params_semantic_tokens.json
diff --git a/cli/tests/lsp/did_open_params_test_code_lens.json b/cli/tests/testdata/lsp/did_open_params_test_code_lens.json
index dcb9e11f3..dcb9e11f3 100644
--- a/cli/tests/lsp/did_open_params_test_code_lens.json
+++ b/cli/tests/testdata/lsp/did_open_params_test_code_lens.json
diff --git a/cli/tests/lsp/document_symbol_response.json b/cli/tests/testdata/lsp/document_symbol_response.json
index 89d56ef70..89d56ef70 100644
--- a/cli/tests/lsp/document_symbol_response.json
+++ b/cli/tests/testdata/lsp/document_symbol_response.json
diff --git a/cli/tests/lsp/formatting_mbc_response.json b/cli/tests/testdata/lsp/formatting_mbc_response.json
index 1c0b9f8e8..1c0b9f8e8 100644
--- a/cli/tests/lsp/formatting_mbc_response.json
+++ b/cli/tests/testdata/lsp/formatting_mbc_response.json
diff --git a/cli/tests/lsp/import-map.json b/cli/tests/testdata/lsp/import-map.json
index 75d5d0849..75d5d0849 100644
--- a/cli/tests/lsp/import-map.json
+++ b/cli/tests/testdata/lsp/import-map.json
diff --git a/cli/tests/lsp/incoming_calls_params.json b/cli/tests/testdata/lsp/incoming_calls_params.json
index 6b38d26ee..6b38d26ee 100644
--- a/cli/tests/lsp/incoming_calls_params.json
+++ b/cli/tests/testdata/lsp/incoming_calls_params.json
diff --git a/cli/tests/lsp/incoming_calls_response.json b/cli/tests/testdata/lsp/incoming_calls_response.json
index 231919a8c..231919a8c 100644
--- a/cli/tests/lsp/incoming_calls_response.json
+++ b/cli/tests/testdata/lsp/incoming_calls_response.json
diff --git a/cli/tests/lsp/initialize_params.json b/cli/tests/testdata/lsp/initialize_params.json
index 3b99be4f0..3b99be4f0 100644
--- a/cli/tests/lsp/initialize_params.json
+++ b/cli/tests/testdata/lsp/initialize_params.json
diff --git a/cli/tests/lsp/initialize_params_bad_config_option.json b/cli/tests/testdata/lsp/initialize_params_bad_config_option.json
index 053cb70f3..053cb70f3 100644
--- a/cli/tests/lsp/initialize_params_bad_config_option.json
+++ b/cli/tests/testdata/lsp/initialize_params_bad_config_option.json
diff --git a/cli/tests/lsp/initialize_params_ca_no_disabled.json b/cli/tests/testdata/lsp/initialize_params_ca_no_disabled.json
index 3df87aded..3df87aded 100644
--- a/cli/tests/lsp/initialize_params_ca_no_disabled.json
+++ b/cli/tests/testdata/lsp/initialize_params_ca_no_disabled.json
diff --git a/cli/tests/lsp/initialize_params_code_lens_test.json b/cli/tests/testdata/lsp/initialize_params_code_lens_test.json
index bdd01bfca..bdd01bfca 100644
--- a/cli/tests/lsp/initialize_params_code_lens_test.json
+++ b/cli/tests/testdata/lsp/initialize_params_code_lens_test.json
diff --git a/cli/tests/lsp/initialize_params_code_lens_test_disabled.json b/cli/tests/testdata/lsp/initialize_params_code_lens_test_disabled.json
index 1d18934ae..1d18934ae 100644
--- a/cli/tests/lsp/initialize_params_code_lens_test_disabled.json
+++ b/cli/tests/testdata/lsp/initialize_params_code_lens_test_disabled.json
diff --git a/cli/tests/lsp/initialize_params_did_config_change.json b/cli/tests/testdata/lsp/initialize_params_did_config_change.json
index 870ad6e0f..870ad6e0f 100644
--- a/cli/tests/lsp/initialize_params_did_config_change.json
+++ b/cli/tests/testdata/lsp/initialize_params_did_config_change.json
diff --git a/cli/tests/lsp/initialize_params_disabled.json b/cli/tests/testdata/lsp/initialize_params_disabled.json
index 879b1181c..879b1181c 100644
--- a/cli/tests/lsp/initialize_params_disabled.json
+++ b/cli/tests/testdata/lsp/initialize_params_disabled.json
diff --git a/cli/tests/lsp/initialize_params_registry.json b/cli/tests/testdata/lsp/initialize_params_registry.json
index 67559ebb3..67559ebb3 100644
--- a/cli/tests/lsp/initialize_params_registry.json
+++ b/cli/tests/testdata/lsp/initialize_params_registry.json
diff --git a/cli/tests/lsp/initialize_params_unstable.json b/cli/tests/testdata/lsp/initialize_params_unstable.json
index 104db16f2..104db16f2 100644
--- a/cli/tests/lsp/initialize_params_unstable.json
+++ b/cli/tests/testdata/lsp/initialize_params_unstable.json
diff --git a/cli/tests/lsp/lib.tsconfig.json b/cli/tests/testdata/lsp/lib.tsconfig.json
index 8d2ae8a8b..8d2ae8a8b 100644
--- a/cli/tests/lsp/lib.tsconfig.json
+++ b/cli/tests/testdata/lsp/lib.tsconfig.json
diff --git a/cli/tests/lsp/outgoing_calls_params.json b/cli/tests/testdata/lsp/outgoing_calls_params.json
index 6b38d26ee..6b38d26ee 100644
--- a/cli/tests/lsp/outgoing_calls_params.json
+++ b/cli/tests/testdata/lsp/outgoing_calls_params.json
diff --git a/cli/tests/lsp/outgoing_calls_response.json b/cli/tests/testdata/lsp/outgoing_calls_response.json
index c7cf85cf8..c7cf85cf8 100644
--- a/cli/tests/lsp/outgoing_calls_response.json
+++ b/cli/tests/testdata/lsp/outgoing_calls_response.json
diff --git a/cli/tests/lsp/prepare_call_hierarchy_response.json b/cli/tests/testdata/lsp/prepare_call_hierarchy_response.json
index 93a7d4f1b..93a7d4f1b 100644
--- a/cli/tests/lsp/prepare_call_hierarchy_response.json
+++ b/cli/tests/testdata/lsp/prepare_call_hierarchy_response.json
diff --git a/cli/tests/lsp/registries/a_latest.json b/cli/tests/testdata/lsp/registries/a_latest.json
index f9f9d111e..f9f9d111e 100644
--- a/cli/tests/lsp/registries/a_latest.json
+++ b/cli/tests/testdata/lsp/registries/a_latest.json
diff --git a/cli/tests/lsp/registries/a_v1.0.0.json b/cli/tests/testdata/lsp/registries/a_v1.0.0.json
index f9f9d111e..f9f9d111e 100644
--- a/cli/tests/lsp/registries/a_v1.0.0.json
+++ b/cli/tests/testdata/lsp/registries/a_v1.0.0.json
diff --git a/cli/tests/lsp/registries/a_v1.0.1.json b/cli/tests/testdata/lsp/registries/a_v1.0.1.json
index f9f9d111e..f9f9d111e 100644
--- a/cli/tests/lsp/registries/a_v1.0.1.json
+++ b/cli/tests/testdata/lsp/registries/a_v1.0.1.json
diff --git a/cli/tests/lsp/registries/a_v2.0.0.json b/cli/tests/testdata/lsp/registries/a_v2.0.0.json
index f9f9d111e..f9f9d111e 100644
--- a/cli/tests/lsp/registries/a_v2.0.0.json
+++ b/cli/tests/testdata/lsp/registries/a_v2.0.0.json
diff --git a/cli/tests/lsp/registries/a_versions.json b/cli/tests/testdata/lsp/registries/a_versions.json
index 930e38323..930e38323 100644
--- a/cli/tests/lsp/registries/a_versions.json
+++ b/cli/tests/testdata/lsp/registries/a_versions.json
diff --git a/cli/tests/lsp/registries/b_latest.json b/cli/tests/testdata/lsp/registries/b_latest.json
index f9f9d111e..f9f9d111e 100644
--- a/cli/tests/lsp/registries/b_latest.json
+++ b/cli/tests/testdata/lsp/registries/b_latest.json
diff --git a/cli/tests/lsp/registries/b_v0.0.1.json b/cli/tests/testdata/lsp/registries/b_v0.0.1.json
index f9f9d111e..f9f9d111e 100644
--- a/cli/tests/lsp/registries/b_v0.0.1.json
+++ b/cli/tests/testdata/lsp/registries/b_v0.0.1.json
diff --git a/cli/tests/lsp/registries/b_v0.0.2.json b/cli/tests/testdata/lsp/registries/b_v0.0.2.json
index f9f9d111e..f9f9d111e 100644
--- a/cli/tests/lsp/registries/b_v0.0.2.json
+++ b/cli/tests/testdata/lsp/registries/b_v0.0.2.json
diff --git a/cli/tests/lsp/registries/b_v0.0.3.json b/cli/tests/testdata/lsp/registries/b_v0.0.3.json
index f9f9d111e..f9f9d111e 100644
--- a/cli/tests/lsp/registries/b_v0.0.3.json
+++ b/cli/tests/testdata/lsp/registries/b_v0.0.3.json
diff --git a/cli/tests/lsp/registries/b_versions.json b/cli/tests/testdata/lsp/registries/b_versions.json
index 9532fbb85..9532fbb85 100644
--- a/cli/tests/lsp/registries/b_versions.json
+++ b/cli/tests/testdata/lsp/registries/b_versions.json
diff --git a/cli/tests/lsp/registries/deno-import-intellisense.json b/cli/tests/testdata/lsp/registries/deno-import-intellisense.json
index ff28fac07..8aa4a4eca 100644
--- a/cli/tests/lsp/registries/deno-import-intellisense.json
+++ b/cli/tests/testdata/lsp/registries/deno-import-intellisense.json
@@ -6,15 +6,15 @@
       "variables": [
         {
           "key": "module",
-          "url": "http://localhost:4545/cli/tests/lsp/registries/modules.json"
+          "url": "http://localhost:4545/lsp/registries/modules.json"
         },
         {
           "key": "version",
-          "url": "http://localhost:4545/cli/tests/lsp/registries/${module}_versions.json"
+          "url": "http://localhost:4545/lsp/registries/${module}_versions.json"
         },
         {
           "key": "path",
-          "url": "http://localhost:4545/cli/tests/lsp/registries/${module}_${{version}}.json"
+          "url": "http://localhost:4545/lsp/registries/${module}_${{version}}.json"
         }
       ]
     },
@@ -23,11 +23,11 @@
       "variables": [
         {
           "key": "module",
-          "url": "http://localhost:4545/cli/tests/lsp/registries/modules.json"
+          "url": "http://localhost:4545/lsp/registries/modules.json"
         },
         {
           "key": "path",
-          "url": "http://localhost:4545/cli/tests/lsp/registries/${module}_latest.json"
+          "url": "http://localhost:4545/lsp/registries/${module}_latest.json"
         }
       ]
     }
diff --git a/cli/tests/lsp/registries/modules.json b/cli/tests/testdata/lsp/registries/modules.json
index 517c9d68e..517c9d68e 100644
--- a/cli/tests/lsp/registries/modules.json
+++ b/cli/tests/testdata/lsp/registries/modules.json
diff --git a/cli/tests/lsp/rename_response.json b/cli/tests/testdata/lsp/rename_response.json
index 5e0e28e4c..5e0e28e4c 100644
--- a/cli/tests/lsp/rename_response.json
+++ b/cli/tests/testdata/lsp/rename_response.json
diff --git a/cli/tests/lsp/selection_range_response.json b/cli/tests/testdata/lsp/selection_range_response.json
index b5eef5ddc..b5eef5ddc 100644
--- a/cli/tests/lsp/selection_range_response.json
+++ b/cli/tests/testdata/lsp/selection_range_response.json
diff --git a/cli/tests/lsp/types.tsconfig.json b/cli/tests/testdata/lsp/types.tsconfig.json
index ba7f3344d..ba7f3344d 100644
--- a/cli/tests/lsp/types.tsconfig.json
+++ b/cli/tests/testdata/lsp/types.tsconfig.json
diff --git a/cli/tests/main_module.ts b/cli/tests/testdata/main_module.ts
index 19988f4bf..19988f4bf 100644
--- a/cli/tests/main_module.ts
+++ b/cli/tests/testdata/main_module.ts
diff --git a/cli/tests/testdata/main_module.ts.out b/cli/tests/testdata/main_module.ts.out
new file mode 100644
index 000000000..817bb6b8c
--- /dev/null
+++ b/cli/tests/testdata/main_module.ts.out
@@ -0,0 +1,2 @@
+main_module2 [WILDCARD]/main_module.ts
+main_module [WILDCARD]/main_module.ts
diff --git a/cli/tests/main_module2.ts b/cli/tests/testdata/main_module2.ts
index 585615c7f..585615c7f 100644
--- a/cli/tests/main_module2.ts
+++ b/cli/tests/testdata/main_module2.ts
diff --git a/cli/tests/module_graph/file_tests-a.mjs b/cli/tests/testdata/module_graph/file_tests-a.mjs
index 72b3a67bc..72b3a67bc 100644
--- a/cli/tests/module_graph/file_tests-a.mjs
+++ b/cli/tests/testdata/module_graph/file_tests-a.mjs
diff --git a/cli/tests/module_graph/file_tests-b-mod.js b/cli/tests/testdata/module_graph/file_tests-b-mod.js
index 59d168993..59d168993 100644
--- a/cli/tests/module_graph/file_tests-b-mod.js
+++ b/cli/tests/testdata/module_graph/file_tests-b-mod.js
diff --git a/cli/tests/module_graph/file_tests-b.ts b/cli/tests/testdata/module_graph/file_tests-b.ts
index 59d168993..59d168993 100644
--- a/cli/tests/module_graph/file_tests-b.ts
+++ b/cli/tests/testdata/module_graph/file_tests-b.ts
diff --git a/cli/tests/module_graph/file_tests-c-mod.ts b/cli/tests/testdata/module_graph/file_tests-c-mod.ts
index 7f2cfac77..7f2cfac77 100644
--- a/cli/tests/module_graph/file_tests-c-mod.ts
+++ b/cli/tests/testdata/module_graph/file_tests-c-mod.ts
diff --git a/cli/tests/module_graph/file_tests-checkwithconfig.ts b/cli/tests/testdata/module_graph/file_tests-checkwithconfig.ts
index e7af5fa19..e7af5fa19 100644
--- a/cli/tests/module_graph/file_tests-checkwithconfig.ts
+++ b/cli/tests/testdata/module_graph/file_tests-checkwithconfig.ts
diff --git a/cli/tests/module_graph/file_tests-diag.ts b/cli/tests/testdata/module_graph/file_tests-diag.ts
index ba365234a..ba365234a 100644
--- a/cli/tests/module_graph/file_tests-diag.ts
+++ b/cli/tests/testdata/module_graph/file_tests-diag.ts
diff --git a/cli/tests/module_graph/file_tests-dynamicimport.ts b/cli/tests/testdata/module_graph/file_tests-dynamicimport.ts
index b5c9f080f..b5c9f080f 100644
--- a/cli/tests/module_graph/file_tests-dynamicimport.ts
+++ b/cli/tests/testdata/module_graph/file_tests-dynamicimport.ts
diff --git a/cli/tests/module_graph/file_tests-importjson.ts b/cli/tests/testdata/module_graph/file_tests-importjson.ts
index c2bc2bca7..c2bc2bca7 100644
--- a/cli/tests/module_graph/file_tests-importjson.ts
+++ b/cli/tests/testdata/module_graph/file_tests-importjson.ts
diff --git a/cli/tests/module_graph/file_tests-importremap.ts b/cli/tests/testdata/module_graph/file_tests-importremap.ts
index 17f012673..17f012673 100644
--- a/cli/tests/module_graph/file_tests-importremap.ts
+++ b/cli/tests/testdata/module_graph/file_tests-importremap.ts
diff --git a/cli/tests/module_graph/file_tests-main.ts b/cli/tests/testdata/module_graph/file_tests-main.ts
index aa8eef1b8..aa8eef1b8 100644
--- a/cli/tests/module_graph/file_tests-main.ts
+++ b/cli/tests/testdata/module_graph/file_tests-main.ts
diff --git a/cli/tests/module_graph/file_tests-some.json b/cli/tests/testdata/module_graph/file_tests-some.json
index 567c4ba21..567c4ba21 100644
--- a/cli/tests/module_graph/file_tests-some.json
+++ b/cli/tests/testdata/module_graph/file_tests-some.json
diff --git a/cli/tests/module_graph/file_typesref.d.ts b/cli/tests/testdata/module_graph/file_typesref.d.ts
index 8ae31dde3..8ae31dde3 100644
--- a/cli/tests/module_graph/file_typesref.d.ts
+++ b/cli/tests/testdata/module_graph/file_typesref.d.ts
diff --git a/cli/tests/module_graph/file_typesref.js b/cli/tests/testdata/module_graph/file_typesref.js
index 79da24cae..79da24cae 100644
--- a/cli/tests/module_graph/file_typesref.js
+++ b/cli/tests/testdata/module_graph/file_typesref.js
diff --git a/cli/tests/module_graph/https_deno.land-std-http-server.ts b/cli/tests/testdata/module_graph/https_deno.land-std-http-server.ts
index 0b3c995ec..0b3c995ec 100644
--- a/cli/tests/module_graph/https_deno.land-std-http-server.ts
+++ b/cli/tests/testdata/module_graph/https_deno.land-std-http-server.ts
diff --git a/cli/tests/module_graph/https_deno.land-x-a-mod.ts b/cli/tests/testdata/module_graph/https_deno.land-x-a-mod.ts
index 1e334d399..1e334d399 100644
--- a/cli/tests/module_graph/https_deno.land-x-a-mod.ts
+++ b/cli/tests/testdata/module_graph/https_deno.land-x-a-mod.ts
diff --git a/cli/tests/module_graph/https_deno.land-x-a.ts b/cli/tests/testdata/module_graph/https_deno.land-x-a.ts
index a6e3cea80..a6e3cea80 100644
--- a/cli/tests/module_graph/https_deno.land-x-a.ts
+++ b/cli/tests/testdata/module_graph/https_deno.land-x-a.ts
diff --git a/cli/tests/module_graph/https_deno.land-x-import_map.ts b/cli/tests/testdata/module_graph/https_deno.land-x-import_map.ts
index e285d863a..e285d863a 100644
--- a/cli/tests/module_graph/https_deno.land-x-import_map.ts
+++ b/cli/tests/testdata/module_graph/https_deno.land-x-import_map.ts
diff --git a/cli/tests/module_graph/https_deno.land-x-jquery.js b/cli/tests/testdata/module_graph/https_deno.land-x-jquery.js
index 71896157a..71896157a 100644
--- a/cli/tests/module_graph/https_deno.land-x-jquery.js
+++ b/cli/tests/testdata/module_graph/https_deno.land-x-jquery.js
diff --git a/cli/tests/module_graph/https_deno.land-x-lib-a.ts b/cli/tests/testdata/module_graph/https_deno.land-x-lib-a.ts
index a0a6f8e94..a0a6f8e94 100644
--- a/cli/tests/module_graph/https_deno.land-x-lib-a.ts
+++ b/cli/tests/testdata/module_graph/https_deno.land-x-lib-a.ts
diff --git a/cli/tests/module_graph/https_deno.land-x-lib-b.js b/cli/tests/testdata/module_graph/https_deno.land-x-lib-b.js
index 13cacdd8b..13cacdd8b 100644
--- a/cli/tests/module_graph/https_deno.land-x-lib-b.js
+++ b/cli/tests/testdata/module_graph/https_deno.land-x-lib-b.js
diff --git a/cli/tests/module_graph/https_deno.land-x-lib-c.d.ts b/cli/tests/testdata/module_graph/https_deno.land-x-lib-c.d.ts
index fac988e49..fac988e49 100644
--- a/cli/tests/module_graph/https_deno.land-x-lib-c.d.ts
+++ b/cli/tests/testdata/module_graph/https_deno.land-x-lib-c.d.ts
diff --git a/cli/tests/module_graph/https_deno.land-x-lib-c.js b/cli/tests/testdata/module_graph/https_deno.land-x-lib-c.js
index 620ca0b66..620ca0b66 100644
--- a/cli/tests/module_graph/https_deno.land-x-lib-c.js
+++ b/cli/tests/testdata/module_graph/https_deno.land-x-lib-c.js
diff --git a/cli/tests/module_graph/https_deno.land-x-lib-mod.d.ts b/cli/tests/testdata/module_graph/https_deno.land-x-lib-mod.d.ts
index 76ed81df0..76ed81df0 100644
--- a/cli/tests/module_graph/https_deno.land-x-lib-mod.d.ts
+++ b/cli/tests/testdata/module_graph/https_deno.land-x-lib-mod.d.ts
diff --git a/cli/tests/module_graph/https_deno.land-x-lib-mod.js b/cli/tests/testdata/module_graph/https_deno.land-x-lib-mod.js
index 505162094..505162094 100644
--- a/cli/tests/module_graph/https_deno.land-x-lib-mod.js
+++ b/cli/tests/testdata/module_graph/https_deno.land-x-lib-mod.js
diff --git a/cli/tests/module_graph/https_deno.land-x-mod.ts b/cli/tests/testdata/module_graph/https_deno.land-x-mod.ts
index 35d76ef75..35d76ef75 100644
--- a/cli/tests/module_graph/https_deno.land-x-mod.ts
+++ b/cli/tests/testdata/module_graph/https_deno.land-x-mod.ts
diff --git a/cli/tests/module_graph/https_deno.land-x-transpile.tsx b/cli/tests/testdata/module_graph/https_deno.land-x-transpile.tsx
index 02955bad8..02955bad8 100644
--- a/cli/tests/module_graph/https_deno.land-x-transpile.tsx
+++ b/cli/tests/testdata/module_graph/https_deno.land-x-transpile.tsx
diff --git a/cli/tests/module_graph/https_unpkg.com-lodash-index.js b/cli/tests/testdata/module_graph/https_unpkg.com-lodash-index.js
index d16c126a6..d16c126a6 100644
--- a/cli/tests/module_graph/https_unpkg.com-lodash-index.js
+++ b/cli/tests/testdata/module_graph/https_unpkg.com-lodash-index.js
diff --git a/cli/tests/module_graph/lockfile.json b/cli/tests/testdata/module_graph/lockfile.json
index 03cfe1185..03cfe1185 100644
--- a/cli/tests/module_graph/lockfile.json
+++ b/cli/tests/testdata/module_graph/lockfile.json
diff --git a/cli/tests/module_graph/lockfile_fail.json b/cli/tests/testdata/module_graph/lockfile_fail.json
index c0019fba4..c0019fba4 100644
--- a/cli/tests/module_graph/lockfile_fail.json
+++ b/cli/tests/testdata/module_graph/lockfile_fail.json
diff --git a/cli/tests/module_graph/tsconfig.json b/cli/tests/testdata/module_graph/tsconfig.json
index a4c5f4f33..a4c5f4f33 100644
--- a/cli/tests/module_graph/tsconfig.json
+++ b/cli/tests/testdata/module_graph/tsconfig.json
diff --git a/cli/tests/module_graph/tsconfig_01.json b/cli/tests/testdata/module_graph/tsconfig_01.json
index f7496d475..f7496d475 100644
--- a/cli/tests/module_graph/tsconfig_01.json
+++ b/cli/tests/testdata/module_graph/tsconfig_01.json
diff --git a/cli/tests/no_check_decorators.ts b/cli/tests/testdata/no_check_decorators.ts
index 9f7ec550d..9f7ec550d 100644
--- a/cli/tests/no_check_decorators.ts
+++ b/cli/tests/testdata/no_check_decorators.ts
diff --git a/cli/tests/no_check_decorators.ts.out b/cli/tests/testdata/no_check_decorators.ts.out
index 015f7076e..015f7076e 100644
--- a/cli/tests/no_check_decorators.ts.out
+++ b/cli/tests/testdata/no_check_decorators.ts.out
diff --git a/cli/tests/no_color.js b/cli/tests/testdata/no_color.js
index cea11a52f..cea11a52f 100644
--- a/cli/tests/no_color.js
+++ b/cli/tests/testdata/no_color.js
diff --git a/cli/tests/no_mem_cache.js b/cli/tests/testdata/no_mem_cache.js
index a486732b6..a486732b6 100644
--- a/cli/tests/no_mem_cache.js
+++ b/cli/tests/testdata/no_mem_cache.js
diff --git a/cli/tests/no_mem_cache.js.out b/cli/tests/testdata/no_mem_cache.js.out
index a32119c8a..a32119c8a 100644
--- a/cli/tests/no_mem_cache.js.out
+++ b/cli/tests/testdata/no_mem_cache.js.out
diff --git a/cli/tests/no_validate_asm.js b/cli/tests/testdata/no_validate_asm.js
index ef999e080..ef999e080 100644
--- a/cli/tests/no_validate_asm.js
+++ b/cli/tests/testdata/no_validate_asm.js
diff --git a/cli/tests/performance_stats.out b/cli/tests/testdata/performance_stats.out
index 141829ee6..141829ee6 100644
--- a/cli/tests/performance_stats.out
+++ b/cli/tests/testdata/performance_stats.out
diff --git a/cli/tests/permission_test.ts b/cli/tests/testdata/permission_test.ts
index 057e935af..a3a38f2a0 100644
--- a/cli/tests/permission_test.ts
+++ b/cli/tests/testdata/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("README.md");
+    Deno.readFileSync("hello.txt");
     return Promise.resolve();
   },
   writeRequired() {
diff --git a/cli/tests/preserve_imports.tsconfig.json b/cli/tests/testdata/preserve_imports.tsconfig.json
index 9b19291aa..9b19291aa 100644
--- a/cli/tests/preserve_imports.tsconfig.json
+++ b/cli/tests/testdata/preserve_imports.tsconfig.json
diff --git a/cli/tests/proto_exploit.js b/cli/tests/testdata/proto_exploit.js
index 8bd22cfe5..8bd22cfe5 100644
--- a/cli/tests/proto_exploit.js
+++ b/cli/tests/testdata/proto_exploit.js
diff --git a/cli/tests/proto_exploit.js.out b/cli/tests/testdata/proto_exploit.js.out
index fde881dc5..fde881dc5 100644
--- a/cli/tests/proto_exploit.js.out
+++ b/cli/tests/testdata/proto_exploit.js.out
diff --git a/cli/tests/raw_mode.ts b/cli/tests/testdata/raw_mode.ts
index 87502e7d9..87502e7d9 100644
--- a/cli/tests/raw_mode.ts
+++ b/cli/tests/testdata/raw_mode.ts
diff --git a/cli/tests/raw_mode_cbreak.ts b/cli/tests/testdata/raw_mode_cbreak.ts
index b1c6d324b..b1c6d324b 100644
--- a/cli/tests/raw_mode_cbreak.ts
+++ b/cli/tests/testdata/raw_mode_cbreak.ts
diff --git a/cli/tests/recursive_imports/A.ts b/cli/tests/testdata/recursive_imports/A.ts
index 43ecdbe5e..43ecdbe5e 100644
--- a/cli/tests/recursive_imports/A.ts
+++ b/cli/tests/testdata/recursive_imports/A.ts
diff --git a/cli/tests/recursive_imports/B.ts b/cli/tests/testdata/recursive_imports/B.ts
index 9fff0fdc9..9fff0fdc9 100644
--- a/cli/tests/recursive_imports/B.ts
+++ b/cli/tests/testdata/recursive_imports/B.ts
diff --git a/cli/tests/recursive_imports/C.ts b/cli/tests/testdata/recursive_imports/C.ts
index e47e77b41..e47e77b41 100644
--- a/cli/tests/recursive_imports/C.ts
+++ b/cli/tests/testdata/recursive_imports/C.ts
diff --git a/cli/tests/recursive_imports/common.ts b/cli/tests/testdata/recursive_imports/common.ts
index 2b16a7bf1..2b16a7bf1 100644
--- a/cli/tests/recursive_imports/common.ts
+++ b/cli/tests/testdata/recursive_imports/common.ts
diff --git a/cli/tests/testdata/redirect_cache.out b/cli/tests/testdata/redirect_cache.out
new file mode 100644
index 000000000..8905c4529
--- /dev/null
+++ b/cli/tests/testdata/redirect_cache.out
@@ -0,0 +1,5 @@
+Download http://localhost:4548/subdir/redirects/a.ts
+Download http://localhost:4546/subdir/redirects/a.ts
+Download http://localhost:4545/subdir/redirects/a.ts
+Download http://localhost:4545/subdir/redirects/b.ts
+Check http://localhost:4548/subdir/redirects/a.ts
diff --git a/cli/tests/reference_types.ts b/cli/tests/testdata/reference_types.ts
index 105e23b37..105e23b37 100644
--- a/cli/tests/reference_types.ts
+++ b/cli/tests/testdata/reference_types.ts
diff --git a/cli/tests/reference_types.ts.out b/cli/tests/testdata/reference_types.ts.out
index 417b7b537..417b7b537 100644
--- a/cli/tests/reference_types.ts.out
+++ b/cli/tests/testdata/reference_types.ts.out
diff --git a/cli/tests/testdata/reference_types_remote.ts b/cli/tests/testdata/reference_types_remote.ts
new file mode 100644
index 000000000..e7fa81b2c
--- /dev/null
+++ b/cli/tests/testdata/reference_types_remote.ts
@@ -0,0 +1,3 @@
+/// <reference types="http://localhost:4545/subdir/types.d.ts" />
+
+console.log(globalThis.a);
diff --git a/cli/tests/reference_types_remote.ts.out b/cli/tests/testdata/reference_types_remote.ts.out
index 417b7b537..417b7b537 100644
--- a/cli/tests/reference_types_remote.ts.out
+++ b/cli/tests/testdata/reference_types_remote.ts.out
diff --git a/cli/tests/resolve_dns.ts b/cli/tests/testdata/resolve_dns.ts
index d765e0536..d765e0536 100644
--- a/cli/tests/resolve_dns.ts
+++ b/cli/tests/testdata/resolve_dns.ts
diff --git a/cli/tests/resolve_dns.ts.out b/cli/tests/testdata/resolve_dns.ts.out
index 78381e6c6..78381e6c6 100644
--- a/cli/tests/resolve_dns.ts.out
+++ b/cli/tests/testdata/resolve_dns.ts.out
diff --git a/cli/tests/runtime_decorators.ts b/cli/tests/testdata/runtime_decorators.ts
index 5da109110..5da109110 100644
--- a/cli/tests/runtime_decorators.ts
+++ b/cli/tests/testdata/runtime_decorators.ts
diff --git a/cli/tests/runtime_decorators.ts.out b/cli/tests/testdata/runtime_decorators.ts.out
index 0fc1d4590..0fc1d4590 100644
--- a/cli/tests/runtime_decorators.ts.out
+++ b/cli/tests/testdata/runtime_decorators.ts.out
diff --git a/cli/tests/seed_random.js b/cli/tests/testdata/seed_random.js
index 7f6e336df..7f6e336df 100644
--- a/cli/tests/seed_random.js
+++ b/cli/tests/testdata/seed_random.js
diff --git a/cli/tests/seed_random.js.out b/cli/tests/testdata/seed_random.js.out
index 4d1ebd081..4d1ebd081 100644
--- a/cli/tests/seed_random.js.out
+++ b/cli/tests/testdata/seed_random.js.out
diff --git a/cli/tests/single_compile_with_reload.ts b/cli/tests/testdata/single_compile_with_reload.ts
index f84e91f2f..f84e91f2f 100644
--- a/cli/tests/single_compile_with_reload.ts
+++ b/cli/tests/testdata/single_compile_with_reload.ts
diff --git a/cli/tests/single_compile_with_reload.ts.out b/cli/tests/testdata/single_compile_with_reload.ts.out
index b0b2fcaf1..b0b2fcaf1 100644
--- a/cli/tests/single_compile_with_reload.ts.out
+++ b/cli/tests/testdata/single_compile_with_reload.ts.out
diff --git a/cli/tests/single_compile_with_reload_dyn.ts b/cli/tests/testdata/single_compile_with_reload_dyn.ts
index 0266bf46c..0266bf46c 100644
--- a/cli/tests/single_compile_with_reload_dyn.ts
+++ b/cli/tests/testdata/single_compile_with_reload_dyn.ts
diff --git a/cli/tests/single_compile_with_reload_worker.ts b/cli/tests/testdata/single_compile_with_reload_worker.ts
index 103cafe20..103cafe20 100644
--- a/cli/tests/single_compile_with_reload_worker.ts
+++ b/cli/tests/testdata/single_compile_with_reload_worker.ts
diff --git a/cli/tests/standalone_compiler_ops.ts b/cli/tests/testdata/standalone_compiler_ops.ts
index b95e1222e..b95e1222e 100644
--- a/cli/tests/standalone_compiler_ops.ts
+++ b/cli/tests/testdata/standalone_compiler_ops.ts
diff --git a/cli/tests/standalone_error.ts b/cli/tests/testdata/standalone_error.ts
index 279398113..279398113 100644
--- a/cli/tests/standalone_error.ts
+++ b/cli/tests/testdata/standalone_error.ts
diff --git a/cli/tests/standalone_import.ts b/cli/tests/testdata/standalone_import.ts
index 804102a53..804102a53 100644
--- a/cli/tests/standalone_import.ts
+++ b/cli/tests/testdata/standalone_import.ts
diff --git a/cli/tests/standalone_import_datauri.ts b/cli/tests/testdata/standalone_import_datauri.ts
index 68f348828..68f348828 100644
--- a/cli/tests/standalone_import_datauri.ts
+++ b/cli/tests/testdata/standalone_import_datauri.ts
diff --git a/cli/tests/standalone_runtime_flags.ts b/cli/tests/testdata/standalone_runtime_flags.ts
index 0154c7f4e..0154c7f4e 100644
--- a/cli/tests/standalone_runtime_flags.ts
+++ b/cli/tests/testdata/standalone_runtime_flags.ts
diff --git a/cli/tests/std_lint.out b/cli/tests/testdata/std_lint.out
index 9d62fcc67..9d62fcc67 100644
--- a/cli/tests/std_lint.out
+++ b/cli/tests/testdata/std_lint.out
diff --git a/cli/tests/stdout_write_all.out b/cli/tests/testdata/stdout_write_all.out
index af5626b4a..af5626b4a 100644
--- a/cli/tests/stdout_write_all.out
+++ b/cli/tests/testdata/stdout_write_all.out
diff --git a/cli/tests/stdout_write_all.ts b/cli/tests/testdata/stdout_write_all.ts
index 623bd8f53..623bd8f53 100644
--- a/cli/tests/stdout_write_all.ts
+++ b/cli/tests/testdata/stdout_write_all.ts
diff --git a/cli/tests/subdir/amd_like.js b/cli/tests/testdata/subdir/amd_like.js
index f27e505e4..f27e505e4 100644
--- a/cli/tests/subdir/amd_like.js
+++ b/cli/tests/testdata/subdir/amd_like.js
diff --git a/cli/tests/subdir/auto_print_hello.ts b/cli/tests/testdata/subdir/auto_print_hello.ts
index 5efa72e03..5efa72e03 100644
--- a/cli/tests/subdir/auto_print_hello.ts
+++ b/cli/tests/testdata/subdir/auto_print_hello.ts
diff --git a/cli/tests/subdir/circular1.ts b/cli/tests/testdata/subdir/circular1.ts
index 06fdb3373..06fdb3373 100644
--- a/cli/tests/subdir/circular1.ts
+++ b/cli/tests/testdata/subdir/circular1.ts
diff --git a/cli/tests/subdir/circular2.ts b/cli/tests/testdata/subdir/circular2.ts
index 0864b7adf..0864b7adf 100644
--- a/cli/tests/subdir/circular2.ts
+++ b/cli/tests/testdata/subdir/circular2.ts
diff --git a/cli/tests/subdir/comment.ts b/cli/tests/testdata/subdir/comment.ts
index ea7e630c0..ea7e630c0 100644
--- a/cli/tests/subdir/comment.ts
+++ b/cli/tests/testdata/subdir/comment.ts
diff --git a/cli/tests/subdir/config.json b/cli/tests/testdata/subdir/config.json
index 01c3b5e79..01c3b5e79 100644
--- a/cli/tests/subdir/config.json
+++ b/cli/tests/testdata/subdir/config.json
diff --git a/cli/tests/subdir/emittable.d.ts b/cli/tests/testdata/subdir/emittable.d.ts
index 425b80f24..425b80f24 100644
--- a/cli/tests/subdir/emittable.d.ts
+++ b/cli/tests/testdata/subdir/emittable.d.ts
diff --git a/cli/tests/subdir/empty.ts b/cli/tests/testdata/subdir/empty.ts
index e69de29bb..e69de29bb 100644
--- a/cli/tests/subdir/empty.ts
+++ b/cli/tests/testdata/subdir/empty.ts
diff --git a/cli/tests/subdir/evil_remote_import.js b/cli/tests/testdata/subdir/evil_remote_import.js
index 4ff7d1b97..4ff7d1b97 100644
--- a/cli/tests/subdir/evil_remote_import.js
+++ b/cli/tests/testdata/subdir/evil_remote_import.js
diff --git a/cli/tests/subdir/foo_types.d.ts b/cli/tests/testdata/subdir/foo_types.d.ts
index c489584b9..c489584b9 100644
--- a/cli/tests/subdir/foo_types.d.ts
+++ b/cli/tests/testdata/subdir/foo_types.d.ts
diff --git a/cli/tests/subdir/form_urlencoded.txt b/cli/tests/testdata/subdir/form_urlencoded.txt
index 70e087c20..70e087c20 100644
--- a/cli/tests/subdir/form_urlencoded.txt
+++ b/cli/tests/testdata/subdir/form_urlencoded.txt
diff --git a/cli/tests/subdir/indirect_import_error.js b/cli/tests/testdata/subdir/indirect_import_error.js
index 84011d291..84011d291 100644
--- a/cli/tests/subdir/indirect_import_error.js
+++ b/cli/tests/testdata/subdir/indirect_import_error.js
diff --git a/cli/tests/subdir/indirect_throws.js b/cli/tests/testdata/subdir/indirect_throws.js
index e1810a66c..e1810a66c 100644
--- a/cli/tests/subdir/indirect_throws.js
+++ b/cli/tests/testdata/subdir/indirect_throws.js
diff --git a/cli/tests/subdir/json_1.json b/cli/tests/testdata/subdir/json_1.json
index 754d16b84..754d16b84 100644
--- a/cli/tests/subdir/json_1.json
+++ b/cli/tests/testdata/subdir/json_1.json
diff --git a/cli/tests/subdir/json_2.json b/cli/tests/testdata/subdir/json_2.json
index 7deb8b173..7deb8b173 100644
--- a/cli/tests/subdir/json_2.json
+++ b/cli/tests/testdata/subdir/json_2.json
diff --git a/cli/tests/subdir/main.ts b/cli/tests/testdata/subdir/main.ts
index 29acf42e0..29acf42e0 100644
--- a/cli/tests/subdir/main.ts
+++ b/cli/tests/testdata/subdir/main.ts
diff --git a/cli/tests/subdir/mismatch_ext.ts b/cli/tests/testdata/subdir/mismatch_ext.ts
index e67d2a017..e67d2a017 100644
--- a/cli/tests/subdir/mismatch_ext.ts
+++ b/cli/tests/testdata/subdir/mismatch_ext.ts
diff --git a/cli/tests/subdir/mod1.ts b/cli/tests/testdata/subdir/mod1.ts
index 5e58f432e..5e58f432e 100644
--- a/cli/tests/subdir/mod1.ts
+++ b/cli/tests/testdata/subdir/mod1.ts
diff --git a/cli/tests/subdir/mod2.ts b/cli/tests/testdata/subdir/mod2.ts
index ce1adc0e8..ce1adc0e8 100644
--- a/cli/tests/subdir/mod2.ts
+++ b/cli/tests/testdata/subdir/mod2.ts
diff --git a/cli/tests/subdir/mod3.js b/cli/tests/testdata/subdir/mod3.js
index ce534f570..ce534f570 100644
--- a/cli/tests/subdir/mod3.js
+++ b/cli/tests/testdata/subdir/mod3.js
diff --git a/cli/tests/subdir/mod4.js b/cli/tests/testdata/subdir/mod4.js
index 71332dbc4..71332dbc4 100644
--- a/cli/tests/subdir/mod4.js
+++ b/cli/tests/testdata/subdir/mod4.js
diff --git a/cli/tests/subdir/mod5.mjs b/cli/tests/testdata/subdir/mod5.mjs
index f21d8862b..f21d8862b 100644
--- a/cli/tests/subdir/mod5.mjs
+++ b/cli/tests/testdata/subdir/mod5.mjs
diff --git a/cli/tests/subdir/mod6.js b/cli/tests/testdata/subdir/mod6.js
index 5e17c9ee0..5e17c9ee0 100644
--- a/cli/tests/subdir/mod6.js
+++ b/cli/tests/testdata/subdir/mod6.js
diff --git a/cli/tests/subdir/more_decorators.ts b/cli/tests/testdata/subdir/more_decorators.ts
index 674705d56..674705d56 100644
--- a/cli/tests/subdir/more_decorators.ts
+++ b/cli/tests/testdata/subdir/more_decorators.ts
diff --git a/cli/tests/subdir/mt_application_ecmascript.j2.js b/cli/tests/testdata/subdir/mt_application_ecmascript.j2.js
index e67d2a017..e67d2a017 100644
--- a/cli/tests/subdir/mt_application_ecmascript.j2.js
+++ b/cli/tests/testdata/subdir/mt_application_ecmascript.j2.js
diff --git a/cli/tests/subdir/mt_application_ecmascript_jsx.j2.jsx b/cli/tests/testdata/subdir/mt_application_ecmascript_jsx.j2.jsx
index c5c27f9f9..c5c27f9f9 100644
--- a/cli/tests/subdir/mt_application_ecmascript_jsx.j2.jsx
+++ b/cli/tests/testdata/subdir/mt_application_ecmascript_jsx.j2.jsx
diff --git a/cli/tests/subdir/mt_application_x_javascript.j4.js b/cli/tests/testdata/subdir/mt_application_x_javascript.j4.js
index e67d2a017..e67d2a017 100644
--- a/cli/tests/subdir/mt_application_x_javascript.j4.js
+++ b/cli/tests/testdata/subdir/mt_application_x_javascript.j4.js
diff --git a/cli/tests/subdir/mt_application_x_javascript_jsx.j4.jsx b/cli/tests/testdata/subdir/mt_application_x_javascript_jsx.j4.jsx
index c5c27f9f9..c5c27f9f9 100644
--- a/cli/tests/subdir/mt_application_x_javascript_jsx.j4.jsx
+++ b/cli/tests/testdata/subdir/mt_application_x_javascript_jsx.j4.jsx
diff --git a/cli/tests/subdir/mt_application_x_typescript.t4.ts b/cli/tests/testdata/subdir/mt_application_x_typescript.t4.ts
index e67d2a017..e67d2a017 100644
--- a/cli/tests/subdir/mt_application_x_typescript.t4.ts
+++ b/cli/tests/testdata/subdir/mt_application_x_typescript.t4.ts
diff --git a/cli/tests/subdir/mt_application_x_typescript_tsx.t4.tsx b/cli/tests/testdata/subdir/mt_application_x_typescript_tsx.t4.tsx
index c5c27f9f9..c5c27f9f9 100644
--- a/cli/tests/subdir/mt_application_x_typescript_tsx.t4.tsx
+++ b/cli/tests/testdata/subdir/mt_application_x_typescript_tsx.t4.tsx
diff --git a/cli/tests/subdir/mt_javascript.js b/cli/tests/testdata/subdir/mt_javascript.js
index e67d2a017..e67d2a017 100644
--- a/cli/tests/subdir/mt_javascript.js
+++ b/cli/tests/testdata/subdir/mt_javascript.js
diff --git a/cli/tests/subdir/mt_javascript_jsx.jsx b/cli/tests/testdata/subdir/mt_javascript_jsx.jsx
index c5c27f9f9..c5c27f9f9 100644
--- a/cli/tests/subdir/mt_javascript_jsx.jsx
+++ b/cli/tests/testdata/subdir/mt_javascript_jsx.jsx
diff --git a/cli/tests/subdir/mt_text_ecmascript.j3.js b/cli/tests/testdata/subdir/mt_text_ecmascript.j3.js
index e67d2a017..e67d2a017 100644
--- a/cli/tests/subdir/mt_text_ecmascript.j3.js
+++ b/cli/tests/testdata/subdir/mt_text_ecmascript.j3.js
diff --git a/cli/tests/subdir/mt_text_ecmascript_jsx.j3.jsx b/cli/tests/testdata/subdir/mt_text_ecmascript_jsx.j3.jsx
index c5c27f9f9..c5c27f9f9 100644
--- a/cli/tests/subdir/mt_text_ecmascript_jsx.j3.jsx
+++ b/cli/tests/testdata/subdir/mt_text_ecmascript_jsx.j3.jsx
diff --git a/cli/tests/subdir/mt_text_javascript.j1.js b/cli/tests/testdata/subdir/mt_text_javascript.j1.js
index e67d2a017..e67d2a017 100644
--- a/cli/tests/subdir/mt_text_javascript.j1.js
+++ b/cli/tests/testdata/subdir/mt_text_javascript.j1.js
diff --git a/cli/tests/subdir/mt_text_javascript_jsx.j1.jsx b/cli/tests/testdata/subdir/mt_text_javascript_jsx.j1.jsx
index c5c27f9f9..c5c27f9f9 100644
--- a/cli/tests/subdir/mt_text_javascript_jsx.j1.jsx
+++ b/cli/tests/testdata/subdir/mt_text_javascript_jsx.j1.jsx
diff --git a/cli/tests/subdir/mt_text_typescript.t1.ts b/cli/tests/testdata/subdir/mt_text_typescript.t1.ts
index e67d2a017..e67d2a017 100644
--- a/cli/tests/subdir/mt_text_typescript.t1.ts
+++ b/cli/tests/testdata/subdir/mt_text_typescript.t1.ts
diff --git a/cli/tests/subdir/mt_text_typescript_tsx.t1.tsx b/cli/tests/testdata/subdir/mt_text_typescript_tsx.t1.tsx
index c5c27f9f9..c5c27f9f9 100644
--- a/cli/tests/subdir/mt_text_typescript_tsx.t1.tsx
+++ b/cli/tests/testdata/subdir/mt_text_typescript_tsx.t1.tsx
diff --git a/cli/tests/subdir/mt_video_mp2t.t3.ts b/cli/tests/testdata/subdir/mt_video_mp2t.t3.ts
index e67d2a017..e67d2a017 100644
--- a/cli/tests/subdir/mt_video_mp2t.t3.ts
+++ b/cli/tests/testdata/subdir/mt_video_mp2t.t3.ts
diff --git a/cli/tests/subdir/mt_video_mp2t_tsx.t3.tsx b/cli/tests/testdata/subdir/mt_video_mp2t_tsx.t3.tsx
index c5c27f9f9..c5c27f9f9 100644
--- a/cli/tests/subdir/mt_video_mp2t_tsx.t3.tsx
+++ b/cli/tests/testdata/subdir/mt_video_mp2t_tsx.t3.tsx
diff --git a/cli/tests/subdir/mt_video_vdn.t2.ts b/cli/tests/testdata/subdir/mt_video_vdn.t2.ts
index e67d2a017..e67d2a017 100644
--- a/cli/tests/subdir/mt_video_vdn.t2.ts
+++ b/cli/tests/testdata/subdir/mt_video_vdn.t2.ts
diff --git a/cli/tests/subdir/mt_video_vdn_tsx.t2.tsx b/cli/tests/testdata/subdir/mt_video_vdn_tsx.t2.tsx
index c5c27f9f9..c5c27f9f9 100644
--- a/cli/tests/subdir/mt_video_vdn_tsx.t2.tsx
+++ b/cli/tests/testdata/subdir/mt_video_vdn_tsx.t2.tsx
diff --git a/cli/tests/subdir/no_ext b/cli/tests/testdata/subdir/no_ext
index e67d2a017..e67d2a017 100644
--- a/cli/tests/subdir/no_ext
+++ b/cli/tests/testdata/subdir/no_ext
diff --git a/cli/tests/subdir/no_js_ext b/cli/tests/testdata/subdir/no_js_ext
index 8322a106f..8322a106f 100644
--- a/cli/tests/subdir/no_js_ext
+++ b/cli/tests/testdata/subdir/no_js_ext
diff --git a/cli/tests/subdir/polyfill.ts b/cli/tests/testdata/subdir/polyfill.ts
index e1cd923cb..e1cd923cb 100644
--- a/cli/tests/subdir/polyfill.ts
+++ b/cli/tests/testdata/subdir/polyfill.ts
diff --git a/cli/tests/subdir/print_hello.ts b/cli/tests/testdata/subdir/print_hello.ts
index b9c0ad527..b9c0ad527 100644
--- a/cli/tests/subdir/print_hello.ts
+++ b/cli/tests/testdata/subdir/print_hello.ts
diff --git a/cli/tests/subdir/redirects/a.ts b/cli/tests/testdata/subdir/redirects/a.ts
index 071ee4728..071ee4728 100644
--- a/cli/tests/subdir/redirects/a.ts
+++ b/cli/tests/testdata/subdir/redirects/a.ts
diff --git a/cli/tests/subdir/redirects/b.ts b/cli/tests/testdata/subdir/redirects/b.ts
index cdb71eaae..cdb71eaae 100644
--- a/cli/tests/subdir/redirects/b.ts
+++ b/cli/tests/testdata/subdir/redirects/b.ts
diff --git a/cli/tests/subdir/redirects/redirect1.js b/cli/tests/testdata/subdir/redirects/redirect1.js
index d674be88c..d674be88c 100644
--- a/cli/tests/subdir/redirects/redirect1.js
+++ b/cli/tests/testdata/subdir/redirects/redirect1.js
diff --git a/cli/tests/subdir/redirects/redirect1.ts b/cli/tests/testdata/subdir/redirects/redirect1.ts
index d674be88c..d674be88c 100644
--- a/cli/tests/subdir/redirects/redirect1.ts
+++ b/cli/tests/testdata/subdir/redirects/redirect1.ts
diff --git a/cli/tests/subdir/redirects/redirect2.js b/cli/tests/testdata/subdir/redirects/redirect2.js
index e4244f638..e4244f638 100644
--- a/cli/tests/subdir/redirects/redirect2.js
+++ b/cli/tests/testdata/subdir/redirects/redirect2.js
diff --git a/cli/tests/subdir/redirects/redirect3.js b/cli/tests/testdata/subdir/redirects/redirect3.js
index e24f2af32..e24f2af32 100644
--- a/cli/tests/subdir/redirects/redirect3.js
+++ b/cli/tests/testdata/subdir/redirects/redirect3.js
diff --git a/cli/tests/subdir/redirects/redirect4.ts b/cli/tests/testdata/subdir/redirects/redirect4.ts
index 45c65c5eb..45c65c5eb 100644
--- a/cli/tests/subdir/redirects/redirect4.ts
+++ b/cli/tests/testdata/subdir/redirects/redirect4.ts
diff --git a/cli/tests/subdir/single_module.ts b/cli/tests/testdata/subdir/single_module.ts
index f41b0a4b5..f41b0a4b5 100644
--- a/cli/tests/subdir/single_module.ts
+++ b/cli/tests/testdata/subdir/single_module.ts
diff --git a/cli/tests/subdir/subdir2/dynamic_import.ts b/cli/tests/testdata/subdir/subdir2/dynamic_import.ts
index 573887b71..573887b71 100644
--- a/cli/tests/subdir/subdir2/dynamic_import.ts
+++ b/cli/tests/testdata/subdir/subdir2/dynamic_import.ts
diff --git a/cli/tests/subdir/subdir2/mod2.ts b/cli/tests/testdata/subdir/subdir2/mod2.ts
index 9071d0aeb..9071d0aeb 100644
--- a/cli/tests/subdir/subdir2/mod2.ts
+++ b/cli/tests/testdata/subdir/subdir2/mod2.ts
diff --git a/cli/tests/subdir/test_worker_basic.js b/cli/tests/testdata/subdir/test_worker_basic.js
index b960128b4..b960128b4 100644
--- a/cli/tests/subdir/test_worker_basic.js
+++ b/cli/tests/testdata/subdir/test_worker_basic.js
diff --git a/cli/tests/subdir/throws.js b/cli/tests/testdata/subdir/throws.js
index abdf29156..abdf29156 100644
--- a/cli/tests/subdir/throws.js
+++ b/cli/tests/testdata/subdir/throws.js
diff --git a/cli/tests/subdir/tla.ts b/cli/tests/testdata/subdir/tla.ts
index 713dbfca0..713dbfca0 100644
--- a/cli/tests/subdir/tla.ts
+++ b/cli/tests/testdata/subdir/tla.ts
diff --git a/cli/tests/subdir/type_and_code.ts b/cli/tests/testdata/subdir/type_and_code.ts
index b14713419..b14713419 100644
--- a/cli/tests/subdir/type_and_code.ts
+++ b/cli/tests/testdata/subdir/type_and_code.ts
diff --git a/cli/tests/subdir/type_reference.d.ts b/cli/tests/testdata/subdir/type_reference.d.ts
index f9b8de5ed..f9b8de5ed 100644
--- a/cli/tests/subdir/type_reference.d.ts
+++ b/cli/tests/testdata/subdir/type_reference.d.ts
diff --git a/cli/tests/subdir/type_reference.js b/cli/tests/testdata/subdir/type_reference.js
index 917d89198..917d89198 100644
--- a/cli/tests/subdir/type_reference.js
+++ b/cli/tests/testdata/subdir/type_reference.js
diff --git a/cli/tests/subdir/types.d.ts b/cli/tests/testdata/subdir/types.d.ts
index 7f587e144..7f587e144 100644
--- a/cli/tests/subdir/types.d.ts
+++ b/cli/tests/testdata/subdir/types.d.ts
diff --git a/cli/tests/subdir/unknown_ext.deno b/cli/tests/testdata/subdir/unknown_ext.deno
index e67d2a017..e67d2a017 100644
--- a/cli/tests/subdir/unknown_ext.deno
+++ b/cli/tests/testdata/subdir/unknown_ext.deno
diff --git a/cli/tests/swc_syntax_error.ts b/cli/tests/testdata/swc_syntax_error.ts
index 991ca9214..991ca9214 100644
--- a/cli/tests/swc_syntax_error.ts
+++ b/cli/tests/testdata/swc_syntax_error.ts
diff --git a/cli/tests/swc_syntax_error.ts.out b/cli/tests/testdata/swc_syntax_error.ts.out
index 53ed29cb6..53ed29cb6 100644
--- a/cli/tests/swc_syntax_error.ts.out
+++ b/cli/tests/testdata/swc_syntax_error.ts.out
diff --git a/cli/tests/symlink_to_subdir b/cli/tests/testdata/symlink_to_subdir
index fe0c45aa4..fe0c45aa4 120000
--- a/cli/tests/symlink_to_subdir
+++ b/cli/tests/testdata/symlink_to_subdir
diff --git a/cli/tests/test/allow_all.out b/cli/tests/testdata/test/allow_all.out
index 9b7367b94..9b7367b94 100644
--- a/cli/tests/test/allow_all.out
+++ b/cli/tests/testdata/test/allow_all.out
diff --git a/cli/tests/test/allow_all.ts b/cli/tests/testdata/test/allow_all.ts
index b8f8c647d..abe55a8d5 100644
--- a/cli/tests/test/allow_all.ts
+++ b/cli/tests/testdata/test/allow_all.ts
@@ -1,4 +1,4 @@
-import { assertEquals } from "../../../test_util/std/testing/asserts.ts";
+import { assertEquals } from "../../../../test_util/std/testing/asserts.ts";
 
 const permissions: Deno.PermissionName[] = [
   "read",
diff --git a/cli/tests/test/allow_none.out b/cli/tests/testdata/test/allow_none.out
index b79c7e6bf..b79c7e6bf 100644
--- a/cli/tests/test/allow_none.out
+++ b/cli/tests/testdata/test/allow_none.out
diff --git a/cli/tests/test/allow_none.ts b/cli/tests/testdata/test/allow_none.ts
index 7872c774e..3153b9755 100644
--- a/cli/tests/test/allow_none.ts
+++ b/cli/tests/testdata/test/allow_none.ts
@@ -1,4 +1,4 @@
-import { unreachable } from "../../../test_util/std/testing/asserts.ts";
+import { unreachable } from "../../../../test_util/std/testing/asserts.ts";
 
 const permissions: Deno.PermissionName[] = [
   "read",
diff --git a/cli/tests/test/clear_timeout.out b/cli/tests/testdata/test/clear_timeout.out
index c9f459dbe..c9f459dbe 100644
--- a/cli/tests/test/clear_timeout.out
+++ b/cli/tests/testdata/test/clear_timeout.out
diff --git a/cli/tests/test/clear_timeout.ts b/cli/tests/testdata/test/clear_timeout.ts
index 00056e853..00056e853 100644
--- a/cli/tests/test/clear_timeout.ts
+++ b/cli/tests/testdata/test/clear_timeout.ts
diff --git a/cli/tests/test/doc.out b/cli/tests/testdata/test/doc.out
index 91ecbd4d4..91ecbd4d4 100644
--- a/cli/tests/test/doc.out
+++ b/cli/tests/testdata/test/doc.out
diff --git a/cli/tests/test/doc.ts b/cli/tests/testdata/test/doc.ts
index 52fe6bdf0..52fe6bdf0 100644
--- a/cli/tests/test/doc.ts
+++ b/cli/tests/testdata/test/doc.ts
diff --git a/cli/tests/test/doc_markdown.out b/cli/tests/testdata/test/doc_markdown.out
index 9d2c35974..9d2c35974 100644
--- a/cli/tests/test/doc_markdown.out
+++ b/cli/tests/testdata/test/doc_markdown.out
diff --git a/cli/tests/test/doc_markdown/doc.md b/cli/tests/testdata/test/doc_markdown/doc.md
index e5afb841b..e5afb841b 100644
--- a/cli/tests/test/doc_markdown/doc.md
+++ b/cli/tests/testdata/test/doc_markdown/doc.md
diff --git a/cli/tests/test/exit_sanitizer.out b/cli/tests/testdata/test/exit_sanitizer.out
index f331d7a70..f331d7a70 100644
--- a/cli/tests/test/exit_sanitizer.out
+++ b/cli/tests/testdata/test/exit_sanitizer.out
diff --git a/cli/tests/test/exit_sanitizer.ts b/cli/tests/testdata/test/exit_sanitizer.ts
index 186406a9d..186406a9d 100644
--- a/cli/tests/test/exit_sanitizer.ts
+++ b/cli/tests/testdata/test/exit_sanitizer.ts
diff --git a/cli/tests/test/fail.out b/cli/tests/testdata/test/fail.out
index 66d471cdf..66d471cdf 100644
--- a/cli/tests/test/fail.out
+++ b/cli/tests/testdata/test/fail.out
diff --git a/cli/tests/test/fail.ts b/cli/tests/testdata/test/fail.ts
index 9340db556..9340db556 100644
--- a/cli/tests/test/fail.ts
+++ b/cli/tests/testdata/test/fail.ts
diff --git a/cli/tests/test/fail_fast.out b/cli/tests/testdata/test/fail_fast.out
index c97f854fa..c97f854fa 100644
--- a/cli/tests/test/fail_fast.out
+++ b/cli/tests/testdata/test/fail_fast.out
diff --git a/cli/tests/test/fail_fast.ts b/cli/tests/testdata/test/fail_fast.ts
index 637e825ec..637e825ec 100644
--- a/cli/tests/test/fail_fast.ts
+++ b/cli/tests/testdata/test/fail_fast.ts
diff --git a/cli/tests/test/fail_fast_with_val.out b/cli/tests/testdata/test/fail_fast_with_val.out
index a902e4c7b..a902e4c7b 100644
--- a/cli/tests/test/fail_fast_with_val.out
+++ b/cli/tests/testdata/test/fail_fast_with_val.out
diff --git a/cli/tests/test/fail_fast_with_val.ts b/cli/tests/testdata/test/fail_fast_with_val.ts
index 637e825ec..637e825ec 100644
--- a/cli/tests/test/fail_fast_with_val.ts
+++ b/cli/tests/testdata/test/fail_fast_with_val.ts
diff --git a/cli/tests/test/finally_timeout.out b/cli/tests/testdata/test/finally_timeout.out
index 570e9108f..570e9108f 100644
--- a/cli/tests/test/finally_timeout.out
+++ b/cli/tests/testdata/test/finally_timeout.out
diff --git a/cli/tests/test/finally_timeout.ts b/cli/tests/testdata/test/finally_timeout.ts
index dcc0a4d64..dcc0a4d64 100644
--- a/cli/tests/test/finally_timeout.ts
+++ b/cli/tests/testdata/test/finally_timeout.ts
diff --git a/cli/tests/test/ignore.out b/cli/tests/testdata/test/ignore.out
index a7c68261d..a7c68261d 100644
--- a/cli/tests/test/ignore.out
+++ b/cli/tests/testdata/test/ignore.out
diff --git a/cli/tests/test/ignore.ts b/cli/tests/testdata/test/ignore.ts
index 01113a129..01113a129 100644
--- a/cli/tests/test/ignore.ts
+++ b/cli/tests/testdata/test/ignore.ts
diff --git a/cli/tests/test/ignore_permissions.out b/cli/tests/testdata/test/ignore_permissions.out
index c4d273d8f..c4d273d8f 100644
--- a/cli/tests/test/ignore_permissions.out
+++ b/cli/tests/testdata/test/ignore_permissions.out
diff --git a/cli/tests/test/ignore_permissions.ts b/cli/tests/testdata/test/ignore_permissions.ts
index ff3084441..ff3084441 100644
--- a/cli/tests/test/ignore_permissions.ts
+++ b/cli/tests/testdata/test/ignore_permissions.ts
diff --git a/cli/tests/test/meta.out b/cli/tests/testdata/test/meta.out
index a8c7acd63..a8c7acd63 100644
--- a/cli/tests/test/meta.out
+++ b/cli/tests/testdata/test/meta.out
diff --git a/cli/tests/test/meta.ts b/cli/tests/testdata/test/meta.ts
index e32fdeea6..e32fdeea6 100644
--- a/cli/tests/test/meta.ts
+++ b/cli/tests/testdata/test/meta.ts
diff --git a/cli/tests/test/no_check.out b/cli/tests/testdata/test/no_check.out
index 9daab7ac4..9daab7ac4 100644
--- a/cli/tests/test/no_check.out
+++ b/cli/tests/testdata/test/no_check.out
diff --git a/cli/tests/test/no_check.ts b/cli/tests/testdata/test/no_check.ts
index 79d75f989..79d75f989 100644
--- a/cli/tests/test/no_check.ts
+++ b/cli/tests/testdata/test/no_check.ts
diff --git a/cli/tests/test/no_color.ts b/cli/tests/testdata/test/no_color.ts
index 38c531ee9..38c531ee9 100644
--- a/cli/tests/test/no_color.ts
+++ b/cli/tests/testdata/test/no_color.ts
diff --git a/cli/tests/test/no_run.out b/cli/tests/testdata/test/no_run.out
index 5edf03fe0..5edf03fe0 100644
--- a/cli/tests/test/no_run.out
+++ b/cli/tests/testdata/test/no_run.out
diff --git a/cli/tests/test/no_run.ts b/cli/tests/testdata/test/no_run.ts
index b75915753..b75915753 100644
--- a/cli/tests/test/no_run.ts
+++ b/cli/tests/testdata/test/no_run.ts
diff --git a/cli/tests/test/only.out b/cli/tests/testdata/test/only.out
index dc78cae80..dc78cae80 100644
--- a/cli/tests/test/only.out
+++ b/cli/tests/testdata/test/only.out
diff --git a/cli/tests/test/only.ts b/cli/tests/testdata/test/only.ts
index 03c4dcac3..03c4dcac3 100644
--- a/cli/tests/test/only.ts
+++ b/cli/tests/testdata/test/only.ts
diff --git a/cli/tests/test/pass.out b/cli/tests/testdata/test/pass.out
index cf81ac2e7..cf81ac2e7 100644
--- a/cli/tests/test/pass.out
+++ b/cli/tests/testdata/test/pass.out
diff --git a/cli/tests/test/pass.ts b/cli/tests/testdata/test/pass.ts
index 288cc7c83..288cc7c83 100644
--- a/cli/tests/test/pass.ts
+++ b/cli/tests/testdata/test/pass.ts
diff --git a/cli/tests/test/quiet.out b/cli/tests/testdata/test/quiet.out
index 05302fb2c..05302fb2c 100644
--- a/cli/tests/test/quiet.out
+++ b/cli/tests/testdata/test/quiet.out
diff --git a/cli/tests/test/quiet.ts b/cli/tests/testdata/test/quiet.ts
index f40805bfb..f40805bfb 100644
--- a/cli/tests/test/quiet.ts
+++ b/cli/tests/testdata/test/quiet.ts
diff --git a/cli/tests/test/shuffle.out b/cli/tests/testdata/test/shuffle.out
index 04dd08ee2..04dd08ee2 100644
--- a/cli/tests/test/shuffle.out
+++ b/cli/tests/testdata/test/shuffle.out
diff --git a/cli/tests/test/shuffle/bar_test.ts b/cli/tests/testdata/test/shuffle/bar_test.ts
index ca118dc0d..ca118dc0d 100644
--- a/cli/tests/test/shuffle/bar_test.ts
+++ b/cli/tests/testdata/test/shuffle/bar_test.ts
diff --git a/cli/tests/test/shuffle/baz_test.ts b/cli/tests/testdata/test/shuffle/baz_test.ts
index ca118dc0d..ca118dc0d 100644
--- a/cli/tests/test/shuffle/baz_test.ts
+++ b/cli/tests/testdata/test/shuffle/baz_test.ts
diff --git a/cli/tests/test/shuffle/foo_test.ts b/cli/tests/testdata/test/shuffle/foo_test.ts
index ca118dc0d..ca118dc0d 100644
--- a/cli/tests/test/shuffle/foo_test.ts
+++ b/cli/tests/testdata/test/shuffle/foo_test.ts
diff --git a/cli/tests/test/unhandled_rejection.out b/cli/tests/testdata/test/unhandled_rejection.out
index fae353a28..fae353a28 100644
--- a/cli/tests/test/unhandled_rejection.out
+++ b/cli/tests/testdata/test/unhandled_rejection.out
diff --git a/cli/tests/test/unhandled_rejection.ts b/cli/tests/testdata/test/unhandled_rejection.ts
index 32f3111ea..32f3111ea 100644
--- a/cli/tests/test/unhandled_rejection.ts
+++ b/cli/tests/testdata/test/unhandled_rejection.ts
diff --git a/cli/tests/test/unresolved_promise.out b/cli/tests/testdata/test/unresolved_promise.out
index cd505bcbf..cd505bcbf 100644
--- a/cli/tests/test/unresolved_promise.out
+++ b/cli/tests/testdata/test/unresolved_promise.out
diff --git a/cli/tests/test/unresolved_promise.ts b/cli/tests/testdata/test/unresolved_promise.ts
index 8f50e907a..8f50e907a 100644
--- a/cli/tests/test/unresolved_promise.ts
+++ b/cli/tests/testdata/test/unresolved_promise.ts
diff --git a/cli/tests/text_decoder_perf.js b/cli/tests/testdata/text_decoder_perf.js
index 2e52b1f8b..2e52b1f8b 100644
--- a/cli/tests/text_decoder_perf.js
+++ b/cli/tests/testdata/text_decoder_perf.js
diff --git a/cli/tests/text_encoder_into_perf.js b/cli/tests/testdata/text_encoder_into_perf.js
index 8d60e9f00..8d60e9f00 100644
--- a/cli/tests/text_encoder_into_perf.js
+++ b/cli/tests/testdata/text_encoder_into_perf.js
diff --git a/cli/tests/text_encoder_perf.js b/cli/tests/testdata/text_encoder_perf.js
index 6f61f019e..6f61f019e 100644
--- a/cli/tests/text_encoder_perf.js
+++ b/cli/tests/testdata/text_encoder_perf.js
diff --git a/cli/tests/tla/a.js b/cli/tests/testdata/tla/a.js
index c3ef3f7db..c3ef3f7db 100644
--- a/cli/tests/tla/a.js
+++ b/cli/tests/testdata/tla/a.js
diff --git a/cli/tests/tla/b.js b/cli/tests/testdata/tla/b.js
index 3271c92d8..3271c92d8 100644
--- a/cli/tests/tla/b.js
+++ b/cli/tests/testdata/tla/b.js
diff --git a/cli/tests/tla/c.js b/cli/tests/testdata/tla/c.js
index 806eb0a8b..806eb0a8b 100644
--- a/cli/tests/tla/c.js
+++ b/cli/tests/testdata/tla/c.js
diff --git a/cli/tests/tla/d.js b/cli/tests/testdata/tla/d.js
index 283ebf817..283ebf817 100644
--- a/cli/tests/tla/d.js
+++ b/cli/tests/testdata/tla/d.js
diff --git a/cli/tests/tla/order.js b/cli/tests/testdata/tla/order.js
index f213a562c..f213a562c 100644
--- a/cli/tests/tla/order.js
+++ b/cli/tests/testdata/tla/order.js
diff --git a/cli/tests/tla/parent.js b/cli/tests/testdata/tla/parent.js
index 1ecc15463..1ecc15463 100644
--- a/cli/tests/tla/parent.js
+++ b/cli/tests/testdata/tla/parent.js
diff --git a/cli/tests/tla2/a.js b/cli/tests/testdata/tla2/a.js
index d07bcb94d..d07bcb94d 100644
--- a/cli/tests/tla2/a.js
+++ b/cli/tests/testdata/tla2/a.js
diff --git a/cli/tests/tla2/b.js b/cli/tests/testdata/tla2/b.js
index 68e357c1e..68e357c1e 100644
--- a/cli/tests/tla2/b.js
+++ b/cli/tests/testdata/tla2/b.js
diff --git a/cli/tests/tla3/b.js b/cli/tests/testdata/tla3/b.js
index b74c659e4..b74c659e4 100644
--- a/cli/tests/tla3/b.js
+++ b/cli/tests/testdata/tla3/b.js
diff --git a/cli/tests/tla3/timeout_loop.js b/cli/tests/testdata/tla3/timeout_loop.js
index 860e6cd2a..860e6cd2a 100644
--- a/cli/tests/tla3/timeout_loop.js
+++ b/cli/tests/testdata/tla3/timeout_loop.js
diff --git a/cli/tests/tls.out b/cli/tests/testdata/tls.out
index c8e8a135c..c8e8a135c 100644
--- a/cli/tests/tls.out
+++ b/cli/tests/testdata/tls.out
diff --git a/cli/tests/tls/README.md b/cli/tests/testdata/tls/README.md
index 19bbaec35..19bbaec35 100644
--- a/cli/tests/tls/README.md
+++ b/cli/tests/testdata/tls/README.md
diff --git a/cli/tests/tls/RootCA.crt b/cli/tests/testdata/tls/RootCA.crt
index c2f84ceeb..c2f84ceeb 100644
--- a/cli/tests/tls/RootCA.crt
+++ b/cli/tests/testdata/tls/RootCA.crt
diff --git a/cli/tests/tls/RootCA.key b/cli/tests/testdata/tls/RootCA.key
index 98ce53b0b..98ce53b0b 100644
--- a/cli/tests/tls/RootCA.key
+++ b/cli/tests/testdata/tls/RootCA.key
diff --git a/cli/tests/tls/RootCA.pem b/cli/tests/testdata/tls/RootCA.pem
index c2f84ceeb..c2f84ceeb 100644
--- a/cli/tests/tls/RootCA.pem
+++ b/cli/tests/testdata/tls/RootCA.pem
diff --git a/cli/tests/tls/domains.txt b/cli/tests/testdata/tls/domains.txt
index 0bba95d33..0bba95d33 100644
--- a/cli/tests/tls/domains.txt
+++ b/cli/tests/testdata/tls/domains.txt
diff --git a/cli/tests/tls/localhost.crt b/cli/tests/testdata/tls/localhost.crt
index a71ae9050..a71ae9050 100644
--- a/cli/tests/tls/localhost.crt
+++ b/cli/tests/testdata/tls/localhost.crt
diff --git a/cli/tests/tls/localhost.key b/cli/tests/testdata/tls/localhost.key
index 42774c977..42774c977 100644
--- a/cli/tests/tls/localhost.key
+++ b/cli/tests/testdata/tls/localhost.key
diff --git a/cli/tests/tls_connecttls.js b/cli/tests/testdata/tls_connecttls.js
index 1ef6b99ee..1e8cf320c 100644
--- a/cli/tests/tls_connecttls.js
+++ b/cli/tests/testdata/tls_connecttls.js
@@ -1,7 +1,10 @@
-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";
+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";
 
 const encoder = new TextEncoder();
 const decoder = new TextDecoder();
diff --git a/cli/tests/tls_starttls.js b/cli/tests/testdata/tls_starttls.js
index 652ba869f..9b8767eaa 100644
--- a/cli/tests/tls_starttls.js
+++ b/cli/tests/testdata/tls_starttls.js
@@ -1,7 +1,10 @@
-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";
+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";
 
 const encoder = new TextEncoder();
 const decoder = new TextDecoder();
diff --git a/cli/tests/top_level_await.js b/cli/tests/testdata/top_level_await.js
index af6fbd662..af6fbd662 100644
--- a/cli/tests/top_level_await.js
+++ b/cli/tests/testdata/top_level_await.js
diff --git a/cli/tests/top_level_await.out b/cli/tests/testdata/top_level_await.out
index 4b65d15fe..4b65d15fe 100644
--- a/cli/tests/top_level_await.out
+++ b/cli/tests/testdata/top_level_await.out
diff --git a/cli/tests/top_level_await.ts b/cli/tests/testdata/top_level_await.ts
index 65de253ea..65de253ea 100644
--- a/cli/tests/top_level_await.ts
+++ b/cli/tests/testdata/top_level_await.ts
diff --git a/cli/tests/top_level_await_circular.js b/cli/tests/testdata/top_level_await_circular.js
index ff2964b6a..ff2964b6a 100644
--- a/cli/tests/top_level_await_circular.js
+++ b/cli/tests/testdata/top_level_await_circular.js
diff --git a/cli/tests/top_level_await_circular.out b/cli/tests/testdata/top_level_await_circular.out
index 3b453122e..fcbc001c3 100644
--- a/cli/tests/top_level_await_circular.out
+++ b/cli/tests/testdata/top_level_await_circular.out
@@ -6,4 +6,4 @@ timeout loop 4
 timeout loop 5
 error: Dynamically imported module evaluation is still pending but there are no pending ops. This situation is often caused by unresolved promise.
 Pending dynamic modules:
-- [WILDCARD]tests/tla3/b.js
+- [WILDCARD]/tla3/b.js
diff --git a/cli/tests/top_level_await_loop.js b/cli/tests/testdata/top_level_await_loop.js
index 384f8d0ed..384f8d0ed 100644
--- a/cli/tests/top_level_await_loop.js
+++ b/cli/tests/testdata/top_level_await_loop.js
diff --git a/cli/tests/top_level_await_loop.out b/cli/tests/testdata/top_level_await_loop.out
index 70e621e45..70e621e45 100644
--- a/cli/tests/top_level_await_loop.out
+++ b/cli/tests/testdata/top_level_await_loop.out
diff --git a/cli/tests/top_level_await_nested.out b/cli/tests/testdata/top_level_await_nested.out
index 8a1218a10..8a1218a10 100644
--- a/cli/tests/top_level_await_nested.out
+++ b/cli/tests/testdata/top_level_await_nested.out
diff --git a/cli/tests/top_level_await_nested/a.js b/cli/tests/testdata/top_level_await_nested/a.js
index 74837d4ba..74837d4ba 100644
--- a/cli/tests/top_level_await_nested/a.js
+++ b/cli/tests/testdata/top_level_await_nested/a.js
diff --git a/cli/tests/top_level_await_nested/b.js b/cli/tests/testdata/top_level_await_nested/b.js
index 3bd241b50..3bd241b50 100644
--- a/cli/tests/top_level_await_nested/b.js
+++ b/cli/tests/testdata/top_level_await_nested/b.js
diff --git a/cli/tests/top_level_await_nested/main.js b/cli/tests/testdata/top_level_await_nested/main.js
index ed46a4717..ed46a4717 100644
--- a/cli/tests/top_level_await_nested/main.js
+++ b/cli/tests/testdata/top_level_await_nested/main.js
diff --git a/cli/tests/top_level_await_order.js b/cli/tests/testdata/top_level_await_order.js
index 30659cdfb..30659cdfb 100644
--- a/cli/tests/top_level_await_order.js
+++ b/cli/tests/testdata/top_level_await_order.js
diff --git a/cli/tests/top_level_await_order.out b/cli/tests/testdata/top_level_await_order.out
index 4cc27858c..4cc27858c 100644
--- a/cli/tests/top_level_await_order.out
+++ b/cli/tests/testdata/top_level_await_order.out
diff --git a/cli/tests/top_level_await_unresolved.js b/cli/tests/testdata/top_level_await_unresolved.js
index 231a8cd63..231a8cd63 100644
--- a/cli/tests/top_level_await_unresolved.js
+++ b/cli/tests/testdata/top_level_await_unresolved.js
diff --git a/cli/tests/top_level_await_unresolved.out b/cli/tests/testdata/top_level_await_unresolved.out
index 77395f5d0..77395f5d0 100644
--- a/cli/tests/top_level_await_unresolved.out
+++ b/cli/tests/testdata/top_level_await_unresolved.out
diff --git a/cli/tests/top_level_for_await.js b/cli/tests/testdata/top_level_for_await.js
index a330f6c71..a330f6c71 100644
--- a/cli/tests/top_level_for_await.js
+++ b/cli/tests/testdata/top_level_for_await.js
diff --git a/cli/tests/top_level_for_await.out b/cli/tests/testdata/top_level_for_await.out
index 4539bbf2d..4539bbf2d 100644
--- a/cli/tests/top_level_for_await.out
+++ b/cli/tests/testdata/top_level_for_await.out
diff --git a/cli/tests/top_level_for_await.ts b/cli/tests/testdata/top_level_for_await.ts
index 9179322d7..9179322d7 100644
--- a/cli/tests/top_level_for_await.ts
+++ b/cli/tests/testdata/top_level_for_await.ts
diff --git a/cli/tests/ts_decorators.ts b/cli/tests/testdata/ts_decorators.ts
index 95fba6cd4..95fba6cd4 100644
--- a/cli/tests/ts_decorators.ts
+++ b/cli/tests/testdata/ts_decorators.ts
diff --git a/cli/tests/ts_decorators.ts.out b/cli/tests/testdata/ts_decorators.ts.out
index 381c7a809..381c7a809 100644
--- a/cli/tests/ts_decorators.ts.out
+++ b/cli/tests/testdata/ts_decorators.ts.out
diff --git a/cli/tests/ts_decorators_bundle.out b/cli/tests/testdata/ts_decorators_bundle.out
index a5b77b7bf..a5b77b7bf 100644
--- a/cli/tests/ts_decorators_bundle.out
+++ b/cli/tests/testdata/ts_decorators_bundle.out
diff --git a/cli/tests/ts_decorators_bundle.ts b/cli/tests/testdata/ts_decorators_bundle.ts
index 72120b2ec..72120b2ec 100644
--- a/cli/tests/ts_decorators_bundle.ts
+++ b/cli/tests/testdata/ts_decorators_bundle.ts
diff --git a/cli/tests/testdata/ts_import_from_js.deps.js b/cli/tests/testdata/ts_import_from_js.deps.js
new file mode 100644
index 000000000..ef326c444
--- /dev/null
+++ b/cli/tests/testdata/ts_import_from_js.deps.js
@@ -0,0 +1,2 @@
+import "./005_more_imports.ts";
+export { printHello } from "http://localhost:4545/subdir/mod2.ts";
diff --git a/cli/tests/ts_import_from_js.js b/cli/tests/testdata/ts_import_from_js.js
index f912c2723..f912c2723 100644
--- a/cli/tests/ts_import_from_js.js
+++ b/cli/tests/testdata/ts_import_from_js.js
diff --git a/cli/tests/ts_import_from_js.js.out b/cli/tests/testdata/ts_import_from_js.js.out
index e1d7a869f..e1d7a869f 100644
--- a/cli/tests/ts_import_from_js.js.out
+++ b/cli/tests/testdata/ts_import_from_js.js.out
diff --git a/cli/tests/ts_type_imports.ts b/cli/tests/testdata/ts_type_imports.ts
index 73c779156..73c779156 100644
--- a/cli/tests/ts_type_imports.ts
+++ b/cli/tests/testdata/ts_type_imports.ts
diff --git a/cli/tests/ts_type_imports.ts.out b/cli/tests/testdata/ts_type_imports.ts.out
index 3972d6a97..3972d6a97 100644
--- a/cli/tests/ts_type_imports.ts.out
+++ b/cli/tests/testdata/ts_type_imports.ts.out
diff --git a/cli/tests/ts_type_imports_foo.ts b/cli/tests/testdata/ts_type_imports_foo.ts
index db20773f6..db20773f6 100644
--- a/cli/tests/ts_type_imports_foo.ts
+++ b/cli/tests/testdata/ts_type_imports_foo.ts
diff --git a/cli/tests/ts_type_only_import.d.ts b/cli/tests/testdata/ts_type_only_import.d.ts
index d48e4b48a..d48e4b48a 100644
--- a/cli/tests/ts_type_only_import.d.ts
+++ b/cli/tests/testdata/ts_type_only_import.d.ts
diff --git a/cli/tests/ts_type_only_import.ts b/cli/tests/testdata/ts_type_only_import.ts
index 53e114373..53e114373 100644
--- a/cli/tests/ts_type_only_import.ts
+++ b/cli/tests/testdata/ts_type_only_import.ts
diff --git a/cli/tests/ts_type_only_import.ts.out b/cli/tests/testdata/ts_type_only_import.ts.out
index f808ed21a..f808ed21a 100644
--- a/cli/tests/ts_type_only_import.ts.out
+++ b/cli/tests/testdata/ts_type_only_import.ts.out
diff --git a/cli/tests/ts_with_generic.ts b/cli/tests/testdata/ts_with_generic.ts
index 1e3591f40..1e3591f40 100644
--- a/cli/tests/ts_with_generic.ts
+++ b/cli/tests/testdata/ts_with_generic.ts
diff --git a/cli/tests/tsc/a.js b/cli/tests/testdata/tsc/a.js
index 5a7b3ff93..5a7b3ff93 100644
--- a/cli/tests/tsc/a.js
+++ b/cli/tests/testdata/tsc/a.js
diff --git a/cli/tests/tsc/d.ts b/cli/tests/testdata/tsc/d.ts
index 3c74b8c83..3c74b8c83 100644
--- a/cli/tests/tsc/d.ts
+++ b/cli/tests/testdata/tsc/d.ts
diff --git a/cli/tests/tsc/node_modules/b.js b/cli/tests/testdata/tsc/node_modules/b.js
index 191660935..191660935 100644
--- a/cli/tests/tsc/node_modules/b.js
+++ b/cli/tests/testdata/tsc/node_modules/b.js
diff --git a/cli/tests/tsc/node_modules/c.js b/cli/tests/testdata/tsc/node_modules/c.js
index cff71c44a..cff71c44a 100644
--- a/cli/tests/tsc/node_modules/c.js
+++ b/cli/tests/testdata/tsc/node_modules/c.js
diff --git a/cli/tests/tsc/test.js b/cli/tests/testdata/tsc/test.js
index b7f46b351..b7f46b351 100644
--- a/cli/tests/tsc/test.js
+++ b/cli/tests/testdata/tsc/test.js
diff --git a/cli/tests/tsc2/file_exportc.ts b/cli/tests/testdata/tsc2/file_exportc.ts
index efcc5bb46..efcc5bb46 100644
--- a/cli/tests/tsc2/file_exportc.ts
+++ b/cli/tests/testdata/tsc2/file_exportc.ts
diff --git a/cli/tests/tsc2/file_libref.ts b/cli/tests/testdata/tsc2/file_libref.ts
index 6f37da139..6f37da139 100644
--- a/cli/tests/tsc2/file_libref.ts
+++ b/cli/tests/testdata/tsc2/file_libref.ts
diff --git a/cli/tests/tsc2/file_main.ts b/cli/tests/testdata/tsc2/file_main.ts
index a45477fde..a45477fde 100644
--- a/cli/tests/tsc2/file_main.ts
+++ b/cli/tests/testdata/tsc2/file_main.ts
diff --git a/cli/tests/tsc2/file_reexports.ts b/cli/tests/testdata/tsc2/file_reexports.ts
index b26297423..b26297423 100644
--- a/cli/tests/tsc2/file_reexports.ts
+++ b/cli/tests/testdata/tsc2/file_reexports.ts
diff --git a/cli/tests/tsc2/https_deno.land-x-a.ts b/cli/tests/testdata/tsc2/https_deno.land-x-a.ts
index 72b3a67bc..72b3a67bc 100644
--- a/cli/tests/tsc2/https_deno.land-x-a.ts
+++ b/cli/tests/testdata/tsc2/https_deno.land-x-a.ts
diff --git a/cli/tests/tsc2/https_deno.land-x-b.ts b/cli/tests/testdata/tsc2/https_deno.land-x-b.ts
index 59d168993..59d168993 100644
--- a/cli/tests/tsc2/https_deno.land-x-b.ts
+++ b/cli/tests/testdata/tsc2/https_deno.land-x-b.ts
diff --git a/cli/tests/tsc2/https_deno.land-x-c.d.ts b/cli/tests/testdata/tsc2/https_deno.land-x-c.d.ts
index bf3a09240..bf3a09240 100644
--- a/cli/tests/tsc2/https_deno.land-x-c.d.ts
+++ b/cli/tests/testdata/tsc2/https_deno.land-x-c.d.ts
diff --git a/cli/tests/tsc2/https_deno.land-x-c.js b/cli/tests/testdata/tsc2/https_deno.land-x-c.js
index 7f2cfac77..7f2cfac77 100644
--- a/cli/tests/tsc2/https_deno.land-x-c.js
+++ b/cli/tests/testdata/tsc2/https_deno.land-x-c.js
diff --git a/cli/tests/tsc2/https_deno.land-x-mod.ts b/cli/tests/testdata/tsc2/https_deno.land-x-mod.ts
index a45477fde..a45477fde 100644
--- a/cli/tests/tsc2/https_deno.land-x-mod.ts
+++ b/cli/tests/testdata/tsc2/https_deno.land-x-mod.ts
diff --git a/cli/tests/tsconfig.decorators.json b/cli/tests/testdata/tsconfig.decorators.json
index 504cd646e..504cd646e 100644
--- a/cli/tests/tsconfig.decorators.json
+++ b/cli/tests/testdata/tsconfig.decorators.json
diff --git a/cli/tests/tsx_imports.ts b/cli/tests/testdata/tsx_imports.ts
index 44ba10b7a..44ba10b7a 100644
--- a/cli/tests/tsx_imports.ts
+++ b/cli/tests/testdata/tsx_imports.ts
diff --git a/cli/tests/tsx_imports.ts.out b/cli/tests/testdata/tsx_imports.ts.out
index 1f8b10d32..1f8b10d32 100644
--- a/cli/tests/tsx_imports.ts.out
+++ b/cli/tests/testdata/tsx_imports.ts.out
diff --git a/cli/tests/type_definitions.ts b/cli/tests/testdata/type_definitions.ts
index a1bb37a65..a1bb37a65 100644
--- a/cli/tests/type_definitions.ts
+++ b/cli/tests/testdata/type_definitions.ts
diff --git a/cli/tests/type_definitions.ts.out b/cli/tests/testdata/type_definitions.ts.out
index b4fa88c50..b4fa88c50 100644
--- a/cli/tests/type_definitions.ts.out
+++ b/cli/tests/testdata/type_definitions.ts.out
diff --git a/cli/tests/type_definitions/bar.d.ts b/cli/tests/testdata/type_definitions/bar.d.ts
index d43335dbb..d43335dbb 100644
--- a/cli/tests/type_definitions/bar.d.ts
+++ b/cli/tests/testdata/type_definitions/bar.d.ts
diff --git a/cli/tests/type_definitions/bar.js b/cli/tests/testdata/type_definitions/bar.js
index e9c2e5193..e9c2e5193 100644
--- a/cli/tests/type_definitions/bar.js
+++ b/cli/tests/testdata/type_definitions/bar.js
diff --git a/cli/tests/type_definitions/fizz.d.ts b/cli/tests/testdata/type_definitions/fizz.d.ts
index 34eb41b96..34eb41b96 100644
--- a/cli/tests/type_definitions/fizz.d.ts
+++ b/cli/tests/testdata/type_definitions/fizz.d.ts
diff --git a/cli/tests/type_definitions/fizz.js b/cli/tests/testdata/type_definitions/fizz.js
index 852162c94..852162c94 100644
--- a/cli/tests/type_definitions/fizz.js
+++ b/cli/tests/testdata/type_definitions/fizz.js
diff --git a/cli/tests/type_definitions/foo.d.ts b/cli/tests/testdata/type_definitions/foo.d.ts
index ce39201e1..ce39201e1 100644
--- a/cli/tests/type_definitions/foo.d.ts
+++ b/cli/tests/testdata/type_definitions/foo.d.ts
diff --git a/cli/tests/type_definitions/foo.js b/cli/tests/testdata/type_definitions/foo.js
index 61d366eb2..61d366eb2 100644
--- a/cli/tests/type_definitions/foo.js
+++ b/cli/tests/testdata/type_definitions/foo.js
diff --git a/cli/tests/type_definitions/qat.ts b/cli/tests/testdata/type_definitions/qat.ts
index 6196c9d38..6196c9d38 100644
--- a/cli/tests/type_definitions/qat.ts
+++ b/cli/tests/testdata/type_definitions/qat.ts
diff --git a/cli/tests/type_definitions_for_export.ts b/cli/tests/testdata/type_definitions_for_export.ts
index 1f17b4962..1f17b4962 100644
--- a/cli/tests/type_definitions_for_export.ts
+++ b/cli/tests/testdata/type_definitions_for_export.ts
diff --git a/cli/tests/type_definitions_for_export.ts.out b/cli/tests/testdata/type_definitions_for_export.ts.out
index 8f1240bc7..8f1240bc7 100644
--- a/cli/tests/type_definitions_for_export.ts.out
+++ b/cli/tests/testdata/type_definitions_for_export.ts.out
diff --git a/cli/tests/type_directives_01.ts b/cli/tests/testdata/type_directives_01.ts
index 71305824c..71305824c 100644
--- a/cli/tests/type_directives_01.ts
+++ b/cli/tests/testdata/type_directives_01.ts
diff --git a/cli/tests/type_directives_01.ts.out b/cli/tests/testdata/type_directives_01.ts.out
index 77ed3ae26..77ed3ae26 100644
--- a/cli/tests/type_directives_01.ts.out
+++ b/cli/tests/testdata/type_directives_01.ts.out
diff --git a/cli/tests/type_directives_02.ts b/cli/tests/testdata/type_directives_02.ts
index f7274bf26..f7274bf26 100644
--- a/cli/tests/type_directives_02.ts
+++ b/cli/tests/testdata/type_directives_02.ts
diff --git a/cli/tests/testdata/type_directives_02.ts.out b/cli/tests/testdata/type_directives_02.ts.out
new file mode 100644
index 000000000..b064483b4
--- /dev/null
+++ b/cli/tests/testdata/type_directives_02.ts.out
@@ -0,0 +1,3 @@
+[WILDCARD]
+DEBUG TS - host.getSourceFile("file:///[WILDCARD]/subdir/type_reference.d.ts", Latest)
+[WILDCARD]
\ No newline at end of file
diff --git a/cli/tests/type_directives_js_main.js b/cli/tests/testdata/type_directives_js_main.js
index f7274bf26..f7274bf26 100644
--- a/cli/tests/type_directives_js_main.js
+++ b/cli/tests/testdata/type_directives_js_main.js
diff --git a/cli/tests/type_directives_js_main.js.out b/cli/tests/testdata/type_directives_js_main.js.out
index 13decaa78..7bca837f0 100644
--- a/cli/tests/type_directives_js_main.js.out
+++ b/cli/tests/testdata/type_directives_js_main.js.out
@@ -1,3 +1,3 @@
 [WILDCARD]
-DEBUG RS - [WILDCARD] - FileFetcher::fetch() - specifier: file:///[WILDCARD]cli/tests/subdir/type_reference.d.ts
+DEBUG RS - [WILDCARD] - FileFetcher::fetch() - specifier: file:///[WILDCARD]/subdir/type_reference.d.ts
 [WILDCARD]
diff --git a/cli/tests/type_directives_redirect.ts b/cli/tests/testdata/type_directives_redirect.ts
index 1756d5af9..1756d5af9 100644
--- a/cli/tests/type_directives_redirect.ts
+++ b/cli/tests/testdata/type_directives_redirect.ts
diff --git a/cli/tests/type_directives_redirect.ts.out b/cli/tests/testdata/type_directives_redirect.ts.out
index 471d9c0b4..471d9c0b4 100644
--- a/cli/tests/type_directives_redirect.ts.out
+++ b/cli/tests/testdata/type_directives_redirect.ts.out
diff --git a/cli/tests/type_headers_deno_types.ts b/cli/tests/testdata/type_headers_deno_types.ts
index 92391c666..92391c666 100644
--- a/cli/tests/type_headers_deno_types.ts
+++ b/cli/tests/testdata/type_headers_deno_types.ts
diff --git a/cli/tests/type_headers_deno_types.ts.out b/cli/tests/testdata/type_headers_deno_types.ts.out
index f1e4ca1f8..f1e4ca1f8 100644
--- a/cli/tests/type_headers_deno_types.ts.out
+++ b/cli/tests/testdata/type_headers_deno_types.ts.out
diff --git a/cli/tests/types.out b/cli/tests/testdata/types.out
index 9cda650eb..9cda650eb 100644
--- a/cli/tests/types.out
+++ b/cli/tests/testdata/types.out
diff --git a/cli/tests/unbuffered_stderr.ts b/cli/tests/testdata/unbuffered_stderr.ts
index 0f1d2a999..0f1d2a999 100644
--- a/cli/tests/unbuffered_stderr.ts
+++ b/cli/tests/testdata/unbuffered_stderr.ts
diff --git a/cli/tests/unbuffered_stderr.ts.out b/cli/tests/testdata/unbuffered_stderr.ts.out
index 500019738..500019738 100644
--- a/cli/tests/unbuffered_stderr.ts.out
+++ b/cli/tests/testdata/unbuffered_stderr.ts.out
diff --git a/cli/tests/unbuffered_stdout.ts b/cli/tests/testdata/unbuffered_stdout.ts
index 9f1e07a97..9f1e07a97 100644
--- a/cli/tests/unbuffered_stdout.ts
+++ b/cli/tests/testdata/unbuffered_stdout.ts
diff --git a/cli/tests/unbuffered_stdout.ts.out b/cli/tests/testdata/unbuffered_stdout.ts.out
index 2e65efe2a..2e65efe2a 100644
--- a/cli/tests/unbuffered_stdout.ts.out
+++ b/cli/tests/testdata/unbuffered_stdout.ts.out
diff --git a/cli/tests/unstable.js b/cli/tests/testdata/unstable.js
index a9894be3e..a9894be3e 100644
--- a/cli/tests/unstable.js
+++ b/cli/tests/testdata/unstable.js
diff --git a/cli/tests/unstable.ts b/cli/tests/testdata/unstable.ts
index a9894be3e..a9894be3e 100644
--- a/cli/tests/unstable.ts
+++ b/cli/tests/testdata/unstable.ts
diff --git a/cli/tests/unstable_disabled.out b/cli/tests/testdata/unstable_disabled.out
index e951c5d0a..28659645d 100644
--- a/cli/tests/unstable_disabled.out
+++ b/cli/tests/testdata/unstable_disabled.out
@@ -2,4 +2,4 @@
 error: TS2339 [ERROR]: Property 'loadavg' does not exist on type 'typeof Deno'. 'Deno.loadavg' is an unstable API. Did you forget to run with the '--unstable' flag?
 console.log(Deno.loadavg);
                  ~~~~~~~
-    at [WILDCARD]/cli/tests/unstable.ts:1:18
+    at [WILDCARD]/unstable.ts:1:18
diff --git a/cli/tests/unstable_disabled_js.out b/cli/tests/testdata/unstable_disabled_js.out
index 417b7b537..417b7b537 100644
--- a/cli/tests/unstable_disabled_js.out
+++ b/cli/tests/testdata/unstable_disabled_js.out
diff --git a/cli/tests/unstable_enabled.out b/cli/tests/testdata/unstable_enabled.out
index b4cedce14..b4cedce14 100644
--- a/cli/tests/unstable_enabled.out
+++ b/cli/tests/testdata/unstable_enabled.out
diff --git a/cli/tests/unstable_enabled_js.out b/cli/tests/testdata/unstable_enabled_js.out
index b4cedce14..b4cedce14 100644
--- a/cli/tests/unstable_enabled_js.out
+++ b/cli/tests/testdata/unstable_enabled_js.out
diff --git a/cli/tests/unstable_worker.ts b/cli/tests/testdata/unstable_worker.ts
index 429754dfe..429754dfe 100644
--- a/cli/tests/unstable_worker.ts
+++ b/cli/tests/testdata/unstable_worker.ts
diff --git a/cli/tests/unstable_worker.ts.out b/cli/tests/testdata/unstable_worker.ts.out
index ece47de97..ece47de97 100644
--- a/cli/tests/unstable_worker.ts.out
+++ b/cli/tests/testdata/unstable_worker.ts.out
diff --git a/cli/tests/unsupported_dynamic_import_scheme.out b/cli/tests/testdata/unsupported_dynamic_import_scheme.out
index c708fced4..c708fced4 100644
--- a/cli/tests/unsupported_dynamic_import_scheme.out
+++ b/cli/tests/testdata/unsupported_dynamic_import_scheme.out
diff --git a/cli/tests/v8_flags.js b/cli/tests/testdata/v8_flags.js
index f7999c4af..f7999c4af 100644
--- a/cli/tests/v8_flags.js
+++ b/cli/tests/testdata/v8_flags.js
diff --git a/cli/tests/v8_flags.js.out b/cli/tests/testdata/v8_flags.js.out
index e2dbde096..e2dbde096 100644
--- a/cli/tests/v8_flags.js.out
+++ b/cli/tests/testdata/v8_flags.js.out
diff --git a/cli/tests/v8_flags_unrecognized.out b/cli/tests/testdata/v8_flags_unrecognized.out
index 56e70f830..56e70f830 100644
--- a/cli/tests/v8_flags_unrecognized.out
+++ b/cli/tests/testdata/v8_flags_unrecognized.out
diff --git a/cli/tests/v8_help.out b/cli/tests/testdata/v8_help.out
index 006d73557..006d73557 100644
--- a/cli/tests/v8_help.out
+++ b/cli/tests/testdata/v8_help.out
diff --git a/cli/tests/wasm.ts b/cli/tests/testdata/wasm.ts
index 96b5fdffc..96b5fdffc 100644
--- a/cli/tests/wasm.ts
+++ b/cli/tests/testdata/wasm.ts
diff --git a/cli/tests/wasm.ts.out b/cli/tests/testdata/wasm.ts.out
index d81cc0710..d81cc0710 100644
--- a/cli/tests/wasm.ts.out
+++ b/cli/tests/testdata/wasm.ts.out
diff --git a/cli/tests/wasm_async.js b/cli/tests/testdata/wasm_async.js
index 837460ae9..837460ae9 100644
--- a/cli/tests/wasm_async.js
+++ b/cli/tests/testdata/wasm_async.js
diff --git a/cli/tests/wasm_async.out b/cli/tests/testdata/wasm_async.out
index 5cdf17de7..5cdf17de7 100644
--- a/cli/tests/wasm_async.out
+++ b/cli/tests/testdata/wasm_async.out
diff --git a/cli/tests/wasm_shared.out b/cli/tests/testdata/wasm_shared.out
index e69de29bb..e69de29bb 100644
--- a/cli/tests/wasm_shared.out
+++ b/cli/tests/testdata/wasm_shared.out
diff --git a/cli/tests/wasm_shared.ts b/cli/tests/testdata/wasm_shared.ts
index b713385d5..b713385d5 100644
--- a/cli/tests/wasm_shared.ts
+++ b/cli/tests/testdata/wasm_shared.ts
diff --git a/cli/tests/wasm_unreachable.js b/cli/tests/testdata/wasm_unreachable.js
index 991ebcec8..991ebcec8 100644
--- a/cli/tests/wasm_unreachable.js
+++ b/cli/tests/testdata/wasm_unreachable.js
diff --git a/cli/tests/wasm_unreachable.out b/cli/tests/testdata/wasm_unreachable.out
index 743e7f6cd..28fe00de6 100644
--- a/cli/tests/wasm_unreachable.out
+++ b/cli/tests/testdata/wasm_unreachable.out
@@ -1,3 +1,3 @@
 error: Uncaught RuntimeError: unreachable
     at <anonymous> (wasm://wasm/[WILDCARD])
-    at [WILDCARD]/cli/tests/wasm_unreachable.js:[WILDCARD]
+    at [WILDCARD]/wasm_unreachable.js:[WILDCARD]
diff --git a/cli/tests/weakref.ts b/cli/tests/testdata/weakref.ts
index 47c3985fe..47c3985fe 100644
--- a/cli/tests/weakref.ts
+++ b/cli/tests/testdata/weakref.ts
diff --git a/cli/tests/weakref.ts.out b/cli/tests/testdata/weakref.ts.out
index 32bafcf2d..32bafcf2d 100644
--- a/cli/tests/weakref.ts.out
+++ b/cli/tests/testdata/weakref.ts.out
diff --git a/cli/tests/webgpu_computepass_shader.wgsl b/cli/tests/testdata/webgpu_computepass_shader.wgsl
index 7d4748e2a..7d4748e2a 100644
--- a/cli/tests/webgpu_computepass_shader.wgsl
+++ b/cli/tests/testdata/webgpu_computepass_shader.wgsl
diff --git a/cli/tests/webgpu_hellotriangle.out b/cli/tests/testdata/webgpu_hellotriangle.out
index 91454dbfc..91454dbfc 100644
--- a/cli/tests/webgpu_hellotriangle.out
+++ b/cli/tests/testdata/webgpu_hellotriangle.out
diff --git a/cli/tests/webgpu_hellotriangle_shader.wgsl b/cli/tests/testdata/webgpu_hellotriangle_shader.wgsl
index b8b2b69fc..b8b2b69fc 100644
--- a/cli/tests/webgpu_hellotriangle_shader.wgsl
+++ b/cli/tests/testdata/webgpu_hellotriangle_shader.wgsl
diff --git a/cli/tests/websocket_test.ts b/cli/tests/testdata/websocket_test.ts
index 7d62679fe..5229ad875 100644
--- a/cli/tests/websocket_test.ts
+++ b/cli/tests/testdata/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/websocketstream_test.ts b/cli/tests/testdata/websocketstream_test.ts
index 5b4d19f6e..aa809ba16 100644
--- a/cli/tests/websocketstream_test.ts
+++ b/cli/tests/testdata/websocketstream_test.ts
@@ -4,7 +4,7 @@ import {
   assertEquals,
   assertThrows,
   assertThrowsAsync,
-} 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/worker_close_race.js b/cli/tests/testdata/worker_close_race.js
index 6d5bbe2c3..6d5bbe2c3 100644
--- a/cli/tests/worker_close_race.js
+++ b/cli/tests/testdata/worker_close_race.js
diff --git a/cli/tests/worker_close_race.js.out b/cli/tests/testdata/worker_close_race.js.out
index e69de29bb..e69de29bb 100644
--- a/cli/tests/worker_close_race.js.out
+++ b/cli/tests/testdata/worker_close_race.js.out
diff --git a/cli/tests/worker_event_handler_test.js b/cli/tests/testdata/worker_event_handler_test.js
index e0ce3d9f8..e0ce3d9f8 100644
--- a/cli/tests/worker_event_handler_test.js
+++ b/cli/tests/testdata/worker_event_handler_test.js
diff --git a/cli/tests/worker_event_handler_test.js.out b/cli/tests/testdata/worker_event_handler_test.js.out
index 5556633b1..5556633b1 100644
--- a/cli/tests/worker_event_handler_test.js.out
+++ b/cli/tests/testdata/worker_event_handler_test.js.out
diff --git a/cli/tests/workers/bench_large_message.ts b/cli/tests/testdata/workers/bench_large_message.ts
index a89ea9a78..a89ea9a78 100644
--- a/cli/tests/workers/bench_large_message.ts
+++ b/cli/tests/testdata/workers/bench_large_message.ts
diff --git a/cli/tests/workers/bench_round_robin.ts b/cli/tests/testdata/workers/bench_round_robin.ts
index a39f7ec6f..13afe286b 100644
--- a/cli/tests/workers/bench_round_robin.ts
+++ b/cli/tests/testdata/workers/bench_round_robin.ts
@@ -5,7 +5,10 @@ const data = "HTTP/1.1 200 OK\r\nContent-Length: 12\r\n\r\nHello World\n";
 const workerCount = 4;
 const cmdsPerWorker = 400;
 
-import { Deferred, deferred } from "../../../test_util/std/async/deferred.ts";
+import {
+  Deferred,
+  deferred,
+} from "../../../../test_util/std/async/deferred.ts";
 
 function handleAsyncMsgFromWorker(
   promiseTable: Map<number, Deferred<string>>,
diff --git a/cli/tests/workers/bench_startup.ts b/cli/tests/testdata/workers/bench_startup.ts
index bcf21ef44..bcf21ef44 100644
--- a/cli/tests/workers/bench_startup.ts
+++ b/cli/tests/testdata/workers/bench_startup.ts
diff --git a/cli/tests/workers/bench_worker.ts b/cli/tests/testdata/workers/bench_worker.ts
index 1edd2750f..1edd2750f 100644
--- a/cli/tests/workers/bench_worker.ts
+++ b/cli/tests/testdata/workers/bench_worker.ts
diff --git a/cli/tests/workers/broadcast_channel.ts b/cli/tests/testdata/workers/broadcast_channel.ts
index 5076e9eb7..5076e9eb7 100644
--- a/cli/tests/workers/broadcast_channel.ts
+++ b/cli/tests/testdata/workers/broadcast_channel.ts
diff --git a/cli/tests/workers/busy_worker.js b/cli/tests/testdata/workers/busy_worker.js
index 7deba0321..7deba0321 100644
--- a/cli/tests/workers/busy_worker.js
+++ b/cli/tests/testdata/workers/busy_worker.js
diff --git a/cli/tests/workers/close_race_worker.js b/cli/tests/testdata/workers/close_race_worker.js
index f582a0d99..f582a0d99 100644
--- a/cli/tests/workers/close_race_worker.js
+++ b/cli/tests/testdata/workers/close_race_worker.js
diff --git a/cli/tests/workers/deno_worker.ts b/cli/tests/testdata/workers/deno_worker.ts
index 2a29c8c4d..2a29c8c4d 100644
--- a/cli/tests/workers/deno_worker.ts
+++ b/cli/tests/testdata/workers/deno_worker.ts
diff --git a/cli/tests/workers/dynamic_remote.ts b/cli/tests/testdata/workers/dynamic_remote.ts
index 381c7f374..381c7f374 100644
--- a/cli/tests/workers/dynamic_remote.ts
+++ b/cli/tests/testdata/workers/dynamic_remote.ts
diff --git a/cli/tests/workers/error.ts b/cli/tests/testdata/workers/error.ts
index 495971090..495971090 100644
--- a/cli/tests/workers/error.ts
+++ b/cli/tests/testdata/workers/error.ts
diff --git a/cli/tests/workers/event_worker.js b/cli/tests/testdata/workers/event_worker.js
index 849b6026c..849b6026c 100644
--- a/cli/tests/workers/event_worker.js
+++ b/cli/tests/testdata/workers/event_worker.js
diff --git a/cli/tests/workers/event_worker_scope.js b/cli/tests/testdata/workers/event_worker_scope.js
index 0381801a8..0381801a8 100644
--- a/cli/tests/workers/event_worker_scope.js
+++ b/cli/tests/testdata/workers/event_worker_scope.js
diff --git a/cli/tests/workers/fetching_worker.js b/cli/tests/testdata/workers/fetching_worker.js
index e1bcdf911..77ff471d7 100644
--- a/cli/tests/workers/fetching_worker.js
+++ b/cli/tests/testdata/workers/fetching_worker.js
@@ -1,5 +1,5 @@
 const r = await fetch(
-  "http://localhost:4545/cli/tests/workers/fetching_worker.js",
+  "http://localhost:4545/workers/fetching_worker.js",
 );
 await r.text();
 postMessage("Done!");
diff --git a/cli/tests/workers/http_worker.js b/cli/tests/testdata/workers/http_worker.js
index 34603ed56..34603ed56 100644
--- a/cli/tests/workers/http_worker.js
+++ b/cli/tests/testdata/workers/http_worker.js
diff --git a/cli/tests/workers/immediately_close_worker.js b/cli/tests/testdata/workers/immediately_close_worker.js
index 8fd27343a..8fd27343a 100644
--- a/cli/tests/workers/immediately_close_worker.js
+++ b/cli/tests/testdata/workers/immediately_close_worker.js
diff --git a/cli/tests/workers/message_port.ts b/cli/tests/testdata/workers/message_port.ts
index d78304a39..d78304a39 100644
--- a/cli/tests/workers/message_port.ts
+++ b/cli/tests/testdata/workers/message_port.ts
diff --git a/cli/tests/workers/nested_worker.js b/cli/tests/testdata/workers/nested_worker.js
index 4b51b8763..4b51b8763 100644
--- a/cli/tests/workers/nested_worker.js
+++ b/cli/tests/testdata/workers/nested_worker.js
diff --git a/cli/tests/workers/no_permissions_worker.js b/cli/tests/testdata/workers/no_permissions_worker.js
index db0d911ac..db0d911ac 100644
--- a/cli/tests/workers/no_permissions_worker.js
+++ b/cli/tests/testdata/workers/no_permissions_worker.js
diff --git a/cli/tests/workers/non_deno_worker.js b/cli/tests/testdata/workers/non_deno_worker.js
index 773721560..773721560 100644
--- a/cli/tests/workers/non_deno_worker.js
+++ b/cli/tests/testdata/workers/non_deno_worker.js
diff --git a/cli/tests/workers/nonexistent_worker.out b/cli/tests/testdata/workers/nonexistent_worker.out
index 04b9f801d..1651321bc 100644
--- a/cli/tests/workers/nonexistent_worker.out
+++ b/cli/tests/testdata/workers/nonexistent_worker.out
@@ -1,3 +1,3 @@
-[WILDCARD]error: Uncaught (in worker "") Cannot resolve module "file:///[WILDCARD]cli/tests/workers/doesnt_exist.js".
+[WILDCARD]error: Uncaught (in worker "") Cannot resolve module "file:///[WILDCARD]/workers/doesnt_exist.js".
 error: Uncaught (in promise) Error: Unhandled error event reached main worker.
     at Worker.#pollControl ([WILDCARD])
diff --git a/cli/tests/workers/nonexistent_worker.ts b/cli/tests/testdata/workers/nonexistent_worker.ts
index 8ebe29114..8ebe29114 100644
--- a/cli/tests/workers/nonexistent_worker.ts
+++ b/cli/tests/testdata/workers/nonexistent_worker.ts
diff --git a/cli/tests/workers/parent_read_check_granular_worker.js b/cli/tests/testdata/workers/parent_read_check_granular_worker.js
index 1391190cd..1391190cd 100644
--- a/cli/tests/workers/parent_read_check_granular_worker.js
+++ b/cli/tests/testdata/workers/parent_read_check_granular_worker.js
diff --git a/cli/tests/workers/parent_read_check_worker.js b/cli/tests/testdata/workers/parent_read_check_worker.js
index ec92cca3f..ec92cca3f 100644
--- a/cli/tests/workers/parent_read_check_worker.js
+++ b/cli/tests/testdata/workers/parent_read_check_worker.js
diff --git a/cli/tests/workers/permissions_blob_local.ts b/cli/tests/testdata/workers/permissions_blob_local.ts
index 52f630bd8..52f630bd8 100644
--- a/cli/tests/workers/permissions_blob_local.ts
+++ b/cli/tests/testdata/workers/permissions_blob_local.ts
diff --git a/cli/tests/workers/permissions_blob_local.ts.out b/cli/tests/testdata/workers/permissions_blob_local.ts.out
index 0835777ec..0835777ec 100644
--- a/cli/tests/workers/permissions_blob_local.ts.out
+++ b/cli/tests/testdata/workers/permissions_blob_local.ts.out
diff --git a/cli/tests/workers/permissions_blob_remote.ts b/cli/tests/testdata/workers/permissions_blob_remote.ts
index 4808bc57b..4808bc57b 100644
--- a/cli/tests/workers/permissions_blob_remote.ts
+++ b/cli/tests/testdata/workers/permissions_blob_remote.ts
diff --git a/cli/tests/workers/permissions_blob_remote.ts.out b/cli/tests/testdata/workers/permissions_blob_remote.ts.out
index 2d01458ca..2d01458ca 100644
--- a/cli/tests/workers/permissions_blob_remote.ts.out
+++ b/cli/tests/testdata/workers/permissions_blob_remote.ts.out
diff --git a/cli/tests/workers/permissions_data_local.ts b/cli/tests/testdata/workers/permissions_data_local.ts
index cda80bed6..cda80bed6 100644
--- a/cli/tests/workers/permissions_data_local.ts
+++ b/cli/tests/testdata/workers/permissions_data_local.ts
diff --git a/cli/tests/workers/permissions_data_local.ts.out b/cli/tests/testdata/workers/permissions_data_local.ts.out
index 2a6be2b57..2a6be2b57 100644
--- a/cli/tests/workers/permissions_data_local.ts.out
+++ b/cli/tests/testdata/workers/permissions_data_local.ts.out
diff --git a/cli/tests/workers/permissions_data_remote.ts b/cli/tests/testdata/workers/permissions_data_remote.ts
index b37bd661d..b37bd661d 100644
--- a/cli/tests/workers/permissions_data_remote.ts
+++ b/cli/tests/testdata/workers/permissions_data_remote.ts
diff --git a/cli/tests/workers/permissions_data_remote.ts.out b/cli/tests/testdata/workers/permissions_data_remote.ts.out
index 90677892a..90677892a 100644
--- a/cli/tests/workers/permissions_data_remote.ts.out
+++ b/cli/tests/testdata/workers/permissions_data_remote.ts.out
diff --git a/cli/tests/workers/permissions_dynamic_remote.ts b/cli/tests/testdata/workers/permissions_dynamic_remote.ts
index a5d293e16..54a361bc0 100644
--- a/cli/tests/workers/permissions_dynamic_remote.ts
+++ b/cli/tests/testdata/workers/permissions_dynamic_remote.ts
@@ -1,5 +1,5 @@
 new Worker(
-  "http://localhost:4545/cli/tests/workers/dynamic_remote.ts",
+  "http://localhost:4545/workers/dynamic_remote.ts",
   {
     type: "module",
     deno: {
diff --git a/cli/tests/workers/permissions_dynamic_remote.ts.out b/cli/tests/testdata/workers/permissions_dynamic_remote.ts.out
index e68c96df1..3c4523ce0 100644
--- a/cli/tests/workers/permissions_dynamic_remote.ts.out
+++ b/cli/tests/testdata/workers/permissions_dynamic_remote.ts.out
@@ -1,6 +1,6 @@
 error: Uncaught (in worker "") (in promise) TypeError: Requires net access to "example.com", run again with the --allow-net flag
 await import("https://example.com/some/file.ts");
 ^
-    at async http://localhost:4545/cli/tests/workers/dynamic_remote.ts:2:1
+    at async http://localhost:4545/workers/dynamic_remote.ts:2:1
 [WILDCARD]error: Uncaught (in promise) Error: Unhandled error event reached main worker.
     at Worker.#pollControl ([WILDCARD])
diff --git a/cli/tests/testdata/workers/permissions_remote_remote.ts b/cli/tests/testdata/workers/permissions_remote_remote.ts
new file mode 100644
index 000000000..4df2a8a5d
--- /dev/null
+++ b/cli/tests/testdata/workers/permissions_remote_remote.ts
@@ -0,0 +1,3 @@
+new Worker("http://localhost:4545/workers/static_remote.ts", {
+  type: "module",
+});
diff --git a/cli/tests/workers/permissions_remote_remote.ts.out b/cli/tests/testdata/workers/permissions_remote_remote.ts.out
index 5656b75a1..94a92c72d 100644
--- a/cli/tests/workers/permissions_remote_remote.ts.out
+++ b/cli/tests/testdata/workers/permissions_remote_remote.ts.out
@@ -1,4 +1,4 @@
 error: Uncaught (in worker "") Requires net access to "example.com", run again with the --allow-net flag
-    at http://localhost:4545/cli/tests/workers/static_remote.ts:2:0
+    at http://localhost:4545/workers/static_remote.ts:2:0
 error: Uncaught (in promise) Error: Unhandled error event reached main worker.
     at Worker.#pollControl ([WILDCARD])
diff --git a/cli/tests/workers/post_undefined.ts b/cli/tests/testdata/workers/post_undefined.ts
index 1b9b8d6ca..1b9b8d6ca 100644
--- a/cli/tests/workers/post_undefined.ts
+++ b/cli/tests/testdata/workers/post_undefined.ts
diff --git a/cli/tests/workers/racy_worker.js b/cli/tests/testdata/workers/racy_worker.js
index 0f66c6278..0f66c6278 100644
--- a/cli/tests/workers/racy_worker.js
+++ b/cli/tests/testdata/workers/racy_worker.js
diff --git a/cli/tests/workers/read_check_granular_worker.js b/cli/tests/testdata/workers/read_check_granular_worker.js
index 25f2058b3..25f2058b3 100644
--- a/cli/tests/workers/read_check_granular_worker.js
+++ b/cli/tests/testdata/workers/read_check_granular_worker.js
diff --git a/cli/tests/workers/read_check_worker.js b/cli/tests/testdata/workers/read_check_worker.js
index 2ad01bf5b..2ad01bf5b 100644
--- a/cli/tests/workers/read_check_worker.js
+++ b/cli/tests/testdata/workers/read_check_worker.js
diff --git a/cli/tests/workers/shared_array_buffer.ts b/cli/tests/testdata/workers/shared_array_buffer.ts
index 4af95863a..4af95863a 100644
--- a/cli/tests/workers/shared_array_buffer.ts
+++ b/cli/tests/testdata/workers/shared_array_buffer.ts
diff --git a/cli/tests/workers/sibling_worker.js b/cli/tests/testdata/workers/sibling_worker.js
index 99707e5d6..99707e5d6 100644
--- a/cli/tests/workers/sibling_worker.js
+++ b/cli/tests/testdata/workers/sibling_worker.js
diff --git a/cli/tests/workers/static_remote.ts b/cli/tests/testdata/workers/static_remote.ts
index 2d6e820fd..2d6e820fd 100644
--- a/cli/tests/workers/static_remote.ts
+++ b/cli/tests/testdata/workers/static_remote.ts
diff --git a/cli/tests/workers/test.ts b/cli/tests/testdata/workers/test.ts
index 44cbca0fe..9d3855fe1 100644
--- a/cli/tests/workers/test.ts
+++ b/cli/tests/testdata/workers/test.ts
@@ -6,9 +6,9 @@ import {
   assert,
   assertEquals,
   assertThrows,
-} from "../../../test_util/std/testing/asserts.ts";
-import { deferred } from "../../../test_util/std/async/deferred.ts";
-import { fromFileUrl } from "../../../test_util/std/path/mod.ts";
+} from "../../../../test_util/std/testing/asserts.ts";
+import { deferred } from "../../../../test_util/std/async/deferred.ts";
+import { fromFileUrl } from "../../../../test_util/std/path/mod.ts";
 
 Deno.test({
   name: "worker terminate",
@@ -668,7 +668,7 @@ Deno.test({
 Deno.test({
   name: "worker with relative specifier",
   fn: async function () {
-    assertEquals(location.href, "http://127.0.0.1:4545/cli/tests/");
+    assertEquals(location.href, "http://127.0.0.1:4545/");
     const promise = deferred();
     const w = new Worker(
       "./workers/test_worker.ts",
@@ -773,7 +773,7 @@ Deno.test({
 Deno.test({
   name: "worker with relative specifier",
   fn: async function () {
-    assertEquals(location.href, "http://127.0.0.1:4545/cli/tests/");
+    assertEquals(location.href, "http://127.0.0.1:4545/");
     const promise = deferred();
     const w = new Worker(
       "./workers/test_worker.ts",
diff --git a/cli/tests/workers/test.ts.out b/cli/tests/testdata/workers/test.ts.out
index 1b4238a9b..1b4238a9b 100644
--- a/cli/tests/workers/test.ts.out
+++ b/cli/tests/testdata/workers/test.ts.out
diff --git a/cli/tests/workers/test_worker.js b/cli/tests/testdata/workers/test_worker.js
index 4260975a6..4260975a6 100644
--- a/cli/tests/workers/test_worker.js
+++ b/cli/tests/testdata/workers/test_worker.js
diff --git a/cli/tests/workers/test_worker.ts b/cli/tests/testdata/workers/test_worker.ts
index 996476058..996476058 100644
--- a/cli/tests/workers/test_worker.ts
+++ b/cli/tests/testdata/workers/test_worker.ts
diff --git a/cli/tests/workers/throwing_worker.js b/cli/tests/testdata/workers/throwing_worker.js
index 56ee4ff88..56ee4ff88 100644
--- a/cli/tests/workers/throwing_worker.js
+++ b/cli/tests/testdata/workers/throwing_worker.js
diff --git a/cli/tests/workers/worker_crypto.js b/cli/tests/testdata/workers/worker_crypto.js
index 4398ad068..4398ad068 100644
--- a/cli/tests/workers/worker_crypto.js
+++ b/cli/tests/testdata/workers/worker_crypto.js
diff --git a/cli/tests/workers/worker_error.ts b/cli/tests/testdata/workers/worker_error.ts
index 696680de8..696680de8 100644
--- a/cli/tests/workers/worker_error.ts
+++ b/cli/tests/testdata/workers/worker_error.ts
diff --git a/cli/tests/workers/worker_error.ts.out b/cli/tests/testdata/workers/worker_error.ts.out
index 4a8e92f00..4a8e92f00 100644
--- a/cli/tests/workers/worker_error.ts.out
+++ b/cli/tests/testdata/workers/worker_error.ts.out
diff --git a/cli/tests/workers/worker_event_handlers.js b/cli/tests/testdata/workers/worker_event_handlers.js
index c8976f79e..c8976f79e 100644
--- a/cli/tests/workers/worker_event_handlers.js
+++ b/cli/tests/testdata/workers/worker_event_handlers.js
diff --git a/cli/tests/workers/worker_globals.ts b/cli/tests/testdata/workers/worker_globals.ts
index 90e369e41..90e369e41 100644
--- a/cli/tests/workers/worker_globals.ts
+++ b/cli/tests/testdata/workers/worker_globals.ts
diff --git a/cli/tests/workers/worker_large_message.js b/cli/tests/testdata/workers/worker_large_message.js
index a1ddae4f9..a1ddae4f9 100644
--- a/cli/tests/workers/worker_large_message.js
+++ b/cli/tests/testdata/workers/worker_large_message.js
diff --git a/cli/tests/workers/worker_location.ts b/cli/tests/testdata/workers/worker_location.ts
index c3c1bb26f..c3c1bb26f 100644
--- a/cli/tests/workers/worker_location.ts
+++ b/cli/tests/testdata/workers/worker_location.ts
diff --git a/cli/tests/workers/worker_nested_error.ts b/cli/tests/testdata/workers/worker_nested_error.ts
index aba2011be..aba2011be 100644
--- a/cli/tests/workers/worker_nested_error.ts
+++ b/cli/tests/testdata/workers/worker_nested_error.ts
diff --git a/cli/tests/workers/worker_nested_error.ts.out b/cli/tests/testdata/workers/worker_nested_error.ts.out
index 4a8e92f00..4a8e92f00 100644
--- a/cli/tests/workers/worker_nested_error.ts.out
+++ b/cli/tests/testdata/workers/worker_nested_error.ts.out
diff --git a/cli/tests/workers/worker_structured_cloning.ts b/cli/tests/testdata/workers/worker_structured_cloning.ts
index eb1719a9a..eb1719a9a 100644
--- a/cli/tests/workers/worker_structured_cloning.ts
+++ b/cli/tests/testdata/workers/worker_structured_cloning.ts
diff --git a/cli/tests/workers/worker_types.ts b/cli/tests/testdata/workers/worker_types.ts
index b67a3b782..b67a3b782 100644
--- a/cli/tests/workers/worker_types.ts
+++ b/cli/tests/testdata/workers/worker_types.ts
diff --git a/cli/tests/workers/worker_unstable.ts b/cli/tests/testdata/workers/worker_unstable.ts
index a5b5f7ba2..a5b5f7ba2 100644
--- a/cli/tests/workers/worker_unstable.ts
+++ b/cli/tests/testdata/workers/worker_unstable.ts
diff --git a/cli/tests/workers/worker_with_top_level_await.ts b/cli/tests/testdata/workers/worker_with_top_level_await.ts
index 1d20bb736..1d20bb736 100644
--- a/cli/tests/workers/worker_with_top_level_await.ts
+++ b/cli/tests/testdata/workers/worker_with_top_level_await.ts
diff --git a/cli/tests/x_deno_warning.js b/cli/tests/testdata/x_deno_warning.js
index 34b950566..34b950566 100644
--- a/cli/tests/x_deno_warning.js
+++ b/cli/tests/testdata/x_deno_warning.js
diff --git a/cli/tests/ts_import_from_js.deps.js b/cli/tests/ts_import_from_js.deps.js
deleted file mode 100644
index bfea5ac79..000000000
--- a/cli/tests/ts_import_from_js.deps.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import "./005_more_imports.ts";
-export { printHello } from "http://localhost:4545/cli/tests/subdir/mod2.ts";
diff --git a/cli/tests/type_directives_02.ts.out b/cli/tests/type_directives_02.ts.out
deleted file mode 100644
index 7949dfab5..000000000
--- a/cli/tests/type_directives_02.ts.out
+++ /dev/null
@@ -1,3 +0,0 @@
-[WILDCARD]
-DEBUG TS - host.getSourceFile("file:///[WILDCARD]cli/tests/subdir/type_reference.d.ts", Latest)
-[WILDCARD]
\ No newline at end of file
diff --git a/cli/tests/unit/README.md b/cli/tests/unit/README.md
index 114bbc043..e1197fe9b 100644
--- a/cli/tests/unit/README.md
+++ b/cli/tests/unit/README.md
@@ -26,7 +26,7 @@ unitTest(
 
 ## Running tests
 
-There are three ways to run `unit_test_runner.ts`:
+There are two ways to run `unit_test_runner.ts`:
 
 ```sh
 # Run all tests.
diff --git a/cli/tests/unit/body_test.ts b/cli/tests/unit/body_test.ts
index 78da2a9d4..fe0bbe25c 100644
--- a/cli/tests/unit/body_test.ts
+++ b/cli/tests/unit/body_test.ts
@@ -57,7 +57,7 @@ unitTest(
   { perms: { net: true } },
   async function bodyURLEncodedFormData() {
     const response = await fetch(
-      "http://localhost:4545/cli/tests/subdir/form_urlencoded.txt",
+      "http://localhost:4545/subdir/form_urlencoded.txt",
     );
     assert(response.body instanceof ReadableStream);
 
diff --git a/cli/tests/unit/broadcast_channel_test.ts b/cli/tests/unit/broadcast_channel_test.ts
index cfa62c856..33a8aaba0 100644
--- a/cli/tests/unit/broadcast_channel_test.ts
+++ b/cli/tests/unit/broadcast_channel_test.ts
@@ -6,7 +6,10 @@ Deno.test("broadcastchannel worker", async () => {
   const intercom = new BroadcastChannel("intercom");
   let count = 0;
 
-  const url = new URL("../workers/broadcast_channel.ts", import.meta.url);
+  const url = new URL(
+    "../testdata/workers/broadcast_channel.ts",
+    import.meta.url,
+  );
   const worker = new Worker(url.href, { type: "module", name: "worker" });
   worker.onmessage = () => intercom.postMessage(++count);
 
diff --git a/cli/tests/unit/fetch_test.ts b/cli/tests/unit/fetch_test.ts
index 24825c653..6e2b1a5d6 100644
--- a/cli/tests/unit/fetch_test.ts
+++ b/cli/tests/unit/fetch_test.ts
@@ -94,40 +94,40 @@ unitTest(
 );
 
 unitTest({ perms: { net: true } }, async function fetchJsonSuccess() {
-  const response = await fetch("http://localhost:4545/cli/tests/fixture.json");
+  const response = await fetch("http://localhost:4545/fixture.json");
   const json = await response.json();
   assertEquals(json.name, "deno");
 });
 
 unitTest(async function fetchPerm() {
   await assertThrowsAsync(async () => {
-    await fetch("http://localhost:4545/cli/tests/fixture.json");
+    await fetch("http://localhost:4545/fixture.json");
   }, Deno.errors.PermissionDenied);
 });
 
 unitTest({ perms: { net: true } }, async function fetchUrl() {
-  const response = await fetch("http://localhost:4545/cli/tests/fixture.json");
-  assertEquals(response.url, "http://localhost:4545/cli/tests/fixture.json");
+  const response = await fetch("http://localhost:4545/fixture.json");
+  assertEquals(response.url, "http://localhost:4545/fixture.json");
   const _json = await response.json();
 });
 
 unitTest({ perms: { net: true } }, async function fetchURL() {
   const response = await fetch(
-    new URL("http://localhost:4545/cli/tests/fixture.json"),
+    new URL("http://localhost:4545/fixture.json"),
   );
-  assertEquals(response.url, "http://localhost:4545/cli/tests/fixture.json");
+  assertEquals(response.url, "http://localhost:4545/fixture.json");
   const _json = await response.json();
 });
 
 unitTest({ perms: { net: true } }, async function fetchHeaders() {
-  const response = await fetch("http://localhost:4545/cli/tests/fixture.json");
+  const response = await fetch("http://localhost:4545/fixture.json");
   const headers = response.headers;
   assertEquals(headers.get("Content-Type"), "application/json");
   const _json = await response.json();
 });
 
 unitTest({ perms: { net: true } }, async function fetchBlob() {
-  const response = await fetch("http://localhost:4545/cli/tests/fixture.json");
+  const response = await fetch("http://localhost:4545/fixture.json");
   const headers = response.headers;
   const blob = await response.blob();
   assertEquals(blob.type, headers.get("Content-Type"));
@@ -138,7 +138,7 @@ unitTest(
   { perms: { net: true } },
   async function fetchBodyUsedReader() {
     const response = await fetch(
-      "http://localhost:4545/cli/tests/fixture.json",
+      "http://localhost:4545/fixture.json",
     );
     assert(response.body !== null);
 
@@ -156,7 +156,7 @@ unitTest(
   { perms: { net: true } },
   async function fetchBodyUsedCancelStream() {
     const response = await fetch(
-      "http://localhost:4545/cli/tests/fixture.json",
+      "http://localhost:4545/fixture.json",
     );
     assert(response.body !== null);
 
@@ -168,7 +168,7 @@ unitTest(
 );
 
 unitTest({ perms: { net: true } }, async function fetchAsyncIterator() {
-  const response = await fetch("http://localhost:4545/cli/tests/fixture.json");
+  const response = await fetch("http://localhost:4545/fixture.json");
   const headers = response.headers;
 
   assert(response.body !== null);
@@ -182,7 +182,7 @@ unitTest({ perms: { net: true } }, async function fetchAsyncIterator() {
 });
 
 unitTest({ perms: { net: true } }, async function fetchBodyReader() {
-  const response = await fetch("http://localhost:4545/cli/tests/fixture.json");
+  const response = await fetch("http://localhost:4545/fixture.json");
   const headers = response.headers;
   assert(response.body !== null);
   const reader = response.body.getReader();
@@ -221,7 +221,7 @@ unitTest(
 );
 
 unitTest({ perms: { net: true } }, async function responseClone() {
-  const response = await fetch("http://localhost:4545/cli/tests/fixture.json");
+  const response = await fetch("http://localhost:4545/fixture.json");
   const response1 = response.clone();
   assert(response !== response1);
   assertEquals(response.status, response1.status);
@@ -272,7 +272,7 @@ unitTest(
   { perms: { net: true } },
   async function fetchURLEncodedFormDataSuccess() {
     const response = await fetch(
-      "http://localhost:4545/cli/tests/subdir/form_urlencoded.txt",
+      "http://localhost:4545/subdir/form_urlencoded.txt",
     );
     const formData = await response.formData();
     assert(formData.has("field_1"));
@@ -360,12 +360,12 @@ unitTest(
     perms: { net: true },
   },
   async function fetchWithRedirection() {
-    const response = await fetch("http://localhost:4546/README.md");
+    const response = await fetch("http://localhost:4546/hello.txt");
     assertEquals(response.status, 200);
     assertEquals(response.statusText, "OK");
-    assertEquals(response.url, "http://localhost:4545/README.md");
+    assertEquals(response.url, "http://localhost:4545/hello.txt");
     const body = await response.text();
-    assert(body.includes("Deno"));
+    assert(body.includes("Hello world!"));
   },
 );
 
@@ -375,7 +375,7 @@ unitTest(
   },
   async function fetchWithRelativeRedirection() {
     const response = await fetch(
-      "http://localhost:4545/cli/tests/001_hello.js",
+      "http://localhost:4545/001_hello.js",
     );
     assertEquals(response.status, 200);
     assertEquals(response.statusText, "OK");
@@ -411,7 +411,7 @@ unitTest(
   },
   async function fetchWithInfRedirection() {
     await assertThrowsAsync(
-      () => fetch("http://localhost:4549/cli/tests"),
+      () => fetch("http://localhost:4549"),
       TypeError,
       "redirect",
     );
@@ -450,7 +450,7 @@ unitTest(
   { perms: { net: true } },
   async function fetchSeparateInit() {
     // related to: https://github.com/denoland/deno/issues/10396
-    const req = new Request("http://localhost:4545/cli/tests/001_hello.js");
+    const req = new Request("http://localhost:4545/001_hello.js");
     const init = {
       method: "GET",
     };
@@ -815,7 +815,7 @@ unitTest(async function responseWithoutBody() {
 });
 
 unitTest({ perms: { net: true } }, async function fetchBodyReadTwice() {
-  const response = await fetch("http://localhost:4545/cli/tests/fixture.json");
+  const response = await fetch("http://localhost:4545/fixture.json");
 
   // Read body
   const _json = await response.json();
@@ -839,7 +839,7 @@ unitTest(
   { perms: { net: true } },
   async function fetchBodyReaderAfterRead() {
     const response = await fetch(
-      "http://localhost:4545/cli/tests/fixture.json",
+      "http://localhost:4545/fixture.json",
     );
     assert(response.body !== null);
     const reader = await response.body.getReader();
@@ -919,7 +919,7 @@ unitTest(
 unitTest(
   { perms: { net: true } },
   async function fetchResourceCloseAfterStreamCancel() {
-    const res = await fetch("http://localhost:4545/cli/tests/fixture.json");
+    const res = await fetch("http://localhost:4545/fixture.json");
     assert(res.body !== null);
 
     // After ReadableStream.cancel is called, resource handle must be closed
@@ -1047,7 +1047,7 @@ MNf4EgWfK+tZMnuqfpfO9740KzfcVoMNo4QJD4yn5YxroUOO/Azi
       },
     );
     const response = await fetch(
-      "https://localhost:5545/cli/tests/fixture.json",
+      "https://localhost:5545/fixture.json",
       { client },
     );
     const json = await response.json();
diff --git a/cli/tests/unit/files_test.ts b/cli/tests/unit/files_test.ts
index a409434c1..fed7c3252 100644
--- a/cli/tests/unit/files_test.ts
+++ b/cli/tests/unit/files_test.ts
@@ -17,7 +17,7 @@ unitTest(function filesStdioFileDescriptors() {
 });
 
 unitTest({ perms: { read: true } }, async function filesCopyToStdout() {
-  const filename = "cli/tests/fixture.json";
+  const filename = "cli/tests/testdata/fixture.json";
   const file = await Deno.open(filename);
   assert(file.rid > 2);
   const bytesWritten = await copy(file, Deno.stdout);
@@ -27,7 +27,7 @@ unitTest({ perms: { read: true } }, async function filesCopyToStdout() {
 });
 
 unitTest({ perms: { read: true } }, async function filesIter() {
-  const filename = "cli/tests/hello.txt";
+  const filename = "cli/tests/testdata/hello.txt";
   const file = await Deno.open(filename);
 
   let totalSize = 0;
@@ -42,7 +42,7 @@ unitTest({ perms: { read: true } }, async function filesIter() {
 unitTest(
   { perms: { read: true } },
   async function filesIterCustomBufSize() {
-    const filename = "cli/tests/hello.txt";
+    const filename = "cli/tests/testdata/hello.txt";
     const file = await Deno.open(filename);
 
     let totalSize = 0;
@@ -59,7 +59,7 @@ unitTest(
 );
 
 unitTest({ perms: { read: true } }, function filesIterSync() {
-  const filename = "cli/tests/hello.txt";
+  const filename = "cli/tests/testdata/hello.txt";
   const file = Deno.openSync(filename);
 
   let totalSize = 0;
@@ -74,7 +74,7 @@ unitTest({ perms: { read: true } }, function filesIterSync() {
 unitTest(
   { perms: { read: true } },
   function filesIterSyncCustomBufSize() {
-    const filename = "cli/tests/hello.txt";
+    const filename = "cli/tests/testdata/hello.txt";
     const file = Deno.openSync(filename);
 
     let totalSize = 0;
@@ -264,7 +264,7 @@ unitTest(
 );
 
 unitTest(async function openOptions() {
-  const filename = "cli/tests/fixture.json";
+  const filename = "cli/tests/testdata/fixture.json";
   await assertThrowsAsync(
     async () => {
       await Deno.open(filename, { write: false });
@@ -532,7 +532,7 @@ unitTest(
 );
 
 unitTest({ perms: { read: true } }, async function seekStart() {
-  const filename = "cli/tests/hello.txt";
+  const filename = "cli/tests/testdata/hello.txt";
   const file = await Deno.open(filename);
   const seekPosition = 6;
   // Deliberately move 1 step forward
@@ -549,7 +549,7 @@ unitTest({ perms: { read: true } }, async function seekStart() {
 });
 
 unitTest({ perms: { read: true } }, function seekSyncStart() {
-  const filename = "cli/tests/hello.txt";
+  const filename = "cli/tests/testdata/hello.txt";
   const file = Deno.openSync(filename);
   const seekPosition = 6;
   // Deliberately move 1 step forward
@@ -566,7 +566,7 @@ unitTest({ perms: { read: true } }, function seekSyncStart() {
 });
 
 unitTest({ perms: { read: true } }, async function seekCurrent() {
-  const filename = "cli/tests/hello.txt";
+  const filename = "cli/tests/testdata/hello.txt";
   const file = await Deno.open(filename);
   // Deliberately move 1 step forward
   await file.read(new Uint8Array(1)); // "H"
@@ -583,7 +583,7 @@ unitTest({ perms: { read: true } }, async function seekCurrent() {
 });
 
 unitTest({ perms: { read: true } }, function seekSyncCurrent() {
-  const filename = "cli/tests/hello.txt";
+  const filename = "cli/tests/testdata/hello.txt";
   const file = Deno.openSync(filename);
   // Deliberately move 1 step forward
   file.readSync(new Uint8Array(1)); // "H"
@@ -600,7 +600,7 @@ unitTest({ perms: { read: true } }, function seekSyncCurrent() {
 });
 
 unitTest({ perms: { read: true } }, async function seekEnd() {
-  const filename = "cli/tests/hello.txt";
+  const filename = "cli/tests/testdata/hello.txt";
   const file = await Deno.open(filename);
   const seekPosition = -6;
   // seek from end of file that has 12 chars, 12 - 6  = 6
@@ -614,7 +614,7 @@ unitTest({ perms: { read: true } }, async function seekEnd() {
 });
 
 unitTest({ perms: { read: true } }, function seekSyncEnd() {
-  const filename = "cli/tests/hello.txt";
+  const filename = "cli/tests/testdata/hello.txt";
   const file = Deno.openSync(filename);
   const seekPosition = -6;
   // seek from end of file that has 12 chars, 12 - 6  = 6
@@ -628,7 +628,7 @@ unitTest({ perms: { read: true } }, function seekSyncEnd() {
 });
 
 unitTest({ perms: { read: true } }, async function seekMode() {
-  const filename = "cli/tests/hello.txt";
+  const filename = "cli/tests/testdata/hello.txt";
   const file = await Deno.open(filename);
   await assertThrowsAsync(
     async () => {
diff --git a/cli/tests/unit/http_test.ts b/cli/tests/unit/http_test.ts
index 4cdd84902..d762a6497 100644
--- a/cli/tests/unit/http_test.ts
+++ b/cli/tests/unit/http_test.ts
@@ -208,8 +208,8 @@ unitTest(
       const listener = Deno.listenTls({
         hostname,
         port,
-        certFile: "cli/tests/tls/localhost.crt",
-        keyFile: "cli/tests/tls/localhost.key",
+        certFile: "cli/tests/testdata/tls/localhost.crt",
+        keyFile: "cli/tests/testdata/tls/localhost.key",
       });
       const conn = await listener.accept();
       const httpConn = Deno.serveHttp(conn);
@@ -226,7 +226,7 @@ unitTest(
       listener.close();
     })();
 
-    const caData = Deno.readTextFileSync("cli/tests/tls/RootCA.pem");
+    const caData = Deno.readTextFileSync("cli/tests/testdata/tls/RootCA.pem");
     const client = Deno.createHttpClient({ caData });
     const resp = await fetch(`https://${hostname}:${port}/`, {
       client,
diff --git a/cli/tests/unit/read_dir_test.ts b/cli/tests/unit/read_dir_test.ts
index 2e4370153..4f02fae9b 100644
--- a/cli/tests/unit/read_dir_test.ts
+++ b/cli/tests/unit/read_dir_test.ts
@@ -22,12 +22,14 @@ function assertSameContent(files: Deno.DirEntry[]) {
 }
 
 unitTest({ perms: { read: true } }, function readDirSyncSuccess() {
-  const files = [...Deno.readDirSync("cli/tests/")];
+  const files = [...Deno.readDirSync("cli/tests/testdata")];
   assertSameContent(files);
 });
 
 unitTest({ perms: { read: true } }, function readDirSyncWithUrl() {
-  const files = [...Deno.readDirSync(pathToAbsoluteFileUrl("cli/tests"))];
+  const files = [
+    ...Deno.readDirSync(pathToAbsoluteFileUrl("cli/tests/testdata")),
+  ];
   assertSameContent(files);
 });
 
@@ -39,7 +41,7 @@ unitTest({ perms: { read: false } }, function readDirSyncPerm() {
 
 unitTest({ perms: { read: true } }, function readDirSyncNotDir() {
   assertThrows(() => {
-    Deno.readDirSync("cli/tests/fixture.json");
+    Deno.readDirSync("cli/tests/testdata/fixture.json");
   }, Error);
 });
 
@@ -51,7 +53,7 @@ unitTest({ perms: { read: true } }, function readDirSyncNotFound() {
 
 unitTest({ perms: { read: true } }, async function readDirSuccess() {
   const files = [];
-  for await (const dirEntry of Deno.readDir("cli/tests/")) {
+  for await (const dirEntry of Deno.readDir("cli/tests/testdata")) {
     files.push(dirEntry);
   }
   assertSameContent(files);
@@ -60,7 +62,7 @@ unitTest({ perms: { read: true } }, async function readDirSuccess() {
 unitTest({ perms: { read: true } }, async function readDirWithUrl() {
   const files = [];
   for await (
-    const dirEntry of Deno.readDir(pathToAbsoluteFileUrl("cli/tests"))
+    const dirEntry of Deno.readDir(pathToAbsoluteFileUrl("cli/tests/testdata"))
   ) {
     files.push(dirEntry);
   }
diff --git a/cli/tests/unit/read_file_test.ts b/cli/tests/unit/read_file_test.ts
index f638c7a7c..7dd2b5621 100644
--- a/cli/tests/unit/read_file_test.ts
+++ b/cli/tests/unit/read_file_test.ts
@@ -9,7 +9,7 @@ import {
 } from "./test_util.ts";
 
 unitTest({ perms: { read: true } }, function readFileSyncSuccess() {
-  const data = Deno.readFileSync("cli/tests/fixture.json");
+  const data = Deno.readFileSync("cli/tests/testdata/fixture.json");
   assert(data.byteLength > 0);
   const decoder = new TextDecoder("utf-8");
   const json = decoder.decode(data);
@@ -19,7 +19,7 @@ unitTest({ perms: { read: true } }, function readFileSyncSuccess() {
 
 unitTest({ perms: { read: true } }, function readFileSyncUrl() {
   const data = Deno.readFileSync(
-    pathToAbsoluteFileUrl("cli/tests/fixture.json"),
+    pathToAbsoluteFileUrl("cli/tests/testdata/fixture.json"),
   );
   assert(data.byteLength > 0);
   const decoder = new TextDecoder("utf-8");
@@ -30,7 +30,7 @@ unitTest({ perms: { read: true } }, function readFileSyncUrl() {
 
 unitTest({ perms: { read: false } }, function readFileSyncPerm() {
   assertThrows(() => {
-    Deno.readFileSync("cli/tests/fixture.json");
+    Deno.readFileSync("cli/tests/testdata/fixture.json");
   }, Deno.errors.PermissionDenied);
 });
 
@@ -42,7 +42,7 @@ unitTest({ perms: { read: true } }, function readFileSyncNotFound() {
 
 unitTest({ perms: { read: true } }, async function readFileUrl() {
   const data = await Deno.readFile(
-    pathToAbsoluteFileUrl("cli/tests/fixture.json"),
+    pathToAbsoluteFileUrl("cli/tests/testdata/fixture.json"),
   );
   assert(data.byteLength > 0);
   const decoder = new TextDecoder("utf-8");
@@ -52,7 +52,7 @@ unitTest({ perms: { read: true } }, async function readFileUrl() {
 });
 
 unitTest({ perms: { read: true } }, async function readFileSuccess() {
-  const data = await Deno.readFile("cli/tests/fixture.json");
+  const data = await Deno.readFile("cli/tests/testdata/fixture.json");
   assert(data.byteLength > 0);
   const decoder = new TextDecoder("utf-8");
   const json = decoder.decode(data);
@@ -62,13 +62,13 @@ unitTest({ perms: { read: true } }, async function readFileSuccess() {
 
 unitTest({ perms: { read: false } }, async function readFilePerm() {
   await assertThrowsAsync(async () => {
-    await Deno.readFile("cli/tests/fixture.json");
+    await Deno.readFile("cli/tests/testdata/fixture.json");
   }, Deno.errors.PermissionDenied);
 });
 
 unitTest({ perms: { read: true } }, function readFileSyncLoop() {
   for (let i = 0; i < 256; i++) {
-    Deno.readFileSync("cli/tests/fixture.json");
+    Deno.readFileSync("cli/tests/testdata/fixture.json");
   }
 });
 
@@ -96,7 +96,9 @@ unitTest(
     const ac = new AbortController();
     queueMicrotask(() => ac.abort());
     await assertThrowsAsync(async () => {
-      await Deno.readFile("cli/tests/fixture.json", { signal: ac.signal });
+      await Deno.readFile("cli/tests/testdata/fixture.json", {
+        signal: ac.signal,
+      });
     });
   },
 );
@@ -107,7 +109,9 @@ unitTest(
     const ac = new AbortController();
     queueMicrotask(() => ac.abort());
     await assertThrowsAsync(async () => {
-      await Deno.readTextFile("cli/tests/fixture.json", { signal: ac.signal });
+      await Deno.readTextFile("cli/tests/testdata/fixture.json", {
+        signal: ac.signal,
+      });
     });
   },
 );
diff --git a/cli/tests/unit/read_text_file_test.ts b/cli/tests/unit/read_text_file_test.ts
index a7eb1a730..3d7ccfaa6 100644
--- a/cli/tests/unit/read_text_file_test.ts
+++ b/cli/tests/unit/read_text_file_test.ts
@@ -8,7 +8,7 @@ import {
 } from "./test_util.ts";
 
 unitTest({ perms: { read: true } }, function readTextFileSyncSuccess() {
-  const data = Deno.readTextFileSync("cli/tests/fixture.json");
+  const data = Deno.readTextFileSync("cli/tests/testdata/fixture.json");
   assert(data.length > 0);
   const pkg = JSON.parse(data);
   assertEquals(pkg.name, "deno");
@@ -16,7 +16,7 @@ unitTest({ perms: { read: true } }, function readTextFileSyncSuccess() {
 
 unitTest({ perms: { read: true } }, function readTextFileSyncByUrl() {
   const data = Deno.readTextFileSync(
-    pathToAbsoluteFileUrl("cli/tests/fixture.json"),
+    pathToAbsoluteFileUrl("cli/tests/testdata/fixture.json"),
   );
   assert(data.length > 0);
   const pkg = JSON.parse(data);
@@ -25,7 +25,7 @@ unitTest({ perms: { read: true } }, function readTextFileSyncByUrl() {
 
 unitTest({ perms: { read: false } }, function readTextFileSyncPerm() {
   assertThrows(() => {
-    Deno.readTextFileSync("cli/tests/fixture.json");
+    Deno.readTextFileSync("cli/tests/testdata/fixture.json");
   }, Deno.errors.PermissionDenied);
 });
 
@@ -38,7 +38,7 @@ unitTest({ perms: { read: true } }, function readTextFileSyncNotFound() {
 unitTest(
   { perms: { read: true } },
   async function readTextFileSuccess() {
-    const data = await Deno.readTextFile("cli/tests/fixture.json");
+    const data = await Deno.readTextFile("cli/tests/testdata/fixture.json");
     assert(data.length > 0);
     const pkg = JSON.parse(data);
     assertEquals(pkg.name, "deno");
@@ -47,7 +47,7 @@ unitTest(
 
 unitTest({ perms: { read: true } }, async function readTextFileByUrl() {
   const data = await Deno.readTextFile(
-    pathToAbsoluteFileUrl("cli/tests/fixture.json"),
+    pathToAbsoluteFileUrl("cli/tests/testdata/fixture.json"),
   );
   assert(data.length > 0);
   const pkg = JSON.parse(data);
@@ -56,13 +56,13 @@ unitTest({ perms: { read: true } }, async function readTextFileByUrl() {
 
 unitTest({ perms: { read: false } }, async function readTextFilePerm() {
   await assertThrowsAsync(async () => {
-    await Deno.readTextFile("cli/tests/fixture.json");
+    await Deno.readTextFile("cli/tests/testdata/fixture.json");
   }, Deno.errors.PermissionDenied);
 });
 
 unitTest({ perms: { read: true } }, function readTextFileSyncLoop() {
   for (let i = 0; i < 256; i++) {
-    Deno.readTextFileSync("cli/tests/fixture.json");
+    Deno.readTextFileSync("cli/tests/testdata/fixture.json");
   }
 });
 
diff --git a/cli/tests/unit/real_path_test.ts b/cli/tests/unit/real_path_test.ts
index b84b0c0df..8c0728ca9 100644
--- a/cli/tests/unit/real_path_test.ts
+++ b/cli/tests/unit/real_path_test.ts
@@ -10,7 +10,7 @@ import {
 } from "./test_util.ts";
 
 unitTest({ perms: { read: true } }, function realPathSyncSuccess() {
-  const relative = "cli/tests/fixture.json";
+  const relative = "cli/tests/testdata/fixture.json";
   const realPath = Deno.realPathSync(relative);
   if (Deno.build.os !== "windows") {
     assert(realPath.startsWith("/"));
@@ -22,7 +22,7 @@ unitTest({ perms: { read: true } }, function realPathSyncSuccess() {
 });
 
 unitTest({ perms: { read: true } }, function realPathSyncUrl() {
-  const relative = "cli/tests/fixture.json";
+  const relative = "cli/tests/testdata/fixture.json";
   const url = pathToAbsoluteFileUrl(relative);
   assertEquals(Deno.realPathSync(relative), Deno.realPathSync(url));
 });
@@ -61,7 +61,7 @@ unitTest({ perms: { read: true } }, function realPathSyncNotFound() {
 });
 
 unitTest({ perms: { read: true } }, async function realPathSuccess() {
-  const relativePath = "cli/tests/fixture.json";
+  const relativePath = "cli/tests/testdata/fixture.json";
   const realPath = await Deno.realPath(relativePath);
   if (Deno.build.os !== "windows") {
     assert(realPath.startsWith("/"));
@@ -75,7 +75,7 @@ unitTest({ perms: { read: true } }, async function realPathSuccess() {
 unitTest(
   { perms: { read: true } },
   async function realPathUrl() {
-    const relative = "cli/tests/fixture.json";
+    const relative = "cli/tests/testdata/fixture.json";
     const url = pathToAbsoluteFileUrl(relative);
     assertEquals(await Deno.realPath(relative), await Deno.realPath(url));
   },
diff --git a/cli/tests/unit/resources_test.ts b/cli/tests/unit/resources_test.ts
index ea183a068..e2ca4116d 100644
--- a/cli/tests/unit/resources_test.ts
+++ b/cli/tests/unit/resources_test.ts
@@ -37,7 +37,7 @@ unitTest({ perms: { net: true } }, async function resourcesNet() {
 
 unitTest({ perms: { read: true } }, async function resourcesFile() {
   const resourcesBefore = Deno.resources();
-  const f = await Deno.open("cli/tests/hello.txt");
+  const f = await Deno.open("cli/tests/testdata/hello.txt");
   const resourcesAfter = Deno.resources();
   f.close();
 
diff --git a/cli/tests/unit/stat_test.ts b/cli/tests/unit/stat_test.ts
index 4b663e5b9..7db9dee71 100644
--- a/cli/tests/unit/stat_test.ts
+++ b/cli/tests/unit/stat_test.ts
@@ -41,11 +41,11 @@ unitTest({ perms: { read: true } }, async function fstatSuccess() {
 unitTest(
   { perms: { read: true, write: true } },
   function statSyncSuccess() {
-    const packageInfo = Deno.statSync("README.md");
-    assert(packageInfo.isFile);
-    assert(!packageInfo.isSymlink);
+    const readmeInfo = Deno.statSync("README.md");
+    assert(readmeInfo.isFile);
+    assert(!readmeInfo.isSymlink);
 
-    const modulesInfo = Deno.statSync("cli/tests/symlink_to_subdir");
+    const modulesInfo = Deno.statSync("cli/tests/testdata/symlink_to_subdir");
     assert(modulesInfo.isDirectory);
     assert(!modulesInfo.isSymlink);
 
@@ -62,12 +62,12 @@ unitTest(
       tempInfo.birthtime === null || now - tempInfo.birthtime.valueOf() < 1000,
     );
 
-    const packageInfoByUrl = Deno.statSync(pathToAbsoluteFileUrl("README.md"));
-    assert(packageInfoByUrl.isFile);
-    assert(!packageInfoByUrl.isSymlink);
+    const readmeInfoByUrl = Deno.statSync(pathToAbsoluteFileUrl("README.md"));
+    assert(readmeInfoByUrl.isFile);
+    assert(!readmeInfoByUrl.isSymlink);
 
     const modulesInfoByUrl = Deno.statSync(
-      pathToAbsoluteFileUrl("cli/tests/symlink_to_subdir"),
+      pathToAbsoluteFileUrl("cli/tests/testdata/symlink_to_subdir"),
     );
     assert(modulesInfoByUrl.isDirectory);
     assert(!modulesInfoByUrl.isSymlink);
@@ -122,12 +122,12 @@ unitTest({ perms: { read: true } }, function lstatSyncSuccess() {
   assert(packageInfoByUrl.isFile);
   assert(!packageInfoByUrl.isSymlink);
 
-  const modulesInfo = Deno.lstatSync("cli/tests/symlink_to_subdir");
+  const modulesInfo = Deno.lstatSync("cli/tests/testdata/symlink_to_subdir");
   assert(!modulesInfo.isDirectory);
   assert(modulesInfo.isSymlink);
 
   const modulesInfoByUrl = Deno.lstatSync(
-    pathToAbsoluteFileUrl("cli/tests/symlink_to_subdir"),
+    pathToAbsoluteFileUrl("cli/tests/testdata/symlink_to_subdir"),
   );
   assert(!modulesInfoByUrl.isDirectory);
   assert(modulesInfoByUrl.isSymlink);
@@ -143,7 +143,7 @@ unitTest({ perms: { read: true } }, function lstatSyncSuccess() {
 
 unitTest({ perms: { read: false } }, function lstatSyncPerm() {
   assertThrows(() => {
-    Deno.lstatSync("README.md");
+    Deno.lstatSync("hello.txt");
   }, Deno.errors.PermissionDenied);
 });
 
@@ -156,22 +156,22 @@ unitTest({ perms: { read: true } }, function lstatSyncNotFound() {
 unitTest(
   { perms: { read: true, write: true } },
   async function statSuccess() {
-    const packageInfo = await Deno.stat("README.md");
-    assert(packageInfo.isFile);
-    assert(!packageInfo.isSymlink);
+    const readmeInfo = await Deno.stat("README.md");
+    assert(readmeInfo.isFile);
+    assert(!readmeInfo.isSymlink);
 
-    const packageInfoByUrl = await Deno.stat(
+    const readmeInfoByUrl = await Deno.stat(
       pathToAbsoluteFileUrl("README.md"),
     );
-    assert(packageInfoByUrl.isFile);
-    assert(!packageInfoByUrl.isSymlink);
+    assert(readmeInfoByUrl.isFile);
+    assert(!readmeInfoByUrl.isSymlink);
 
-    const modulesInfo = await Deno.stat("cli/tests/symlink_to_subdir");
+    const modulesInfo = await Deno.stat("cli/tests/testdata/symlink_to_subdir");
     assert(modulesInfo.isDirectory);
     assert(!modulesInfo.isSymlink);
 
     const modulesInfoByUrl = await Deno.stat(
-      pathToAbsoluteFileUrl("cli/tests/symlink_to_subdir"),
+      pathToAbsoluteFileUrl("cli/tests/testdata/symlink_to_subdir"),
     );
     assert(modulesInfoByUrl.isDirectory);
     assert(!modulesInfoByUrl.isSymlink);
@@ -234,20 +234,20 @@ unitTest({ perms: { read: true } }, async function statNotFound() {
 });
 
 unitTest({ perms: { read: true } }, async function lstatSuccess() {
-  const packageInfo = await Deno.lstat("README.md");
-  assert(packageInfo.isFile);
-  assert(!packageInfo.isSymlink);
+  const readmeInfo = await Deno.lstat("README.md");
+  assert(readmeInfo.isFile);
+  assert(!readmeInfo.isSymlink);
 
-  const packageInfoByUrl = await Deno.lstat(pathToAbsoluteFileUrl("README.md"));
-  assert(packageInfoByUrl.isFile);
-  assert(!packageInfoByUrl.isSymlink);
+  const readmeInfoByUrl = await Deno.lstat(pathToAbsoluteFileUrl("README.md"));
+  assert(readmeInfoByUrl.isFile);
+  assert(!readmeInfoByUrl.isSymlink);
 
-  const modulesInfo = await Deno.lstat("cli/tests/symlink_to_subdir");
+  const modulesInfo = await Deno.lstat("cli/tests/testdata/symlink_to_subdir");
   assert(!modulesInfo.isDirectory);
   assert(modulesInfo.isSymlink);
 
   const modulesInfoByUrl = await Deno.lstat(
-    pathToAbsoluteFileUrl("cli/tests/symlink_to_subdir"),
+    pathToAbsoluteFileUrl("cli/tests/testdata/symlink_to_subdir"),
   );
   assert(!modulesInfoByUrl.isDirectory);
   assert(modulesInfoByUrl.isSymlink);
diff --git a/cli/tests/unit/tls_test.ts b/cli/tests/unit/tls_test.ts
index 8472d93e0..12fe9bd50 100644
--- a/cli/tests/unit/tls_test.ts
+++ b/cli/tests/unit/tls_test.ts
@@ -37,8 +37,8 @@ unitTest(
     const listener = await Deno.listenTls({
       hostname: "localhost",
       port: 3567,
-      certFile: "cli/tests/tls/localhost.crt",
-      keyFile: "cli/tests/tls/localhost.key",
+      certFile: "cli/tests/testdata/tls/localhost.crt",
+      keyFile: "cli/tests/testdata/tls/localhost.key",
     });
 
     await assertThrowsAsync(async () => {
@@ -54,7 +54,7 @@ unitTest(async function connectTLSCertFileNoReadPerm() {
     await Deno.connectTls({
       hostname: "deno.land",
       port: 443,
-      certFile: "cli/tests/tls/RootCA.crt",
+      certFile: "cli/tests/testdata/tls/RootCA.crt",
     });
   }, Deno.errors.PermissionDenied);
 });
@@ -65,8 +65,8 @@ unitTest(
     const options = {
       hostname: "localhost",
       port: 3500,
-      certFile: "cli/tests/tls/localhost.crt",
-      keyFile: "cli/tests/tls/localhost.key",
+      certFile: "cli/tests/testdata/tls/localhost.crt",
+      keyFile: "cli/tests/testdata/tls/localhost.key",
     };
 
     assertThrows(() => {
@@ -90,8 +90,8 @@ unitTest({ perms: { net: true } }, function listenTLSNoReadPerm() {
     Deno.listenTls({
       hostname: "localhost",
       port: 3500,
-      certFile: "cli/tests/tls/localhost.crt",
-      keyFile: "cli/tests/tls/localhost.key",
+      certFile: "cli/tests/testdata/tls/localhost.crt",
+      keyFile: "cli/tests/testdata/tls/localhost.key",
     });
   }, Deno.errors.PermissionDenied);
 });
@@ -104,8 +104,8 @@ unitTest(
     const options = {
       hostname: "localhost",
       port: 3500,
-      certFile: "cli/tests/tls/localhost.crt",
-      keyFile: "cli/tests/tls/localhost.key",
+      certFile: "cli/tests/testdata/tls/localhost.crt",
+      keyFile: "cli/tests/testdata/tls/localhost.key",
     };
 
     const testDir = Deno.makeTempDirSync();
@@ -129,8 +129,8 @@ unitTest(
     const options = {
       hostname: "localhost",
       port: 3500,
-      certFile: "cli/tests/tls/localhost.crt",
-      keyFile: "cli/tests/tls/localhost.key",
+      certFile: "cli/tests/testdata/tls/localhost.crt",
+      keyFile: "cli/tests/testdata/tls/localhost.key",
     };
 
     const testDir = Deno.makeTempDirSync();
@@ -158,8 +158,8 @@ unitTest(
     const listener = Deno.listenTls({
       hostname,
       port,
-      certFile: "cli/tests/tls/localhost.crt",
-      keyFile: "cli/tests/tls/localhost.key",
+      certFile: "cli/tests/testdata/tls/localhost.crt",
+      keyFile: "cli/tests/testdata/tls/localhost.key",
     });
 
     const response = encoder.encode(
@@ -182,7 +182,7 @@ unitTest(
     const conn = await Deno.connectTls({
       hostname,
       port,
-      certFile: "cli/tests/tls/RootCA.pem",
+      certFile: "cli/tests/testdata/tls/RootCA.pem",
     });
     assert(conn.rid > 0);
     const w = new BufWriter(conn);
@@ -222,15 +222,15 @@ async function tlsPair(): Promise<[Deno.Conn, Deno.Conn]> {
   const listener = Deno.listenTls({
     hostname: "localhost",
     port,
-    certFile: "cli/tests/tls/localhost.crt",
-    keyFile: "cli/tests/tls/localhost.key",
+    certFile: "cli/tests/testdata/tls/localhost.crt",
+    keyFile: "cli/tests/testdata/tls/localhost.key",
   });
 
   const acceptPromise = listener.accept();
   const connectPromise = Deno.connectTls({
     hostname: "localhost",
     port,
-    certFile: "cli/tests/tls/RootCA.pem",
+    certFile: "cli/tests/testdata/tls/RootCA.pem",
   });
   const endpoints = await Promise.all([acceptPromise, connectPromise]);
 
@@ -553,8 +553,8 @@ async function tlsWithTcpFailureTestImpl(
   const tlsListener = Deno.listenTls({
     hostname: "localhost",
     port: tlsPort,
-    certFile: "cli/tests/tls/localhost.crt",
-    keyFile: "cli/tests/tls/localhost.key",
+    certFile: "cli/tests/testdata/tls/localhost.crt",
+    keyFile: "cli/tests/testdata/tls/localhost.key",
   });
 
   const tcpPort = getPort();
@@ -570,7 +570,7 @@ async function tlsWithTcpFailureTestImpl(
     Deno.connectTls({
       hostname: "localhost",
       port: tcpPort,
-      certFile: "cli/tests/tls/RootCA.crt",
+      certFile: "cli/tests/testdata/tls/RootCA.crt",
     }),
   ]);
 
@@ -845,8 +845,8 @@ function createHttpsListener(port: number): Deno.Listener {
   const listener = Deno.listenTls({
     hostname: "localhost",
     port,
-    certFile: "./cli/tests/tls/localhost.crt",
-    keyFile: "./cli/tests/tls/localhost.key",
+    certFile: "./cli/tests/testdata/tls/localhost.crt",
+    keyFile: "./cli/tests/testdata/tls/localhost.key",
   });
 
   serve(listener);
@@ -995,7 +995,9 @@ unitTest(
         hostname: "deno.land",
         port: 443,
         certChain: "bad data",
-        privateKey: await Deno.readTextFile("cli/tests/tls/localhost.key"),
+        privateKey: await Deno.readTextFile(
+          "cli/tests/testdata/tls/localhost.key",
+        ),
       });
     }, Deno.errors.InvalidData);
   },
@@ -1008,7 +1010,9 @@ unitTest(
       await Deno.connectTls({
         hostname: "deno.land",
         port: 443,
-        certChain: await Deno.readTextFile("cli/tests/tls/localhost.crt"),
+        certChain: await Deno.readTextFile(
+          "cli/tests/testdata/tls/localhost.crt",
+        ),
         privateKey: "bad data",
       });
     }, Deno.errors.InvalidData);
@@ -1022,7 +1026,9 @@ unitTest(
       await Deno.connectTls({
         hostname: "deno.land",
         port: 443,
-        certChain: await Deno.readTextFile("cli/tests/tls/localhost.crt"),
+        certChain: await Deno.readTextFile(
+          "cli/tests/testdata/tls/localhost.crt",
+        ),
         privateKey: "",
       });
     }, Deno.errors.InvalidData);
@@ -1034,15 +1040,19 @@ unitTest(
   async function connectWithClientCert() {
     // The test_server running on port 4552 responds with 'PASS' if client
     // authentication was successful. Try it by running test_server and
-    //   curl --key cli/tests/tls/localhost.key \
-    //        --cert cli/tests/tls/localhost.crt \
-    //        --cacert cli/tests/tls/RootCA.crt https://localhost:4552/
+    //   curl --key cli/tests/testdata/tls/localhost.key \
+    //        --cert cli/tests/testdata/tls/localhost.crt \
+    //        --cacert cli/tests/testdata/tls/RootCA.crt https://localhost:4552/
     const conn = await Deno.connectTls({
       hostname: "localhost",
       port: 4552,
-      certChain: await Deno.readTextFile("cli/tests/tls/localhost.crt"),
-      privateKey: await Deno.readTextFile("cli/tests/tls/localhost.key"),
-      certFile: "cli/tests/tls/RootCA.crt",
+      certChain: await Deno.readTextFile(
+        "cli/tests/testdata/tls/localhost.crt",
+      ),
+      privateKey: await Deno.readTextFile(
+        "cli/tests/testdata/tls/localhost.key",
+      ),
+      certFile: "cli/tests/testdata/tls/RootCA.crt",
     });
     const result = decoder.decode(await readAll(conn));
     assertEquals(result, "PASS");
diff --git a/cli/tests/unit/tty_test.ts b/cli/tests/unit/tty_test.ts
index a9f1105f6..b45a43f1a 100644
--- a/cli/tests/unit/tty_test.ts
+++ b/cli/tests/unit/tty_test.ts
@@ -4,7 +4,7 @@ import { assert, assertThrows, unitTest } from "./test_util.ts";
 // Note tests for Deno.setRaw is in integration tests.
 
 unitTest({ perms: { read: true } }, function consoleSizeFile() {
-  const file = Deno.openSync("cli/tests/hello.txt");
+  const file = Deno.openSync("cli/tests/testdata/hello.txt");
   assertThrows(() => {
     Deno.consoleSize(file.rid);
   }, Error);
@@ -20,7 +20,7 @@ unitTest(function consoleSizeError() {
 
 unitTest({ perms: { read: true } }, function isatty() {
   // CI not under TTY, so cannot test stdin/stdout/stderr.
-  const f = Deno.openSync("cli/tests/hello.txt");
+  const f = Deno.openSync("cli/tests/testdata/hello.txt");
   assert(!Deno.isatty(f.rid));
   f.close();
 });
diff --git a/cli/tests/unit/wasm_test.ts b/cli/tests/unit/wasm_test.ts
index 66fcacade..c2180db3c 100644
--- a/cli/tests/unit/wasm_test.ts
+++ b/cli/tests/unit/wasm_test.ts
@@ -74,7 +74,7 @@ unitTest(
     // deno-dom's WASM file is a real-world non-trivial case that gave us
     // trouble when implementing this.
     await WebAssembly.instantiateStreaming(fetch(
-      "http://localhost:4545/cli/tests/deno_dom_0.1.3-alpha2.wasm",
+      "http://localhost:4545/deno_dom_0.1.3-alpha2.wasm",
     ));
   },
 );
diff --git a/cli/tests/unit/webgpu_test.ts b/cli/tests/unit/webgpu_test.ts
index 4fbbd5cde..cbefa7c07 100644
--- a/cli/tests/unit/webgpu_test.ts
+++ b/cli/tests/unit/webgpu_test.ts
@@ -22,7 +22,7 @@ unitTest({
   assert(device);
 
   const shaderCode = await Deno.readTextFile(
-    "cli/tests/webgpu_computepass_shader.wgsl",
+    "cli/tests/testdata/webgpu_computepass_shader.wgsl",
   );
 
   const shaderModule = device.createShaderModule({
@@ -111,7 +111,7 @@ unitTest({
   assert(device);
 
   const shaderCode = await Deno.readTextFile(
-    "cli/tests/webgpu_hellotriangle_shader.wgsl",
+    "cli/tests/testdata/webgpu_hellotriangle_shader.wgsl",
   );
 
   const shaderModule = device.createShaderModule({
@@ -194,7 +194,10 @@ unitTest({
   await outputBuffer.mapAsync(1);
   const data = new Uint8Array(outputBuffer.getMappedRange());
 
-  assertEquals(data, await Deno.readFile("cli/tests/webgpu_hellotriangle.out"));
+  assertEquals(
+    data,
+    await Deno.readFile("cli/tests/testdata/webgpu_hellotriangle.out"),
+  );
 
   outputBuffer.unmap();
 
diff --git a/cli/tests/workers/permissions_remote_remote.ts b/cli/tests/workers/permissions_remote_remote.ts
deleted file mode 100644
index b1f954a31..000000000
--- a/cli/tests/workers/permissions_remote_remote.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-new Worker("http://localhost:4545/cli/tests/workers/static_remote.ts", {
-  type: "module",
-});
diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs
index b6bb8bbb2..4d4709e28 100644
--- a/cli/tools/installer.rs
+++ b/cli/tools/installer.rs
@@ -320,7 +320,7 @@ mod tests {
   use deno_core::parking_lot::Mutex;
   use std::process::Command;
   use tempfile::TempDir;
-  use test_util::tests_path;
+  use test_util::testdata_path;
 
   lazy_static::lazy_static! {
     pub static ref ENV_LOCK: Mutex<()> = Mutex::new(());
@@ -417,7 +417,7 @@ mod tests {
 
     install(
       Flags::default(),
-      "http://localhost:4545/cli/tests/echo_server.ts",
+      "http://localhost:4545/echo_server.ts",
       vec![],
       Some("echo_test".to_string()),
       None,
@@ -437,11 +437,11 @@ mod tests {
     assert_eq!(content.chars().last().unwrap(), '\n');
 
     if cfg!(windows) {
-      assert!(content
-        .contains(r#""run" "http://localhost:4545/cli/tests/echo_server.ts""#));
+      assert!(
+        content.contains(r#""run" "http://localhost:4545/echo_server.ts""#)
+      );
     } else {
-      assert!(content
-        .contains(r#"run 'http://localhost:4545/cli/tests/echo_server.ts'"#));
+      assert!(content.contains(r#"run 'http://localhost:4545/echo_server.ts'"#));
     }
     if let Some(home) = original_home {
       env::set_var("HOME", home);
@@ -465,7 +465,7 @@ mod tests {
         unstable: true,
         ..Flags::default()
       },
-      "http://localhost:4545/cli/tests/echo_server.ts",
+      "http://localhost:4545/echo_server.ts",
       vec![],
       Some("echo_test".to_string()),
       Some(temp_dir.path().to_path_buf()),
@@ -484,12 +484,11 @@ mod tests {
     println!("this is the file path {:?}", content);
     if cfg!(windows) {
       assert!(content.contains(
-        r#""run" "--unstable" "http://localhost:4545/cli/tests/echo_server.ts""#
+        r#""run" "--unstable" "http://localhost:4545/echo_server.ts""#
       ));
     } else {
-      assert!(content.contains(
-        r#"run --unstable 'http://localhost:4545/cli/tests/echo_server.ts'"#
-      ));
+      assert!(content
+        .contains(r#"run --unstable 'http://localhost:4545/echo_server.ts'"#));
     }
   }
 
@@ -501,7 +500,7 @@ mod tests {
 
     install(
       Flags::default(),
-      "http://localhost:4545/cli/tests/echo_server.ts",
+      "http://localhost:4545/echo_server.ts",
       vec![],
       None,
       Some(temp_dir.path().to_path_buf()),
@@ -517,11 +516,11 @@ mod tests {
     assert!(file_path.exists());
     let content = fs::read_to_string(file_path).unwrap();
     if cfg!(windows) {
-      assert!(content
-        .contains(r#""run" "http://localhost:4545/cli/tests/echo_server.ts""#));
+      assert!(
+        content.contains(r#""run" "http://localhost:4545/echo_server.ts""#)
+      );
     } else {
-      assert!(content
-        .contains(r#"run 'http://localhost:4545/cli/tests/echo_server.ts'"#));
+      assert!(content.contains(r#"run 'http://localhost:4545/echo_server.ts'"#));
     }
   }
 
@@ -533,7 +532,7 @@ mod tests {
 
     install(
       Flags::default(),
-      "http://localhost:4545/cli/tests/subdir/main.ts",
+      "http://localhost:4545/subdir/main.ts",
       vec![],
       None,
       Some(temp_dir.path().to_path_buf()),
@@ -549,11 +548,11 @@ mod tests {
     assert!(file_path.exists());
     let content = fs::read_to_string(file_path).unwrap();
     if cfg!(windows) {
-      assert!(content
-        .contains(r#""run" "http://localhost:4545/cli/tests/subdir/main.ts""#));
+      assert!(
+        content.contains(r#""run" "http://localhost:4545/subdir/main.ts""#)
+      );
     } else {
-      assert!(content
-        .contains(r#"run 'http://localhost:4545/cli/tests/subdir/main.ts'"#));
+      assert!(content.contains(r#"run 'http://localhost:4545/subdir/main.ts'"#));
     }
   }
 
@@ -565,7 +564,7 @@ mod tests {
 
     install(
       Flags::default(),
-      "http://localhost:4545/cli/tests/echo_server.ts",
+      "http://localhost:4545/echo_server.ts",
       vec![],
       Some("echo_test".to_string()),
       Some(temp_dir.path().to_path_buf()),
@@ -581,11 +580,11 @@ mod tests {
     assert!(file_path.exists());
     let content = fs::read_to_string(file_path).unwrap();
     if cfg!(windows) {
-      assert!(content
-        .contains(r#""run" "http://localhost:4545/cli/tests/echo_server.ts""#));
+      assert!(
+        content.contains(r#""run" "http://localhost:4545/echo_server.ts""#)
+      );
     } else {
-      assert!(content
-        .contains(r#"run 'http://localhost:4545/cli/tests/echo_server.ts'"#));
+      assert!(content.contains(r#"run 'http://localhost:4545/echo_server.ts'"#));
     }
   }
 
@@ -600,7 +599,7 @@ mod tests {
 
     install(
       Flags::default(),
-      "http://localhost:4545/cli/tests/echo_server.ts",
+      "http://localhost:4545/echo_server.ts",
       vec![],
       Some("echo_test".to_string()),
       None,
@@ -616,11 +615,11 @@ mod tests {
     assert!(file_path.exists());
     let content = fs::read_to_string(file_path).unwrap();
     if cfg!(windows) {
-      assert!(content
-        .contains(r#""run" "http://localhost:4545/cli/tests/echo_server.ts""#));
+      assert!(
+        content.contains(r#""run" "http://localhost:4545/echo_server.ts""#)
+      );
     } else {
-      assert!(content
-        .contains(r#"run 'http://localhost:4545/cli/tests/echo_server.ts'"#));
+      assert!(content.contains(r#"run 'http://localhost:4545/echo_server.ts'"#));
     }
     if let Some(install_root) = original_install_root {
       env::set_var("DENO_INSTALL_ROOT", install_root);
@@ -641,7 +640,7 @@ mod tests {
         log_level: Some(Level::Error),
         ..Flags::default()
       },
-      "http://localhost:4545/cli/tests/echo_server.ts",
+      "http://localhost:4545/echo_server.ts",
       vec!["--foobar".to_string()],
       Some("echo_test".to_string()),
       Some(temp_dir.path().to_path_buf()),
@@ -657,9 +656,9 @@ mod tests {
     assert!(file_path.exists());
     let content = fs::read_to_string(file_path).unwrap();
     if cfg!(windows) {
-      assert!(content.contains(r#""run" "--allow-read" "--allow-net" "--quiet" "--no-check" "http://localhost:4545/cli/tests/echo_server.ts" "--foobar""#));
+      assert!(content.contains(r#""run" "--allow-read" "--allow-net" "--quiet" "--no-check" "http://localhost:4545/echo_server.ts" "--foobar""#));
     } else {
-      assert!(content.contains(r#"run --allow-read --allow-net --quiet --no-check 'http://localhost:4545/cli/tests/echo_server.ts' --foobar"#));
+      assert!(content.contains(r#"run --allow-read --allow-net --quiet --no-check 'http://localhost:4545/echo_server.ts' --foobar"#));
     }
   }
 
@@ -700,7 +699,7 @@ mod tests {
 
     install(
       Flags::default(),
-      "http://localhost:4545/cli/tests/echo_server.ts",
+      "http://localhost:4545/echo_server.ts",
       vec![],
       Some("echo_test".to_string()),
       Some(temp_dir.path().to_path_buf()),
@@ -717,7 +716,7 @@ mod tests {
     // No force. Install failed.
     let no_force_result = install(
       Flags::default(),
-      "http://localhost:4545/cli/tests/cat.ts", // using a different URL
+      "http://localhost:4545/cat.ts", // using a different URL
       vec![],
       Some("echo_test".to_string()),
       Some(temp_dir.path().to_path_buf()),
@@ -735,7 +734,7 @@ mod tests {
     // Force. Install success.
     let force_result = install(
       Flags::default(),
-      "http://localhost:4545/cli/tests/cat.ts", // using a different URL
+      "http://localhost:4545/cat.ts", // using a different URL
       vec![],
       Some("echo_test".to_string()),
       Some(temp_dir.path().to_path_buf()),
@@ -762,7 +761,7 @@ mod tests {
         config_path: Some(config_file_path.to_string_lossy().to_string()),
         ..Flags::default()
       },
-      "http://localhost:4545/cli/tests/cat.ts",
+      "http://localhost:4545/cat.ts",
       vec![],
       Some("echo_test".to_string()),
       Some(temp_dir.path().to_path_buf()),
@@ -789,7 +788,7 @@ mod tests {
 
     install(
       Flags::default(),
-      "http://localhost:4545/cli/tests/echo_server.ts",
+      "http://localhost:4545/echo_server.ts",
       vec!["\"".to_string()],
       Some("echo_test".to_string()),
       Some(temp_dir.path().to_path_buf()),
@@ -808,9 +807,9 @@ mod tests {
     if cfg!(windows) {
       // TODO: see comment above this test
     } else {
-      assert!(content.contains(
-        r#"run 'http://localhost:4545/cli/tests/echo_server.ts' '"'"#
-      ));
+      assert!(
+        content.contains(r#"run 'http://localhost:4545/echo_server.ts' '"'"#)
+      );
     }
   }
 
@@ -864,7 +863,7 @@ mod tests {
         import_map_path: Some(import_map_path.to_string_lossy().to_string()),
         ..Flags::default()
       },
-      "http://localhost:4545/cli/tests/cat.ts",
+      "http://localhost:4545/cat.ts",
       vec![],
       Some("echo_test".to_string()),
       Some(temp_dir.path().to_path_buf()),
@@ -879,12 +878,12 @@ mod tests {
     assert!(file_path.exists());
 
     let mut expected_string = format!(
-      "--import-map '{}' 'http://localhost:4545/cli/tests/cat.ts'",
+      "--import-map '{}' 'http://localhost:4545/cat.ts'",
       import_map_url.to_string()
     );
     if cfg!(windows) {
       expected_string = format!(
-        "\"--import-map\" \"{}\" \"http://localhost:4545/cli/tests/cat.ts\"",
+        "\"--import-map\" \"{}\" \"http://localhost:4545/cat.ts\"",
         import_map_url.to_string()
       );
     }
@@ -898,7 +897,7 @@ mod tests {
   fn install_file_url() {
     let temp_dir = TempDir::new().expect("tempdir fail");
     let bin_dir = temp_dir.path().join("bin");
-    let module_path = fs::canonicalize(tests_path().join("cat.ts")).unwrap();
+    let module_path = fs::canonicalize(testdata_path().join("cat.ts")).unwrap();
     let file_module_string =
       Url::from_file_path(module_path).unwrap().to_string();
     assert!(file_module_string.starts_with("file:///"));
diff --git a/cli/tools/test_runner.rs b/cli/tools/test_runner.rs
index 106555f7d..b0cf0c845 100644
--- a/cli/tools/test_runner.rs
+++ b/cli/tools/test_runner.rs
@@ -708,7 +708,7 @@ mod tests {
 
   #[test]
   fn test_collect_test_module_specifiers() {
-    let test_data_path = test_util::root_path().join("cli/tests/subdir");
+    let sub_dir_path = test_util::testdata_path().join("subdir");
     let mut matched_urls = collect_test_module_specifiers(
       vec![
         "https://example.com/colors_test.ts".to_string(),
@@ -717,12 +717,11 @@ mod tests {
         "subdir2/mod2.ts".to_string(),
         "http://example.com/printf_test.ts".to_string(),
       ],
-      &test_data_path,
+      &sub_dir_path,
       is_supported,
     )
     .unwrap();
-    let test_data_url =
-      Url::from_file_path(test_data_path).unwrap().to_string();
+    let test_data_url = Url::from_file_path(sub_dir_path).unwrap().to_string();
 
     let expected: Vec<Url> = vec![
       format!("{}/mod1.ts", test_data_url),
diff --git a/cli/tsc.rs b/cli/tsc.rs
index b355c12fa..57bbeeca3 100644
--- a/cli/tsc.rs
+++ b/cli/tsc.rs
@@ -596,8 +596,6 @@ mod tests {
   use crate::module_graph::tests::MockSpecifierHandler;
   use crate::module_graph::GraphBuilder;
   use deno_core::parking_lot::Mutex;
-  use std::env;
-  use std::path::PathBuf;
 
   async fn setup(
     maybe_specifier: Option<ModuleSpecifier>,
@@ -607,8 +605,7 @@ mod tests {
     let specifier = maybe_specifier
       .unwrap_or_else(|| resolve_url_or_path("file:///main.ts").unwrap());
     let hash_data = maybe_hash_data.unwrap_or_else(|| vec![b"".to_vec()]);
-    let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
-    let fixtures = c.join("tests/tsc2");
+    let fixtures = test_util::testdata_path().join("tsc2");
     let handler = Arc::new(Mutex::new(MockSpecifierHandler {
       fixtures,
       ..MockSpecifierHandler::default()
@@ -633,8 +630,7 @@ mod tests {
     specifier: &ModuleSpecifier,
   ) -> Result<Response, AnyError> {
     let hash_data = vec![b"something".to_vec()];
-    let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
-    let fixtures = c.join("tests/tsc2");
+    let fixtures = test_util::testdata_path().join("tsc2");
     let handler = Arc::new(Mutex::new(MockSpecifierHandler {
       fixtures,
       ..Default::default()
diff --git a/cli/tsc/99_main_compiler.js b/cli/tsc/99_main_compiler.js
index 29a387887..c87d091ad 100644
--- a/cli/tsc/99_main_compiler.js
+++ b/cli/tsc/99_main_compiler.js
@@ -151,7 +151,7 @@ delete Object.prototype.__proto__;
     // TS1103: 'for-await-of' statement is only allowed within an async function
     // or async generator.
     1103,
-    // TS2306: File 'file:///Users/rld/src/deno/cli/tests/subdir/amd_like.js' is
+    // TS2306: File 'file:///Users/rld/src/deno/cli/tests/testdata/subdir/amd_like.js' is
     // not a module.
     2306,
     // TS2688: Cannot find type definition file for '...'.
@@ -166,7 +166,7 @@ delete Object.prototype.__proto__;
     // TS5009: Cannot find the common subdirectory path for the input files.
     5009,
     // TS5055: Cannot write file
-    // 'http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js'
+    // 'http://localhost:4545/subdir/mt_application_x_javascript.j4.js'
     // because it would overwrite input file.
     5055,
     // TypeScript is overly opinionated that only CommonJS modules kinds can
diff --git a/runtime/worker.rs b/runtime/worker.rs
index 8057e38f1..b200ef08e 100644
--- a/runtime/worker.rs
+++ b/runtime/worker.rs
@@ -329,10 +329,7 @@ mod tests {
 
   #[tokio::test]
   async fn execute_mod_esm_imports_a() {
-    let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-      .parent()
-      .unwrap()
-      .join("cli/tests/esm_imports_a.js");
+    let p = test_util::testdata_path().join("esm_imports_a.js");
     let module_specifier = resolve_url_or_path(&p.to_string_lossy()).unwrap();
     let mut worker = create_test_worker();
     let result = worker.execute_module(&module_specifier).await;
@@ -375,10 +372,7 @@ mod tests {
     // This assumes cwd is project root (an assumption made throughout the
     // tests).
     let mut worker = create_test_worker();
-    let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-      .parent()
-      .unwrap()
-      .join("cli/tests/001_hello.js");
+    let p = test_util::testdata_path().join("001_hello.js");
     let module_specifier = resolve_url_or_path(&p.to_string_lossy()).unwrap();
     let result = worker.execute_module(&module_specifier).await;
     assert!(result.is_ok());
diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs
index 93a02c98e..d0067b15f 100644
--- a/test_util/src/lib.rs
+++ b/test_util/src/lib.rs
@@ -92,6 +92,10 @@ pub fn tests_path() -> PathBuf {
   root_path().join("cli").join("tests")
 }
 
+pub fn testdata_path() -> PathBuf {
+  tests_path().join("testdata")
+}
+
 pub fn third_party_path() -> PathBuf {
   root_path().join("third_party")
 }
@@ -200,7 +204,7 @@ async fn inf_redirects(req: Request<Body>) -> hyper::Result<Response<Body>> {
 async fn another_redirect(req: Request<Body>) -> hyper::Result<Response<Body>> {
   let p = req.uri().path();
   assert_eq!(&p[0..1], "/");
-  let url = format!("http://localhost:{}/cli/tests/subdir{}", PORT, p);
+  let url = format!("http://localhost:{}/subdir{}", PORT, p);
 
   Ok(redirect_resp(url))
 }
@@ -265,12 +269,9 @@ async fn get_tls_config(
   key: &str,
   ca: &str,
 ) -> io::Result<Arc<rustls::ServerConfig>> {
-  let mut cert_path = root_path();
-  let mut key_path = root_path();
-  let mut ca_path = root_path();
-  cert_path.push(cert);
-  key_path.push(key);
-  ca_path.push(ca);
+  let cert_path = testdata_path().join(cert);
+  let key_path = testdata_path().join(key);
+  let ca_path = testdata_path().join(ca);
 
   let cert_file = std::fs::File::open(cert_path)?;
   let key_file = std::fs::File::open(key_path)?;
@@ -323,9 +324,9 @@ async fn get_tls_config(
 }
 
 async fn run_wss_server(addr: &SocketAddr) {
-  let cert_file = "cli/tests/tls/localhost.crt";
-  let key_file = "cli/tests/tls/localhost.key";
-  let ca_cert_file = "cli/tests/tls/RootCA.pem";
+  let cert_file = "tls/localhost.crt";
+  let key_file = "tls/localhost.key";
+  let ca_cert_file = "tls/RootCA.pem";
 
   let tls_config = get_tls_config(cert_file, key_file, ca_cert_file)
     .await
@@ -362,13 +363,13 @@ async fn run_wss_server(addr: &SocketAddr) {
 
 /// This server responds with 'PASS' if client authentication was successful. Try it by running
 /// test_server and
-///   curl --key cli/tests/tls/localhost.key \
-///        --cert cli/tests/tls/localhost.crt \
-///        --cacert cli/tests/tls/RootCA.crt https://localhost:4552/
+///   curl --key cli/tests/testdata/tls/localhost.key \
+///        --cert cli/tests/testsdata/tls/localhost.crt \
+///        --cacert cli/tests/testdata/tls/RootCA.crt https://localhost:4552/
 async fn run_tls_client_auth_server() {
-  let cert_file = "cli/tests/tls/localhost.crt";
-  let key_file = "cli/tests/tls/localhost.key";
-  let ca_cert_file = "cli/tests/tls/RootCA.pem";
+  let cert_file = "tls/localhost.crt";
+  let key_file = "tls/localhost.key";
+  let ca_cert_file = "tls/RootCA.pem";
   let tls_config = get_tls_config(cert_file, key_file, ca_cert_file)
     .await
     .unwrap();
@@ -444,7 +445,7 @@ async fn absolute_redirect(
     }
   }
 
-  let mut file_path = root_path();
+  let mut file_path = testdata_path();
   file_path.push(&req.uri().path()[1..]);
   if file_path.is_dir() || !file_path.exists() {
     let mut not_found_resp = Response::new(Body::empty());
@@ -676,7 +677,7 @@ async fn main_server(req: Request<Body>) -> hyper::Result<Response<Body>> {
       );
       Ok(res)
     }
-    (_, "/cli/tests/subdir/xTypeScriptTypesRedirect.d.ts") => {
+    (_, "/subdir/xTypeScriptTypesRedirect.d.ts") => {
       let mut res = Response::new(Body::from(
         "import './xTypeScriptTypesRedirected.d.ts';",
       ));
@@ -686,7 +687,7 @@ async fn main_server(req: Request<Body>) -> hyper::Result<Response<Body>> {
       );
       Ok(res)
     }
-    (_, "/cli/tests/subdir/xTypeScriptTypesRedirected.d.ts") => {
+    (_, "/subdir/xTypeScriptTypesRedirected.d.ts") => {
       let mut res = Response::new(Body::from("export const foo: 'foo';"));
       res.headers_mut().insert(
         "Content-type",
@@ -702,7 +703,7 @@ async fn main_server(req: Request<Body>) -> hyper::Result<Response<Body>> {
       );
       Ok(res)
     }
-    (_, "/cli/tests/subdir/file_with_:_in_name.ts") => {
+    (_, "/subdir/file_with_:_in_name.ts") => {
       let mut res = Response::new(Body::from(
         "console.log('Hello from file_with_:_in_name.ts');",
       ));
@@ -712,7 +713,7 @@ async fn main_server(req: Request<Body>) -> hyper::Result<Response<Body>> {
       );
       Ok(res)
     }
-    (_, "/cli/tests/subdir/no_js_ext@1.0.0") => {
+    (_, "/subdir/no_js_ext@1.0.0") => {
       let mut res = Response::new(Body::from(
         r#"import { printHello } from "./mod2.ts";
         printHello();
@@ -725,8 +726,8 @@ async fn main_server(req: Request<Body>) -> hyper::Result<Response<Body>> {
       Ok(res)
     }
     (_, "/.well-known/deno-import-intellisense.json") => {
-      let file_path = root_path()
-        .join("cli/tests/lsp/registries/deno-import-intellisense.json");
+      let file_path =
+        testdata_path().join("lsp/registries/deno-import-intellisense.json");
       if let Ok(body) = tokio::fs::read(file_path).await {
         Ok(custom_headers(
           "/.well-known/deno-import-intellisense.json",
@@ -737,10 +738,10 @@ async fn main_server(req: Request<Body>) -> hyper::Result<Response<Body>> {
       }
     }
     _ => {
-      let mut file_path = root_path();
+      let mut file_path = testdata_path();
       file_path.push(&req.uri().path()[1..]);
       if let Ok(file) = tokio::fs::read(file_path).await {
-        let file_resp = custom_headers(&req.uri().path()[1..], file);
+        let file_resp = custom_headers(req.uri().path(), file);
         return Ok(file_resp);
       }
 
@@ -860,12 +861,12 @@ async fn wrap_main_server() {
 
 async fn wrap_main_https_server() {
   let main_server_https_addr = SocketAddr::from(([127, 0, 0, 1], HTTPS_PORT));
-  let cert_file = "cli/tests/tls/localhost.crt";
-  let key_file = "cli/tests/tls/localhost.key";
-  let ca_cert_file = "cli/tests/tls/RootCA.pem";
+  let cert_file = "tls/localhost.crt";
+  let key_file = "tls/localhost.key";
+  let ca_cert_file = "tls/RootCA.pem";
   let tls_config = get_tls_config(cert_file, key_file, ca_cert_file)
     .await
-    .expect("Cannot get TLS config");
+    .unwrap();
   loop {
     let tcp = TcpListener::bind(&main_server_https_addr)
       .await
@@ -957,7 +958,7 @@ pub async fn run_all_servers() {
 fn custom_headers(p: &str, body: Vec<u8>) -> Response<Body> {
   let mut response = Response::new(Body::from(body));
 
-  if p.ends_with("cli/tests/x_deno_warning.js") {
+  if p.ends_with("/x_deno_warning.js") {
     response.headers_mut().insert(
       "Content-Type",
       HeaderValue::from_static("application/javascript"),
@@ -967,7 +968,7 @@ fn custom_headers(p: &str, body: Vec<u8>) -> Response<Body> {
       .insert("X-Deno-Warning", HeaderValue::from_static("foobar"));
     return response;
   }
-  if p.ends_with("cli/tests/053_import_compression/brotli") {
+  if p.ends_with("/053_import_compression/brotli") {
     response
       .headers_mut()
       .insert("Content-Encoding", HeaderValue::from_static("br"));
@@ -980,7 +981,7 @@ fn custom_headers(p: &str, body: Vec<u8>) -> Response<Body> {
       .insert("Content-Length", HeaderValue::from_static("26"));
     return response;
   }
-  if p.ends_with("cli/tests/053_import_compression/gziped") {
+  if p.ends_with("/053_import_compression/gziped") {
     response
       .headers_mut()
       .insert("Content-Encoding", HeaderValue::from_static("gzip"));
@@ -994,7 +995,7 @@ fn custom_headers(p: &str, body: Vec<u8>) -> Response<Body> {
     return response;
   }
 
-  if p.contains("cli/tests/encoding/") {
+  if p.contains("/encoding/") {
     let charset = p
       .split_terminator('/')
       .last()
@@ -1069,7 +1070,7 @@ impl HttpServerCount {
 
       println!("test_server starting...");
       let mut test_server = Command::new(test_server_path())
-        .current_dir(root_path())
+        .current_dir(testdata_path())
         .stdout(Stdio::piped())
         .spawn()
         .expect("failed to execute test_server");
@@ -1251,7 +1252,7 @@ pub fn run_and_collect_output_with_args(
   let mut deno_process_builder = deno_cmd();
   deno_process_builder
     .args(args)
-    .current_dir(&tests_path())
+    .current_dir(&testdata_path())
     .stdin(Stdio::piped())
     .stdout(Stdio::piped())
     .stderr(Stdio::piped());
@@ -1313,7 +1314,7 @@ pub fn run_powershell_script_file(
 
   command
     .env("DENO_DIR", deno_dir.path())
-    .current_dir(root_path())
+    .current_dir(testdata_path())
     .arg("-file")
     .arg(script_file_path);
 
@@ -1348,9 +1349,7 @@ pub struct CheckOutputIntegrationTest {
 impl CheckOutputIntegrationTest {
   pub fn run(&self) {
     let args = self.args.split_whitespace();
-    let root = root_path();
     let deno_exe = deno_exe_path();
-    println!("root path {}", root.display());
     println!("deno_exe path {}", deno_exe.display());
 
     let _http_server_guard = if self.http_server {
@@ -1360,12 +1359,12 @@ impl CheckOutputIntegrationTest {
     };
 
     let (mut reader, writer) = pipe().unwrap();
-    let tests_dir = root.join("cli").join("tests");
+    let testdata_dir = testdata_path();
     let mut command = deno_cmd();
     println!("deno_exe args {}", self.args);
-    println!("deno_exe tests path {:?}", &tests_dir);
+    println!("deno_exe testdata path {:?}", &testdata_dir);
     command.args(args);
-    command.current_dir(&tests_dir);
+    command.current_dir(&testdata_dir);
     command.stdin(Stdio::piped());
     let writer_clone = writer.try_clone().unwrap();
     command.stderr(writer_clone);
@@ -1420,7 +1419,7 @@ impl CheckOutputIntegrationTest {
     let expected = if let Some(s) = self.output_str {
       s.to_owned()
     } else {
-      let output_path = tests_dir.join(self.output);
+      let output_path = testdata_dir.join(self.output);
       println!("output path {}", output_path.display());
       std::fs::read_to_string(output_path).expect("cannot read output")
     };
@@ -1492,7 +1491,7 @@ pub fn pattern_match(pattern: &str, s: &str, wildcard: &str) -> bool {
 pub fn test_pty(args: &str, output_path: &str, input: &[u8]) {
   use pty::fork::Fork;
 
-  let tests_path = tests_path();
+  let tests_path = testdata_path();
   let fork = Fork::from_ptmx().unwrap();
   if let Ok(mut master) = fork.is_parent() {
     let mut output_actual = String::new();
diff --git a/tools/lint.js b/tools/lint.js
index 299632d90..f5aadc77c 100755
--- a/tools/lint.js
+++ b/tools/lint.js
@@ -17,19 +17,19 @@ async function dlint() {
     "*.js",
     "*.ts",
     ":!:.github/mtime_cache/action.js",
-    ":!:cli/tests/swc_syntax_error.ts",
-    ":!:cli/tests/038_checkjs.js",
-    ":!:cli/tests/error_008_checkjs.js",
+    ":!:cli/tests/testdata/swc_syntax_error.ts",
+    ":!:cli/tests/testdata/038_checkjs.js",
+    ":!:cli/tests/testdata/error_008_checkjs.js",
     ":!:std/**/testdata/*",
     ":!:std/**/node_modules/*",
     ":!:cli/bench/node*.js",
     ":!:cli/compilers/wasm_wrap.js",
     ":!:cli/dts/**",
-    ":!:cli/tests/encoding/**",
-    ":!:cli/tests/error_syntax.js",
+    ":!:cli/tests/testdata/encoding/**",
+    ":!:cli/tests/testdata/error_syntax.js",
     ":!:cli/tests/unit/**",
-    ":!:cli/tests/lint/**",
-    ":!:cli/tests/tsc/**",
+    ":!:cli/tests/testdata/lint/**",
+    ":!:cli/tests/testdata/tsc/**",
     ":!:cli/tsc/*typescript.js",
     ":!:test_util/wpt/**",
   ]);