diff --git a/examples/stdio-custom-dependencies/McpTaskHandlers.php b/examples/stdio-custom-dependencies/McpTaskHandlers.php
index 262d1a86..65d2f003 100644
--- a/examples/stdio-custom-dependencies/McpTaskHandlers.php
+++ b/examples/stdio-custom-dependencies/McpTaskHandlers.php
@@ -13,8 +13,8 @@
 
 use Mcp\Capability\Attribute\McpResource;
 use Mcp\Capability\Attribute\McpTool;
-use Mcp\Example\DependenciesStdioExample\Service\StatsServiceInterface;
-use Mcp\Example\DependenciesStdioExample\Service\TaskRepositoryInterface;
+use Mcp\Example\StdioCustomDependencies\Service\StatsServiceInterface;
+use Mcp\Example\StdioCustomDependencies\Service\TaskRepositoryInterface;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/examples/stdio-custom-dependencies/Service/InMemoryTaskRepository.php b/examples/stdio-custom-dependencies/Service/InMemoryTaskRepository.php
index 47526c4c..63ce8611 100644
--- a/examples/stdio-custom-dependencies/Service/InMemoryTaskRepository.php
+++ b/examples/stdio-custom-dependencies/Service/InMemoryTaskRepository.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\DependenciesStdioExample\Service;
+namespace Mcp\Example\StdioCustomDependencies\Service;
 
 use Psr\Log\LoggerInterface;
 
diff --git a/examples/stdio-custom-dependencies/Service/StatsServiceInterface.php b/examples/stdio-custom-dependencies/Service/StatsServiceInterface.php
index b8485d2a..a7e8b276 100644
--- a/examples/stdio-custom-dependencies/Service/StatsServiceInterface.php
+++ b/examples/stdio-custom-dependencies/Service/StatsServiceInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\DependenciesStdioExample\Service;
+namespace Mcp\Example\StdioCustomDependencies\Service;
 
 interface StatsServiceInterface
 {
diff --git a/examples/stdio-custom-dependencies/Service/SystemStatsService.php b/examples/stdio-custom-dependencies/Service/SystemStatsService.php
index 075dd8a0..5a766792 100644
--- a/examples/stdio-custom-dependencies/Service/SystemStatsService.php
+++ b/examples/stdio-custom-dependencies/Service/SystemStatsService.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\DependenciesStdioExample\Service;
+namespace Mcp\Example\StdioCustomDependencies\Service;
 
 final class SystemStatsService implements StatsServiceInterface
 {
diff --git a/examples/stdio-custom-dependencies/Service/TaskRepositoryInterface.php b/examples/stdio-custom-dependencies/Service/TaskRepositoryInterface.php
index 975cc711..6c091be1 100644
--- a/examples/stdio-custom-dependencies/Service/TaskRepositoryInterface.php
+++ b/examples/stdio-custom-dependencies/Service/TaskRepositoryInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\DependenciesStdioExample\Service;
+namespace Mcp\Example\StdioCustomDependencies\Service;
 
 /**
  * @phpstan-type Task array{id: int, userId: string, description: string, completed: bool, createdAt: string}
diff --git a/examples/stdio-custom-dependencies/server.php b/examples/stdio-custom-dependencies/server.php
index 659f4499..4ebd4cbd 100644
--- a/examples/stdio-custom-dependencies/server.php
+++ b/examples/stdio-custom-dependencies/server.php
@@ -13,10 +13,10 @@
 require_once dirname(__DIR__).'/bootstrap.php';
 chdir(__DIR__);
 
-use Mcp\Example\DependenciesStdioExample\Service\InMemoryTaskRepository;
-use Mcp\Example\DependenciesStdioExample\Service\StatsServiceInterface;
-use Mcp\Example\DependenciesStdioExample\Service\SystemStatsService;
-use Mcp\Example\DependenciesStdioExample\Service\TaskRepositoryInterface;
+use Mcp\Example\StdioCustomDependencies\Service\InMemoryTaskRepository;
+use Mcp\Example\StdioCustomDependencies\Service\StatsServiceInterface;
+use Mcp\Example\StdioCustomDependencies\Service\SystemStatsService;
+use Mcp\Example\StdioCustomDependencies\Service\TaskRepositoryInterface;
 use Mcp\Server;
 use Mcp\Server\Transport\StdioTransport;
 
diff --git a/tests/Inspector/StdioCachedDiscoveryTest.php b/tests/Inspector/StdioCachedDiscoveryTest.php
new file mode 100644
index 00000000..dfc8acec
--- /dev/null
+++ b/tests/Inspector/StdioCachedDiscoveryTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the official PHP MCP SDK.
+ *
+ * A collaboration between Symfony and the PHP Foundation.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Inspector;
+
+use Mcp\Tests\Inspector\InspectorSnapshotTestCase;
+
+final class StdioCachedDiscoveryTest extends InspectorSnapshotTestCase
+{
+    public static function provideMethods(): array
+    {
+        return [
+            ...parent::provideListMethods(),
+        ];
+    }
+
+    protected function getServerScript(): string
+    {
+        return \dirname(__DIR__, 2).'/examples/stdio-cached-discovery/server.php';
+    }
+}
diff --git a/tests/Inspector/StdioCustomDependenciesTest.php b/tests/Inspector/StdioCustomDependenciesTest.php
new file mode 100644
index 00000000..c54351bb
--- /dev/null
+++ b/tests/Inspector/StdioCustomDependenciesTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the official PHP MCP SDK.
+ *
+ * A collaboration between Symfony and the PHP Foundation.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Inspector;
+
+use Mcp\Tests\Inspector\InspectorSnapshotTestCase;
+
+final class StdioCustomDependenciesTest extends InspectorSnapshotTestCase
+{
+    public static function provideMethods(): array
+    {
+        return [
+            ...parent::provideListMethods(),
+        ];
+    }
+
+    protected function getServerScript(): string
+    {
+        return \dirname(__DIR__, 2).'/examples/stdio-custom-dependencies/server.php';
+    }
+}
diff --git a/tests/Inspector/StdioCalculatorExampleTest.php b/tests/Inspector/StdioDiscoveryCalculatorTest.php
similarity index 93%
rename from tests/Inspector/StdioCalculatorExampleTest.php
rename to tests/Inspector/StdioDiscoveryCalculatorTest.php
index b023b5b5..5fe04b69 100644
--- a/tests/Inspector/StdioCalculatorExampleTest.php
+++ b/tests/Inspector/StdioDiscoveryCalculatorTest.php
@@ -11,7 +11,7 @@
 
 namespace Mcp\Tests\Inspector;
 
-final class StdioCalculatorExampleTest extends InspectorSnapshotTestCase
+final class StdioDiscoveryCalculatorTest extends InspectorSnapshotTestCase
 {
     public static function provideMethods(): array
     {
diff --git a/tests/Inspector/StdioEnvVariablesTest.php b/tests/Inspector/StdioEnvVariablesTest.php
new file mode 100644
index 00000000..d347cd69
--- /dev/null
+++ b/tests/Inspector/StdioEnvVariablesTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the official PHP MCP SDK.
+ *
+ * A collaboration between Symfony and the PHP Foundation.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Inspector;
+
+use Mcp\Tests\Inspector\InspectorSnapshotTestCase;
+
+final class StdioEnvVariablesTest extends InspectorSnapshotTestCase
+{
+    public static function provideMethods(): array
+    {
+        return [
+            ...parent::provideListMethods(),
+        ];
+    }
+
+    protected function getServerScript(): string
+    {
+        return \dirname(__DIR__, 2).'/examples/stdio-env-variables/server.php';
+    }
+}
diff --git a/tests/Inspector/ManualStdioExampleTest.php b/tests/Inspector/StdioExplicitRegistrationTest.php
similarity index 89%
rename from tests/Inspector/ManualStdioExampleTest.php
rename to tests/Inspector/StdioExplicitRegistrationTest.php
index 582de0dc..cf00f0e5 100644
--- a/tests/Inspector/ManualStdioExampleTest.php
+++ b/tests/Inspector/StdioExplicitRegistrationTest.php
@@ -13,7 +13,7 @@
 
 use Mcp\Tests\Inspector\InspectorSnapshotTestCase;
 
-final class ManualStdioExampleTest extends InspectorSnapshotTestCase
+final class StdioExplicitRegistrationTest extends InspectorSnapshotTestCase
 {
     public static function provideMethods(): array
     {
diff --git a/tests/Inspector/snapshots/StdioCalculatorExampleTest-prompts_list.json b/tests/Inspector/snapshots/StdioCachedDiscoveryTest-prompts_list.json
similarity index 95%
rename from tests/Inspector/snapshots/StdioCalculatorExampleTest-prompts_list.json
rename to tests/Inspector/snapshots/StdioCachedDiscoveryTest-prompts_list.json
index 911451f2..7292222c 100644
--- a/tests/Inspector/snapshots/StdioCalculatorExampleTest-prompts_list.json
+++ b/tests/Inspector/snapshots/StdioCachedDiscoveryTest-prompts_list.json
@@ -1,4 +1,3 @@
 {
   "prompts": []
 }
-
diff --git a/tests/Inspector/snapshots/StdioCachedDiscoveryTest-resources_list.json b/tests/Inspector/snapshots/StdioCachedDiscoveryTest-resources_list.json
new file mode 100644
index 00000000..d02ef58d
--- /dev/null
+++ b/tests/Inspector/snapshots/StdioCachedDiscoveryTest-resources_list.json
@@ -0,0 +1,3 @@
+{
+  "resources": []
+}
diff --git a/tests/Inspector/snapshots/StdioCalculatorExampleTest-resources_templates_list.json b/tests/Inspector/snapshots/StdioCachedDiscoveryTest-resources_templates_list.json
similarity index 100%
rename from tests/Inspector/snapshots/StdioCalculatorExampleTest-resources_templates_list.json
rename to tests/Inspector/snapshots/StdioCachedDiscoveryTest-resources_templates_list.json
diff --git a/tests/Inspector/snapshots/StdioCachedDiscoveryTest-tools_list.json b/tests/Inspector/snapshots/StdioCachedDiscoveryTest-tools_list.json
new file mode 100644
index 00000000..60848ab1
--- /dev/null
+++ b/tests/Inspector/snapshots/StdioCachedDiscoveryTest-tools_list.json
@@ -0,0 +1,76 @@
+{
+  "tools": [
+    {
+      "name": "add_numbers",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "a": {
+            "type": "integer"
+          },
+          "b": {
+            "type": "integer"
+          }
+        },
+        "required": [
+          "a",
+          "b"
+        ]
+      }
+    },
+    {
+      "name": "multiply_numbers",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "a": {
+            "type": "integer"
+          },
+          "b": {
+            "type": "integer"
+          }
+        },
+        "required": [
+          "a",
+          "b"
+        ]
+      }
+    },
+    {
+      "name": "divide_numbers",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "a": {
+            "type": "integer"
+          },
+          "b": {
+            "type": "integer"
+          }
+        },
+        "required": [
+          "a",
+          "b"
+        ]
+      }
+    },
+    {
+      "name": "power",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "base": {
+            "type": "integer"
+          },
+          "exponent": {
+            "type": "integer"
+          }
+        },
+        "required": [
+          "base",
+          "exponent"
+        ]
+      }
+    }
+  ]
+}
diff --git a/tests/Inspector/snapshots/StdioCustomDependenciesTest-prompts_list.json b/tests/Inspector/snapshots/StdioCustomDependenciesTest-prompts_list.json
new file mode 100644
index 00000000..7292222c
--- /dev/null
+++ b/tests/Inspector/snapshots/StdioCustomDependenciesTest-prompts_list.json
@@ -0,0 +1,3 @@
+{
+  "prompts": []
+}
diff --git a/tests/Inspector/snapshots/StdioCustomDependenciesTest-resources_list.json b/tests/Inspector/snapshots/StdioCustomDependenciesTest-resources_list.json
new file mode 100644
index 00000000..0b80ce0f
--- /dev/null
+++ b/tests/Inspector/snapshots/StdioCustomDependenciesTest-resources_list.json
@@ -0,0 +1,10 @@
+{
+  "resources": [
+    {
+      "name": "system_stats",
+      "uri": "stats://system/overview",
+      "description": "Provides current system statistics.",
+      "mimeType": "application/json"
+    }
+  ]
+}
diff --git a/tests/Inspector/snapshots/StdioCustomDependenciesTest-resources_templates_list.json b/tests/Inspector/snapshots/StdioCustomDependenciesTest-resources_templates_list.json
new file mode 100644
index 00000000..e867d9d2
--- /dev/null
+++ b/tests/Inspector/snapshots/StdioCustomDependenciesTest-resources_templates_list.json
@@ -0,0 +1,3 @@
+{
+  "resourceTemplates": []
+}
diff --git a/tests/Inspector/snapshots/StdioCustomDependenciesTest-tools_list.json b/tests/Inspector/snapshots/StdioCustomDependenciesTest-tools_list.json
new file mode 100644
index 00000000..247b27fc
--- /dev/null
+++ b/tests/Inspector/snapshots/StdioCustomDependenciesTest-tools_list.json
@@ -0,0 +1,57 @@
+{
+  "tools": [
+    {
+      "name": "add_task",
+      "description": "Adds a new task for a given user.",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "userId": {
+            "type": "string",
+            "description": "the ID of the user"
+          },
+          "description": {
+            "type": "string",
+            "description": "the task description"
+          }
+        },
+        "required": [
+          "userId",
+          "description"
+        ]
+      }
+    },
+    {
+      "name": "list_user_tasks",
+      "description": "Lists pending tasks for a specific user.",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "userId": {
+            "type": "string",
+            "description": "the ID of the user"
+          }
+        },
+        "required": [
+          "userId"
+        ]
+      }
+    },
+    {
+      "name": "complete_task",
+      "description": "Marks a task as complete.",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "taskId": {
+            "type": "integer",
+            "description": "the ID of the task to complete"
+          }
+        },
+        "required": [
+          "taskId"
+        ]
+      }
+    }
+  ]
+}
diff --git a/tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-prompts_list.json b/tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-prompts_list.json
new file mode 100644
index 00000000..7292222c
--- /dev/null
+++ b/tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-prompts_list.json
@@ -0,0 +1,3 @@
+{
+  "prompts": []
+}
diff --git a/tests/Inspector/snapshots/StdioCalculatorExampleTest-resources_list.json b/tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-resources_list.json
similarity index 99%
rename from tests/Inspector/snapshots/StdioCalculatorExampleTest-resources_list.json
rename to tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-resources_list.json
index e6402959..a40f3489 100644
--- a/tests/Inspector/snapshots/StdioCalculatorExampleTest-resources_list.json
+++ b/tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-resources_list.json
@@ -8,4 +8,3 @@
     }
   ]
 }
-
diff --git a/tests/Inspector/snapshots/StdioCalculatorExampleTest-resources_read.json b/tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-resources_read.json
similarity index 100%
rename from tests/Inspector/snapshots/StdioCalculatorExampleTest-resources_read.json
rename to tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-resources_read.json
diff --git a/tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-resources_templates_list.json b/tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-resources_templates_list.json
new file mode 100644
index 00000000..e867d9d2
--- /dev/null
+++ b/tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-resources_templates_list.json
@@ -0,0 +1,3 @@
+{
+  "resourceTemplates": []
+}
diff --git a/tests/Inspector/snapshots/StdioCalculatorExampleTest-tools_call.json b/tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-tools_call.json
similarity index 100%
rename from tests/Inspector/snapshots/StdioCalculatorExampleTest-tools_call.json
rename to tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-tools_call.json
diff --git a/tests/Inspector/snapshots/StdioCalculatorExampleTest-tools_list.json b/tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-tools_list.json
similarity index 99%
rename from tests/Inspector/snapshots/StdioCalculatorExampleTest-tools_list.json
rename to tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-tools_list.json
index 2812c849..d4a4531a 100644
--- a/tests/Inspector/snapshots/StdioCalculatorExampleTest-tools_list.json
+++ b/tests/Inspector/snapshots/StdioDiscoveryCalculatorTest-tools_list.json
@@ -48,4 +48,3 @@
     }
   ]
 }
-
diff --git a/tests/Inspector/snapshots/StdioEnvVariablesTest-prompts_list.json b/tests/Inspector/snapshots/StdioEnvVariablesTest-prompts_list.json
new file mode 100644
index 00000000..7292222c
--- /dev/null
+++ b/tests/Inspector/snapshots/StdioEnvVariablesTest-prompts_list.json
@@ -0,0 +1,3 @@
+{
+  "prompts": []
+}
diff --git a/tests/Inspector/snapshots/StdioEnvVariablesTest-resources_list.json b/tests/Inspector/snapshots/StdioEnvVariablesTest-resources_list.json
new file mode 100644
index 00000000..d02ef58d
--- /dev/null
+++ b/tests/Inspector/snapshots/StdioEnvVariablesTest-resources_list.json
@@ -0,0 +1,3 @@
+{
+  "resources": []
+}
diff --git a/tests/Inspector/snapshots/StdioEnvVariablesTest-resources_templates_list.json b/tests/Inspector/snapshots/StdioEnvVariablesTest-resources_templates_list.json
new file mode 100644
index 00000000..e867d9d2
--- /dev/null
+++ b/tests/Inspector/snapshots/StdioEnvVariablesTest-resources_templates_list.json
@@ -0,0 +1,3 @@
+{
+  "resourceTemplates": []
+}
diff --git a/tests/Inspector/snapshots/StdioEnvVariablesTest-tools_list.json b/tests/Inspector/snapshots/StdioEnvVariablesTest-tools_list.json
new file mode 100644
index 00000000..32141675
--- /dev/null
+++ b/tests/Inspector/snapshots/StdioEnvVariablesTest-tools_list.json
@@ -0,0 +1,20 @@
+{
+  "tools": [
+    {
+      "name": "process_data_by_mode",
+      "description": "Performs an action that can be modified by an environment variable.",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "input": {
+            "type": "string",
+            "description": "some input data"
+          }
+        },
+        "required": [
+          "input"
+        ]
+      }
+    }
+  ]
+}
diff --git a/tests/Inspector/snapshots/ManualStdioExampleTest-prompts_list.json b/tests/Inspector/snapshots/StdioExplicitRegistrationTest-prompts_list.json
similarity index 100%
rename from tests/Inspector/snapshots/ManualStdioExampleTest-prompts_list.json
rename to tests/Inspector/snapshots/StdioExplicitRegistrationTest-prompts_list.json
diff --git a/tests/Inspector/snapshots/ManualStdioExampleTest-resources_list.json b/tests/Inspector/snapshots/StdioExplicitRegistrationTest-resources_list.json
similarity index 100%
rename from tests/Inspector/snapshots/ManualStdioExampleTest-resources_list.json
rename to tests/Inspector/snapshots/StdioExplicitRegistrationTest-resources_list.json
diff --git a/tests/Inspector/snapshots/ManualStdioExampleTest-resources_templates_list.json b/tests/Inspector/snapshots/StdioExplicitRegistrationTest-resources_templates_list.json
similarity index 100%
rename from tests/Inspector/snapshots/ManualStdioExampleTest-resources_templates_list.json
rename to tests/Inspector/snapshots/StdioExplicitRegistrationTest-resources_templates_list.json
diff --git a/tests/Inspector/snapshots/ManualStdioExampleTest-tools_list.json b/tests/Inspector/snapshots/StdioExplicitRegistrationTest-tools_list.json
similarity index 100%
rename from tests/Inspector/snapshots/ManualStdioExampleTest-tools_list.json
rename to tests/Inspector/snapshots/StdioExplicitRegistrationTest-tools_list.json