diff --git a/public/admin/santaAdmin.html b/public/admin/santaAdmin.html
index 225bb1b..836f7c8 100644
--- a/public/admin/santaAdmin.html
+++ b/public/admin/santaAdmin.html
@@ -320,7 +320,7 @@ <h5 class="modal-title">
                   <option selected value="">Choose...</option>
                 </select>
                 <label for="forbiddenUser2"
-                  >Will never be paired with (and vice-versa):</label
+                  >Will never be paired with (and vice versa):</label
                 >
                 <select class="form-select" id="forbiddenUser2" required>
                   <option selected value="">Choose...</option>
diff --git a/public/chat/message.html b/public/chat/message.html
index d4a0489..f75a953 100644
--- a/public/chat/message.html
+++ b/public/chat/message.html
@@ -3,7 +3,7 @@
     <span data-name="chatTo"></span>
     <div class="">
       <button
-        data-name="msgDelete"
+        data-name="deleteChatMessage"
         type="button"
         class="btn-close align-self-top w-25 h-25"
         data-bs-toggle="modal"
diff --git a/public/chat/santaChat.js b/public/chat/santaChat.js
index 79e02ae..d16d82f 100644
--- a/public/chat/santaChat.js
+++ b/public/chat/santaChat.js
@@ -61,7 +61,7 @@ $(async function () {
             .text(`From: ${item.from || 'Anonymous'}`);
 
           $(chatElement)
-            .find('[data-name="msgDelete"]')
+            .find('[data-name="deleteChatMessage"]')
             .on('click', function () {
               chatId = item._id;
               chatEl = chatElement;
@@ -93,7 +93,7 @@ $(async function () {
             $(chatElement).find('[data-name="chatFrom"]').text('From: you');
 
             $(chatElement)
-              .find('[data-name="msgDelete"]')
+              .find('[data-name="deleteChatMessage"]')
               .on('click', function () {
                 chatId = response.insertedId;
                 chatEl = chatElement;
diff --git a/routers/admin-router.js b/routers/admin-router.js
index 4973df4..c08ce58 100644
--- a/routers/admin-router.js
+++ b/routers/admin-router.js
@@ -98,7 +98,7 @@ adminRouter.post('/api/user', async (req, res) => {
   }
 
   const response = {
-    success: `User '${req.body.email}' invited to the group: ${activeGroup._id}`,
+    success: `User '${req.body.email}' invited to the group: ${activeGroup.name}`,
     userId: userId,
   };
   if (activeGroup.userAddedNotification === true) {
diff --git a/tests/admin.spec.js b/tests/admin.spec.js
index b231498..3daab84 100644
--- a/tests/admin.spec.js
+++ b/tests/admin.spec.js
@@ -15,7 +15,7 @@ import { createNewGroup, createDraftedGroup } from './helpers/setup.js';
 test.describe('admin tests', () => {
   test.describe('group settings tests', () => {
     test('admin can change group settings', async ({ page }) => {
-      const groupData = await createDraftedGroup(page.request);
+      const groupData = await createNewGroup(page.request);
       await login(
         page.request,
         groupData.users.admin.email,
@@ -43,6 +43,60 @@ test.describe('admin tests', () => {
     });
   });
 
+  test.describe('user group tests', () => {
+    test('admin can invite a non existing user to the group', async ({
+      page,
+    }) => {
+      const groupData = await createNewGroup(page.request);
+      await login(
+        page.request,
+        groupData.users.admin.email,
+        groupData.users.admin.password
+      );
+      await page.goto('/admin');
+
+      await page.getByRole('button', { name: 'Invite new users' }).click();
+
+      const email = faker.internet.email();
+      await page.getByLabel('Email address').fill(email);
+      await page.getByRole('button', { name: 'Invite', exact: true }).click();
+
+      await expect(
+        page.locator('[data-name="userEmail"]').getByText(email)
+      ).toBeVisible();
+      await expect(page.locator('#footerAlert')).toHaveText(
+        `User '${email}' invited to the group: ${groupData.group.name}`
+      );
+    });
+
+    test('admin can invite an existing user to the group', async ({ page }) => {
+      const groupData = await createNewGroup(page.request);
+      const user = {
+        email: faker.internet.email(),
+        password: faker.internet.password(),
+      };
+      await registerUser(page.request, user);
+      await login(
+        page.request,
+        groupData.users.admin.email,
+        groupData.users.admin.password
+      );
+      await page.goto('/admin');
+
+      await page.getByRole('button', { name: 'Invite new users' }).click();
+
+      await page.getByLabel('Email address').fill(user.email);
+      await page.getByRole('button', { name: 'Invite', exact: true }).click();
+
+      await expect(
+        page.locator('[data-name="userEmail"]').getByText(user.email)
+      ).toBeVisible();
+      await expect(page.locator('#footerAlert')).toHaveText(
+        `User '${user.email}' invited to the group: ${groupData.group.name}`
+      );
+    });
+  });
+
   test.describe('drafting pairs tests', () => {
     test('admin can draft pairs', async ({ page }) => {
       const adminUser = {
diff --git a/tests/chat.spec.js b/tests/chat.spec.js
index 107f31e..8b7438c 100644
--- a/tests/chat.spec.js
+++ b/tests/chat.spec.js
@@ -64,6 +64,43 @@ test.describe('chat tests', () => {
     );
   });
 
+  test('user/admin cannot/can delete a message', async ({ page }) => {
+    await login(
+      page.request,
+      groupData.users.user1.email,
+      groupData.users.user1.password
+    );
+    const message = {
+      userId: groupData.users.user2.id,
+      email: groupData.users.user2.email,
+      message: faker.word.words(10),
+    };
+    await sendMessage(page.request, message);
+
+    await login(
+      page.request,
+      groupData.users.user2.email,
+      groupData.users.user2.password
+    );
+    await page.goto('/chat');
+    await page.locator('[data-name="deleteChatMessage"]').click();
+    await page.getByRole('button', { name: 'Delete message' }).click();
+    await expect(page.locator('#footerAlert')).toHaveText(
+      'User not allowed to delete messages!'
+    );
+    await login(
+      page.request,
+      groupData.users.admin.email,
+      groupData.users.admin.password
+    );
+    await page.goto('/chat');
+    await page.locator('[data-name="deleteChatMessage"]').click();
+    await page.getByRole('button', { name: 'Delete message' }).click();
+    await expect(page.locator('#footerAlert')).toHaveText(
+      'The message was successfully deleted'
+    );
+  });
+
   test('user with no group cannot access chat page', async ({ page }) => {
     const user = {
       email: faker.internet.email(),
diff --git a/tests/email.spec.js b/tests/email.spec.js
index bb3c1b6..0bc9cdf 100644
--- a/tests/email.spec.js
+++ b/tests/email.spec.js
@@ -122,47 +122,7 @@ test.describe('email tests', () => {
 
 test.describe('chat tests', () => {
   test('user should receive a chat email', async ({ page }) => {
-    const defaultData = {
-      users: {
-        admin: {
-          email: faker.internet.email(),
-          password: 'test',
-          name: faker.person.fullName(),
-          address: {
-            street: faker.location.street(),
-            city: faker.location.city(),
-            postalCode: faker.location.zipCode(),
-            state: faker.location.state(),
-          },
-        },
-        user1: {
-          email: faker.internet.email(),
-          password: 'test',
-          name: faker.person.fullName(),
-          address: {
-            street: faker.location.street(),
-            city: faker.location.city(),
-            postalCode: faker.location.zipCode(),
-            state: faker.location.state(),
-          },
-        },
-        user2: {
-          email: faker.internet.email(),
-          password: 'test',
-          name: faker.person.fullName(),
-          address: {
-            street: faker.location.street(),
-            city: faker.location.city(),
-            postalCode: faker.location.zipCode(),
-            state: faker.location.state(),
-          },
-        },
-      },
-      group: {
-        name: faker.word.noun(),
-      },
-    };
-    const groupData = await createDraftedGroup(page.request, defaultData);
+    const groupData = await createDraftedGroup(page.request);
     const updatedGroupData = {
       name: groupData.group.name,
       userAddedNotification: false,
@@ -196,47 +156,7 @@ test.describe('chat tests', () => {
   });
 
   test('user should not receives a chat email', async ({ page }) => {
-    const defaultData = {
-      users: {
-        admin: {
-          email: faker.internet.email(),
-          password: 'test',
-          name: faker.person.fullName(),
-          address: {
-            street: faker.location.street(),
-            city: faker.location.city(),
-            postalCode: faker.location.zipCode(),
-            state: faker.location.state(),
-          },
-        },
-        user1: {
-          email: faker.internet.email(),
-          password: 'test',
-          name: faker.person.fullName(),
-          address: {
-            street: faker.location.street(),
-            city: faker.location.city(),
-            postalCode: faker.location.zipCode(),
-            state: faker.location.state(),
-          },
-        },
-        user2: {
-          email: faker.internet.email(),
-          password: 'test',
-          name: faker.person.fullName(),
-          address: {
-            street: faker.location.street(),
-            city: faker.location.city(),
-            postalCode: faker.location.zipCode(),
-            state: faker.location.state(),
-          },
-        },
-      },
-      group: {
-        name: faker.word.noun(),
-      },
-    };
-    const groupData = await createNewGroup(page.request, defaultData);
+    const groupData = await createNewGroup(page.request);
     await login(
       page.request,
       groupData.users.user2.email,