diff --git a/project_history.toml b/project_history.toml
index 516d166..a717789 100644
--- a/project_history.toml
+++ b/project_history.toml
@@ -8,5 +8,5 @@ active = "main"
 
 [discussions.main]
 git_commit = ""
-last_updated = "2026-03-05T16:40:05"
+last_updated = "2026-03-05T16:50:57"
 history = []
diff --git a/tests/test_agent_capabilities.py b/tests/test_agent_capabilities.py
index bb2a6f3..947af2d 100644
--- a/tests/test_agent_capabilities.py
+++ b/tests/test_agent_capabilities.py
@@ -6,7 +6,7 @@ from unittest.mock import patch, MagicMock
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src")))
 
-import ai_client
+from src import ai_client
 
 def test_agent_capabilities_listing() -> None:
  # Mock credentials
diff --git a/tests/test_api_events.py b/tests/test_api_events.py
index 0fa5fa1..ac9a989 100644
--- a/tests/test_api_events.py
+++ b/tests/test_api_events.py
@@ -1,6 +1,6 @@
 from typing import Any
 from unittest.mock import MagicMock, patch
-import ai_client
+from src import ai_client
 
 class MockUsage:
  def __init__(self) -> None:
diff --git a/tests/test_ast_parser.py b/tests/test_ast_parser.py
index 20c56ca..b9b27a9 100644
--- a/tests/test_ast_parser.py
+++ b/tests/test_ast_parser.py
@@ -4,7 +4,7 @@ from src.file_cache import ASTParser
 def test_ast_parser_initialization() -> None:
  """Verify that ASTParser can be initialized with a language string."""
  parser = ASTParser(language="python")
- assert parser.language == "python"
+ assert parser.language.name == "python"
 
 def test_ast_parser_parse() -> None:
  """Verify that the parse method returns a tree_sitter.Tree."""
diff --git a/tests/test_deepseek_infra.py b/tests/test_deepseek_infra.py
index 652e065..2176474 100644
--- a/tests/test_deepseek_infra.py
+++ b/tests/test_deepseek_infra.py
@@ -7,8 +7,8 @@ import sys
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src")))
 
-import ai_client
-import project_manager
+from src import ai_client
+from src import project_manager
 
 def test_credentials_error_mentions_deepseek(monkeypatch: pytest.MonkeyPatch) -> None:
  """
diff --git a/tests/test_gemini_metrics.py b/tests/test_gemini_metrics.py
index 508df4a..e55e5b2 100644
--- a/tests/test_gemini_metrics.py
+++ b/tests/test_gemini_metrics.py
@@ -7,7 +7,7 @@ sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src")))
 
 # Import the necessary functions from ai_client, including the reset helper
-from ai_client import get_gemini_cache_stats, reset_session
+from src.ai_client import get_gemini_cache_stats, reset_session
 
 def test_get_gemini_cache_stats_with_mock_client() -> None:
  """
diff --git a/tests/test_logging_e2e.py b/tests/test_logging_e2e.py
index a1d8787..05300dd 100644
--- a/tests/test_logging_e2e.py
+++ b/tests/test_logging_e2e.py
@@ -2,7 +2,7 @@ import pytest
 from typing import Any
 from pathlib import Path
 from datetime import datetime, timedelta
-import session_logger
+from src import session_logger
 from src.log_registry import LogRegistry
 from log_pruner import LogPruner
 
diff --git a/tests/test_mcp_perf_tool.py b/tests/test_mcp_perf_tool.py
index 44fecf7..0cbbd00 100644
--- a/tests/test_mcp_perf_tool.py
+++ b/tests/test_mcp_perf_tool.py
@@ -6,7 +6,7 @@ from unittest.mock import patch
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src")))
 
-import mcp_client
+from src import mcp_client
 
 def test_mcp_perf_tool_retrieval() -> None:
  mock_metrics = {"fps": 60, "last_frame_time_ms": 16.6}
diff --git a/tests/test_session_logging.py b/tests/test_session_logging.py
index b603a95..e56d98e 100644
--- a/tests/test_session_logging.py
+++ b/tests/test_session_logging.py
@@ -2,7 +2,7 @@ import pytest
 import tomllib
 from pathlib import Path
 from typing import Generator
-import session_logger
+from src import session_logger
 
 @pytest.fixture
 def temp_logs(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Generator[Path, None, None]: