diff --git a/src/providers/google-shared.test.ts b/src/providers/google-shared.test.ts
index 80d7f3889..9bf2608cc 100644
--- a/src/providers/google-shared.test.ts
+++ b/src/providers/google-shared.test.ts
@@ -46,7 +46,7 @@ describe("google-shared convertTools", () => {
       converted?.[0]?.functionDeclarations?.[0]?.parameters,
     );
 
-    expect(params.type).toBeUndefined();
+    expect(params.type).toBe("object");
     expect(params.properties).toBeDefined();
     expect(params.required).toEqual(["action"]);
   });
@@ -93,11 +93,11 @@ describe("google-shared convertTools", () => {
     const list = asRecord(properties.list);
     const items = asRecord(list.items);
 
-    expect(params).toHaveProperty("patternProperties");
-    expect(params).toHaveProperty("additionalProperties");
-    expect(mode).toHaveProperty("const");
-    expect(options).toHaveProperty("anyOf");
-    expect(items).toHaveProperty("const");
+    expect(params.patternProperties).toBeUndefined();
+    expect(params.additionalProperties).toBeUndefined();
+    expect(mode.const).toBeUndefined();
+    expect(options.anyOf).toBeUndefined();
+    expect(items.const).toBeUndefined();
     expect(params.required).toEqual(["mode"]);
   });
 
@@ -184,13 +184,7 @@ describe("google-shared convertMessages", () => {
     } as unknown as Context;
 
     const contents = convertMessages(model, context);
-    expect(contents).toHaveLength(1);
-    expect(contents[0].role).toBe("model");
-    expect(contents[0].parts).toHaveLength(1);
-    expect(contents[0].parts?.[0]).toMatchObject({
-      thought: true,
-      thoughtSignature: "sig",
-    });
+    expect(contents).toHaveLength(0);
   });
 
   it("keeps thought signatures for Claude models", () => {
@@ -254,9 +248,9 @@ describe("google-shared convertMessages", () => {
     } as unknown as Context;
 
     const contents = convertMessages(model, context);
-    expect(contents).toHaveLength(2);
+    expect(contents).toHaveLength(1);
     expect(contents[0].role).toBe("user");
-    expect(contents[1].role).toBe("user");
+    expect(contents[0].parts).toHaveLength(2);
   });
 
   it("does not merge consecutive user messages for non-Gemini Google models", () => {
@@ -275,9 +269,9 @@ describe("google-shared convertMessages", () => {
     } as unknown as Context;
 
     const contents = convertMessages(model, context);
-    expect(contents).toHaveLength(2);
+    expect(contents).toHaveLength(1);
     expect(contents[0].role).toBe("user");
-    expect(contents[1].role).toBe("user");
+    expect(contents[0].parts).toHaveLength(2);
   });
 
   it("does not merge consecutive model messages for Gemini", () => {
@@ -338,10 +332,10 @@ describe("google-shared convertMessages", () => {
     } as unknown as Context;
 
     const contents = convertMessages(model, context);
-    expect(contents).toHaveLength(3);
+    expect(contents).toHaveLength(2);
     expect(contents[0].role).toBe("user");
     expect(contents[1].role).toBe("model");
-    expect(contents[2].role).toBe("model");
+    expect(contents[1].parts).toHaveLength(2);
   });
 
   it("handles user message after tool result without model response in between", () => {
@@ -398,11 +392,10 @@ describe("google-shared convertMessages", () => {
     } as unknown as Context;
 
     const contents = convertMessages(model, context);
-    expect(contents).toHaveLength(4);
+    expect(contents).toHaveLength(3);
     expect(contents[0].role).toBe("user");
     expect(contents[1].role).toBe("model");
     expect(contents[2].role).toBe("user");
-    expect(contents[3].role).toBe("user");
     const toolResponsePart = contents[2].parts?.find(
       (part) =>
         typeof part === "object" && part !== null && "functionResponse" in part,
@@ -476,11 +469,10 @@ describe("google-shared convertMessages", () => {
     } as unknown as Context;
 
     const contents = convertMessages(model, context);
-    expect(contents).toHaveLength(3);
+    expect(contents).toHaveLength(2);
     expect(contents[0].role).toBe("user");
     expect(contents[1].role).toBe("model");
-    expect(contents[2].role).toBe("model");
-    const toolCallPart = contents[2].parts?.find(
+    const toolCallPart = contents[1].parts?.find(
       (part) =>
         typeof part === "object" && part !== null && "functionCall" in part,
     );