diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
index 67105c844801..1da80b327d26 100644
--- a/.github/workflows/dotnet-build.yml
+++ b/.github/workflows/dotnet-build.yml
@@ -102,8 +102,10 @@ jobs:
       run: |
         echo "Build AutoGen"
         dotnet build --no-restore --configuration Release -bl /p:SignAssembly=true
-    - name: Unit Test
-      run: dotnet test --no-build -bl --configuration Release --filter type=!integration
+    - name: Unit Test V1
+      run: dotnet test --no-build -bl --configuration Release --filter "Category=UnitV1"
+    - name: Unit Test V2
+      run: dotnet test --no-build -bl --configuration Release --filter "Category=UnitV2"
 
   integration-test:
     strategy:
@@ -155,7 +157,7 @@ jobs:
         echo "Build AutoGen"
         dotnet build --no-restore --configuration Release -bl /p:SignAssembly=true
     - name: Integration Test
-      run: dotnet --version && dotnet test --no-build -bl --configuration Release --filter type=integration
+      run: dotnet --version && dotnet test --no-build -bl --configuration Release --filter "Category=Integration"
     - name: Restore the global.json
       run: rm global.json && git checkout -- global.json
 
diff --git a/dotnet/test/AutoGen.Anthropic.Tests/AnthropicClientAgentTest.cs b/dotnet/test/AutoGen.Anthropic.Tests/AnthropicClientAgentTest.cs
index 91097d7485df..4dfa9c8aaec6 100644
--- a/dotnet/test/AutoGen.Anthropic.Tests/AnthropicClientAgentTest.cs
+++ b/dotnet/test/AutoGen.Anthropic.Tests/AnthropicClientAgentTest.cs
@@ -7,9 +7,11 @@
 using AutoGen.Core;
 using AutoGen.Tests;
 using FluentAssertions;
+using Xunit;
 
 namespace AutoGen.Anthropic.Tests;
 
+[Trait("Category", "UnitV1")]
 public class AnthropicClientAgentTest
 {
     [ApiKeyFact("ANTHROPIC_API_KEY")]
diff --git a/dotnet/test/AutoGen.Anthropic.Tests/AnthropicClientTest.cs b/dotnet/test/AutoGen.Anthropic.Tests/AnthropicClientTest.cs
index c98a81079854..3d6dae018e15 100644
--- a/dotnet/test/AutoGen.Anthropic.Tests/AnthropicClientTest.cs
+++ b/dotnet/test/AutoGen.Anthropic.Tests/AnthropicClientTest.cs
@@ -13,6 +13,7 @@
 
 namespace AutoGen.Anthropic.Tests;
 
+[Trait("Category", "UnitV1")]
 public class AnthropicClientTests
 {
     [ApiKeyFact("ANTHROPIC_API_KEY")]
diff --git a/dotnet/test/AutoGen.AzureAIInference.Tests/ChatCompletionClientAgentTests.cs b/dotnet/test/AutoGen.AzureAIInference.Tests/ChatCompletionClientAgentTests.cs
index ae1a9d57645d..5d2e0721ce64 100644
--- a/dotnet/test/AutoGen.AzureAIInference.Tests/ChatCompletionClientAgentTests.cs
+++ b/dotnet/test/AutoGen.AzureAIInference.Tests/ChatCompletionClientAgentTests.cs
@@ -15,6 +15,7 @@
 
 namespace AutoGen.AzureAIInference.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class ChatCompletionClientAgentTests
 {
     /// <summary>
diff --git a/dotnet/test/AutoGen.AzureAIInference.Tests/ChatRequestMessageTests.cs b/dotnet/test/AutoGen.AzureAIInference.Tests/ChatRequestMessageTests.cs
index 3eacada41c30..c480a1909bac 100644
--- a/dotnet/test/AutoGen.AzureAIInference.Tests/ChatRequestMessageTests.cs
+++ b/dotnet/test/AutoGen.AzureAIInference.Tests/ChatRequestMessageTests.cs
@@ -14,6 +14,7 @@
 
 namespace AutoGen.AzureAIInference.Tests;
 
+[Trait("Category", "UnitV1")]
 public class ChatRequestMessageTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.DotnetInteractive.Tests/DotnetInteractiveServiceTest.cs b/dotnet/test/AutoGen.DotnetInteractive.Tests/DotnetInteractiveServiceTest.cs
index 1d2becb7d84e..7c61c9fa02bf 100644
--- a/dotnet/test/AutoGen.DotnetInteractive.Tests/DotnetInteractiveServiceTest.cs
+++ b/dotnet/test/AutoGen.DotnetInteractive.Tests/DotnetInteractiveServiceTest.cs
@@ -8,6 +8,7 @@
 namespace AutoGen.DotnetInteractive.Tests;
 
 [Collection("Sequential")]
+[Trait("Category", "UnitV1")]
 public class DotnetInteractiveServiceTest : IDisposable
 {
     private ITestOutputHelper _output;
diff --git a/dotnet/test/AutoGen.DotnetInteractive.Tests/DotnetInteractiveStdioKernelConnectorTests.cs b/dotnet/test/AutoGen.DotnetInteractive.Tests/DotnetInteractiveStdioKernelConnectorTests.cs
index cb3478001469..003e23c2070d 100644
--- a/dotnet/test/AutoGen.DotnetInteractive.Tests/DotnetInteractiveStdioKernelConnectorTests.cs
+++ b/dotnet/test/AutoGen.DotnetInteractive.Tests/DotnetInteractiveStdioKernelConnectorTests.cs
@@ -10,6 +10,7 @@
 namespace AutoGen.DotnetInteractive.Tests;
 
 [Collection("Sequential")]
+[Trait("Category", "UnitV1Kernel")]
 public class DotnetInteractiveStdioKernelConnectorTests : IDisposable
 {
     private string _workingDir;
diff --git a/dotnet/test/AutoGen.DotnetInteractive.Tests/InProcessDotnetInteractiveKernelBuilderTest.cs b/dotnet/test/AutoGen.DotnetInteractive.Tests/InProcessDotnetInteractiveKernelBuilderTest.cs
index bb89762ef23b..9195231adcac 100644
--- a/dotnet/test/AutoGen.DotnetInteractive.Tests/InProcessDotnetInteractiveKernelBuilderTest.cs
+++ b/dotnet/test/AutoGen.DotnetInteractive.Tests/InProcessDotnetInteractiveKernelBuilderTest.cs
@@ -8,6 +8,7 @@
 namespace AutoGen.DotnetInteractive.Tests;
 
 [Collection("Sequential")]
+[Trait("Category", "UnitV1Kernel")]
 public class InProcessDotnetInteractiveKernelBuilderTest
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.DotnetInteractive.Tests/MessageExtensionTests.cs b/dotnet/test/AutoGen.DotnetInteractive.Tests/MessageExtensionTests.cs
index 21ff5850be84..61e1d9f21a37 100644
--- a/dotnet/test/AutoGen.DotnetInteractive.Tests/MessageExtensionTests.cs
+++ b/dotnet/test/AutoGen.DotnetInteractive.Tests/MessageExtensionTests.cs
@@ -8,6 +8,7 @@
 
 namespace AutoGen.DotnetInteractive.Tests;
 
+[Trait("Category", "UnitV1")]
 public class MessageExtensionTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.Gemini.Tests/FunctionContractExtensionTests.cs b/dotnet/test/AutoGen.Gemini.Tests/FunctionContractExtensionTests.cs
index ae8e4a6215d1..5b807e6f4701 100644
--- a/dotnet/test/AutoGen.Gemini.Tests/FunctionContractExtensionTests.cs
+++ b/dotnet/test/AutoGen.Gemini.Tests/FunctionContractExtensionTests.cs
@@ -10,6 +10,7 @@
 
 namespace AutoGen.Gemini.Tests;
 
+[Trait("Category", "UnitV1")]
 public class FunctionContractExtensionTests
 {
     private readonly Functions functions = new Functions();
diff --git a/dotnet/test/AutoGen.Gemini.Tests/GeminiAgentTests.cs b/dotnet/test/AutoGen.Gemini.Tests/GeminiAgentTests.cs
index fe2a4738760a..b169252c37b7 100644
--- a/dotnet/test/AutoGen.Gemini.Tests/GeminiAgentTests.cs
+++ b/dotnet/test/AutoGen.Gemini.Tests/GeminiAgentTests.cs
@@ -6,10 +6,12 @@
 using AutoGen.Tests;
 using FluentAssertions;
 using Google.Cloud.AIPlatform.V1;
+using Xunit;
 using Xunit.Abstractions;
 using static Google.Cloud.AIPlatform.V1.Part;
 namespace AutoGen.Gemini.Tests;
 
+[Trait("Category", "UnitV1")]
 public class GeminiAgentTests
 {
     private readonly Functions functions = new Functions();
diff --git a/dotnet/test/AutoGen.Gemini.Tests/GeminiMessageTests.cs b/dotnet/test/AutoGen.Gemini.Tests/GeminiMessageTests.cs
index 6e513375cf66..48074596e027 100644
--- a/dotnet/test/AutoGen.Gemini.Tests/GeminiMessageTests.cs
+++ b/dotnet/test/AutoGen.Gemini.Tests/GeminiMessageTests.cs
@@ -9,6 +9,7 @@
 
 namespace AutoGen.Gemini.Tests;
 
+[Trait("Category", "UnitV1")]
 public class GeminiMessageTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.Gemini.Tests/GoogleGeminiClientTests.cs b/dotnet/test/AutoGen.Gemini.Tests/GoogleGeminiClientTests.cs
index 37b274a8a639..4a651ce8faf5 100644
--- a/dotnet/test/AutoGen.Gemini.Tests/GoogleGeminiClientTests.cs
+++ b/dotnet/test/AutoGen.Gemini.Tests/GoogleGeminiClientTests.cs
@@ -5,10 +5,12 @@
 using FluentAssertions;
 using Google.Cloud.AIPlatform.V1;
 using Google.Protobuf;
+using Xunit;
 using static Google.Cloud.AIPlatform.V1.Candidate.Types;
 
 namespace AutoGen.Gemini.Tests;
 
+[Trait("Category", "UnitV1")]
 public class GoogleGeminiClientTests
 {
     [ApiKeyFact("GOOGLE_GEMINI_API_KEY")]
diff --git a/dotnet/test/AutoGen.Gemini.Tests/SampleTests.cs b/dotnet/test/AutoGen.Gemini.Tests/SampleTests.cs
index 3cd2c438bcfb..8a354b0a711e 100644
--- a/dotnet/test/AutoGen.Gemini.Tests/SampleTests.cs
+++ b/dotnet/test/AutoGen.Gemini.Tests/SampleTests.cs
@@ -3,9 +3,11 @@
 
 using AutoGen.Gemini.Sample;
 using AutoGen.Tests;
+using Xunit;
 
 namespace AutoGen.Gemini.Tests;
 
+[Trait("Category", "UnitV1")]
 public class SampleTests
 {
     [ApiKeyFact("GCP_VERTEX_PROJECT_ID")]
diff --git a/dotnet/test/AutoGen.Gemini.Tests/VertexGeminiClientTests.cs b/dotnet/test/AutoGen.Gemini.Tests/VertexGeminiClientTests.cs
index 00e551d1a477..68b5b69b1331 100644
--- a/dotnet/test/AutoGen.Gemini.Tests/VertexGeminiClientTests.cs
+++ b/dotnet/test/AutoGen.Gemini.Tests/VertexGeminiClientTests.cs
@@ -5,9 +5,11 @@
 using FluentAssertions;
 using Google.Cloud.AIPlatform.V1;
 using Google.Protobuf;
+using Xunit;
 using static Google.Cloud.AIPlatform.V1.Candidate.Types;
 namespace AutoGen.Gemini.Tests;
 
+[Trait("Category", "UnitV1")]
 public class VertexGeminiClientTests
 {
     [ApiKeyFact("GCP_VERTEX_PROJECT_ID")]
diff --git a/dotnet/test/AutoGen.Mistral.Tests/MistralClientAgentTests.cs b/dotnet/test/AutoGen.Mistral.Tests/MistralClientAgentTests.cs
index 26715b2c9089..46cc07689482 100644
--- a/dotnet/test/AutoGen.Mistral.Tests/MistralClientAgentTests.cs
+++ b/dotnet/test/AutoGen.Mistral.Tests/MistralClientAgentTests.cs
@@ -6,10 +6,12 @@
 using AutoGen.Mistral.Extension;
 using AutoGen.Tests;
 using FluentAssertions;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.Mistral.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class MistralClientAgentTests
 {
     private ITestOutputHelper _output;
diff --git a/dotnet/test/AutoGen.Mistral.Tests/MistralClientTests.cs b/dotnet/test/AutoGen.Mistral.Tests/MistralClientTests.cs
index 50756d5fc592..f442776cb3cc 100644
--- a/dotnet/test/AutoGen.Mistral.Tests/MistralClientTests.cs
+++ b/dotnet/test/AutoGen.Mistral.Tests/MistralClientTests.cs
@@ -7,9 +7,11 @@
 using AutoGen.Mistral.Extension;
 using AutoGen.Tests;
 using FluentAssertions;
+using Xunit;
 
 namespace AutoGen.Mistral.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class MistralClientTests
 {
     [Function]
diff --git a/dotnet/test/AutoGen.Ollama.Tests/OllamaAgentTests.cs b/dotnet/test/AutoGen.Ollama.Tests/OllamaAgentTests.cs
index 73d2b9d28a33..e6defd411950 100644
--- a/dotnet/test/AutoGen.Ollama.Tests/OllamaAgentTests.cs
+++ b/dotnet/test/AutoGen.Ollama.Tests/OllamaAgentTests.cs
@@ -6,9 +6,11 @@
 using AutoGen.Ollama.Extension;
 using AutoGen.Tests;
 using FluentAssertions;
+using Xunit;
 
 namespace AutoGen.Ollama.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OllamaAgentTests
 {
     [ApiKeyFact("OLLAMA_HOST", "OLLAMA_MODEL_NAME")]
diff --git a/dotnet/test/AutoGen.Ollama.Tests/OllamaMessageTests.cs b/dotnet/test/AutoGen.Ollama.Tests/OllamaMessageTests.cs
index 3a34a108ddf1..e30943ee5412 100644
--- a/dotnet/test/AutoGen.Ollama.Tests/OllamaMessageTests.cs
+++ b/dotnet/test/AutoGen.Ollama.Tests/OllamaMessageTests.cs
@@ -7,6 +7,7 @@
 using Xunit;
 namespace AutoGen.Ollama.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OllamaMessageTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.Ollama.Tests/OllamaTextEmbeddingServiceTests.cs b/dotnet/test/AutoGen.Ollama.Tests/OllamaTextEmbeddingServiceTests.cs
index 06522bdd8238..bbe7ec1de604 100644
--- a/dotnet/test/AutoGen.Ollama.Tests/OllamaTextEmbeddingServiceTests.cs
+++ b/dotnet/test/AutoGen.Ollama.Tests/OllamaTextEmbeddingServiceTests.cs
@@ -3,9 +3,11 @@
 
 using AutoGen.Tests;
 using FluentAssertions;
+using Xunit;
 
 namespace AutoGen.Ollama.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OllamaTextEmbeddingServiceTests
 {
     [ApiKeyFact("OLLAMA_HOST", "OLLAMA_EMBEDDING_MODEL_NAME")]
diff --git a/dotnet/test/AutoGen.OpenAI.Tests/MathClassTest.cs b/dotnet/test/AutoGen.OpenAI.Tests/MathClassTest.cs
index 3f255aeb329e..e8a85213c57c 100644
--- a/dotnet/test/AutoGen.OpenAI.Tests/MathClassTest.cs
+++ b/dotnet/test/AutoGen.OpenAI.Tests/MathClassTest.cs
@@ -12,10 +12,12 @@
 using Azure.AI.OpenAI;
 using FluentAssertions;
 using OpenAI;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.OpenAI.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class MathClassTest
 {
     private readonly ITestOutputHelper _output;
diff --git a/dotnet/test/AutoGen.OpenAI.Tests/OpenAIChatAgentTest.cs b/dotnet/test/AutoGen.OpenAI.Tests/OpenAIChatAgentTest.cs
index f3d51f2ff35a..e68c89383654 100644
--- a/dotnet/test/AutoGen.OpenAI.Tests/OpenAIChatAgentTest.cs
+++ b/dotnet/test/AutoGen.OpenAI.Tests/OpenAIChatAgentTest.cs
@@ -12,9 +12,11 @@
 using FluentAssertions;
 using OpenAI;
 using OpenAI.Chat;
+using Xunit;
 
 namespace AutoGen.OpenAI.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class OpenAIChatAgentTest
 {
     /// <summary>
diff --git a/dotnet/test/AutoGen.OpenAI.Tests/OpenAIMessageTests.cs b/dotnet/test/AutoGen.OpenAI.Tests/OpenAIMessageTests.cs
index 9fa6b5787ede..b5aa5e78fdd3 100644
--- a/dotnet/test/AutoGen.OpenAI.Tests/OpenAIMessageTests.cs
+++ b/dotnet/test/AutoGen.OpenAI.Tests/OpenAIMessageTests.cs
@@ -17,6 +17,7 @@
 
 namespace AutoGen.OpenAI.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OpenAIMessageTests
 {
     private readonly JsonSerializerOptions jsonSerializerOptions = new JsonSerializerOptions
diff --git a/dotnet/test/AutoGen.OpenAI.Tests/OpenAISampleTest.cs b/dotnet/test/AutoGen.OpenAI.Tests/OpenAISampleTest.cs
index 2d82ad8b856f..6907c3dfecc6 100644
--- a/dotnet/test/AutoGen.OpenAI.Tests/OpenAISampleTest.cs
+++ b/dotnet/test/AutoGen.OpenAI.Tests/OpenAISampleTest.cs
@@ -6,10 +6,12 @@
 using System.Threading.Tasks;
 using AutoGen.OpenAI.Sample;
 using AutoGen.Tests;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.OpenAI.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OpenAISampleTest
 {
     private readonly ITestOutputHelper _output;
diff --git a/dotnet/test/AutoGen.OpenAI.Tests/RolePlayToolCallOrchestratorTests.cs b/dotnet/test/AutoGen.OpenAI.Tests/RolePlayToolCallOrchestratorTests.cs
index 807bf41e9479..f4ecbc7ea511 100644
--- a/dotnet/test/AutoGen.OpenAI.Tests/RolePlayToolCallOrchestratorTests.cs
+++ b/dotnet/test/AutoGen.OpenAI.Tests/RolePlayToolCallOrchestratorTests.cs
@@ -15,6 +15,7 @@
 
 namespace AutoGen.OpenAI.Tests;
 
+[Trait("Category", "UnitV1")]
 public class RolePlayToolCallOrchestratorTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.OpenAI.V1.Tests/GPTAgentTest.cs b/dotnet/test/AutoGen.OpenAI.V1.Tests/GPTAgentTest.cs
index 8137f55ae4ba..36a9de1ed3ce 100644
--- a/dotnet/test/AutoGen.OpenAI.V1.Tests/GPTAgentTest.cs
+++ b/dotnet/test/AutoGen.OpenAI.V1.Tests/GPTAgentTest.cs
@@ -10,10 +10,12 @@
 using AutoGen.Tests;
 using Azure.AI.OpenAI;
 using FluentAssertions;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.OpenAI.V1.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class GPTAgentTest
 {
     private ITestOutputHelper _output;
diff --git a/dotnet/test/AutoGen.OpenAI.V1.Tests/MathClassTest.cs b/dotnet/test/AutoGen.OpenAI.V1.Tests/MathClassTest.cs
index 0508d3dbeee3..e0b427440f90 100644
--- a/dotnet/test/AutoGen.OpenAI.V1.Tests/MathClassTest.cs
+++ b/dotnet/test/AutoGen.OpenAI.V1.Tests/MathClassTest.cs
@@ -11,10 +11,12 @@
 using AutoGen.Tests;
 using Azure.AI.OpenAI;
 using FluentAssertions;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.OpenAI.V1.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class MathClassTest
 {
     private readonly ITestOutputHelper _output;
diff --git a/dotnet/test/AutoGen.OpenAI.V1.Tests/OpenAIChatAgentTest.cs b/dotnet/test/AutoGen.OpenAI.V1.Tests/OpenAIChatAgentTest.cs
index e9a183d225c4..275e1bcd6876 100644
--- a/dotnet/test/AutoGen.OpenAI.V1.Tests/OpenAIChatAgentTest.cs
+++ b/dotnet/test/AutoGen.OpenAI.V1.Tests/OpenAIChatAgentTest.cs
@@ -9,9 +9,11 @@
 using AutoGen.Tests;
 using Azure.AI.OpenAI;
 using FluentAssertions;
+using Xunit;
 
 namespace AutoGen.OpenAI.V1.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class OpenAIChatAgentTest
 {
     /// <summary>
diff --git a/dotnet/test/AutoGen.OpenAI.V1.Tests/OpenAIMessageTests.cs b/dotnet/test/AutoGen.OpenAI.V1.Tests/OpenAIMessageTests.cs
index 276829d99b33..b4f7c4e029df 100644
--- a/dotnet/test/AutoGen.OpenAI.V1.Tests/OpenAIMessageTests.cs
+++ b/dotnet/test/AutoGen.OpenAI.V1.Tests/OpenAIMessageTests.cs
@@ -17,6 +17,7 @@
 
 namespace AutoGen.OpenAI.V1.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OpenAIMessageTests
 {
     private readonly JsonSerializerOptions jsonSerializerOptions = new JsonSerializerOptions
diff --git a/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionExtensionTests.cs b/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionExtensionTests.cs
index 9b97a194e6ad..00a484f59fe1 100644
--- a/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionExtensionTests.cs
+++ b/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionExtensionTests.cs
@@ -13,6 +13,7 @@
 
 namespace AutoGen.SemanticKernel.Tests;
 
+[Trait("Category", "UnitV1")]
 public class TestPlugin
 {
     public bool IsOn { get; set; }
diff --git a/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionMiddlewareTests.cs b/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionMiddlewareTests.cs
index bc00bb2287ed..c29777b7dff8 100644
--- a/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionMiddlewareTests.cs
+++ b/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionMiddlewareTests.cs
@@ -9,9 +9,11 @@
 using Azure.AI.OpenAI;
 using FluentAssertions;
 using Microsoft.SemanticKernel;
+using Xunit;
 
 namespace AutoGen.SemanticKernel.Tests;
 
+[Trait("Category", "UnitV1")]
 public class KernelFunctionMiddlewareTests
 {
     [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]
diff --git a/dotnet/test/AutoGen.SemanticKernel.Tests/SemanticKernelAgentTest.cs b/dotnet/test/AutoGen.SemanticKernel.Tests/SemanticKernelAgentTest.cs
index 93bc8bb11507..cb7d83ed8a77 100644
--- a/dotnet/test/AutoGen.SemanticKernel.Tests/SemanticKernelAgentTest.cs
+++ b/dotnet/test/AutoGen.SemanticKernel.Tests/SemanticKernelAgentTest.cs
@@ -9,9 +9,11 @@
 using Microsoft.SemanticKernel.Agents;
 using Microsoft.SemanticKernel.ChatCompletion;
 using Microsoft.SemanticKernel.Connectors.OpenAI;
+using Xunit;
 
 namespace AutoGen.SemanticKernel.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class SemanticKernelAgentTest
 {
     /// <summary>
diff --git a/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionCallTemplateEncodingTests.cs b/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionCallTemplateEncodingTests.cs
index f54271844169..0ce79cae33a3 100644
--- a/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionCallTemplateEncodingTests.cs
+++ b/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionCallTemplateEncodingTests.cs
@@ -6,6 +6,7 @@
 
 namespace AutoGen.SourceGenerator.Tests;
 
+[Trait("Category", "UnitV1")]
 public class FunctionCallTemplateEncodingTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionCallTemplateTests.cs b/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionCallTemplateTests.cs
index df89b08b9ca4..1bd52b381240 100644
--- a/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionCallTemplateTests.cs
+++ b/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionCallTemplateTests.cs
@@ -9,6 +9,7 @@
 
 namespace AutoGen.SourceGenerator.Tests;
 
+[Trait("Category", "UnitV1")]
 public class FunctionCallTemplateTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionExample.test.cs b/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionExample.test.cs
index fd2281e7198d..715b6658214a 100644
--- a/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionExample.test.cs
+++ b/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionExample.test.cs
@@ -12,6 +12,7 @@
 
 namespace AutoGen.SourceGenerator.Tests;
 
+[Trait("Category", "UnitV1")]
 public class FunctionExample
 {
     private readonly FunctionExamples functionExamples = new FunctionExamples();
diff --git a/dotnet/test/AutoGen.Tests/BasicSampleTest.cs b/dotnet/test/AutoGen.Tests/BasicSampleTest.cs
index 8c51a1c6b2c3..49a5f9fbe307 100644
--- a/dotnet/test/AutoGen.Tests/BasicSampleTest.cs
+++ b/dotnet/test/AutoGen.Tests/BasicSampleTest.cs
@@ -5,10 +5,12 @@
 using System.IO;
 using System.Threading.Tasks;
 using AutoGen.Basic.Sample;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public class BasicSampleTest
 {
     private readonly ITestOutputHelper _output;
diff --git a/dotnet/test/AutoGen.Tests/Function/FunctionTests.cs b/dotnet/test/AutoGen.Tests/Function/FunctionTests.cs
index 64abb293bb16..adb97e1c5327 100644
--- a/dotnet/test/AutoGen.Tests/Function/FunctionTests.cs
+++ b/dotnet/test/AutoGen.Tests/Function/FunctionTests.cs
@@ -16,6 +16,8 @@
 using Xunit;
 
 namespace AutoGen.Tests.Function;
+
+[Trait("Category", "UnitV1")]
 public class FunctionTests
 {
     private readonly JsonSerializerOptions _jsonSerializerOptions = new() { WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull };
diff --git a/dotnet/test/AutoGen.Tests/GroupChat/GraphTests.cs b/dotnet/test/AutoGen.Tests/GroupChat/GraphTests.cs
index 6698e42abd02..e75d5824a15d 100644
--- a/dotnet/test/AutoGen.Tests/GroupChat/GraphTests.cs
+++ b/dotnet/test/AutoGen.Tests/GroupChat/GraphTests.cs
@@ -5,6 +5,7 @@
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public class GraphTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.Tests/GroupChat/GroupChatTests.cs b/dotnet/test/AutoGen.Tests/GroupChat/GroupChatTests.cs
index 234c137b8c7e..9b1e78503c89 100644
--- a/dotnet/test/AutoGen.Tests/GroupChat/GroupChatTests.cs
+++ b/dotnet/test/AutoGen.Tests/GroupChat/GroupChatTests.cs
@@ -12,6 +12,7 @@
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public class GroupChatTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.Tests/ImageMessageTests.cs b/dotnet/test/AutoGen.Tests/ImageMessageTests.cs
index bb256a170f2a..ec1471a91b71 100644
--- a/dotnet/test/AutoGen.Tests/ImageMessageTests.cs
+++ b/dotnet/test/AutoGen.Tests/ImageMessageTests.cs
@@ -9,6 +9,7 @@
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public class ImageMessageTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.Tests/MiddlewareAgentTest.cs b/dotnet/test/AutoGen.Tests/MiddlewareAgentTest.cs
index f0475643f92c..30b620e521a1 100644
--- a/dotnet/test/AutoGen.Tests/MiddlewareAgentTest.cs
+++ b/dotnet/test/AutoGen.Tests/MiddlewareAgentTest.cs
@@ -8,6 +8,7 @@
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public class MiddlewareAgentTest
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.Tests/MiddlewareTest.cs b/dotnet/test/AutoGen.Tests/MiddlewareTest.cs
index 61691b225437..564406ec7469 100644
--- a/dotnet/test/AutoGen.Tests/MiddlewareTest.cs
+++ b/dotnet/test/AutoGen.Tests/MiddlewareTest.cs
@@ -12,6 +12,7 @@
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class MiddlewareTest
 {
     [Function]
diff --git a/dotnet/test/AutoGen.Tests/Orchestrator/RolePlayOrchestratorTests.cs b/dotnet/test/AutoGen.Tests/Orchestrator/RolePlayOrchestratorTests.cs
index cf9dd6463cd0..256d704cc4c4 100644
--- a/dotnet/test/AutoGen.Tests/Orchestrator/RolePlayOrchestratorTests.cs
+++ b/dotnet/test/AutoGen.Tests/Orchestrator/RolePlayOrchestratorTests.cs
@@ -26,6 +26,7 @@
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public class RolePlayOrchestratorTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.Tests/Orchestrator/RoundRobinOrchestratorTests.cs b/dotnet/test/AutoGen.Tests/Orchestrator/RoundRobinOrchestratorTests.cs
index da6feda111dc..793b7e239b83 100644
--- a/dotnet/test/AutoGen.Tests/Orchestrator/RoundRobinOrchestratorTests.cs
+++ b/dotnet/test/AutoGen.Tests/Orchestrator/RoundRobinOrchestratorTests.cs
@@ -9,6 +9,7 @@
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public class RoundRobinOrchestratorTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.Tests/Orchestrator/WorkflowOrchestratorTests.cs b/dotnet/test/AutoGen.Tests/Orchestrator/WorkflowOrchestratorTests.cs
index 3253a161b625..5b38496bf052 100644
--- a/dotnet/test/AutoGen.Tests/Orchestrator/WorkflowOrchestratorTests.cs
+++ b/dotnet/test/AutoGen.Tests/Orchestrator/WorkflowOrchestratorTests.cs
@@ -10,6 +10,7 @@
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public class WorkflowOrchestratorTests
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.Tests/SingleAgentTest.cs b/dotnet/test/AutoGen.Tests/SingleAgentTest.cs
index 9b527d83d7e4..8611714c351d 100644
--- a/dotnet/test/AutoGen.Tests/SingleAgentTest.cs
+++ b/dotnet/test/AutoGen.Tests/SingleAgentTest.cs
@@ -11,6 +11,7 @@
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class SingleAgentTest
 {
     private ITestOutputHelper _output;
diff --git a/dotnet/test/AutoGen.Tests/TwoAgentTest.cs b/dotnet/test/AutoGen.Tests/TwoAgentTest.cs
index 5537506d344a..8ba4a3fedbd8 100644
--- a/dotnet/test/AutoGen.Tests/TwoAgentTest.cs
+++ b/dotnet/test/AutoGen.Tests/TwoAgentTest.cs
@@ -7,10 +7,12 @@
 using System.Linq;
 using System.Threading.Tasks;
 using FluentAssertions;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class TwoAgentTest
 {
     private ITestOutputHelper _output;
diff --git a/dotnet/test/AutoGen.Tests/WorkflowTest.cs b/dotnet/test/AutoGen.Tests/WorkflowTest.cs
index 265510cf111d..f3c5d129f66b 100644
--- a/dotnet/test/AutoGen.Tests/WorkflowTest.cs
+++ b/dotnet/test/AutoGen.Tests/WorkflowTest.cs
@@ -9,6 +9,7 @@
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public class WorkflowTest
 {
     [Fact]
diff --git a/dotnet/test/AutoGen.WebAPI.Tests/OpenAIChatCompletionMiddlewareTests.cs b/dotnet/test/AutoGen.WebAPI.Tests/OpenAIChatCompletionMiddlewareTests.cs
index 4b7d93334ee9..4349b6cc1bc3 100644
--- a/dotnet/test/AutoGen.WebAPI.Tests/OpenAIChatCompletionMiddlewareTests.cs
+++ b/dotnet/test/AutoGen.WebAPI.Tests/OpenAIChatCompletionMiddlewareTests.cs
@@ -15,6 +15,7 @@
 
 namespace AutoGen.WebAPI.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OpenAIChatCompletionMiddlewareTests
 {
     [Fact]
diff --git a/dotnet/test/Microsoft.AutoGen.Core.Grpc.Tests/AgentGrpcTests.cs b/dotnet/test/Microsoft.AutoGen.Core.Grpc.Tests/AgentGrpcTests.cs
index f9f1341e8e0d..7514609e145b 100644
--- a/dotnet/test/Microsoft.AutoGen.Core.Grpc.Tests/AgentGrpcTests.cs
+++ b/dotnet/test/Microsoft.AutoGen.Core.Grpc.Tests/AgentGrpcTests.cs
@@ -14,6 +14,7 @@
 
 namespace Microsoft.AutoGen.Core.Grpc.Tests;
 
+[Trait("Category", "UnitV2")]
 public class AgentGrpcTests
 {
     /// <summary>
diff --git a/dotnet/test/Microsoft.AutoGen.Core.Tests/AgentIdTests.cs b/dotnet/test/Microsoft.AutoGen.Core.Tests/AgentIdTests.cs
index 974e9334a18a..69b8c9582594 100644
--- a/dotnet/test/Microsoft.AutoGen.Core.Tests/AgentIdTests.cs
+++ b/dotnet/test/Microsoft.AutoGen.Core.Tests/AgentIdTests.cs
@@ -6,6 +6,7 @@
 
 namespace Microsoft.AutoGen.Core.Tests;
 
+[Trait("Category", "UnitV2")]
 public class AgentIdTests()
 {
     [Fact]
diff --git a/dotnet/test/Microsoft.AutoGen.Core.Tests/AgentMetaDataTests.cs b/dotnet/test/Microsoft.AutoGen.Core.Tests/AgentMetaDataTests.cs
index c4f0b7b0e606..2e0f64fd2ea8 100644
--- a/dotnet/test/Microsoft.AutoGen.Core.Tests/AgentMetaDataTests.cs
+++ b/dotnet/test/Microsoft.AutoGen.Core.Tests/AgentMetaDataTests.cs
@@ -6,6 +6,7 @@
 
 namespace Microsoft.AutoGen.Core.Tests;
 
+[Trait("Category", "UnitV2")]
 public class AgentMetadataTests()
 {
     [Fact]
diff --git a/dotnet/test/Microsoft.AutoGen.Core.Tests/AgentTests.cs b/dotnet/test/Microsoft.AutoGen.Core.Tests/AgentTests.cs
index e8cd894f75d9..cc39b3564c66 100644
--- a/dotnet/test/Microsoft.AutoGen.Core.Tests/AgentTests.cs
+++ b/dotnet/test/Microsoft.AutoGen.Core.Tests/AgentTests.cs
@@ -7,6 +7,7 @@
 
 namespace Microsoft.AutoGen.Core.Tests;
 
+[Trait("Category", "UnitV2")]
 public class AgentTests()
 {
     [Fact]
diff --git a/dotnet/test/Microsoft.AutoGen.Core.Tests/HandlerInvokerTest.cs b/dotnet/test/Microsoft.AutoGen.Core.Tests/HandlerInvokerTest.cs
index 7387366b5f71..bc6b1734d593 100644
--- a/dotnet/test/Microsoft.AutoGen.Core.Tests/HandlerInvokerTest.cs
+++ b/dotnet/test/Microsoft.AutoGen.Core.Tests/HandlerInvokerTest.cs
@@ -7,6 +7,7 @@
 
 namespace Microsoft.AutoGen.Core.Tests;
 
+[Trait("Category", "UnitV2")]
 public class HandlerInvokerTest()
 {
     public List<(string, MessageContext)> PublishlikeInvocations = new List<(string, MessageContext)>();
diff --git a/dotnet/test/Microsoft.AutoGen.Integration.Tests/HelloAppHostIntegrationTests.cs b/dotnet/test/Microsoft.AutoGen.Integration.Tests/HelloAppHostIntegrationTests.cs
index ba83b07f72df..e612eb5b87ea 100644
--- a/dotnet/test/Microsoft.AutoGen.Integration.Tests/HelloAppHostIntegrationTests.cs
+++ b/dotnet/test/Microsoft.AutoGen.Integration.Tests/HelloAppHostIntegrationTests.cs
@@ -8,7 +8,7 @@ namespace Microsoft.AutoGen.Integration.Tests;
 
 public class HelloAppHostIntegrationTests(ITestOutputHelper testOutput)
 {
-    [Theory, Trait("type", "integration")]
+    [Theory, Trait("Category", "Integration")]
     [MemberData(nameof(AppHostAssemblies))]
     public async Task AppHostRunsCleanly(string appHostPath)
     {
@@ -22,7 +22,7 @@ public async Task AppHostRunsCleanly(string appHostPath)
         await app.StopAsync().WaitAsync(TimeSpan.FromSeconds(15));
     }
 
-    [Theory, Trait("type", "integration")]
+    [Theory, Trait("Category", "Integration")]
     [MemberData(nameof(TestEndpoints))]
     public async Task AppHostLogsHelloAgentE2E(TestEndpoints testEndpoints)
     {
diff --git a/dotnet/test/Microsoft.AutoGen.Integration.Tests/InMemoryRuntimeIntegrationTests.cs b/dotnet/test/Microsoft.AutoGen.Integration.Tests/InMemoryRuntimeIntegrationTests.cs
index b6bdd9eb72d9..ee972a67ef47 100644
--- a/dotnet/test/Microsoft.AutoGen.Integration.Tests/InMemoryRuntimeIntegrationTests.cs
+++ b/dotnet/test/Microsoft.AutoGen.Integration.Tests/InMemoryRuntimeIntegrationTests.cs
@@ -7,7 +7,7 @@ namespace Microsoft.AutoGen.Integration.Tests;
 public class InMemoryRuntimeIntegrationTests(ITestOutputHelper testOutput)
 {
 
-    [Theory, Trait("type", "integration")]
+    [Theory, Trait("Category", "Integration")]
     [MemberData(nameof(AppHostAssemblies))]
     public async Task HelloAgentsE2EInMemory(string appHostAssemblyPath)
     {
diff --git a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/GrpcGatewayServiceTests.cs b/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/GrpcGatewayServiceTests.cs
index 89f17f2fe755..90b6b2dddcf2 100644
--- a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/GrpcGatewayServiceTests.cs
+++ b/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/GrpcGatewayServiceTests.cs
@@ -12,6 +12,7 @@
 
 namespace Microsoft.AutoGen.Runtime.Grpc.Tests;
 [Collection(ClusterCollection.Name)]
+[Trait("Category", "UnitV2")]
 public class GrpcGatewayServiceTests
 {
     private readonly ClusterFixture _fixture;