diff --git a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/AssignStory/AssignStoryCommandHandlerTests.cs b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/AssignStory/AssignStoryCommandHandlerTests.cs
index e4264c5..7b3235c 100644
--- a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/AssignStory/AssignStoryCommandHandlerTests.cs
+++ b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/AssignStory/AssignStoryCommandHandlerTests.cs
@@ -27,7 +27,7 @@ public class AssignStoryCommandHandlerTests
         // Arrange
         var userId = UserId.Create();
         var assigneeId = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Description", TaskPriority.Medium, userId);
 
@@ -83,7 +83,7 @@ public class AssignStoryCommandHandlerTests
         var userId = UserId.Create();
         var firstAssignee = UserId.Create();
         var secondAssignee = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Description", TaskPriority.Medium, userId);
 
diff --git a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/CreateStory/CreateStoryCommandHandlerTests.cs b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/CreateStory/CreateStoryCommandHandlerTests.cs
index 8538dce..037bde4 100644
--- a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/CreateStory/CreateStoryCommandHandlerTests.cs
+++ b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/CreateStory/CreateStoryCommandHandlerTests.cs
@@ -26,7 +26,7 @@ public class CreateStoryCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var epicId = epic.Id;
 
@@ -94,7 +94,7 @@ public class CreateStoryCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
 
         _projectRepositoryMock
diff --git a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/CreateTask/CreateTaskCommandHandlerTests.cs b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/CreateTask/CreateTaskCommandHandlerTests.cs
index 51c8679..8ed330e 100644
--- a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/CreateTask/CreateTaskCommandHandlerTests.cs
+++ b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/CreateTask/CreateTaskCommandHandlerTests.cs
@@ -26,7 +26,7 @@ public class CreateTaskCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
         var storyId = story.Id;
@@ -95,7 +95,7 @@ public class CreateTaskCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
 
diff --git a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/DeleteStory/DeleteStoryCommandHandlerTests.cs b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/DeleteStory/DeleteStoryCommandHandlerTests.cs
index 1a5e383..9efadcc 100644
--- a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/DeleteStory/DeleteStoryCommandHandlerTests.cs
+++ b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/DeleteStory/DeleteStoryCommandHandlerTests.cs
@@ -26,7 +26,7 @@ public class DeleteStoryCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Story to Delete", "Description", TaskPriority.Medium, userId);
         var storyId = story.Id;
@@ -70,7 +70,7 @@ public class DeleteStoryCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Story with Tasks", "Description", TaskPriority.Medium, userId);
 
diff --git a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/DeleteTask/DeleteTaskCommandHandlerTests.cs b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/DeleteTask/DeleteTaskCommandHandlerTests.cs
index 0232d56..1eccfea 100644
--- a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/DeleteTask/DeleteTaskCommandHandlerTests.cs
+++ b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/DeleteTask/DeleteTaskCommandHandlerTests.cs
@@ -26,7 +26,7 @@ public class DeleteTaskCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
         var task = story.CreateTask("Task to Delete", "Description", TaskPriority.Medium, userId);
diff --git a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/UpdateStory/UpdateStoryCommandHandlerTests.cs b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/UpdateStory/UpdateStoryCommandHandlerTests.cs
index af17592..32e9f14 100644
--- a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/UpdateStory/UpdateStoryCommandHandlerTests.cs
+++ b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/UpdateStory/UpdateStoryCommandHandlerTests.cs
@@ -26,7 +26,7 @@ public class UpdateStoryCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Original Title", "Original Description", TaskPriority.Low, userId);
         var storyId = story.Id;
@@ -89,7 +89,7 @@ public class UpdateStoryCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Original", "Original", TaskPriority.Low, userId);
 
diff --git a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/UpdateTaskStatus/UpdateTaskStatusCommandHandlerTests.cs b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/UpdateTaskStatus/UpdateTaskStatusCommandHandlerTests.cs
index fb0ea6e..cb4a8b3 100644
--- a/colaflow-api/tests/ColaFlow.Application.Tests/Commands/UpdateTaskStatus/UpdateTaskStatusCommandHandlerTests.cs
+++ b/colaflow-api/tests/ColaFlow.Application.Tests/Commands/UpdateTaskStatus/UpdateTaskStatusCommandHandlerTests.cs
@@ -29,7 +29,7 @@ public class UpdateTaskStatusCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Test Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Test Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
         var task = story.CreateTask("Test Task", "Task Description", TaskPriority.Medium, userId);
@@ -63,7 +63,7 @@ public class UpdateTaskStatusCommandHandlerTests
     {
         // Arrange - This tests the bug fix for accepting "InProgress" (without space)
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Test Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Test Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
         var task = story.CreateTask("Test Task", "Task Description", TaskPriority.Medium, userId);
@@ -94,7 +94,7 @@ public class UpdateTaskStatusCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Test Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Test Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
         var task = story.CreateTask("Test Task", "Task Description", TaskPriority.Medium, userId);
@@ -124,7 +124,7 @@ public class UpdateTaskStatusCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Test Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Test Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
         var task = story.CreateTask("Test Task", "Task Description", TaskPriority.Medium, userId);
@@ -154,7 +154,7 @@ public class UpdateTaskStatusCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Test Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Test Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
         var task = story.CreateTask("Test Task", "Task Description", TaskPriority.Medium, userId);
@@ -207,7 +207,7 @@ public class UpdateTaskStatusCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Test Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Test Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
         var task = story.CreateTask("Test Task", "Task Description", TaskPriority.Medium, userId);
@@ -239,7 +239,7 @@ public class UpdateTaskStatusCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Test Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Test Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
         var task = story.CreateTask("Test Task", "Task Description", TaskPriority.Medium, userId);
@@ -272,7 +272,7 @@ public class UpdateTaskStatusCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Test Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Test Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
         var task = story.CreateTask("Test Task", "Task Description", TaskPriority.Medium, userId);
@@ -305,7 +305,7 @@ public class UpdateTaskStatusCommandHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Test Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Test Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
         var task = story.CreateTask("Test Task", "Task Description", TaskPriority.Medium, userId);
diff --git a/colaflow-api/tests/ColaFlow.Application.Tests/Queries/GetStoryById/GetStoryByIdQueryHandlerTests.cs b/colaflow-api/tests/ColaFlow.Application.Tests/Queries/GetStoryById/GetStoryByIdQueryHandlerTests.cs
index 15d50fb..166502b 100644
--- a/colaflow-api/tests/ColaFlow.Application.Tests/Queries/GetStoryById/GetStoryByIdQueryHandlerTests.cs
+++ b/colaflow-api/tests/ColaFlow.Application.Tests/Queries/GetStoryById/GetStoryByIdQueryHandlerTests.cs
@@ -24,7 +24,7 @@ public class GetStoryByIdQueryHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.High, userId);
         var task1 = story.CreateTask("Task 1", "Description 1", TaskPriority.Medium, userId);
diff --git a/colaflow-api/tests/ColaFlow.Application.Tests/Queries/GetTaskById/GetTaskByIdQueryHandlerTests.cs b/colaflow-api/tests/ColaFlow.Application.Tests/Queries/GetTaskById/GetTaskByIdQueryHandlerTests.cs
index 8c5fec6..a43014b 100644
--- a/colaflow-api/tests/ColaFlow.Application.Tests/Queries/GetTaskById/GetTaskByIdQueryHandlerTests.cs
+++ b/colaflow-api/tests/ColaFlow.Application.Tests/Queries/GetTaskById/GetTaskByIdQueryHandlerTests.cs
@@ -24,7 +24,7 @@ public class GetTaskByIdQueryHandlerTests
     {
         // Arrange
         var userId = UserId.Create();
-        var project = Project.Create("Test Project", "Description", "TST", userId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TST", userId);
         var epic = project.CreateEpic("Test Epic", "Epic Description", userId);
         var story = epic.CreateStory("Test Story", "Story Description", TaskPriority.Medium, userId);
         var task = story.CreateTask("Test Task", "Task Description", TaskPriority.High, userId);
diff --git a/colaflow-api/tests/ColaFlow.Domain.Tests/Aggregates/ProjectTests.cs b/colaflow-api/tests/ColaFlow.Domain.Tests/Aggregates/ProjectTests.cs
index 289badf..45498cd 100644
--- a/colaflow-api/tests/ColaFlow.Domain.Tests/Aggregates/ProjectTests.cs
+++ b/colaflow-api/tests/ColaFlow.Domain.Tests/Aggregates/ProjectTests.cs
@@ -23,7 +23,7 @@ public class ProjectTests
         var ownerId = UserId.Create();
 
         // Act
-        var project = Project.Create(name, description, key, ownerId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), name, description, key, ownerId);
 
         // Assert
         project.Should().NotBeNull();
@@ -47,7 +47,7 @@ public class ProjectTests
         var ownerId = UserId.Create();
 
         // Act
-        var project = Project.Create(name, description, key, ownerId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), name, description, key, ownerId);
 
         // Assert
         project.DomainEvents.Should().ContainSingle();
@@ -70,7 +70,7 @@ public class ProjectTests
         var ownerId = UserId.Create();
 
         // Act
-        var project = Project.Create(name, description!, key, ownerId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), name, description!, key, ownerId);
 
         // Assert
         project.Should().NotBeNull();
@@ -88,7 +88,7 @@ public class ProjectTests
         var ownerId = UserId.Create();
 
         // Act
-        Action act = () => Project.Create(invalidName, "Description", key, ownerId);
+        Action act = () => Project.Create(TenantId.Create(Guid.NewGuid()), invalidName, "Description", key, ownerId);
 
         // Assert
         act.Should().Throw<DomainException>()
@@ -104,7 +104,7 @@ public class ProjectTests
         var ownerId = UserId.Create();
 
         // Act
-        Action act = () => Project.Create(name, "Description", key, ownerId);
+        Action act = () => Project.Create(TenantId.Create(Guid.NewGuid()), name, "Description", key, ownerId);
 
         // Assert
         act.Should().Throw<DomainException>()
@@ -120,7 +120,7 @@ public class ProjectTests
         var ownerId = UserId.Create();
 
         // Act
-        var project = Project.Create(name, "Description", key, ownerId);
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), name, "Description", key, ownerId);
 
         // Assert
         project.Should().NotBeNull();
@@ -135,7 +135,7 @@ public class ProjectTests
     public void UpdateDetails_WithValidData_ShouldUpdateProject()
     {
         // Arrange
-        var project = Project.Create("Original Name", "Original Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Original Name", "Original Description", "TEST", UserId.Create());
         var originalCreatedAt = project.CreatedAt;
         var newName = "Updated Name";
         var newDescription = "Updated Description";
@@ -155,7 +155,7 @@ public class ProjectTests
     public void UpdateDetails_WhenCalled_ShouldRaiseProjectUpdatedEvent()
     {
         // Arrange
-        var project = Project.Create("Original Name", "Original Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Original Name", "Original Description", "TEST", UserId.Create());
         project.ClearDomainEvents(); // Clear creation event
         var newName = "Updated Name";
         var newDescription = "Updated Description";
@@ -178,7 +178,7 @@ public class ProjectTests
     public void UpdateDetails_WithNullDescription_ShouldSetEmptyDescription()
     {
         // Arrange
-        var project = Project.Create("Original Name", "Original Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Original Name", "Original Description", "TEST", UserId.Create());
 
         // Act
         project.UpdateDetails("Updated Name", null!);
@@ -194,7 +194,7 @@ public class ProjectTests
     public void UpdateDetails_WithEmptyName_ShouldThrowDomainException(string invalidName)
     {
         // Arrange
-        var project = Project.Create("Original Name", "Original Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Original Name", "Original Description", "TEST", UserId.Create());
 
         // Act
         Action act = () => project.UpdateDetails(invalidName, "Updated Description");
@@ -208,7 +208,7 @@ public class ProjectTests
     public void UpdateDetails_WithNameExceeding200Characters_ShouldThrowDomainException()
     {
         // Arrange
-        var project = Project.Create("Original Name", "Original Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Original Name", "Original Description", "TEST", UserId.Create());
         var name = new string('A', 201);
 
         // Act
@@ -227,7 +227,7 @@ public class ProjectTests
     public void CreateEpic_WithValidData_ShouldCreateEpic()
     {
         // Arrange
-        var project = Project.Create("Test Project", "Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TEST", UserId.Create());
         project.ClearDomainEvents();
         var epicName = "Epic 1";
         var epicDescription = "Epic Description";
@@ -250,7 +250,7 @@ public class ProjectTests
     public void CreateEpic_WhenCalled_ShouldRaiseEpicCreatedEvent()
     {
         // Arrange
-        var project = Project.Create("Test Project", "Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TEST", UserId.Create());
         project.ClearDomainEvents();
         var epicName = "Epic 1";
         var createdBy = UserId.Create();
@@ -273,7 +273,7 @@ public class ProjectTests
     public void CreateEpic_InArchivedProject_ShouldThrowDomainException()
     {
         // Arrange
-        var project = Project.Create("Test Project", "Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TEST", UserId.Create());
         project.Archive();
         var createdBy = UserId.Create();
 
@@ -289,7 +289,7 @@ public class ProjectTests
     public void CreateEpic_MultipleEpics_ShouldAddToCollection()
     {
         // Arrange
-        var project = Project.Create("Test Project", "Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TEST", UserId.Create());
         var createdBy = UserId.Create();
 
         // Act
@@ -310,7 +310,7 @@ public class ProjectTests
     public void Archive_ActiveProject_ShouldArchiveProject()
     {
         // Arrange
-        var project = Project.Create("Test Project", "Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TEST", UserId.Create());
 
         // Act
         project.Archive();
@@ -325,7 +325,7 @@ public class ProjectTests
     public void Archive_WhenCalled_ShouldRaiseProjectArchivedEvent()
     {
         // Arrange
-        var project = Project.Create("Test Project", "Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TEST", UserId.Create());
         project.ClearDomainEvents();
 
         // Act
@@ -344,7 +344,7 @@ public class ProjectTests
     public void Archive_AlreadyArchivedProject_ShouldThrowDomainException()
     {
         // Arrange
-        var project = Project.Create("Test Project", "Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TEST", UserId.Create());
         project.Archive();
 
         // Act
@@ -363,7 +363,7 @@ public class ProjectTests
     public void Activate_ArchivedProject_ShouldActivateProject()
     {
         // Arrange
-        var project = Project.Create("Test Project", "Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TEST", UserId.Create());
         project.Archive();
 
         // Act
@@ -379,7 +379,7 @@ public class ProjectTests
     public void Activate_AlreadyActiveProject_ShouldThrowDomainException()
     {
         // Arrange
-        var project = Project.Create("Test Project", "Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TEST", UserId.Create());
 
         // Act
         Action act = () => project.Activate();
@@ -393,7 +393,7 @@ public class ProjectTests
     public void Activate_ArchivedProjectWithEpics_ShouldActivateSuccessfully()
     {
         // Arrange
-        var project = Project.Create("Test Project", "Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TEST", UserId.Create());
         project.CreateEpic("Epic 1", "Description", UserId.Create());
         project.Archive();
 
@@ -413,7 +413,7 @@ public class ProjectTests
     public void Epics_Collection_ShouldBeReadOnly()
     {
         // Arrange
-        var project = Project.Create("Test Project", "Description", "TEST", UserId.Create());
+        var project = Project.Create(TenantId.Create(Guid.NewGuid()), "Test Project", "Description", "TEST", UserId.Create());
 
         // Act & Assert
         project.Epics.Should().BeAssignableTo<IReadOnlyCollection<Epic>>();
@@ -423,8 +423,8 @@ public class ProjectTests
     public void Project_ShouldHaveUniqueId()
     {
         // Arrange & Act
-        var project1 = Project.Create("Project 1", "Description", "PRJ1", UserId.Create());
-        var project2 = Project.Create("Project 2", "Description", "PRJ2", UserId.Create());
+        var project1 = Project.Create(TenantId.Create(Guid.NewGuid()), "Project 1", "Description", "PRJ1", UserId.Create());
+        var project2 = Project.Create(TenantId.Create(Guid.NewGuid()), "Project 2", "Description", "PRJ2", UserId.Create());
 
         // Assert
         project1.Id.Should().NotBe(project2.Id);
diff --git a/colaflow-api/tests/ColaFlow.Domain.Tests/Events/DomainEventsTests.cs b/colaflow-api/tests/ColaFlow.Domain.Tests/Events/DomainEventsTests.cs
index bd89385..3111930 100644
--- a/colaflow-api/tests/ColaFlow.Domain.Tests/Events/DomainEventsTests.cs
+++ b/colaflow-api/tests/ColaFlow.Domain.Tests/Events/DomainEventsTests.cs
@@ -20,7 +20,7 @@ public class DomainEventsTests
         var createdBy = UserId.Create();
 
         // Act
-        var @event = new ProjectCreatedEvent(projectId, projectName, createdBy);
+        var @event = new ProjectCreatedEvent(projectId, TenantId.Create(Guid.NewGuid()), projectName, createdBy);
 
         // Assert
         @event.ProjectId.Should().Be(projectId);
@@ -38,8 +38,9 @@ public class DomainEventsTests
         var createdBy = UserId.Create();
 
         // Act
-        var event1 = new ProjectCreatedEvent(projectId, projectName, createdBy);
-        var event2 = new ProjectCreatedEvent(projectId, projectName, createdBy);
+        var tenantId = TenantId.Create(Guid.NewGuid());
+        var event1 = new ProjectCreatedEvent(projectId, tenantId, projectName, createdBy);
+        var event2 = new ProjectCreatedEvent(projectId, tenantId, projectName, createdBy);
 
         // Assert - Records with same values should be equal
         event1.ProjectId.Should().Be(event2.ProjectId);
@@ -163,7 +164,7 @@ public class DomainEventsTests
     public void DomainEvents_OccurredOn_ShouldBeUtcTime()
     {
         // Arrange & Act
-        var projectCreatedEvent = new ProjectCreatedEvent(ProjectId.Create(), "Test", UserId.Create());
+        var projectCreatedEvent = new ProjectCreatedEvent(ProjectId.Create(), TenantId.Create(Guid.NewGuid()), "Test", UserId.Create());
         var projectUpdatedEvent = new ProjectUpdatedEvent(ProjectId.Create(), "Test", "Desc");
         var projectArchivedEvent = new ProjectArchivedEvent(ProjectId.Create());
         var epicCreatedEvent = new EpicCreatedEvent(EpicId.Create(), "Epic", ProjectId.Create());
@@ -182,7 +183,7 @@ public class DomainEventsTests
         var beforeCreation = DateTime.UtcNow;
 
         // Act
-        var @event = new ProjectCreatedEvent(ProjectId.Create(), "Test", UserId.Create());
+        var @event = new ProjectCreatedEvent(ProjectId.Create(), TenantId.Create(Guid.NewGuid()), "Test", UserId.Create());
 
         // Assert
         var afterCreation = DateTime.UtcNow;
@@ -203,7 +204,7 @@ public class DomainEventsTests
         var createdBy = UserId.Create();
 
         // Act
-        var @event = new ProjectCreatedEvent(projectId, projectName, createdBy);
+        var @event = new ProjectCreatedEvent(projectId, TenantId.Create(Guid.NewGuid()), projectName, createdBy);
         var originalProjectId = @event.ProjectId;
         var originalProjectName = @event.ProjectName;
         var originalCreatedBy = @event.CreatedBy;
diff --git a/colaflow-api/tests/Modules/Identity/ColaFlow.Modules.Identity.Infrastructure.Tests/Persistence/GlobalQueryFilterTests.cs b/colaflow-api/tests/Modules/Identity/ColaFlow.Modules.Identity.Infrastructure.Tests/Persistence/GlobalQueryFilterTests.cs
index 1fea702..86b0357 100644
--- a/colaflow-api/tests/Modules/Identity/ColaFlow.Modules.Identity.Infrastructure.Tests/Persistence/GlobalQueryFilterTests.cs
+++ b/colaflow-api/tests/Modules/Identity/ColaFlow.Modules.Identity.Infrastructure.Tests/Persistence/GlobalQueryFilterTests.cs
@@ -5,6 +5,8 @@ using ColaFlow.Modules.Identity.Infrastructure.Services;
 using FluentAssertions;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using Moq;
 
 namespace ColaFlow.Modules.Identity.Infrastructure.Tests.Persistence;
@@ -13,6 +15,8 @@ public class GlobalQueryFilterTests : IDisposable
 {
     private readonly Mock<ITenantContext> _mockTenantContext;
     private readonly Mock<IMediator> _mockMediator;
+    private readonly Mock<IHostEnvironment> _mockEnvironment;
+    private readonly Mock<ILogger<IdentityDbContext>> _mockLogger;
     private readonly IdentityDbContext _context;
 
     public GlobalQueryFilterTests()
@@ -23,7 +27,10 @@ public class GlobalQueryFilterTests : IDisposable
 
         _mockTenantContext = new Mock<ITenantContext>();
         _mockMediator = new Mock<IMediator>();
-        _context = new IdentityDbContext(options, _mockTenantContext.Object, _mockMediator.Object);
+        _mockEnvironment = new Mock<IHostEnvironment>();
+        _mockEnvironment.Setup(e => e.EnvironmentName).Returns("Development");
+        _mockLogger = new Mock<ILogger<IdentityDbContext>>();
+        _context = new IdentityDbContext(options, _mockTenantContext.Object, _mockMediator.Object, _mockEnvironment.Object, _mockLogger.Object);
     }
 
     [Fact]
@@ -43,7 +50,10 @@ public class GlobalQueryFilterTests : IDisposable
             .Options;
 
         var mockMediator = new Mock<IMediator>();
-        using var context = new IdentityDbContext(options, mockTenantContext.Object, mockMediator.Object);
+        var mockEnvironment = new Mock<IHostEnvironment>();
+        mockEnvironment.Setup(e => e.EnvironmentName).Returns("Development");
+        var mockLogger = new Mock<ILogger<IdentityDbContext>>();
+        using var context = new IdentityDbContext(options, mockTenantContext.Object, mockMediator.Object, mockEnvironment.Object, mockLogger.Object);
 
         var user1 = User.CreateLocal(
             tenant1Id,
@@ -86,7 +96,10 @@ public class GlobalQueryFilterTests : IDisposable
             .Options;
 
         var mockMediator = new Mock<IMediator>();
-        using var context = new IdentityDbContext(options, mockTenantContext.Object, mockMediator.Object);
+        var mockEnvironment = new Mock<IHostEnvironment>();
+        mockEnvironment.Setup(e => e.EnvironmentName).Returns("Development");
+        var mockLogger = new Mock<ILogger<IdentityDbContext>>();
+        using var context = new IdentityDbContext(options, mockTenantContext.Object, mockMediator.Object, mockEnvironment.Object, mockLogger.Object);
 
         var user1 = User.CreateLocal(tenant1Id, Email.Create("admin@tenant1.com"), "pass", FullName.Create("Admin One"));
         var user2 = User.CreateLocal(tenant2Id, Email.Create("admin@tenant2.com"), "pass", FullName.Create("Admin Two"));
@@ -117,7 +130,10 @@ public class GlobalQueryFilterTests : IDisposable
             .Options;
 
         var mockMediator = new Mock<IMediator>();
-        using var context = new IdentityDbContext(options, mockTenantContext.Object, mockMediator.Object);
+        var mockEnvironment = new Mock<IHostEnvironment>();
+        mockEnvironment.Setup(e => e.EnvironmentName).Returns("Development");
+        var mockLogger = new Mock<ILogger<IdentityDbContext>>();
+        using var context = new IdentityDbContext(options, mockTenantContext.Object, mockMediator.Object, mockEnvironment.Object, mockLogger.Object);
 
         var user1 = User.CreateLocal(tenant1Id, Email.Create("user1@test.com"), "pass", FullName.Create("User One"));
         var user2 = User.CreateLocal(tenant2Id, Email.Create("user2@test.com"), "pass", FullName.Create("User Two"));
@@ -149,7 +165,10 @@ public class GlobalQueryFilterTests : IDisposable
             .Options;
 
         var mockMediator = new Mock<IMediator>();
-        using var context = new IdentityDbContext(options, mockTenantContext.Object, mockMediator.Object);
+        var mockEnvironment = new Mock<IHostEnvironment>();
+        mockEnvironment.Setup(e => e.EnvironmentName).Returns("Development");
+        var mockLogger = new Mock<ILogger<IdentityDbContext>>();
+        using var context = new IdentityDbContext(options, mockTenantContext.Object, mockMediator.Object, mockEnvironment.Object, mockLogger.Object);
 
         var user1 = User.CreateLocal(tenant1Id, Email.Create("john@tenant1.com"), "pass", FullName.Create("John Doe"));
         var user2 = User.CreateLocal(tenant2Id, Email.Create("jane@tenant2.com"), "pass", FullName.Create("Jane Doe"));
diff --git a/colaflow-api/tests/Modules/Identity/ColaFlow.Modules.Identity.Infrastructure.Tests/Repositories/TenantRepositoryTests.cs b/colaflow-api/tests/Modules/Identity/ColaFlow.Modules.Identity.Infrastructure.Tests/Repositories/TenantRepositoryTests.cs
index 5a5639e..e8a0db7 100644
--- a/colaflow-api/tests/Modules/Identity/ColaFlow.Modules.Identity.Infrastructure.Tests/Repositories/TenantRepositoryTests.cs
+++ b/colaflow-api/tests/Modules/Identity/ColaFlow.Modules.Identity.Infrastructure.Tests/Repositories/TenantRepositoryTests.cs
@@ -5,6 +5,8 @@ using ColaFlow.Modules.Identity.Infrastructure.Services;
 using FluentAssertions;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using Moq;
 
 namespace ColaFlow.Modules.Identity.Infrastructure.Tests.Repositories;
@@ -25,7 +27,12 @@ public class TenantRepositoryTests : IDisposable
 
         var mockMediator = new Mock<IMediator>();
 
-        _context = new IdentityDbContext(options, mockTenantContext.Object, mockMediator.Object);
+        var mockEnvironment = new Mock<IHostEnvironment>();
+        mockEnvironment.Setup(e => e.EnvironmentName).Returns("Development");
+
+        var mockLogger = new Mock<ILogger<IdentityDbContext>>();
+
+        _context = new IdentityDbContext(options, mockTenantContext.Object, mockMediator.Object, mockEnvironment.Object, mockLogger.Object);
         _repository = new TenantRepository(_context);
     }