diff --git a/__tests__/ExpensiMark-HTML-test.js b/__tests__/ExpensiMark-HTML-test.js
index c66999f0a..5525d7d96 100644
--- a/__tests__/ExpensiMark-HTML-test.js
+++ b/__tests__/ExpensiMark-HTML-test.js
@@ -1253,7 +1253,7 @@ test('Test for here mention with invalid username', () => {
     expect(parser.replace(testString)).toBe(resultString);
 });
 
-test('Test for @here mention with italic, bold and strikethrough styles', () => {
+test('Test for @here mention with italic, bold and strikethrough styles', () => { // .!$%&+/=?^`{|}_-
     const testString = '@here'
     + ' _@here_'
     + ' *@here*'
@@ -1270,7 +1270,10 @@ test('Test for @here mention with italic, bold and strikethrough styles', () =>
     + ' @here@'
     + ' @here$'
     + ' @here^'
-    + ' @here(';
+    + ' @here('
+    + ' @here.'
+    + ' @here!'
+    + ' @here?';
 
     const resultString = '<mention-here>@here</mention-here>'
     + ' <em><mention-here>@here</mention-here></em>'
@@ -1288,7 +1291,10 @@ test('Test for @here mention with italic, bold and strikethrough styles', () =>
     + ' <mention-here>@here</mention-here>@'
     + ' <mention-here>@here</mention-here>$'
     + ' <mention-here>@here</mention-here>^'
-    + ' <mention-here>@here</mention-here>(';
+    + ' <mention-here>@here</mention-here>('
+    + ' <mention-here>@here</mention-here>.'
+    + ' <mention-here>@here</mention-here>!'
+    + ' <mention-here>@here</mention-here>?';
     expect(parser.replace(testString)).toBe(resultString);
 });
 
@@ -1418,17 +1424,6 @@ test('Test here mention with @here@here', () => {
     expect(parser.replace(testString)).toBe(resultString);
 });
 
-test('Test here mention with @herex', () => {
-    const testString = '@herex';
-    expect(parser.replace(testString)).toBe(testString);
-});
-
-test('Test here mention with @here!', () => {
-    const testString = '@here!';
-    const resultString = '<mention-here>@here</mention-here>!';
-    expect(parser.replace(testString)).toBe(resultString);
-});
-
 test('Test link with code fence inside the alias text part', () => {
     const testString = '[```code```](google.com) '
         + '[test ```code``` test](google.com)';