diff --git a/contributing/samples/gepa/experiment.py b/contributing/samples/gepa/experiment.py
index f3751206a8..2710c3894c 100644
--- a/contributing/samples/gepa/experiment.py
+++ b/contributing/samples/gepa/experiment.py
@@ -43,7 +43,6 @@
 from tau_bench.types import EnvRunResult
 from tau_bench.types import RunConfig
 import tau_bench_agent as tau_bench_agent_lib
-
 import utils
 
 
diff --git a/contributing/samples/gepa/run_experiment.py b/contributing/samples/gepa/run_experiment.py
index d857da9635..e31db15788 100644
--- a/contributing/samples/gepa/run_experiment.py
+++ b/contributing/samples/gepa/run_experiment.py
@@ -25,7 +25,6 @@
 from absl import flags
 import experiment
 from google.genai import types
-
 import utils
 
 _OUTPUT_DIR = flags.DEFINE_string(
diff --git a/pyproject.toml b/pyproject.toml
index 5e3e9ec3d6..e708c95ee7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -208,6 +208,7 @@ known_third_party = ["google.adk"]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
+pythonpath = "src"
 asyncio_default_fixture_loop_scope = "function"
 asyncio_mode = "auto"
 
diff --git a/src/google/adk/auth/auth_credential.py b/src/google/adk/auth/auth_credential.py
index 6e4f73351f..e6fb7253a3 100644
--- a/src/google/adk/auth/auth_credential.py
+++ b/src/google/adk/auth/auth_credential.py
@@ -78,6 +78,7 @@ class OAuth2Auth(BaseModelWithConfig):
   auth_response_uri: Optional[str] = None
   auth_code: Optional[str] = None
   access_token: Optional[str] = None
+  id_token: Optional[str] = None
   refresh_token: Optional[str] = None
   expires_at: Optional[int] = None
   expires_in: Optional[int] = None
diff --git a/src/google/adk/auth/oauth2_credential_util.py b/src/google/adk/auth/oauth2_credential_util.py
index d2f40b339f..3e91886b64 100644
--- a/src/google/adk/auth/oauth2_credential_util.py
+++ b/src/google/adk/auth/oauth2_credential_util.py
@@ -109,6 +109,7 @@ def update_credential_with_tokens(
   """
   auth_credential.oauth2.access_token = tokens.get("access_token")
   auth_credential.oauth2.refresh_token = tokens.get("refresh_token")
+  auth_credential.oauth2.id_token = tokens.get("id_token", None)
   auth_credential.oauth2.expires_at = (
       int(tokens.get("expires_at")) if tokens.get("expires_at") else None
   )
diff --git a/tests/unittests/agents/test_remote_a2a_agent.py b/tests/unittests/agents/test_remote_a2a_agent.py
index 7643125d81..b884bc4048 100644
--- a/tests/unittests/agents/test_remote_a2a_agent.py
+++ b/tests/unittests/agents/test_remote_a2a_agent.py
@@ -17,6 +17,7 @@
 import tempfile
 from unittest.mock import AsyncMock
 from unittest.mock import create_autospec
+from unittest.mock import MagicMock
 from unittest.mock import Mock
 from unittest.mock import patch
 
@@ -1002,7 +1003,7 @@ async def test_handle_a2a_response_with_task_submitted_and_no_update(self):
           mock_a2a_task,
           self.agent.name,
           self.mock_context,
-          self.mock_a2a_part_converter,
+          self.agent._a2a_part_converter,
       )
       # Check the parts are updated as Thought
       assert result.content.parts[0].thought is True
@@ -1770,7 +1771,7 @@ async def test_run_async_impl_successful_request(self):
           )  # Tuple with parts and context_id
 
           # Mock A2A client
-          mock_a2a_client = create_autospec(spec=A2AClient, instance=True)
+          mock_a2a_client = MagicMock(spec=A2AClient)
           mock_response = Mock()
           mock_send_message = AsyncMock()
           mock_send_message.__aiter__.return_value = [mock_response]
@@ -1909,7 +1910,7 @@ async def test_run_async_impl_with_meta_provider(self):
           )  # Tuple with parts and context_id
 
           # Mock A2A client
-          mock_a2a_client = create_autospec(spec=A2AClient, instance=True)
+          mock_a2a_client = MagicMock(spec=A2AClient)
           mock_response = Mock()
           mock_send_message = AsyncMock()
           mock_send_message.__aiter__.return_value = [mock_response]
@@ -2046,7 +2047,7 @@ async def test_run_async_impl_successful_request(self):
           )  # Tuple with parts and context_id
 
           # Mock A2A client
-          mock_a2a_client = create_autospec(spec=A2AClient, instance=True)
+          mock_a2a_client = MagicMock(spec=A2AClient)
           mock_response = Mock()
           mock_send_message = AsyncMock()
           mock_send_message.__aiter__.return_value = [mock_response]
diff --git a/tests/unittests/auth/test_oauth2_credential_util.py b/tests/unittests/auth/test_oauth2_credential_util.py
index 1e499ca741..091d89bc17 100644
--- a/tests/unittests/auth/test_oauth2_credential_util.py
+++ b/tests/unittests/auth/test_oauth2_credential_util.py
@@ -222,6 +222,7 @@ def test_update_credential_with_tokens(self):
     tokens = OAuth2Token({
         "access_token": "new_access_token",
         "refresh_token": "new_refresh_token",
+        "id_token": "some_id_token",
         "expires_at": expected_expires_at,
         "expires_in": 3600,
     })
@@ -230,5 +231,6 @@ def test_update_credential_with_tokens(self):
 
     assert credential.oauth2.access_token == "new_access_token"
     assert credential.oauth2.refresh_token == "new_refresh_token"
+    assert credential.oauth2.id_token == "some_id_token"
     assert credential.oauth2.expires_at == expected_expires_at
     assert credential.oauth2.expires_in == 3600