diff --git a/src/test/java/org/grouphq/groupservice/group/domain/groups/GroupRepositoryTest.java b/src/test/java/org/grouphq/groupservice/group/domain/groups/GroupRepositoryTest.java
index 7a5173c..955d5eb 100644
--- a/src/test/java/org/grouphq/groupservice/group/domain/groups/GroupRepositoryTest.java
+++ b/src/test/java/org/grouphq/groupservice/group/domain/groups/GroupRepositoryTest.java
@@ -8,7 +8,12 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import org.grouphq.groupservice.config.DataConfig;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.data.r2dbc.DataR2dbcTest;
 import org.springframework.context.annotation.Import;
@@ -101,7 +106,8 @@ void retrievesAllGroups() {
         StepVerifier.create(groupRepository.getAllGroups())
             .recordWith(() -> groupsReturned)
             .expectNextCount(3)
-            .expectComplete().verify(Duration.ofSeconds(1));
+            .expectComplete()
+            .verify(Duration.ofSeconds(1));
 
         assertThat(groupsReturned)
             .hasSize(3)
diff --git a/src/test/java/org/grouphq/groupservice/group/domain/members/MemberServiceTest.java b/src/test/java/org/grouphq/groupservice/group/domain/members/MemberServiceTest.java
index a790d03..c589e28 100644
--- a/src/test/java/org/grouphq/groupservice/group/domain/members/MemberServiceTest.java
+++ b/src/test/java/org/grouphq/groupservice/group/domain/members/MemberServiceTest.java
@@ -3,7 +3,9 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -13,7 +15,13 @@
 import java.util.Objects;
 import java.util.UUID;
 import java.util.function.Supplier;
-import org.grouphq.groupservice.group.domain.exceptions.*;
+import org.grouphq.groupservice.group.domain.exceptions.EventAlreadyPublishedException;
+import org.grouphq.groupservice.group.domain.exceptions.ExceptionMapper;
+import org.grouphq.groupservice.group.domain.exceptions.GroupDoesNotExistException;
+import org.grouphq.groupservice.group.domain.exceptions.GroupIsFullException;
+import org.grouphq.groupservice.group.domain.exceptions.GroupNotActiveException;
+import org.grouphq.groupservice.group.domain.exceptions.MemberNotActiveException;
+import org.grouphq.groupservice.group.domain.exceptions.MemberNotFoundException;
 import org.grouphq.groupservice.group.domain.groups.Group;
 import org.grouphq.groupservice.group.domain.groups.GroupRepository;
 import org.grouphq.groupservice.group.domain.groups.GroupStatus;
diff --git a/src/test/java/org/grouphq/groupservice/group/web/GroupControllerIntegrationTest.java b/src/test/java/org/grouphq/groupservice/group/web/GroupControllerIntegrationTest.java
index 3ee6b9e..81cbc62 100644
--- a/src/test/java/org/grouphq/groupservice/group/web/GroupControllerIntegrationTest.java
+++ b/src/test/java/org/grouphq/groupservice/group/web/GroupControllerIntegrationTest.java
@@ -119,15 +119,15 @@ void retrieveActiveGroupMembersAsPublic() {
             .verify(Duration.ofSeconds(1));
 
         final List<PublicMember> publicMembers = List.of(
-            new PublicMember(memberList.get(0).username(), memberList.get(0).groupId(),
-                memberList.get(0).memberStatus(), memberList.get(0).joinedDate(),
-                memberList.get(0).exitedDate()),
-            new PublicMember(memberList.get(1).username(), memberList.get(1).groupId(),
-                memberList.get(1).memberStatus(), memberList.get(1).joinedDate(),
-                memberList.get(1).exitedDate()),
-            new PublicMember(memberList.get(2).username(), memberList.get(2).groupId(),
-                memberList.get(2).memberStatus(), memberList.get(2).joinedDate(),
-                memberList.get(2).exitedDate())
+            new PublicMember(memberList.get(0).id(), memberList.get(0).username(),
+                memberList.get(0).groupId(), memberList.get(0).memberStatus(),
+                memberList.get(0).joinedDate(), memberList.get(0).exitedDate()),
+            new PublicMember(memberList.get(1).id(), memberList.get(1).username(),
+                memberList.get(1).groupId(), memberList.get(1).memberStatus(),
+                memberList.get(1).joinedDate(), memberList.get(1).exitedDate()),
+            new PublicMember(memberList.get(2).id(), memberList.get(2).username(),
+                memberList.get(2).groupId(), memberList.get(2).memberStatus(),
+                memberList.get(2).joinedDate(), memberList.get(2).exitedDate())
         );
 
         webTestClient
diff --git a/src/test/java/org/grouphq/groupservice/group/web/GroupControllerTest.java b/src/test/java/org/grouphq/groupservice/group/web/GroupControllerTest.java
index 77e7085..7b92b8d 100644
--- a/src/test/java/org/grouphq/groupservice/group/web/GroupControllerTest.java
+++ b/src/test/java/org/grouphq/groupservice/group/web/GroupControllerTest.java
@@ -79,11 +79,11 @@ void retrieveActiveGroupMembersAsPublic() {
             .willReturn(Flux.just(members));
 
         final List<PublicMember> publicMembers = List.of(
-            new PublicMember(members[0].username(), members[0].groupId(),
+            new PublicMember(members[0].id(), members[0].username(), members[0].groupId(),
                 members[0].memberStatus(), members[0].joinedDate(), members[0].exitedDate()),
-            new PublicMember(members[1].username(), members[1].groupId(),
+            new PublicMember(members[1].id(), members[1].username(), members[1].groupId(),
                 members[1].memberStatus(), members[1].joinedDate(), members[1].exitedDate()),
-            new PublicMember(members[2].username(), members[2].groupId(),
+            new PublicMember(members[2].id(), members[2].username(), members[2].groupId(),
                 members[2].memberStatus(), members[2].joinedDate(), members[2].exitedDate())
         );