diff --git a/TEST_MAPPING b/TEST_MAPPING
index 683e448..f6e4123 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,6 +2,12 @@
 {
   "imports": [
     {
+      "path": "external/boringssl"
+    },
+    {
+      "path": "external/open-dice"
+    },
+    {
       "path": "external/rust/crates/aho-corasick"
     },
     {
@@ -20,7 +26,7 @@
       "path": "external/rust/crates/ash"
     },
     {
-      "path": "external/rust/crates/base64"
+      "path": "external/rust/crates/async-stream"
     },
     {
       "path": "external/rust/crates/bencher"
@@ -29,9 +35,6 @@
       "path": "external/rust/crates/bitflags"
     },
     {
-      "path": "external/rust/crates/buddy_system_allocator"
-    },
-    {
       "path": "external/rust/crates/bytes"
     },
     {
@@ -44,7 +47,13 @@
       "path": "external/rust/crates/cfg-if"
     },
     {
-      "path": "external/rust/crates/clap"
+      "path": "external/rust/crates/ciborium-ll"
+    },
+    {
+      "path": "external/rust/crates/clap/2.33.3"
+    },
+    {
+      "path": "external/rust/crates/coset"
     },
     {
       "path": "external/rust/crates/crc32fast"
@@ -74,12 +83,24 @@
       "path": "external/rust/crates/fallible-iterator"
     },
     {
+      "path": "external/rust/crates/flate2"
+    },
+    {
       "path": "external/rust/crates/fnv"
     },
     {
+      "path": "external/rust/crates/futures-channel"
+    },
+    {
+      "path": "external/rust/crates/futures-executor"
+    },
+    {
       "path": "external/rust/crates/futures-task"
     },
     {
+      "path": "external/rust/crates/futures-test"
+    },
+    {
       "path": "external/rust/crates/futures-util"
     },
     {
@@ -92,9 +113,18 @@
       "path": "external/rust/crates/grpcio-sys"
     },
     {
+      "path": "external/rust/crates/hashbrown"
+    },
+    {
+      "path": "external/rust/crates/hashlink"
+    },
+    {
       "path": "external/rust/crates/heck"
     },
     {
+      "path": "external/rust/crates/heck/0.3.3"
+    },
+    {
       "path": "external/rust/crates/itoa"
     },
     {
@@ -113,9 +143,6 @@
       "path": "external/rust/crates/libsqlite3-sys"
     },
     {
-      "path": "external/rust/crates/linked-hash-map"
-    },
-    {
       "path": "external/rust/crates/lru-cache"
     },
     {
@@ -146,6 +173,9 @@
       "path": "external/rust/crates/num_cpus"
     },
     {
+      "path": "external/rust/crates/octets"
+    },
+    {
       "path": "external/rust/crates/oid-registry"
     },
     {
@@ -263,6 +293,9 @@
       "path": "external/rust/crates/url"
     },
     {
+      "path": "external/rust/crates/virtio-drivers"
+    },
+    {
       "path": "external/rust/crates/vulkano"
     },
     {
@@ -270,322 +303,81 @@
     },
     {
       "path": "external/rust/crates/xml-rs"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "VtsAidlDiceDemoteTargetTest"
     },
     {
-      "name": "VtsAidlDiceTargetTest"
+      "path": "external/rust/crates/zerocopy"
     },
     {
-      "name": "ZipFuseTest"
+      "path": "external/rust/crates/zeroize"
     },
     {
-      "name": "apkdmverity.test"
+      "path": "external/uwb/src"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "packages/modules/DnsResolver"
     },
     {
-      "name": "diced_open_dice_cbor_test"
+      "path": "packages/modules/Virtualization/apkdmverity"
     },
     {
-      "name": "diced_sample_inputs_test"
+      "path": "packages/modules/Virtualization/authfs"
     },
     {
-      "name": "diced_test"
+      "path": "packages/modules/Virtualization/avmd"
     },
     {
-      "name": "diced_utils_test"
+      "path": "packages/modules/Virtualization/encryptedstore"
     },
     {
-      "name": "diced_vendor_test"
+      "path": "packages/modules/Virtualization/libs/apexutil"
     },
     {
-      "name": "doh_unit_test"
+      "path": "packages/modules/Virtualization/libs/apkverify"
     },
     {
-      "name": "keystore2_client_tests"
+      "path": "packages/modules/Virtualization/libs/avb"
     },
     {
-      "name": "keystore2_crypto_test_rust"
+      "path": "packages/modules/Virtualization/libs/capabilities"
     },
     {
-      "name": "keystore2_km_compat_test"
+      "path": "packages/modules/Virtualization/libs/devicemapper"
     },
     {
-      "name": "keystore2_legacy_blobs_test"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
-      "name": "keystore2_selinux_concurrency_test"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "keystore2_selinux_test"
+      "path": "packages/modules/Virtualization/vm"
     },
     {
-      "name": "keystore2_test"
+      "path": "packages/modules/Virtualization/zipfuse"
     },
     {
-      "name": "keystore2_test_utils_test"
+      "path": "system/keymint/derive"
     },
     {
-      "name": "keystore2_vintf_test"
+      "path": "system/keymint/hal"
     },
     {
-      "name": "legacykeystore_test"
+      "path": "system/logging/rust"
     },
     {
-      "name": "libapexutil_rust.test"
+      "path": "system/security/diced"
     },
     {
-      "name": "libapkverify.integration_test"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "libapkverify.test"
+      "path": "system/security/keystore2/legacykeystore"
     },
     {
-      "name": "libavb_bindgen_test"
+      "path": "system/security/keystore2/selinux"
     },
     {
-      "name": "libbinder_ndk_bindgen_test"
-    },
-    {
-      "name": "libbinder_rpc_unstable_bindgen_test"
-    },
-    {
-      "name": "libbinder_rs-internal_test"
-    },
-    {
-      "name": "libbssl_sys_raw_test"
-    },
-    {
-      "name": "libcutils_bindgen_test"
-    },
-    {
-      "name": "libidsig.test"
-    },
-    {
-      "name": "libkeystore2_aaid_bindgen_test"
-    },
-    {
-      "name": "libkeystore2_apc_compat_bindgen_test"
-    },
-    {
-      "name": "libkeystore2_crypto_bindgen_test"
-    },
-    {
-      "name": "liblog_event_list_bindgen_test"
-    },
-    {
-      "name": "libopen_dice_bcc_bindgen_test"
-    },
-    {
-      "name": "libopen_dice_cbor_bindgen_test"
-    },
-    {
-      "name": "librustutils_test"
-    },
-    {
-      "name": "libselinux_bindgen_test"
-    },
-    {
-      "name": "libsimpleperf_profcollect_bindgen_test"
-    },
-    {
-      "name": "libstatspull_bindgen_test"
-    },
-    {
-      "name": "libsystem_properties_bindgen_test"
-    },
-    {
-      "name": "libtombstoned_client_rust_test"
-    },
-    {
-      "name": "logger_device_unit_tests"
-    },
-    {
-      "name": "logger_test_config_log_level"
-    },
-    {
-      "name": "logger_test_default_init"
-    },
-    {
-      "name": "logger_test_env_log_level"
-    },
-    {
-      "name": "logger_test_multiple_init"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "rustBinderTest"
-    },
-    {
-      "name": "rustBinderTestService"
-    },
-    {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "VtsAidlDiceDemoteTargetTest"
-    },
-    {
-      "name": "VtsAidlDiceTargetTest"
-    },
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "apkdmverity.test"
-    },
-    {
-      "name": "authfs_device_test_src_lib"
-    },
-    {
-      "name": "diced_open_dice_cbor_test"
-    },
-    {
-      "name": "diced_sample_inputs_test"
-    },
-    {
-      "name": "diced_test"
-    },
-    {
-      "name": "diced_utils_test"
-    },
-    {
-      "name": "diced_vendor_test"
-    },
-    {
-      "name": "doh_unit_test"
-    },
-    {
-      "name": "keystore2_client_tests"
-    },
-    {
-      "name": "keystore2_crypto_test_rust"
-    },
-    {
-      "name": "keystore2_km_compat_test"
-    },
-    {
-      "name": "keystore2_legacy_blobs_test"
-    },
-    {
-      "name": "keystore2_selinux_concurrency_test"
-    },
-    {
-      "name": "keystore2_selinux_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "keystore2_test_utils_test"
-    },
-    {
-      "name": "keystore2_vintf_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "libapexutil_rust.test"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "libavb_bindgen_test"
-    },
-    {
-      "name": "libbinder_ndk_bindgen_test"
-    },
-    {
-      "name": "libbinder_rpc_unstable_bindgen_test"
-    },
-    {
-      "name": "libbinder_rs-internal_test"
-    },
-    {
-      "name": "libbssl_sys_raw_test"
-    },
-    {
-      "name": "libcutils_bindgen_test"
-    },
-    {
-      "name": "libidsig.test"
-    },
-    {
-      "name": "libkeystore2_aaid_bindgen_test"
-    },
-    {
-      "name": "libkeystore2_apc_compat_bindgen_test"
-    },
-    {
-      "name": "libkeystore2_crypto_bindgen_test"
-    },
-    {
-      "name": "liblog_event_list_bindgen_test"
-    },
-    {
-      "name": "libopen_dice_bcc_bindgen_test"
-    },
-    {
-      "name": "libopen_dice_cbor_bindgen_test"
-    },
-    {
-      "name": "librustutils_test"
-    },
-    {
-      "name": "libselinux_bindgen_test"
-    },
-    {
-      "name": "libsimpleperf_profcollect_bindgen_test"
-    },
-    {
-      "name": "libstatspull_bindgen_test"
-    },
-    {
-      "name": "libsystem_properties_bindgen_test"
-    },
-    {
-      "name": "libtombstoned_client_rust_test"
-    },
-    {
-      "name": "logger_device_unit_tests"
-    },
-    {
-      "name": "logger_test_config_log_level"
-    },
-    {
-      "name": "logger_test_default_init"
-    },
-    {
-      "name": "logger_test_env_log_level"
-    },
-    {
-      "name": "logger_test_multiple_init"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "rustBinderTest"
-    },
-    {
-      "name": "rustBinderTestService"
-    },
-    {
-      "name": "virtualizationservice_device_test"
+      "path": "system/security/keystore2/src/crypto"
     }
   ]
 }