diff --git a/src/components/HTMLLoader.jsx b/src/components/HTMLLoader.jsx
index 8f57a8a7..48908f43 100644
--- a/src/components/HTMLLoader.jsx
+++ b/src/components/HTMLLoader.jsx
@@ -10,14 +10,17 @@ const defaultSanitizeOptions = {
   ADD_ATTR: ['columnalign'],
 };
 
-function HTMLLoader({ htmlNode, componentId, cssClassName }) {
+function HTMLLoader({
+  htmlNode, componentId, cssClassName, testId,
+}) {
   const sanitizedMath = DOMPurify.sanitize(htmlNode, { ...defaultSanitizeOptions });
   const previewRef = useRef();
 
   useEffect(() => {
     let promise = Promise.resolve(); // Used to hold chain of typesetting calls
+
     function typeset(code) {
-      promise = promise.then(() => window.MathJax.typesetPromise(code()))
+      promise = promise.then(() => window.MathJax?.typesetPromise(code()))
         .catch((err) => logError(`Typeset failed: ${err.message}`));
       return promise;
     }
@@ -25,10 +28,10 @@ function HTMLLoader({ htmlNode, componentId, cssClassName }) {
     typeset(() => {
       previewRef.current.innerHTML = sanitizedMath;
     });
-  }, [sanitizedMath]);
+  }, [htmlNode]);
 
   return (
-    <div ref={previewRef} className={cssClassName} id={componentId} />
+    <div ref={previewRef} className={cssClassName} id={componentId} data-testid={testId} />
 
   );
 }
@@ -37,12 +40,14 @@ HTMLLoader.propTypes = {
   htmlNode: PropTypes.node,
   componentId: PropTypes.string,
   cssClassName: PropTypes.string,
+  testId: PropTypes.string,
 };
 
 HTMLLoader.defaultProps = {
   htmlNode: '',
   componentId: null,
   cssClassName: '',
+  testId: '',
 };
 
 export default HTMLLoader;
diff --git a/src/components/PostPreviewPane.jsx b/src/components/PostPreviewPane.jsx
index 8334c280..5126e65d 100644
--- a/src/components/PostPreviewPane.jsx
+++ b/src/components/PostPreviewPane.jsx
@@ -29,7 +29,7 @@ function PostPreviewPane({
             className="float-right p-3"
             iconClassNames="icon-size"
           />
-          <HTMLLoader htmlNode={htmlNode} cssClassName="text-primary" componentId="post-preview" />
+          <HTMLLoader htmlNode={htmlNode} cssClassName="text-primary" componentId="post-preview" testId="post-preview" />
         </div>
       )}
       <div className="d-flex justify-content-end">
diff --git a/src/discussions/comments/CommentsView.test.jsx b/src/discussions/comments/CommentsView.test.jsx
index 69f9a84c..da849168 100644
--- a/src/discussions/comments/CommentsView.test.jsx
+++ b/src/discussions/comments/CommentsView.test.jsx
@@ -162,7 +162,7 @@ describe('CommentsView', () => {
 
     it('should show and hide the editor', async () => {
       renderComponent(discussionPostId);
-      await waitFor(() => screen.findByText('comment number 1', { exact: false }));
+      await screen.findByTestId('thread-1');
       const addResponseButtons = screen.getAllByRole('button', { name: /add a response/i });
       await act(async () => {
         fireEvent.click(
@@ -178,7 +178,7 @@ describe('CommentsView', () => {
 
     it('should allow posting a response', async () => {
       renderComponent(discussionPostId);
-      await waitFor(() => screen.findByText('comment number 1', { exact: false }));
+      await screen.findByTestId('thread-1');
       const responseButtons = screen.getAllByRole('button', { name: /add a response/i });
       await act(async () => {
         fireEvent.click(
@@ -195,7 +195,7 @@ describe('CommentsView', () => {
         );
       });
       expect(screen.queryByTestId('tinymce-editor')).not.toBeInTheDocument();
-      await waitFor(async () => expect(await screen.findByText('testing123', { exact: false })).toBeInTheDocument());
+      await waitFor(async () => expect(await screen.findByTestId('comment-1')).toBeInTheDocument());
     });
 
     it('should not allow posting a response on a closed post', async () => {
@@ -209,7 +209,7 @@ describe('CommentsView', () => {
     it('should allow posting a comment', async () => {
       renderComponent(discussionPostId);
       await act(async () => {
-        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 1', { exact: false })));
+        fireEvent.mouseOver(await waitFor(() => screen.findByTestId('comment-1')));
       });
       await act(async () => {
         fireEvent.click(
@@ -226,14 +226,15 @@ describe('CommentsView', () => {
         );
       });
       expect(screen.queryByTestId('tinymce-editor')).not.toBeInTheDocument();
-      await waitFor(async () => expect(await screen.findByText('testing123', { exact: false })).toBeInTheDocument());
+      await waitFor(async () => expect(await screen.findByTestId('comment-comment-1')).toBeInTheDocument());
     });
 
     it('should not allow posting a comment on a closed post', async () => {
       renderComponent(closedPostId);
+      await screen.findByTestId('thread-2');
 
       await act(async () => {
-        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 3', { exact: false })));
+        fireEvent.mouseOver(await waitFor(() => screen.findByTestId('comment-3')));
       });
 
       const addCommentButton = screen.getAllByRole('button', { name: /add comment/i }, { hidden: false })[0];
@@ -243,7 +244,7 @@ describe('CommentsView', () => {
     it('should allow editing an existing comment', async () => {
       renderComponent(discussionPostId);
       await act(async () => {
-        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 1', { exact: false })));
+        fireEvent.mouseOver(await waitFor(() => screen.findByTestId('comment-1')));
       });
       await act(async () => {
         fireEvent.click(
@@ -261,7 +262,7 @@ describe('CommentsView', () => {
         fireEvent.click(screen.getByRole('button', { name: /submit/i }));
       });
       await waitFor(async () => {
-        expect(await screen.findByText('testing123', { exact: false })).toBeInTheDocument();
+        expect(await screen.findByTestId('comment-1')).toBeInTheDocument();
       });
     });
 
@@ -286,7 +287,7 @@ describe('CommentsView', () => {
       setupCourseConfig();
       renderComponent(discussionPostId);
       await act(async () => {
-        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 1', { exact: false })));
+        fireEvent.mouseOver(await waitFor(() => screen.findByTestId('comment-1')));
       });
       await act(async () => {
         fireEvent.click(
@@ -300,10 +301,12 @@ describe('CommentsView', () => {
       expect(screen.queryByRole('combobox', { name: /reason for editing/i })).toBeInTheDocument();
       expect(screen.getAllByRole('option', { name: /reason \d/i })).toHaveLength(2);
       await act(async () => {
-        fireEvent.change(screen.queryByRole('combobox', { name: /reason for editing/i }), { target: { value: null } });
+        fireEvent.change(screen.queryByRole('combobox', { name: /reason for editing/i }),
+          { target: { value: null } });
       });
       await act(async () => {
-        fireEvent.change(screen.queryByRole('combobox', { name: /reason for editing/i }), { target: { value: 'reason-1' } });
+        fireEvent.change(screen.queryByRole('combobox',
+          { name: /reason for editing/i }), { target: { value: 'reason-1' } });
       });
       await act(async () => {
         fireEvent.change(screen.getByTestId('tinymce-editor'), { target: { value: 'testing123' } });
@@ -450,7 +453,7 @@ describe('CommentsView', () => {
 
       // Wait for the content to load
       await act(async () => {
-        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 7', { exact: false })));
+        fireEvent.mouseOver(await waitFor(() => screen.findByTestId('comment-7')));
       });
       const view = screen.getByTestId('comment-comment-1');
 
@@ -466,7 +469,7 @@ describe('CommentsView', () => {
       renderComponent(discussionPostId);
       // Wait for the content to load
       await act(async () => {
-        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 7', { exact: false })));
+        fireEvent.mouseOver(await waitFor(() => screen.findByTestId('comment-7')));
       });
 
       await act(async () => {
@@ -480,7 +483,7 @@ describe('CommentsView', () => {
       renderComponent(discussionPostId);
       // Wait for the content to load
       await act(async () => {
-        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 7', { exact: false })));
+        fireEvent.mouseOver(await waitFor(() => screen.findByTestId('comment-7')));
       });
       const actionButtons = screen.queryAllByRole('button', { name: /actions menu/i });
       await act(async () => {
@@ -511,9 +514,9 @@ describe('CommentsView', () => {
 
     it('initially loads only the first page', async () => {
       renderComponent(discussionPostId);
-      expect(await screen.findByText('comment number 1', { exact: false }))
+      expect(await screen.findByTestId('comment-1'))
         .toBeInTheDocument();
-      expect(screen.queryByText('comment number 2', { exact: false }))
+      expect(screen.queryByTestId('comment-2'))
         .not
         .toBeInTheDocument();
     });
@@ -524,8 +527,8 @@ describe('CommentsView', () => {
       const loadMoreButton = await findLoadMoreCommentsButton();
       fireEvent.click(loadMoreButton);
 
-      await screen.findByText('comment number 1', { exact: false });
-      await screen.findByText('comment number 2', { exact: false });
+      await screen.findByTestId('comment-1');
+      await screen.findByTestId('comment-2');
     });
 
     it('newly loaded comments are appended to the old ones', async () => {
@@ -534,9 +537,9 @@ describe('CommentsView', () => {
       const loadMoreButton = await findLoadMoreCommentsButton();
       fireEvent.click(loadMoreButton);
 
-      await screen.findByText('comment number 1', { exact: false });
+      await screen.findByTestId('comment-1');
       // check that comments from the first page are also displayed
-      expect(screen.queryByText('comment number 2', { exact: false }))
+      expect(screen.queryByTestId('comment-2'))
         .toBeInTheDocument();
     });
 
@@ -549,7 +552,7 @@ describe('CommentsView', () => {
         fireEvent.click(loadMoreButton);
       }
 
-      await screen.findByText('comment number 2', { exact: false });
+      await screen.findByTestId('comment-2');
       await expect(findLoadMoreCommentsButton())
         .rejects
         .toThrow();
@@ -561,11 +564,11 @@ describe('CommentsView', () => {
 
     it('initially loads only the first page', async () => {
       act(() => renderComponent(questionPostId));
-      expect(await screen.findByText('comment number 3', { exact: false }))
+      expect(await screen.findByTestId('comment-3'))
         .toBeInTheDocument();
-      expect(await screen.findByText('endorsed comment number 5', { exact: false }))
+      expect(await screen.findByTestId('comment-5'))
         .toBeInTheDocument();
-      expect(screen.queryByText('comment number 4', { exact: false }))
+      expect(screen.queryByTestId('comment-4'))
         .not
         .toBeInTheDocument();
     });
@@ -578,15 +581,15 @@ describe('CommentsView', () => {
       const [loadMoreButtonEndorsed, loadMoreButtonUnendorsed] = await findLoadMoreCommentsButtons();
       // Both load more buttons should show
       expect(await findLoadMoreCommentsButtons()).toHaveLength(2);
-      expect(await screen.findByText('unendorsed comment number 3', { exact: false }))
+      expect(await screen.findByTestId('comment-3'))
         .toBeInTheDocument();
-      expect(await screen.findByText('endorsed comment number 5', { exact: false }))
+      expect(await screen.findByTestId('comment-5'))
         .toBeInTheDocument();
       // Comments from next page should not be loaded yet.
-      expect(await screen.queryByText('endorsed comment number 6', { exact: false }))
+      expect(await screen.queryByTestId('comment-6'))
         .not
         .toBeInTheDocument();
-      expect(await screen.queryByText('unendorsed comment number 4', { exact: false }))
+      expect(await screen.queryByTestId('comment-4'))
         .not
         .toBeInTheDocument();
 
@@ -594,10 +597,10 @@ describe('CommentsView', () => {
         fireEvent.click(loadMoreButtonEndorsed);
       });
       // Endorsed comment from next page should be loaded now.
-      await waitFor(() => expect(screen.queryByText('endorsed comment number 6', { exact: false }))
+      await waitFor(() => expect(screen.queryByTestId('comment-6'))
         .toBeInTheDocument());
       // Unendorsed comment from next page should not be loaded yet.
-      expect(await screen.queryByText('unendorsed comment number 4', { exact: false }))
+      expect(await screen.queryByTestId('comment-4'))
         .not
         .toBeInTheDocument();
       // Now only one load more buttons should show, for unendorsed comments
@@ -606,7 +609,7 @@ describe('CommentsView', () => {
         fireEvent.click(loadMoreButtonUnendorsed);
       });
       // Unendorsed comment from next page should be loaded now.
-      await waitFor(() => expect(screen.queryByText('unendorsed comment number 4', { exact: false }))
+      await waitFor(() => expect(screen.queryByTestId('comment-4'))
         .toBeInTheDocument());
       await expect(findLoadMoreCommentsButtons()).rejects.toThrow();
     });
@@ -618,8 +621,8 @@ describe('CommentsView', () => {
     it('initially loads only the first page', async () => {
       renderComponent(discussionPostId);
 
-      await waitFor(() => screen.findByText('comment number 7', { exact: false }));
-      expect(screen.queryByText('comment number 8', { exact: false })).not.toBeInTheDocument();
+      await waitFor(() => screen.findByTestId('comment-7'));
+      expect(screen.queryByTestId('comment-8')).not.toBeInTheDocument();
     });
 
     it('pressing load more button will load next page of responses', async () => {
@@ -630,7 +633,7 @@ describe('CommentsView', () => {
         fireEvent.click(loadMoreButton);
       });
 
-      await screen.findByText('comment number 8', { exact: false });
+      await screen.findByTestId('comment-8');
     });
 
     it('newly loaded responses are appended to the old ones', async () => {
@@ -641,9 +644,9 @@ describe('CommentsView', () => {
         fireEvent.click(loadMoreButton);
       });
 
-      await screen.findByText('comment number 8', { exact: false });
+      await screen.findByTestId('comment-8');
       // check that comments from the first page are also displayed
-      expect(screen.queryByText('comment number 7', { exact: false })).toBeInTheDocument();
+      expect(screen.queryByTestId('comment-7')).toBeInTheDocument();
     });
 
     it('load more button is hidden when no more responses pages to load', async () => {
@@ -657,7 +660,7 @@ describe('CommentsView', () => {
         });
       }
 
-      await screen.findByText('comment number 8', { exact: false });
+      await screen.findByTestId('comment-8');
       await expect(findLoadMoreCommentsResponsesButton())
         .rejects
         .toThrow();
@@ -668,7 +671,7 @@ describe('CommentsView', () => {
 
       // Wait for the content to load
       await act(async () => {
-        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 7', { exact: false })));
+        fireEvent.mouseOver(await waitFor(() => screen.findByTestId('comment-7')));
       });
       const view = screen.getByTestId('comment-comment-1');
 
@@ -684,7 +687,7 @@ describe('CommentsView', () => {
       renderComponent(discussionPostId);
       // Wait for the content to load
       await act(async () => {
-        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 7', { exact: false })));
+        fireEvent.mouseOver(await waitFor(() => screen.findByTestId('comment-7')));
       });
 
       await act(async () => {
@@ -698,7 +701,7 @@ describe('CommentsView', () => {
       renderComponent(discussionPostId);
       // Wait for the content to load
       await act(async () => {
-        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 7', { exact: false })));
+        fireEvent.mouseOver(await waitFor(() => screen.findByTestId('comment-7')));
       });
 
       // There should be three buttons, one for the post, the second for the
@@ -732,7 +735,8 @@ describe('CommentsView', () => {
     test(`for ${component}`, async () => {
       renderComponent(discussionPostId);
       // Wait for the content to load
-      await waitFor(() => expect(screen.queryByText('comment number 7', { exact: false })).toBeInTheDocument());
+      // await waitFor(() => expect(screen.findByTestId('post-thread-1')).toBeInTheDocument());
+      await waitFor(() => expect(screen.queryByText('This is Thread-1', { exact: false })).toBeInTheDocument());
       const content = screen.getByTestId(testId);
       await act(async () => {
         fireEvent.mouseOver(content);
diff --git a/src/discussions/comments/comment/Comment.jsx b/src/discussions/comments/comment/Comment.jsx
index dbb96291..aa7c3ba3 100644
--- a/src/discussions/comments/comment/Comment.jsx
+++ b/src/discussions/comments/comment/Comment.jsx
@@ -149,6 +149,7 @@ function Comment({
                 cssClassName="comment-body html-loader text-break mt-14px font-style-normal font-family-inter text-primary-500"
                 componentId="comment"
                 htmlNode={comment.renderedBody}
+                testId={comment.id}
               />
             )}
           <CommentIcons
diff --git a/src/discussions/comments/comment/Reply.jsx b/src/discussions/comments/comment/Reply.jsx
index a2a5cbbc..a0a15438 100644
--- a/src/discussions/comments/comment/Reply.jsx
+++ b/src/discussions/comments/comment/Reply.jsx
@@ -138,6 +138,7 @@ function Reply({
                 componentId="reply"
                 htmlNode={reply.renderedBody}
                 cssClassName="html-loader text-break font-style-normal pb-1 font-family-inter text-primary-500"
+                testId={reply.id}
               />
             )}
         </div>
diff --git a/src/discussions/common/HoverCard.jsx b/src/discussions/common/HoverCard.jsx
index e2a53074..62901051 100644
--- a/src/discussions/common/HoverCard.jsx
+++ b/src/discussions/common/HoverCard.jsx
@@ -81,7 +81,7 @@ function HoverCard({
           }}
         />
       </div>
-      {commentOrPost.following && (
+      {commentOrPost.following !== undefined && (
         <div className="hover-button">
           <IconButton
             src={commentOrPost.following ? StarFilled : StarOutline}
diff --git a/src/discussions/common/HoverCard.test.jsx b/src/discussions/common/HoverCard.test.jsx
index 6f11b3b2..4976b1d5 100644
--- a/src/discussions/common/HoverCard.test.jsx
+++ b/src/discussions/common/HoverCard.test.jsx
@@ -159,7 +159,7 @@ describe('HoverCard', () => {
 
   test('it should show hover card when hovered on comment', async () => {
     renderComponent(discussionPostId);
-    const comment = await waitFor(() => screen.findByText('comment number 1', { exact: false }));
+    const comment = await waitFor(() => screen.findByTestId('comment-1'));
     userEvent.hover(comment);
     expect(screen.getByTestId('hover-card')).toBeInTheDocument();
   });
@@ -182,7 +182,7 @@ describe('HoverCard', () => {
 
   test('it should show add comment, Endorse, like and actions menu Buttons for hovered comment', async () => {
     renderComponent(questionPostId);
-    const comment = await waitFor(() => screen.findByText('unendorsed comment number 3', { exact: false }));
+    const comment = await waitFor(() => screen.findByTestId('comment-3'));
     userEvent.hover(comment);
     const view = screen.getByTestId('hover-card');
     expect(screen.getByTestId('hover-card')).toBeInTheDocument();
diff --git a/src/discussions/posts/post/Post.jsx b/src/discussions/posts/post/Post.jsx
index e48e4fe0..3ed3a3b3 100644
--- a/src/discussions/posts/post/Post.jsx
+++ b/src/discussions/posts/post/Post.jsx
@@ -137,7 +137,7 @@ function Post({
       <AlertBanner content={post} />
       <PostHeader post={post} />
       <div className="d-flex mt-14px text-break font-style-normal font-family-inter text-primary-500">
-        <HTMLLoader htmlNode={post.renderedBody} componentId="post" cssClassName="html-loader" />
+        <HTMLLoader htmlNode={post.renderedBody} componentId="post" cssClassName="html-loader" testId={post.id} />
       </div>
       {topicContext && topic && (
         <div