diff --git a/src/Cortex.Tests/Cortex.Tests.csproj b/src/Cortex.Tests/Cortex.Tests.csproj
index ffdfccb..8b8a08e 100644
--- a/src/Cortex.Tests/Cortex.Tests.csproj
+++ b/src/Cortex.Tests/Cortex.Tests.csproj
@@ -32,4 +32,8 @@
     <Using Include="Xunit" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Mediator\Tests\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Cortex.Tests/Mediator/Tests/MediatorTests.cs b/src/Cortex.Tests/Mediator/Tests/MediatorTests.cs
deleted file mode 100644
index 8552e4e..0000000
--- a/src/Cortex.Tests/Mediator/Tests/MediatorTests.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Moq;
-
-namespace Cortex.Mediator.Tests
-{
-    public class MediatorTests
-    {
-        private readonly Mock<IServiceProvider> _mockServiceProvider;
-        private readonly Cortex.Mediator.Mediator _mediator;
-
-        public MediatorTests()
-        {
-            _mockServiceProvider = new Mock<IServiceProvider>();
-            _mediator = new Mediator(_mockServiceProvider.Object);
-        }
-
-        [Fact]
-        public async Task SendAsync_ShouldInvokeHandler()
-        {
-            // Arrange
-            var mockHandler = new Mock<IHandler<ICommand, string>>();
-            _mockServiceProvider
-                .Setup(sp => sp.GetService(typeof(IHandler<ICommand, string>)))
-                .Returns(mockHandler.Object);
-
-            var command = new Mock<ICommand>();
-            var expectedResponse = "Response";
-            mockHandler.Setup(h => h.Handle(command.Object)).ReturnsAsync(expectedResponse);
-
-            // Act
-            var result = await _mediator.SendAsync<ICommand, string>(command.Object);
-
-            // Assert
-            Assert.Equal(expectedResponse, result);
-            mockHandler.Verify(h => h.Handle(command.Object), Times.Once);
-        }
-
-        [Fact]
-        public async Task SendAsync_ShouldThrowIfHandlerNotFound()
-        {
-            // Arrange
-            _mockServiceProvider
-                .Setup(sp => sp.GetService(It.IsAny<Type>()))
-                .Returns(null);
-
-            var command = new Mock<ICommand>();
-
-            // Act & Assert
-            await Assert.ThrowsAsync<InvalidOperationException>(
-                () => _mediator.SendAsync<ICommand, string>(command.Object));
-        }
-    }
-}