diff --git a/mcp/client_list_test.go b/mcp/client_list_test.go
index 6d2c2c9..cf8d192 100644
--- a/mcp/client_list_test.go
+++ b/mcp/client_list_test.go
@@ -15,109 +15,97 @@ import (
 	"github.com/modelcontextprotocol/go-sdk/jsonschema"
 )
 
-func TestListTools(t *testing.T) {
-	toolA := mcp.NewTool("apple", "apple tool", SayHi)
-	toolB := mcp.NewTool("banana", "banana tool", SayHi)
-	toolC := mcp.NewTool("cherry", "cherry tool", SayHi)
-	tools := []*mcp.ServerTool{toolA, toolB, toolC}
-
-	wantTools := []*mcp.Tool{toolA.Tool, toolB.Tool, toolC.Tool}
+func TestList(t *testing.T) {
 	ctx := context.Background()
 	clientSession, serverSession, server := createSessions(ctx)
 	defer clientSession.Close()
 	defer serverSession.Close()
-	server.AddTools(tools...)
-	t.Run("ListTools", func(t *testing.T) {
-		res, err := clientSession.ListTools(ctx, nil)
-		if err != nil {
-			t.Fatal("ListTools() failed:", err)
-		}
-		if diff := cmp.Diff(wantTools, res.Tools, cmpopts.IgnoreUnexported(jsonschema.Schema{})); diff != "" {
-			t.Fatalf("ListTools() mismatch (-want +got):\n%s", diff)
-		}
-	})
-	t.Run("ToolsIterator", func(t *testing.T) {
-		testIterator(ctx, t, clientSession.Tools(ctx, nil), wantTools)
-	})
-}
 
-func TestListResources(t *testing.T) {
-	resourceA := &mcp.ServerResource{Resource: &mcp.Resource{URI: "http://apple"}}
-	resourceB := &mcp.ServerResource{Resource: &mcp.Resource{URI: "http://banana"}}
-	resourceC := &mcp.ServerResource{Resource: &mcp.Resource{URI: "http://cherry"}}
-	wantResources := []*mcp.Resource{resourceA.Resource, resourceB.Resource, resourceC.Resource}
+	t.Run("tools", func(t *testing.T) {
+		toolA := mcp.NewTool("apple", "apple tool", SayHi)
+		toolB := mcp.NewTool("banana", "banana tool", SayHi)
+		toolC := mcp.NewTool("cherry", "cherry tool", SayHi)
+		tools := []*mcp.ServerTool{toolA, toolB, toolC}
+		wantTools := []*mcp.Tool{toolA.Tool, toolB.Tool, toolC.Tool}
+		server.AddTools(tools...)
+		t.Run("list", func(t *testing.T) {
+			res, err := clientSession.ListTools(ctx, nil)
+			if err != nil {
+				t.Fatal("ListTools() failed:", err)
+			}
+			if diff := cmp.Diff(wantTools, res.Tools, cmpopts.IgnoreUnexported(jsonschema.Schema{})); diff != "" {
+				t.Fatalf("ListTools() mismatch (-want +got):\n%s", diff)
+			}
+		})
+		t.Run("iterator", func(t *testing.T) {
+			testIterator(ctx, t, clientSession.Tools(ctx, nil), wantTools)
+		})
+	})
 
-	resources := []*mcp.ServerResource{resourceA, resourceB, resourceC}
-	ctx := context.Background()
-	clientSession, serverSession, server := createSessions(ctx)
-	defer clientSession.Close()
-	defer serverSession.Close()
-	server.AddResources(resources...)
-	t.Run("ListResources", func(t *testing.T) {
-		res, err := clientSession.ListResources(ctx, nil)
-		if err != nil {
-			t.Fatal("ListResources() failed:", err)
-		}
-		if diff := cmp.Diff(wantResources, res.Resources, cmpopts.IgnoreUnexported(jsonschema.Schema{})); diff != "" {
-			t.Fatalf("ListResources() mismatch (-want +got):\n%s", diff)
-		}
+	t.Run("resources", func(t *testing.T) {
+		resourceA := &mcp.ServerResource{Resource: &mcp.Resource{URI: "http://apple"}}
+		resourceB := &mcp.ServerResource{Resource: &mcp.Resource{URI: "http://banana"}}
+		resourceC := &mcp.ServerResource{Resource: &mcp.Resource{URI: "http://cherry"}}
+		wantResources := []*mcp.Resource{resourceA.Resource, resourceB.Resource, resourceC.Resource}
+		resources := []*mcp.ServerResource{resourceA, resourceB, resourceC}
+		server.AddResources(resources...)
+		t.Run("list", func(t *testing.T) {
+			res, err := clientSession.ListResources(ctx, nil)
+			if err != nil {
+				t.Fatal("ListResources() failed:", err)
+			}
+			if diff := cmp.Diff(wantResources, res.Resources, cmpopts.IgnoreUnexported(jsonschema.Schema{})); diff != "" {
+				t.Fatalf("ListResources() mismatch (-want +got):\n%s", diff)
+			}
+		})
+		t.Run("iterator", func(t *testing.T) {
+			testIterator(ctx, t, clientSession.Resources(ctx, nil), wantResources)
+		})
 	})
-	t.Run("ResourcesIterator", func(t *testing.T) {
-		testIterator(ctx, t, clientSession.Resources(ctx, nil), wantResources)
-	})
-}
 
-func TestListResourceTemplates(t *testing.T) {
-	resourceTmplA := &mcp.ServerResourceTemplate{ResourceTemplate: &mcp.ResourceTemplate{URITemplate: "http://apple/{x}"}}
-	resourceTmplB := &mcp.ServerResourceTemplate{ResourceTemplate: &mcp.ResourceTemplate{URITemplate: "http://banana/{x}"}}
-	resourceTmplC := &mcp.ServerResourceTemplate{ResourceTemplate: &mcp.ResourceTemplate{URITemplate: "http://cherry/{x}"}}
-	wantResourceTemplates := []*mcp.ResourceTemplate{
-		resourceTmplA.ResourceTemplate, resourceTmplB.ResourceTemplate,
-		resourceTmplC.ResourceTemplate,
-	}
-	resourceTemplates := []*mcp.ServerResourceTemplate{resourceTmplA, resourceTmplB, resourceTmplC}
-	ctx := context.Background()
-	clientSession, serverSession, server := createSessions(ctx)
-	defer clientSession.Close()
-	defer serverSession.Close()
-	server.AddResourceTemplates(resourceTemplates...)
-	t.Run("ListResourceTemplates", func(t *testing.T) {
-		res, err := clientSession.ListResourceTemplates(ctx, nil)
-		if err != nil {
-			t.Fatal("ListResourceTemplates() failed:", err)
-		}
-		if diff := cmp.Diff(wantResourceTemplates, res.ResourceTemplates, cmpopts.IgnoreUnexported(jsonschema.Schema{})); diff != "" {
-			t.Fatalf("ListResourceTemplates() mismatch (-want +got):\n%s", diff)
+	t.Run("templates", func(t *testing.T) {
+		resourceTmplA := &mcp.ServerResourceTemplate{ResourceTemplate: &mcp.ResourceTemplate{URITemplate: "http://apple/{x}"}}
+		resourceTmplB := &mcp.ServerResourceTemplate{ResourceTemplate: &mcp.ResourceTemplate{URITemplate: "http://banana/{x}"}}
+		resourceTmplC := &mcp.ServerResourceTemplate{ResourceTemplate: &mcp.ResourceTemplate{URITemplate: "http://cherry/{x}"}}
+		wantResourceTemplates := []*mcp.ResourceTemplate{
+			resourceTmplA.ResourceTemplate, resourceTmplB.ResourceTemplate,
+			resourceTmplC.ResourceTemplate,
 		}
+		resourceTemplates := []*mcp.ServerResourceTemplate{resourceTmplA, resourceTmplB, resourceTmplC}
+		server.AddResourceTemplates(resourceTemplates...)
+		t.Run("list", func(t *testing.T) {
+			res, err := clientSession.ListResourceTemplates(ctx, nil)
+			if err != nil {
+				t.Fatal("ListResourceTemplates() failed:", err)
+			}
+			if diff := cmp.Diff(wantResourceTemplates, res.ResourceTemplates, cmpopts.IgnoreUnexported(jsonschema.Schema{})); diff != "" {
+				t.Fatalf("ListResourceTemplates() mismatch (-want +got):\n%s", diff)
+			}
+		})
+		t.Run("ResourceTemplatesIterator", func(t *testing.T) {
+			testIterator(ctx, t, clientSession.ResourceTemplates(ctx, nil), wantResourceTemplates)
+		})
 	})
-	t.Run("ResourceTemplatesIterator", func(t *testing.T) {
-		testIterator(ctx, t, clientSession.ResourceTemplates(ctx, nil), wantResourceTemplates)
-	})
-}
 
-func TestListPrompts(t *testing.T) {
-	promptA := mcp.NewPrompt("apple", "apple prompt", testPromptHandler[struct{}])
-	promptB := mcp.NewPrompt("banana", "banana prompt", testPromptHandler[struct{}])
-	promptC := mcp.NewPrompt("cherry", "cherry prompt", testPromptHandler[struct{}])
-	wantPrompts := []*mcp.Prompt{promptA.Prompt, promptB.Prompt, promptC.Prompt}
-
-	prompts := []*mcp.ServerPrompt{promptA, promptB, promptC}
-	ctx := context.Background()
-	clientSession, serverSession, server := createSessions(ctx)
-	defer clientSession.Close()
-	defer serverSession.Close()
-	server.AddPrompts(prompts...)
-	t.Run("ListPrompts", func(t *testing.T) {
-		res, err := clientSession.ListPrompts(ctx, nil)
-		if err != nil {
-			t.Fatal("ListPrompts() failed:", err)
-		}
-		if diff := cmp.Diff(wantPrompts, res.Prompts, cmpopts.IgnoreUnexported(jsonschema.Schema{})); diff != "" {
-			t.Fatalf("ListPrompts() mismatch (-want +got):\n%s", diff)
-		}
-	})
-	t.Run("PromptsIterator", func(t *testing.T) {
-		testIterator(ctx, t, clientSession.Prompts(ctx, nil), wantPrompts)
+	t.Run("prompts", func(t *testing.T) {
+		promptA := mcp.NewPrompt("apple", "apple prompt", testPromptHandler[struct{}])
+		promptB := mcp.NewPrompt("banana", "banana prompt", testPromptHandler[struct{}])
+		promptC := mcp.NewPrompt("cherry", "cherry prompt", testPromptHandler[struct{}])
+		wantPrompts := []*mcp.Prompt{promptA.Prompt, promptB.Prompt, promptC.Prompt}
+		prompts := []*mcp.ServerPrompt{promptA, promptB, promptC}
+		server.AddPrompts(prompts...)
+		t.Run("list", func(t *testing.T) {
+			res, err := clientSession.ListPrompts(ctx, nil)
+			if err != nil {
+				t.Fatal("ListPrompts() failed:", err)
+			}
+			if diff := cmp.Diff(wantPrompts, res.Prompts, cmpopts.IgnoreUnexported(jsonschema.Schema{})); diff != "" {
+				t.Fatalf("ListPrompts() mismatch (-want +got):\n%s", diff)
+			}
+		})
+		t.Run("iterator", func(t *testing.T) {
+			testIterator(ctx, t, clientSession.Prompts(ctx, nil), wantPrompts)
+		})
 	})
 }