diff --git a/.github/workflows/live-test.yml b/.github/workflows/live-test.yml
index 88e7a23bb..f1359007c 100644
--- a/.github/workflows/live-test.yml
+++ b/.github/workflows/live-test.yml
@@ -29,13 +29,16 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Run live tests
+      - name: Restore tools
+        run: dotnet tool restore --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
+
+      - name: Run recorded tests
         run: dotnet test ./tests/OpenAI.Tests.csproj
           --configuration Release
-          --filter="TestCategory!=Smoke&TestCategory!=Assistants&TestCategory!=StoredChat&TestCategory!=Images&TestCategory!=Uploads&TestCategory!=Moderations&TestCategory!=FineTuning&TestCategory!=Containers&TestCategory!=Conversation&TestCategory!=MCP&TestCategory!=Manual"
+          --filter="(TestCategory=Chat|TestCategory=Embeddings|TestCategory=Responses)&TestCategory!=MPFD"
           --logger "trx;LogFilePrefix=live"
-          --results-directory ${{github.workspace}}/artifacts/test-results
-          ${{ env.version_suffix_args}}
+          --results-directory ${{ github.workspace }}/artifacts/test-results
+          ${{ env.version_suffix_args }}
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8abf3de71..3a9f9bdf7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,8 +36,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Restore tools
+        run: dotnet tool restore --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
+
       # Pack the client NuGet package and include URL back to the repository and release tag
-      - name: Build and Pack
+      - name: Build and pack
         run: dotnet pack
           --configuration Release
           --output "${{ github.workspace }}/artifacts/packages"
@@ -45,17 +48,17 @@ jobs:
           /p:PackageReleaseNotes="${{ github.server_url }}/${{ github.repository }}/blob/${{ github.event.release.tag_name }}/CHANGELOG.md"
           ${{ env.version_suffix_args }}
 
-      - name: Unit Test
+      - name: Run unit tests
         run: dotnet test
           --configuration Release
           --filter="TestCategory=Smoke&TestCategory!=Manual"
           --logger "trx;LogFileName=${{ github.workspace }}/artifacts/test-results/smoke.trx"
           ${{ env.version_suffix_args }}
 
-      - name: Run Live Tests
+      - name: Run recorded tests
         run: dotnet test ./tests/OpenAI.Tests.csproj
           --configuration Release
-          --filter="TestCategory!=Smoke&TestCategory!=Assistants&TestCategory!=StoredChat&TestCategory!=Images&TestCategory!=Uploads&TestCategory!=Moderations&TestCategory!=FineTuning&TestCategory!=Containers&TestCategory!=Conversation&TestCategory!=MCP&TestCategory!=Manual"
+          --filter="(TestCategory=Chat|TestCategory=Embeddings|TestCategory=Responses)&TestCategory!=MPFD"
           --logger "trx;LogFilePrefix=live"
           --results-directory ${{ github.workspace }}/artifacts/test-results
           ${{ env.version_suffix_args }}
@@ -118,7 +121,7 @@ jobs:
         path: ${{ github.workspace }}/build-artifacts
         
   deploy:
-    name: Publish Package
+    name: Publish package
     needs: sign
     runs-on: ubuntu-latest
     steps:
diff --git a/tests/Chat/ChatStoreTests.cs b/tests/Chat/ChatStoreTests.cs
index fa62532f4..ec25d9c5e 100644
--- a/tests/Chat/ChatStoreTests.cs
+++ b/tests/Chat/ChatStoreTests.cs
@@ -11,7 +11,8 @@
 
 namespace OpenAI.Tests.Chat;
 
-[Category("StoredChat")]
+[Category("Chat")]
+[Category("ChatStore")]
 public class ChatStoreTests : OpenAIRecordedTestBase
 {
     public ChatStoreTests(bool isAsync) : base(isAsync)
diff --git a/tests/Chat/ChatTests.cs b/tests/Chat/ChatTests.cs
index e3c9e5fc1..4b2e532c7 100644
--- a/tests/Chat/ChatTests.cs
+++ b/tests/Chat/ChatTests.cs
@@ -786,6 +786,7 @@ public async Task WebSearchWorks()
     }
 
     [RecordedTest]
+    [Category("MPFD")]
     public async Task FileIdContentWorks()
     {
         OpenAIFileClient fileClient = GetProxiedOpenAIClient<OpenAIFileClient>(TestScenario.Files);
diff --git a/tests/Chat/ChatToolTests.cs b/tests/Chat/ChatToolTests.cs
index 237eaefc2..9c40a2070 100644
--- a/tests/Chat/ChatToolTests.cs
+++ b/tests/Chat/ChatToolTests.cs
@@ -14,6 +14,7 @@
 namespace OpenAI.Tests.Chat;
 
 [Category("Chat")]
+[Category("ChatTools")]
 public class ChatToolTests : OpenAIRecordedTestBase
 {
     public enum SchemaPresence { WithSchema, WithoutSchema }
diff --git a/tests/Responses/ResponseStoreTests.cs b/tests/Responses/ResponseStoreTests.cs
index 14a16775b..0068a9e52 100644
--- a/tests/Responses/ResponseStoreTests.cs
+++ b/tests/Responses/ResponseStoreTests.cs
@@ -13,6 +13,7 @@ namespace OpenAI.Tests.Responses;
 #pragma warning disable OPENAICUA001
 
 [Category("Responses")]
+[Category("ResponsesStore")]
 public partial class ResponseStoreTests : OpenAIRecordedTestBase
 {
     public ResponseStoreTests(bool isAsync) : base(isAsync)
diff --git a/tests/Responses/ResponsesToolTests.cs b/tests/Responses/ResponsesToolTests.cs
index 17cb5de69..4a5f5a797 100644
--- a/tests/Responses/ResponsesToolTests.cs
+++ b/tests/Responses/ResponsesToolTests.cs
@@ -18,7 +18,7 @@
 namespace OpenAI.Tests.Responses;
 
 [Category("Responses")]
-[Category("MCP")]
+[Category("ResponsesTools")]
 public partial class ResponsesToolTests : OpenAIRecordedTestBase
 {
     public ResponsesToolTests(bool isAsync) : base(isAsync)