microsoft · gvanrossum · Jan 1, 2026 · Jan 1, 2026 · Jan 1, 2026 · Jan 1, 2026
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -86,13 +86,13 @@ jobs:
         shell: bash
         if: matrix.task == 'check'
         run: |
-            uv run pyright src test tools gmail
+            uv run pyright src tests tools gmail
 
       - name: Run Format
         shell: bash
         if: matrix.task == 'format'
         run: |
-            uv run black -tpy312 -tpy313 -tpy314 src test tools gmail demo --check
+            uv run black -tpy312 -tpy313 -tpy314 src tests tools gmail demo --check
 
       - name: Login to Azure
         if: matrix.task == 'test'

diff --git a/Makefile b/Makefile
@@ -8,12 +8,12 @@ all: venv format check test build
 
 .PHONY: format
 format: venv
-	.venv/bin/isort src test tools gmail demo $(FLAGS)
-	.venv/bin/black -tpy312 -tpy313 -tpy314 src test tools gmail demo $(FLAGS)
+	.venv/bin/isort src tests tools gmail demo $(FLAGS)
+	.venv/bin/black -tpy312 -tpy313 -tpy314 src tests tools gmail demo $(FLAGS)
 
 .PHONY: check
 check: venv
-	.venv/bin/pyright --pythonpath .venv/bin/python src test tools gmail
+	.venv/bin/pyright --pythonpath .venv/bin/python src tests tools gmail
 
 .PHONY: test
 test: venv
@@ -88,7 +88,7 @@ help:
 	@echo "make all         # venv, format, check, test, build"
 	@echo "make format      # Run isort and black"
 	@echo "make check       # Run pyright"
-	@echo "make test        # Run pytest (tests are in test/)"
+	@echo "make test        # Run pytest (tests are in tests/)"
 	@echo "make coverage    # Run tests with coverage"
 	@echo "make build       # Build the wheel (under dist/)"
 	@echo "make demo        # python tools/query.py (interactive)"

diff --git a/make.bat b/make.bat
@@ -26,14 +26,14 @@ goto help
 :format
 if not exist ".venv\" call make.bat venv
 echo Formatting code...
-.venv\Scripts\isort src test tools gmail demo
-.venv\Scripts\black src test tools gmail demo
+.venv\Scripts\isort src tests tools gmail demo
+.venv\Scripts\black src tests tools gmail demo
 goto end
 
 :check
 if not exist ".venv\" call make.bat venv
 echo Running type checks...
-.venv\Scripts\pyright --pythonpath .venv\Scripts\python src test tools gmail demo
+.venv\Scripts\pyright --pythonpath .venv\Scripts\python src tests tools gmail demo
 goto end
 
 :test

diff --git a/pyproject.toml b/pyproject.toml
@@ -69,7 +69,7 @@ module-root = "src"
 
 [tool.pytest.ini_options]
 asyncio_default_fixture_loop_scope = "function"
-testpaths = ["test"]
+testpaths = ["tests"]
 
 [tool.pyright]
 reportUnusedVariable = true
@@ -83,7 +83,7 @@ force_sort_within_sections = true
 
 sections = ["FUTURE", "STDLIB", "THIRDPARTY", "AI", "FIRSTPARTY", "LOCALFOLDER"]
 known_ai = ["mcp", "openai", "pydantic", "pydantic_ai", "tiktoken", "typechat"]
-known_first_party = ["typeagent", "test", "tools", "gmail", "demo"]
+known_first_party = ["typeagent", "tests", "tools", "gmail", "demo"]
 known_local_folder = ["conftest"]
 
 [dependency-groups]

diff --git a/test/conftest.py → tests/test/conftest.py b/test/conftest.py → tests/test/conftest.py
diff --git a/test/test_add_messages_with_indexing.py → ...s/test/test_add_messages_with_indexing.py b/test/test_add_messages_with_indexing.py → ...s/test/test_add_messages_with_indexing.py
diff --git a/test/test_auth.py → tests/test/test_auth.py b/test/test_auth.py → tests/test/test_auth.py
diff --git a/test/test_collections.py → tests/test/test_collections.py b/test/test_collections.py → tests/test/test_collections.py
diff --git a/test/test_conversation_metadata.py → tests/test/test_conversation_metadata.py b/test/test_conversation_metadata.py → tests/test/test_conversation_metadata.py
diff --git a/test/test_demo.py → tests/test/test_demo.py b/test/test_demo.py → tests/test/test_demo.py
diff --git a/test/test_embedding_consistency.py → tests/test/test_embedding_consistency.py b/test/test_embedding_consistency.py → tests/test/test_embedding_consistency.py
diff --git a/test/test_embeddings.py → tests/test/test_embeddings.py b/test/test_embeddings.py → tests/test/test_embeddings.py
@@ -9,8 +9,13 @@
 import openai
 
 from typeagent.aitools.embeddings import AsyncEmbeddingModel
-from conftest import embedding_model  # type: ignore  # Magic, prevents side effects of mocking
-from conftest import FakeEmbeddings
+
+from conftest import (
+    embedding_model,  # type: ignore  # Magic, prevents side effects of mocking
+)
+from conftest import (
+    FakeEmbeddings,
+)
 
 
 @pytest.mark.asyncio

diff --git a/test/test_factory.py → tests/test/test_factory.py b/test/test_factory.py → tests/test/test_factory.py
diff --git a/test/test_incremental_index.py → tests/test/test_incremental_index.py b/test/test_incremental_index.py → tests/test/test_incremental_index.py
@@ -18,6 +18,9 @@
 )
 from typeagent.transcripts.transcript_ingest import ingest_vtt_transcript
 
+tests_dir = os.path.dirname(__file__)
+root_dir = os.path.dirname(tests_dir)
+
 
 @pytest.mark.asyncio
 async def test_incremental_index_building():
@@ -141,8 +144,9 @@ async def test_incremental_index_with_vtt_files():
         # First VTT file ingestion
         print("\n=== Import first VTT file ===")
         # Import the first transcript
+        DEFAULT_FILE = os.path.join(root_dir, "testdata", "Confuse-A-Cat.vtt")
         transcript1 = await ingest_vtt_transcript(
-            "testdata/Confuse-A-Cat.vtt",
+            DEFAULT_FILE,
             settings,
             dbname=db_path,
         )
@@ -165,8 +169,9 @@ async def test_incremental_index_with_vtt_files():
         settings2.semantic_ref_index_settings.auto_extract_knowledge = False
 
         # Ingest the second transcript
+        DEFAULT_FILE = os.path.join(root_dir, "testdata", "Parrot_Sketch.vtt")
         transcript2 = await ingest_vtt_transcript(
-            "testdata/Parrot_Sketch.vtt",
+            DEFAULT_FILE,
             settings2,
             dbname=db_path,
         )

diff --git a/test/test_interfaces.py → tests/test/test_interfaces.py b/test/test_interfaces.py → tests/test/test_interfaces.py
diff --git a/test/test_knowledge.py → tests/test/test_knowledge.py b/test/test_knowledge.py → tests/test/test_knowledge.py
diff --git a/test/test_kplib.py → tests/test/test_kplib.py b/test/test_kplib.py → tests/test/test_kplib.py
diff --git a/test/test_mcp_server.py → tests/test/test_mcp_server.py b/test/test_mcp_server.py → tests/test/test_mcp_server.py
diff --git a/test/test_message_text_index_population.py → ...est/test_message_text_index_population.py b/test/test_message_text_index_population.py → ...est/test_message_text_index_population.py
diff --git a/.../test_message_text_index_serialization.py → .../test_message_text_index_serialization.py b/.../test_message_text_index_serialization.py → .../test_message_text_index_serialization.py
diff --git a/test/test_messageindex.py → tests/test/test_messageindex.py b/test/test_messageindex.py → tests/test/test_messageindex.py
diff --git a/test/test_online.py → tests/test/test_online.py b/test/test_online.py → tests/test/test_online.py
diff --git a/test/test_podcast_incremental.py → tests/test/test_podcast_incremental.py b/test/test_podcast_incremental.py → tests/test/test_podcast_incremental.py
diff --git a/test/test_podcasts.py → tests/test/test_podcasts.py b/test/test_podcasts.py → tests/test/test_podcasts.py
@@ -13,6 +13,10 @@
 from typeagent.podcasts import podcast_ingest
 from typeagent.podcasts.podcast import Podcast
 
+tests_dir = os.path.dirname(__file__)
+root_dir = os.path.dirname(tests_dir)
+DEFAULT_FILE = os.path.join(root_dir, "testdata", "FakePodcast.txt")
+
 
 @pytest.mark.asyncio
 async def test_ingest_podcast(
@@ -21,7 +25,7 @@ async def test_ingest_podcast(
     # Import the podcast
     settings = ConversationSettings(embedding_model)
     pod = await podcast_ingest.ingest_podcast(
-        "testdata/FakePodcast.txt",
+        DEFAULT_FILE,
         settings,
         None,
         Datetime.now(timezone.utc),  # Use timezone-aware datetime

diff --git a/test/test_property_index_population.py → tests/test/test_property_index_population.py b/test/test_property_index_population.py → tests/test/test_property_index_population.py
diff --git a/test/test_propindex.py → tests/test/test_propindex.py b/test/test_propindex.py → tests/test/test_propindex.py
diff --git a/test/test_query.py → tests/test/test_query.py b/test/test_query.py → tests/test/test_query.py
diff --git a/test/test_query_method.py → tests/test/test_query_method.py b/test/test_query_method.py → tests/test/test_query_method.py
diff --git a/test/test_related_terms_fast.py → tests/test/test_related_terms_fast.py b/test/test_related_terms_fast.py → tests/test/test_related_terms_fast.py
diff --git a/test/test_related_terms_index_population.py → ...st/test_related_terms_index_population.py b/test/test_related_terms_index_population.py → ...st/test_related_terms_index_population.py
diff --git a/test/test_reltermsindex.py → tests/test/test_reltermsindex.py b/test/test_reltermsindex.py → tests/test/test_reltermsindex.py
diff --git a/test/test_searchlib.py → tests/test/test_searchlib.py b/test/test_searchlib.py → tests/test/test_searchlib.py
diff --git a/test/test_secindex.py → tests/test/test_secindex.py b/test/test_secindex.py → tests/test/test_secindex.py
diff --git a/test/test_secindex_storage_integration.py → ...test/test_secindex_storage_integration.py b/test/test_secindex_storage_integration.py → ...test/test_secindex_storage_integration.py
diff --git a/test/test_semrefindex.py → tests/test/test_semrefindex.py b/test/test_semrefindex.py → tests/test/test_semrefindex.py
diff --git a/test/test_serialization.py → tests/test/test_serialization.py b/test/test_serialization.py → tests/test/test_serialization.py
diff --git a/test/test_sqlite_indexes.py → tests/test/test_sqlite_indexes.py b/test/test_sqlite_indexes.py → tests/test/test_sqlite_indexes.py
diff --git a/test/test_sqlitestore.py → tests/test/test_sqlitestore.py b/test/test_sqlitestore.py → tests/test/test_sqlitestore.py
diff --git a/test/test_storage_providers_unified.py → tests/test/test_storage_providers_unified.py b/test/test_storage_providers_unified.py → tests/test/test_storage_providers_unified.py
diff --git a/test/test_timestampindex.py → tests/test/test_timestampindex.py b/test/test_timestampindex.py → tests/test/test_timestampindex.py
diff --git a/test/test_transcripts.py → tests/test/test_transcripts.py b/test/test_transcripts.py → tests/test/test_transcripts.py
diff --git a/test/test_utils.py → tests/test/test_utils.py b/test/test_utils.py → tests/test/test_utils.py
diff --git a/test/test_vectorbase.py → tests/test/test_vectorbase.py b/test/test_vectorbase.py → tests/test/test_vectorbase.py
diff --git a/testdata/Confuse-A-Cat.vtt → tests/testdata/Confuse-A-Cat.vtt b/testdata/Confuse-A-Cat.vtt → tests/testdata/Confuse-A-Cat.vtt
diff --git a/testdata/Episode_53_AdrianTchaikovsky.txt → ...testdata/Episode_53_AdrianTchaikovsky.txt b/testdata/Episode_53_AdrianTchaikovsky.txt → ...testdata/Episode_53_AdrianTchaikovsky.txt
diff --git a/...sode_53_AdrianTchaikovsky_index_data.json → ...sode_53_AdrianTchaikovsky_index_data.json b/...sode_53_AdrianTchaikovsky_index_data.json → ...sode_53_AdrianTchaikovsky_index_data.json
diff --git a/...53_AdrianTchaikovsky_index_embeddings.bin → ...53_AdrianTchaikovsky_index_embeddings.bin b/...53_AdrianTchaikovsky_index_embeddings.bin → ...53_AdrianTchaikovsky_index_embeddings.bin
diff --git a/testdata/FakePodcast.txt → tests/testdata/FakePodcast.txt b/testdata/FakePodcast.txt → tests/testdata/FakePodcast.txt
diff --git a/testdata/Parrot_Sketch.vtt → tests/testdata/Parrot_Sketch.vtt b/testdata/Parrot_Sketch.vtt → tests/testdata/Parrot_Sketch.vtt
diff --git a/testdata/PythonDocumentary.vtt → tests/testdata/PythonDocumentary.vtt b/testdata/PythonDocumentary.vtt → tests/testdata/PythonDocumentary.vtt
diff --git a/testdata/Short.vtt → tests/testdata/Short.vtt b/testdata/Short.vtt → tests/testdata/Short.vtt