From 7ee9d9168467ab53225fe8c59e9821e32b2dd658 Mon Sep 17 00:00:00 2001
From: Steven Enamakel <enamakel@tinyhumans.ai>
Date: Thu, 1 Oct 2026 22:14:38 +0300
Subject: [PATCH] test: rename legacy test.rs and *_test.rs files to *_tests.rs

Each module keeps its name; its declaration gains a #[path] to the renamed file.
Only names change, no test code does. Drops the legacy-files note from the guidance.

Co-authored-by: Medulla <medulla@tinyhumans.ai>
---
 AGENTS.md                                                      | 3 ---
 crates/tinymcp-bus/src/agent_tools/mod.rs                      | 1 +
 crates/tinymcp-bus/src/agent_tools/{test.rs => mod_tests.rs}   | 0
 crates/tinymcp-bus/src/audit/mod.rs                            | 1 +
 crates/tinymcp-bus/src/audit/{test.rs => mod_tests.rs}         | 0
 crates/tinymcp-bus/src/auth/mod.rs                             | 1 +
 crates/tinymcp-bus/src/auth/{test.rs => mod_tests.rs}          | 0
 crates/tinymcp-bus/src/config/mod.rs                           | 1 +
 crates/tinymcp-bus/src/config/{test.rs => mod_tests.rs}        | 0
 crates/tinymcp-bus/src/errors/mod.rs                           | 1 +
 crates/tinymcp-bus/src/errors/{test.rs => mod_tests.rs}        | 0
 crates/tinymcp-bus/src/method/mod.rs                           | 1 +
 crates/tinymcp-bus/src/method/{test.rs => mod_tests.rs}        | 0
 crates/tinymcp-bus/src/names/mod.rs                            | 1 +
 crates/tinymcp-bus/src/names/{test.rs => mod_tests.rs}         | 0
 crates/tinymcp-bus/src/registry/mod.rs                         | 1 +
 crates/tinymcp-bus/src/registry/{test.rs => mod_tests.rs}      | 0
 crates/tinymcp-bus/src/sanitize/mod.rs                         | 1 +
 crates/tinymcp-bus/src/sanitize/{test.rs => mod_tests.rs}      | 0
 crates/tinymcp-bus/src/transport/mod.rs                        | 1 +
 crates/tinymcp-bus/src/transport/{test.rs => mod_tests.rs}     | 0
 crates/tinymcp-bus/src/version/mod.rs                          | 1 +
 crates/tinymcp-bus/src/version/{test.rs => mod_tests.rs}       | 0
 crates/tinymcp/src/audit/store/mod.rs                          | 1 +
 crates/tinymcp/src/audit/store/{test.rs => mod_tests.rs}       | 0
 crates/tinymcp/src/config_servers/mod.rs                       | 1 +
 crates/tinymcp/src/config_servers/{test.rs => mod_tests.rs}    | 0
 crates/tinymcp/src/error/mod.rs                                | 1 +
 crates/tinymcp/src/error/{test.rs => mod_tests.rs}             | 0
 crates/tinymcp/src/registry/boot/mod.rs                        | 1 +
 crates/tinymcp/src/registry/boot/{test.rs => mod_tests.rs}     | 0
 crates/tinymcp/src/registry/config_doc/mod.rs                  | 1 +
 .../tinymcp/src/registry/config_doc/{test.rs => mod_tests.rs}  | 0
 crates/tinymcp/src/registry/connections/mod.rs                 | 1 +
 .../tinymcp/src/registry/connections/{test.rs => mod_tests.rs} | 0
 crates/tinymcp/src/registry/curation/mod.rs                    | 1 +
 crates/tinymcp/src/registry/curation/{test.rs => mod_tests.rs} | 0
 crates/tinymcp/src/registry/oauth/mod.rs                       | 1 +
 crates/tinymcp/src/registry/oauth/{test.rs => mod_tests.rs}    | 0
 crates/tinymcp/src/registry/ops/mod.rs                         | 1 +
 crates/tinymcp/src/registry/ops/{test.rs => mod_tests.rs}      | 0
 crates/tinymcp/src/registry/setup/mod.rs                       | 1 +
 crates/tinymcp/src/registry/setup/{test.rs => mod_tests.rs}    | 0
 crates/tinymcp/src/registry/sources/mod.rs                     | 1 +
 crates/tinymcp/src/registry/sources/{test.rs => mod_tests.rs}  | 0
 crates/tinymcp/src/registry/sources/official/mod.rs            | 1 +
 .../src/registry/sources/official/{test.rs => mod_tests.rs}    | 0
 crates/tinymcp/src/registry/sources/smithery/mod.rs            | 1 +
 .../src/registry/sources/smithery/{test.rs => mod_tests.rs}    | 0
 crates/tinymcp/src/registry/store/mod.rs                       | 1 +
 crates/tinymcp/src/registry/store/{test.rs => mod_tests.rs}    | 0
 crates/tinymcp/src/registry/supervisor/mod.rs                  | 1 +
 .../tinymcp/src/registry/supervisor/{test.rs => mod_tests.rs}  | 0
 crates/tinymcp/src/server/args/mod.rs                          | 1 +
 crates/tinymcp/src/server/args/{test.rs => mod_tests.rs}       | 0
 crates/tinymcp/src/server/http/mod.rs                          | 1 +
 crates/tinymcp/src/server/http/{test.rs => mod_tests.rs}       | 0
 crates/tinymcp/src/server/mod.rs                               | 1 +
 crates/tinymcp/src/server/{test.rs => mod_tests.rs}            | 0
 crates/tinymcp/src/server/protocol/mod.rs                      | 1 +
 crates/tinymcp/src/server/protocol/{test.rs => mod_tests.rs}   | 0
 crates/tinymcp/src/server/session/mod.rs                       | 1 +
 crates/tinymcp/src/server/session/{test.rs => mod_tests.rs}    | 0
 crates/tinymcp/src/server/stdio/mod.rs                         | 1 +
 crates/tinymcp/src/server/stdio/{test.rs => mod_tests.rs}      | 0
 crates/tinymcp/src/tinybus_module/directories/mod.rs           | 1 +
 .../src/tinybus_module/directories/{test.rs => mod_tests.rs}   | 0
 crates/tinymcp/src/tinybus_module/maintenance/mod.rs           | 1 +
 .../src/tinybus_module/maintenance/{test.rs => mod_tests.rs}   | 0
 crates/tinymcp/src/tinybus_module/mod.rs                       | 1 +
 crates/tinymcp/src/tinybus_module/{test.rs => mod_tests.rs}    | 0
 crates/tinymcp/src/tools/{bridge_test.rs => bridge_tests.rs}   | 0
 crates/tinymcp/src/tools/mod.rs                                | 3 +++
 crates/tinymcp/src/tools/{test.rs => mod_tests.rs}             | 0
 crates/tinymcp/src/tools/{scrub_test.rs => scrub_tests.rs}     | 0
 crates/tinymcp/src/transport/http/mod.rs                       | 1 +
 crates/tinymcp/src/transport/http/{test.rs => mod_tests.rs}    | 0
 crates/tinymcp/src/transport/mod.rs                            | 1 +
 crates/tinymcp/src/transport/{test.rs => mod_tests.rs}         | 0
 crates/tinymcp/src/transport/stdio/mod.rs                      | 1 +
 crates/tinymcp/src/transport/stdio/{test.rs => mod_tests.rs}   | 0
 crates/tinymcp/src/transport/stdio/spawn_env/mod.rs            | 1 +
 .../src/transport/stdio/spawn_env/{test.rs => mod_tests.rs}    | 0
 83 files changed, 42 insertions(+), 3 deletions(-)
 rename crates/tinymcp-bus/src/agent_tools/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp-bus/src/audit/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp-bus/src/auth/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp-bus/src/config/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp-bus/src/errors/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp-bus/src/method/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp-bus/src/names/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp-bus/src/registry/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp-bus/src/sanitize/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp-bus/src/transport/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp-bus/src/version/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/audit/store/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/config_servers/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/error/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/registry/boot/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/registry/config_doc/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/registry/connections/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/registry/curation/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/registry/oauth/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/registry/ops/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/registry/setup/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/registry/sources/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/registry/sources/official/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/registry/sources/smithery/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/registry/store/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/registry/supervisor/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/server/args/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/server/http/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/server/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/server/protocol/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/server/session/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/server/stdio/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/tinybus_module/directories/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/tinybus_module/maintenance/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/tinybus_module/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/tools/{bridge_test.rs => bridge_tests.rs} (100%)
 rename crates/tinymcp/src/tools/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/tools/{scrub_test.rs => scrub_tests.rs} (100%)
 rename crates/tinymcp/src/transport/http/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/transport/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/transport/stdio/{test.rs => mod_tests.rs} (100%)
 rename crates/tinymcp/src/transport/stdio/spawn_env/{test.rs => mod_tests.rs} (100%)

diff --git a/AGENTS.md b/AGENTS.md
index cb78a275..2fd59a31 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -356,6 +356,3 @@ For automated contributors specifically:
 - Integration tests stay in the crate's `tests/` directory.
 - OpenHuman's `scripts/externalize-inline-tests.mjs <repo-root> --write` moves
   inline test modules out mechanically; without `--write` it only reports.
-- Existing `test.rs` and `<module>_test.rs` files predate this rule. Rename each
-  to `<module>_tests.rs` (keep its `mod` name, add the `#[path]` attribute) the
-  next time you touch it.
diff --git a/crates/tinymcp-bus/src/agent_tools/mod.rs b/crates/tinymcp-bus/src/agent_tools/mod.rs
index 4b4733f9..147a2b30 100644
--- a/crates/tinymcp-bus/src/agent_tools/mod.rs
+++ b/crates/tinymcp-bus/src/agent_tools/mod.rs
@@ -34,4 +34,5 @@ pub use registry_tools::{RegistryTool, registry_tool_specs};
 pub use types::{AgentToolEffect, AgentToolSpec, ArgsError};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp-bus/src/agent_tools/test.rs b/crates/tinymcp-bus/src/agent_tools/mod_tests.rs
similarity index 100%
rename from crates/tinymcp-bus/src/agent_tools/test.rs
rename to crates/tinymcp-bus/src/agent_tools/mod_tests.rs
diff --git a/crates/tinymcp-bus/src/audit/mod.rs b/crates/tinymcp-bus/src/audit/mod.rs
index a0005d26..7206fd49 100644
--- a/crates/tinymcp-bus/src/audit/mod.rs
+++ b/crates/tinymcp-bus/src/audit/mod.rs
@@ -35,4 +35,5 @@ pub use types::{
 };
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp-bus/src/audit/test.rs b/crates/tinymcp-bus/src/audit/mod_tests.rs
similarity index 100%
rename from crates/tinymcp-bus/src/audit/test.rs
rename to crates/tinymcp-bus/src/audit/mod_tests.rs
diff --git a/crates/tinymcp-bus/src/auth/mod.rs b/crates/tinymcp-bus/src/auth/mod.rs
index bf9b380c..32e7ddd9 100644
--- a/crates/tinymcp-bus/src/auth/mod.rs
+++ b/crates/tinymcp-bus/src/auth/mod.rs
@@ -11,4 +11,5 @@ mod types;
 pub use types::{AuthDetection, AuthKind};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp-bus/src/auth/test.rs b/crates/tinymcp-bus/src/auth/mod_tests.rs
similarity index 100%
rename from crates/tinymcp-bus/src/auth/test.rs
rename to crates/tinymcp-bus/src/auth/mod_tests.rs
diff --git a/crates/tinymcp-bus/src/config/mod.rs b/crates/tinymcp-bus/src/config/mod.rs
index 6a762176..283286a0 100644
--- a/crates/tinymcp-bus/src/config/mod.rs
+++ b/crates/tinymcp-bus/src/config/mod.rs
@@ -33,4 +33,5 @@ pub use types::{
 };
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp-bus/src/config/test.rs b/crates/tinymcp-bus/src/config/mod_tests.rs
similarity index 100%
rename from crates/tinymcp-bus/src/config/test.rs
rename to crates/tinymcp-bus/src/config/mod_tests.rs
diff --git a/crates/tinymcp-bus/src/errors/mod.rs b/crates/tinymcp-bus/src/errors/mod.rs
index 2018b748..5ab3781d 100644
--- a/crates/tinymcp-bus/src/errors/mod.rs
+++ b/crates/tinymcp-bus/src/errors/mod.rs
@@ -113,4 +113,5 @@ pub const ALL: &[&str] = &[
 ];
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp-bus/src/errors/test.rs b/crates/tinymcp-bus/src/errors/mod_tests.rs
similarity index 100%
rename from crates/tinymcp-bus/src/errors/test.rs
rename to crates/tinymcp-bus/src/errors/mod_tests.rs
diff --git a/crates/tinymcp-bus/src/method/mod.rs b/crates/tinymcp-bus/src/method/mod.rs
index 2cfbd566..a5a14c89 100644
--- a/crates/tinymcp-bus/src/method/mod.rs
+++ b/crates/tinymcp-bus/src/method/mod.rs
@@ -21,4 +21,5 @@ pub use types::{
 };
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp-bus/src/method/test.rs b/crates/tinymcp-bus/src/method/mod_tests.rs
similarity index 100%
rename from crates/tinymcp-bus/src/method/test.rs
rename to crates/tinymcp-bus/src/method/mod_tests.rs
diff --git a/crates/tinymcp-bus/src/names/mod.rs b/crates/tinymcp-bus/src/names/mod.rs
index 4d7805e2..2d611a7a 100644
--- a/crates/tinymcp-bus/src/names/mod.rs
+++ b/crates/tinymcp-bus/src/names/mod.rs
@@ -193,4 +193,5 @@ pub const METHODS: &[&str] = &[
 ];
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp-bus/src/names/test.rs b/crates/tinymcp-bus/src/names/mod_tests.rs
similarity index 100%
rename from crates/tinymcp-bus/src/names/test.rs
rename to crates/tinymcp-bus/src/names/mod_tests.rs
diff --git a/crates/tinymcp-bus/src/registry/mod.rs b/crates/tinymcp-bus/src/registry/mod.rs
index 1b4ae459..32c76b89 100644
--- a/crates/tinymcp-bus/src/registry/mod.rs
+++ b/crates/tinymcp-bus/src/registry/mod.rs
@@ -43,4 +43,5 @@ pub use types::{
 };
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp-bus/src/registry/test.rs b/crates/tinymcp-bus/src/registry/mod_tests.rs
similarity index 100%
rename from crates/tinymcp-bus/src/registry/test.rs
rename to crates/tinymcp-bus/src/registry/mod_tests.rs
diff --git a/crates/tinymcp-bus/src/sanitize/mod.rs b/crates/tinymcp-bus/src/sanitize/mod.rs
index ecf8e675..a378f4b9 100644
--- a/crates/tinymcp-bus/src/sanitize/mod.rs
+++ b/crates/tinymcp-bus/src/sanitize/mod.rs
@@ -233,4 +233,5 @@ pub fn sanitize_for_llm(input: &str, max_bytes: usize) -> String {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp-bus/src/sanitize/test.rs b/crates/tinymcp-bus/src/sanitize/mod_tests.rs
similarity index 100%
rename from crates/tinymcp-bus/src/sanitize/test.rs
rename to crates/tinymcp-bus/src/sanitize/mod_tests.rs
diff --git a/crates/tinymcp-bus/src/transport/mod.rs b/crates/tinymcp-bus/src/transport/mod.rs
index 93405a0d..0f3d47c6 100644
--- a/crates/tinymcp-bus/src/transport/mod.rs
+++ b/crates/tinymcp-bus/src/transport/mod.rs
@@ -37,4 +37,5 @@ pub use types::{
 };
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp-bus/src/transport/test.rs b/crates/tinymcp-bus/src/transport/mod_tests.rs
similarity index 100%
rename from crates/tinymcp-bus/src/transport/test.rs
rename to crates/tinymcp-bus/src/transport/mod_tests.rs
diff --git a/crates/tinymcp-bus/src/version/mod.rs b/crates/tinymcp-bus/src/version/mod.rs
index a4c2b4d5..ecfe484d 100644
--- a/crates/tinymcp-bus/src/version/mod.rs
+++ b/crates/tinymcp-bus/src/version/mod.rs
@@ -45,4 +45,5 @@ fn binds(host: (u32, u32), module: (u32, u32)) -> bool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp-bus/src/version/test.rs b/crates/tinymcp-bus/src/version/mod_tests.rs
similarity index 100%
rename from crates/tinymcp-bus/src/version/test.rs
rename to crates/tinymcp-bus/src/version/mod_tests.rs
diff --git a/crates/tinymcp/src/audit/store/mod.rs b/crates/tinymcp/src/audit/store/mod.rs
index cc1e872c..46d4a8c2 100644
--- a/crates/tinymcp/src/audit/store/mod.rs
+++ b/crates/tinymcp/src/audit/store/mod.rs
@@ -5,4 +5,5 @@ mod types;
 pub use types::AuditStore;
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/audit/store/test.rs b/crates/tinymcp/src/audit/store/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/audit/store/test.rs
rename to crates/tinymcp/src/audit/store/mod_tests.rs
diff --git a/crates/tinymcp/src/config_servers/mod.rs b/crates/tinymcp/src/config_servers/mod.rs
index 4b3ebd89..e415d255 100644
--- a/crates/tinymcp/src/config_servers/mod.rs
+++ b/crates/tinymcp/src/config_servers/mod.rs
@@ -33,4 +33,5 @@ mod types;
 pub use types::{McpRegistrySource, McpServerDefinition, McpServerRegistry, McpTransportClient};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/config_servers/test.rs b/crates/tinymcp/src/config_servers/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/config_servers/test.rs
rename to crates/tinymcp/src/config_servers/mod_tests.rs
diff --git a/crates/tinymcp/src/error/mod.rs b/crates/tinymcp/src/error/mod.rs
index fc295c03..ac431894 100644
--- a/crates/tinymcp/src/error/mod.rs
+++ b/crates/tinymcp/src/error/mod.rs
@@ -544,4 +544,5 @@ fn rendered_body(body: &str) -> String {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/error/test.rs b/crates/tinymcp/src/error/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/error/test.rs
rename to crates/tinymcp/src/error/mod_tests.rs
diff --git a/crates/tinymcp/src/registry/boot/mod.rs b/crates/tinymcp/src/registry/boot/mod.rs
index 22190e1e..27324dda 100644
--- a/crates/tinymcp/src/registry/boot/mod.rs
+++ b/crates/tinymcp/src/registry/boot/mod.rs
@@ -24,4 +24,5 @@ mod types;
 pub use types::{BOOT_CONCURRENCY, BootOutcome, connect_installed_servers};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/registry/boot/test.rs b/crates/tinymcp/src/registry/boot/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/registry/boot/test.rs
rename to crates/tinymcp/src/registry/boot/mod_tests.rs
diff --git a/crates/tinymcp/src/registry/config_doc/mod.rs b/crates/tinymcp/src/registry/config_doc/mod.rs
index 5b8059a9..6973c65a 100644
--- a/crates/tinymcp/src/registry/config_doc/mod.rs
+++ b/crates/tinymcp/src/registry/config_doc/mod.rs
@@ -39,4 +39,5 @@ pub use document::{ROOT_KEY, merge_credentials, parse, render, same_dial, to_ins
 pub use types::{AppliedServer, ConfigApplyReport, Declared};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/registry/config_doc/test.rs b/crates/tinymcp/src/registry/config_doc/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/registry/config_doc/test.rs
rename to crates/tinymcp/src/registry/config_doc/mod_tests.rs
diff --git a/crates/tinymcp/src/registry/connections/mod.rs b/crates/tinymcp/src/registry/connections/mod.rs
index c8d074d5..c30d4a3f 100644
--- a/crates/tinymcp/src/registry/connections/mod.rs
+++ b/crates/tinymcp/src/registry/connections/mod.rs
@@ -45,4 +45,5 @@ pub(crate) use dial::build_http_auth;
 pub use types::{Connections, ProbeOutcome, REMOTE_REQUEST_TIMEOUT};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/registry/connections/test.rs b/crates/tinymcp/src/registry/connections/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/registry/connections/test.rs
rename to crates/tinymcp/src/registry/connections/mod_tests.rs
diff --git a/crates/tinymcp/src/registry/curation/mod.rs b/crates/tinymcp/src/registry/curation/mod.rs
index 6f1fc83b..382be12e 100644
--- a/crates/tinymcp/src/registry/curation/mod.rs
+++ b/crates/tinymcp/src/registry/curation/mod.rs
@@ -28,4 +28,5 @@ pub use types::{
 };
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/registry/curation/test.rs b/crates/tinymcp/src/registry/curation/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/registry/curation/test.rs
rename to crates/tinymcp/src/registry/curation/mod_tests.rs
diff --git a/crates/tinymcp/src/registry/oauth/mod.rs b/crates/tinymcp/src/registry/oauth/mod.rs
index c657af67..ce6d56a8 100644
--- a/crates/tinymcp/src/registry/oauth/mod.rs
+++ b/crates/tinymcp/src/registry/oauth/mod.rs
@@ -49,4 +49,5 @@ pub use tokens::{OAUTH_BUNDLE_KEY, refresh_if_expired};
 pub use types::{AuthDetection, AuthKind};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/registry/oauth/test.rs b/crates/tinymcp/src/registry/oauth/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/registry/oauth/test.rs
rename to crates/tinymcp/src/registry/oauth/mod_tests.rs
diff --git a/crates/tinymcp/src/registry/ops/mod.rs b/crates/tinymcp/src/registry/ops/mod.rs
index acc015d8..5a3e2bf3 100644
--- a/crates/tinymcp/src/registry/ops/mod.rs
+++ b/crates/tinymcp/src/registry/ops/mod.rs
@@ -34,4 +34,5 @@ pub use install::{build_install_transport, collect_required_env_keys, pick_conne
 pub use types::McpRegistry;
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/registry/ops/test.rs b/crates/tinymcp/src/registry/ops/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/registry/ops/test.rs
rename to crates/tinymcp/src/registry/ops/mod_tests.rs
diff --git a/crates/tinymcp/src/registry/setup/mod.rs b/crates/tinymcp/src/registry/setup/mod.rs
index a983b01f..d54808b2 100644
--- a/crates/tinymcp/src/registry/setup/mod.rs
+++ b/crates/tinymcp/src/registry/setup/mod.rs
@@ -42,4 +42,5 @@ mod types;
 pub use types::{IDLE_TTL, REQUEST_TIMEOUT, SecretRef, SecretVault};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/registry/setup/test.rs b/crates/tinymcp/src/registry/setup/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/registry/setup/test.rs
rename to crates/tinymcp/src/registry/setup/mod_tests.rs
diff --git a/crates/tinymcp/src/registry/sources/mod.rs b/crates/tinymcp/src/registry/sources/mod.rs
index 3c6a2142..7bd7b5dc 100644
--- a/crates/tinymcp/src/registry/sources/mod.rs
+++ b/crates/tinymcp/src/registry/sources/mod.rs
@@ -40,4 +40,5 @@ pub use smithery::SmitheryRegistry;
 pub use types::{Registries, RegistrySource, SOURCE_MCP_OFFICIAL, SOURCE_SMITHERY};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/registry/sources/test.rs b/crates/tinymcp/src/registry/sources/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/registry/sources/test.rs
rename to crates/tinymcp/src/registry/sources/mod_tests.rs
diff --git a/crates/tinymcp/src/registry/sources/official/mod.rs b/crates/tinymcp/src/registry/sources/official/mod.rs
index efd5a6fc..1c075f72 100644
--- a/crates/tinymcp/src/registry/sources/official/mod.rs
+++ b/crates/tinymcp/src/registry/sources/official/mod.rs
@@ -368,4 +368,5 @@ fn auth_token(auth: &McpRegistryAuthConfig) -> Option<String> {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/registry/sources/official/test.rs b/crates/tinymcp/src/registry/sources/official/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/registry/sources/official/test.rs
rename to crates/tinymcp/src/registry/sources/official/mod_tests.rs
diff --git a/crates/tinymcp/src/registry/sources/smithery/mod.rs b/crates/tinymcp/src/registry/sources/smithery/mod.rs
index a6c33cfc..393e8a99 100644
--- a/crates/tinymcp/src/registry/sources/smithery/mod.rs
+++ b/crates/tinymcp/src/registry/sources/smithery/mod.rs
@@ -205,4 +205,5 @@ pub(super) fn tag_source(mut servers: Vec<RegistryServerSummary>) -> Vec<Registr
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/registry/sources/smithery/test.rs b/crates/tinymcp/src/registry/sources/smithery/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/registry/sources/smithery/test.rs
rename to crates/tinymcp/src/registry/sources/smithery/mod_tests.rs
diff --git a/crates/tinymcp/src/registry/store/mod.rs b/crates/tinymcp/src/registry/store/mod.rs
index ab0b09b4..01e820ac 100644
--- a/crates/tinymcp/src/registry/store/mod.rs
+++ b/crates/tinymcp/src/registry/store/mod.rs
@@ -44,4 +44,5 @@ pub use tool_cache::{CachedTools, installed_fingerprint, static_cache_key};
 pub use types::Store;
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/registry/store/test.rs b/crates/tinymcp/src/registry/store/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/registry/store/test.rs
rename to crates/tinymcp/src/registry/store/mod_tests.rs
diff --git a/crates/tinymcp/src/registry/supervisor/mod.rs b/crates/tinymcp/src/registry/supervisor/mod.rs
index ce57c5c7..d719dd4f 100644
--- a/crates/tinymcp/src/registry/supervisor/mod.rs
+++ b/crates/tinymcp/src/registry/supervisor/mod.rs
@@ -46,4 +46,5 @@ pub use report::{ServerRef, SupervisorEvent, TickReport};
 pub use types::{SupervisedHost, Supervisor, SupervisorConfig};
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/registry/supervisor/test.rs b/crates/tinymcp/src/registry/supervisor/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/registry/supervisor/test.rs
rename to crates/tinymcp/src/registry/supervisor/mod_tests.rs
diff --git a/crates/tinymcp/src/server/args/mod.rs b/crates/tinymcp/src/server/args/mod.rs
index e6d9d69e..c68275e1 100644
--- a/crates/tinymcp/src/server/args/mod.rs
+++ b/crates/tinymcp/src/server/args/mod.rs
@@ -294,4 +294,5 @@ fn bounded_positive(key: &str, value: &Value, max: u64) -> Result<u64, ToolCallE
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/server/args/test.rs b/crates/tinymcp/src/server/args/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/server/args/test.rs
rename to crates/tinymcp/src/server/args/mod_tests.rs
diff --git a/crates/tinymcp/src/server/http/mod.rs b/crates/tinymcp/src/server/http/mod.rs
index 72f05e4d..cf5ad064 100644
--- a/crates/tinymcp/src/server/http/mod.rs
+++ b/crates/tinymcp/src/server/http/mod.rs
@@ -419,4 +419,5 @@ fn text_error(status: StatusCode, message: &str) -> Response {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/server/http/test.rs b/crates/tinymcp/src/server/http/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/server/http/test.rs
rename to crates/tinymcp/src/server/http/mod_tests.rs
diff --git a/crates/tinymcp/src/server/mod.rs b/crates/tinymcp/src/server/mod.rs
index b982b24c..90743775 100644
--- a/crates/tinymcp/src/server/mod.rs
+++ b/crates/tinymcp/src/server/mod.rs
@@ -27,4 +27,5 @@ pub use types::{
 };
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/server/test.rs b/crates/tinymcp/src/server/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/server/test.rs
rename to crates/tinymcp/src/server/mod_tests.rs
diff --git a/crates/tinymcp/src/server/protocol/mod.rs b/crates/tinymcp/src/server/protocol/mod.rs
index bafd6f80..23501dd5 100644
--- a/crates/tinymcp/src/server/protocol/mod.rs
+++ b/crates/tinymcp/src/server/protocol/mod.rs
@@ -415,4 +415,5 @@ fn valid_request_id(id: &Value) -> bool {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/server/protocol/test.rs b/crates/tinymcp/src/server/protocol/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/server/protocol/test.rs
rename to crates/tinymcp/src/server/protocol/mod_tests.rs
diff --git a/crates/tinymcp/src/server/session/mod.rs b/crates/tinymcp/src/server/session/mod.rs
index 13d8b32c..5402f8de 100644
--- a/crates/tinymcp/src/server/session/mod.rs
+++ b/crates/tinymcp/src/server/session/mod.rs
@@ -120,4 +120,5 @@ pub(crate) fn object_keys(value: &Value) -> Vec<String> {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/server/session/test.rs b/crates/tinymcp/src/server/session/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/server/session/test.rs
rename to crates/tinymcp/src/server/session/mod_tests.rs
diff --git a/crates/tinymcp/src/server/stdio/mod.rs b/crates/tinymcp/src/server/stdio/mod.rs
index 362628d1..a71300e3 100644
--- a/crates/tinymcp/src/server/stdio/mod.rs
+++ b/crates/tinymcp/src/server/stdio/mod.rs
@@ -53,4 +53,5 @@ where
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/server/stdio/test.rs b/crates/tinymcp/src/server/stdio/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/server/stdio/test.rs
rename to crates/tinymcp/src/server/stdio/mod_tests.rs
diff --git a/crates/tinymcp/src/tinybus_module/directories/mod.rs b/crates/tinymcp/src/tinybus_module/directories/mod.rs
index 886b6dcb..e6aac3cf 100644
--- a/crates/tinymcp/src/tinybus_module/directories/mod.rs
+++ b/crates/tinymcp/src/tinybus_module/directories/mod.rs
@@ -46,4 +46,5 @@ pub(super) use types::DirectoryOpener;
 pub(super) use types::MAX_OPEN_DIRECTORIES;
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/tinybus_module/directories/test.rs b/crates/tinymcp/src/tinybus_module/directories/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/tinybus_module/directories/test.rs
rename to crates/tinymcp/src/tinybus_module/directories/mod_tests.rs
diff --git a/crates/tinymcp/src/tinybus_module/maintenance/mod.rs b/crates/tinymcp/src/tinybus_module/maintenance/mod.rs
index d340637a..75f0b6b5 100644
--- a/crates/tinymcp/src/tinybus_module/maintenance/mod.rs
+++ b/crates/tinymcp/src/tinybus_module/maintenance/mod.rs
@@ -31,4 +31,5 @@ mod types;
 pub(super) use types::Maintenance;
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/tinybus_module/maintenance/test.rs b/crates/tinymcp/src/tinybus_module/maintenance/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/tinybus_module/maintenance/test.rs
rename to crates/tinymcp/src/tinybus_module/maintenance/mod_tests.rs
diff --git a/crates/tinymcp/src/tinybus_module/mod.rs b/crates/tinymcp/src/tinybus_module/mod.rs
index d603beba..1dafa3e0 100644
--- a/crates/tinymcp/src/tinybus_module/mod.rs
+++ b/crates/tinymcp/src/tinybus_module/mod.rs
@@ -136,4 +136,5 @@ export_module! {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/tinybus_module/test.rs b/crates/tinymcp/src/tinybus_module/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/tinybus_module/test.rs
rename to crates/tinymcp/src/tinybus_module/mod_tests.rs
diff --git a/crates/tinymcp/src/tools/bridge_test.rs b/crates/tinymcp/src/tools/bridge_tests.rs
similarity index 100%
rename from crates/tinymcp/src/tools/bridge_test.rs
rename to crates/tinymcp/src/tools/bridge_tests.rs
diff --git a/crates/tinymcp/src/tools/mod.rs b/crates/tinymcp/src/tools/mod.rs
index cf349d9c..1fa439c8 100644
--- a/crates/tinymcp/src/tools/mod.rs
+++ b/crates/tinymcp/src/tools/mod.rs
@@ -99,9 +99,12 @@ pub fn tools_for(
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
 
 #[cfg(test)]
+#[path = "bridge_tests.rs"]
 mod bridge_test;
 #[cfg(test)]
+#[path = "scrub_tests.rs"]
 mod scrub_test;
diff --git a/crates/tinymcp/src/tools/test.rs b/crates/tinymcp/src/tools/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/tools/test.rs
rename to crates/tinymcp/src/tools/mod_tests.rs
diff --git a/crates/tinymcp/src/tools/scrub_test.rs b/crates/tinymcp/src/tools/scrub_tests.rs
similarity index 100%
rename from crates/tinymcp/src/tools/scrub_test.rs
rename to crates/tinymcp/src/tools/scrub_tests.rs
diff --git a/crates/tinymcp/src/transport/http/mod.rs b/crates/tinymcp/src/transport/http/mod.rs
index 26104d75..0504f8c3 100644
--- a/crates/tinymcp/src/transport/http/mod.rs
+++ b/crates/tinymcp/src/transport/http/mod.rs
@@ -1037,4 +1037,5 @@ fn fill_missing_metadata(
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/transport/http/test.rs b/crates/tinymcp/src/transport/http/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/transport/http/test.rs
rename to crates/tinymcp/src/transport/http/mod_tests.rs
diff --git a/crates/tinymcp/src/transport/mod.rs b/crates/tinymcp/src/transport/mod.rs
index ee6665d8..0cdebfb2 100644
--- a/crates/tinymcp/src/transport/mod.rs
+++ b/crates/tinymcp/src/transport/mod.rs
@@ -45,4 +45,5 @@ pub(crate) fn validate_protocol_version(version: &str) -> Result<()> {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/transport/test.rs b/crates/tinymcp/src/transport/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/transport/test.rs
rename to crates/tinymcp/src/transport/mod_tests.rs
diff --git a/crates/tinymcp/src/transport/stdio/mod.rs b/crates/tinymcp/src/transport/stdio/mod.rs
index 13e58a9b..9a7975a4 100644
--- a/crates/tinymcp/src/transport/stdio/mod.rs
+++ b/crates/tinymcp/src/transport/stdio/mod.rs
@@ -391,4 +391,5 @@ impl McpStdioClient {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/transport/stdio/test.rs b/crates/tinymcp/src/transport/stdio/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/transport/stdio/test.rs
rename to crates/tinymcp/src/transport/stdio/mod_tests.rs
diff --git a/crates/tinymcp/src/transport/stdio/spawn_env/mod.rs b/crates/tinymcp/src/transport/stdio/spawn_env/mod.rs
index 00764d07..4d50d05f 100644
--- a/crates/tinymcp/src/transport/stdio/spawn_env/mod.rs
+++ b/crates/tinymcp/src/transport/stdio/spawn_env/mod.rs
@@ -431,4 +431,5 @@ pub fn required_runtime(command: &str) -> CommandKind {
 }
 
 #[cfg(test)]
+#[path = "mod_tests.rs"]
 mod test;
diff --git a/crates/tinymcp/src/transport/stdio/spawn_env/test.rs b/crates/tinymcp/src/transport/stdio/spawn_env/mod_tests.rs
similarity index 100%
rename from crates/tinymcp/src/transport/stdio/spawn_env/test.rs
rename to crates/tinymcp/src/transport/stdio/spawn_env/mod_tests.rs