diff --git a/test/api/v3/integration/chat/POST-chat.flag.test.js b/test/api/v3/integration/chat/POST-chat.flag.test.js
index 88b41744c8..d93c199c63 100644
--- a/test/api/v3/integration/chat/POST-chat.flag.test.js
+++ b/test/api/v3/integration/chat/POST-chat.flag.test.js
@@ -63,7 +63,7 @@ describe('POST /chat/:chatId/flag', () => {
 
     /* eslint-disable camelcase */
     expect(IncomingWebhook.prototype.send).to.be.calledWith({
-      text: `${user.profile.name} (${user.id}; language: en) flagged a message`,
+      text: `${user.profile.name} (${user.id}; language: en) flagged a group message`,
       attachments: [{
         fallback: 'Flag Message',
         color: 'danger',
@@ -98,7 +98,7 @@ describe('POST /chat/:chatId/flag', () => {
 
     /* eslint-disable camelcase */
     expect(IncomingWebhook.prototype.send).to.be.calledWith({
-      text: `${newUser.profile.name} (${newUser.id}; language: en) flagged a message`,
+      text: `${newUser.profile.name} (${newUser.id}; language: en) flagged a group message`,
       attachments: [{
         fallback: 'Flag Message',
         color: 'danger',
diff --git a/test/api/v3/integration/members/POST-flag_private_message.test.js b/test/api/v4/members/POST-flag_private_message.test.js
similarity index 80%
rename from test/api/v3/integration/members/POST-flag_private_message.test.js
rename to test/api/v4/members/POST-flag_private_message.test.js
index 343be5ccb8..94769bed47 100644
--- a/test/api/v3/integration/members/POST-flag_private_message.test.js
+++ b/test/api/v4/members/POST-flag_private_message.test.js
@@ -1,7 +1,7 @@
 import {
   generateUser,
   translate as t,
-} from '../../../../helpers/api-integration/v3';
+} from '../../../helpers/api-integration/v4';
 
 describe('POST /members/flag-private-message/:messageId', () => {
   let userToSendMessage;
@@ -19,9 +19,9 @@ describe('POST /members/flag-private-message/:messageId', () => {
       toUserId: receiver._id,
     });
 
-    let updatedSender = await userToSendMessage.get('/user');
+    let senderMessages = await userToSendMessage.get('/inbox/messages');
 
-    let sendersMessageInSendersInbox = _.find(updatedSender.inbox.messages, (message) => {
+    let sendersMessageInSendersInbox = _.find(senderMessages, (message) => {
       return message.uuid === receiver._id && message.text === messageToSend;
     });
 
@@ -37,9 +37,9 @@ describe('POST /members/flag-private-message/:messageId', () => {
       toUserId: receiver._id,
     });
 
-    let updatedReceiver = await receiver.get('/user');
+    let receiversMessages = await receiver.get('/inbox/messages');
 
-    let sendersMessageInReceiversInbox = _.find(updatedReceiver.inbox.messages, (message) => {
+    let sendersMessageInReceiversInbox = _.find(receiversMessages, (message) => {
       return message.uuid === userToSendMessage._id && message.text === messageToSend;
     });
 
@@ -55,9 +55,9 @@ describe('POST /members/flag-private-message/:messageId', () => {
       toUserId: receiver._id,
     });
 
-    let updatedReceiver = await receiver.get('/user');
+    let receiversMessages = await receiver.get('/inbox/messages');
 
-    let sendersMessageInReceiversInbox = _.find(updatedReceiver.inbox.messages, (message) => {
+    let sendersMessageInReceiversInbox = _.find(receiversMessages, (message) => {
       return message.uuid === userToSendMessage._id && message.text === messageToSend;
     });
 
diff --git a/website/server/controllers/api-v3/members.js b/website/server/controllers/api-v3/members.js
index d6b019276d..ff09a2cd8a 100644
--- a/website/server/controllers/api-v3/members.js
+++ b/website/server/controllers/api-v3/members.js
@@ -20,7 +20,6 @@ import {
 } from '../../libs/email';
 import { sendNotification as sendPushNotification } from '../../libs/pushNotifications';
 import { achievements } from '../../../../website/common/';
-import {chatReporterFactory} from '../../libs/chatReporting/chatReporterFactory';
 
 let api = {};