From c1c1ceac79ae0984b566195b1455f16d6cd849cd Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Mon, 8 Dec 2025 17:04:31 +0100
Subject: [PATCH 01/13] Add SUMO rules mentions & Improve AAQ step 3

Add SUMO rules mentions when creating/editing a question, an answer, a forum thread, a forum post, a KB forum thread or a KB forum post.
In AAQ step 3, replace "Subject:" with "Summarize your question" and add help text for this field.
In AAQ step 3, display the Troubleshooting Info help text above the Share Data button, right after the field name.
In AAQ step 3, add the "tb_version" extra field.
In AAQ step 3, autofill the OS version field for Thunderbird.
Fix the issue with the Share Data button not working when editing a question.
Do not display the Common responses button when editing a question.
Improve accessibility.
Use "Windows 10/11" when there is not enough info to identify the exact Windows NT 10.0 version.
---
 kitsune/forums/jinja2/forums/edit_post.html   |  2 +-
 kitsune/forums/jinja2/forums/new_thread.html  |  2 +-
 kitsune/forums/jinja2/forums/posts.html       |  2 +-
 .../kbforums/jinja2/kbforums/edit_post.html   |  2 +-
 .../kbforums/jinja2/kbforums/new_thread.html  |  2 +-
 kitsune/kbforums/jinja2/kbforums/posts.html   |  2 +-
 kitsune/questions/forms.py                    | 25 +++++++++++++--
 .../jinja2/questions/edit_answer.html         |  2 +-
 .../jinja2/questions/includes/aaq_macros.html | 31 ++++++++-----------
 .../includes/question_editing_frame.html      |  8 ++---
 .../jinja2/questions/question_details.html    |  2 +-
 .../sumo/jinja2/includes/common_macros.html   |  7 ++++-
 kitsune/sumo/static/sumo/js/aaq.js            | 25 +++++++++++----
 kitsune/sumo/static/sumo/js/browserdetect.js  |  2 +-
 kitsune/sumo/static/sumo/js/questions.js      |  5 +--
 .../scss/components/_field-help-text.scss     |  5 +++
 .../static/sumo/scss/components/_index.scss   |  1 +
 17 files changed, 82 insertions(+), 43 deletions(-)
 create mode 100644 kitsune/sumo/static/sumo/scss/components/_field-help-text.scss

diff --git a/kitsune/forums/jinja2/forums/edit_post.html b/kitsune/forums/jinja2/forums/edit_post.html
index 5788f540fe2..35fc72f58c5 100644
--- a/kitsune/forums/jinja2/forums/edit_post.html
+++ b/kitsune/forums/jinja2/forums/edit_post.html
@@ -21,7 +21,7 @@ <h1>{{ _('Edit a post') }}</h1>
       <div class="form-widget{% if form.content.errors %} invalid{% endif %}">
         {{ form.content.label_tag()|safe }}
         <div class="content-box">
-          {{ content_editor(form.content) }}
+          {{ content_editor(form.content, mention_rules=true) }}
         </div>
       </div>
 
diff --git a/kitsune/forums/jinja2/forums/new_thread.html b/kitsune/forums/jinja2/forums/new_thread.html
index bfcaee1dd42..d88d5c7c7b0 100644
--- a/kitsune/forums/jinja2/forums/new_thread.html
+++ b/kitsune/forums/jinja2/forums/new_thread.html
@@ -28,7 +28,7 @@ <h1 class="sumo-page-heading">{{ _('Create a new thread') }}</h1>
           {{ field.label_tag()|safe }}
           {% if field.name == 'content' %}
             <div class="content-box">
-              {{ content_editor(field) }}
+              {{ content_editor(field, mention_rules=true) }}
             </div>
           {% else %}
             {{ field|safe }}
diff --git a/kitsune/forums/jinja2/forums/posts.html b/kitsune/forums/jinja2/forums/posts.html
index bdc6e7b0dc4..9c8a5fa6776 100644
--- a/kitsune/forums/jinja2/forums/posts.html
+++ b/kitsune/forums/jinja2/forums/posts.html
@@ -68,7 +68,7 @@ <h3 class="sumo-card-heading" id="thread-reply-title">{{ _('Post a reply') }}</h
         {% endif %}
 
         <div id="thread-reply">
-          {{ content_editor(form.content) }}
+          {{ content_editor(form.content, mention_rules=true) }}
         </div>
         <div class="editor-actions sumo-button-wrap reverse-on-desktop align-end">
           <button type="submit" class="sumo-button primary-button">{{ _('Post Reply') }}</button>
diff --git a/kitsune/kbforums/jinja2/kbforums/edit_post.html b/kitsune/kbforums/jinja2/kbforums/edit_post.html
index 7c89c6cec76..840df9b53cb 100644
--- a/kitsune/kbforums/jinja2/kbforums/edit_post.html
+++ b/kitsune/kbforums/jinja2/kbforums/edit_post.html
@@ -22,7 +22,7 @@ <h1 class="sumo-page-subheading">{{ _('Edit a post') }}</h1>
       <div class="form-widget{% if form.content.errors %} invalid{% endif %}">
         {{ form.content.label_tag()|safe }}
         <div class="content-box">
-          {{ content_editor(form.content) }}
+          {{ content_editor(form.content, mention_rules=true) }}
         </div>
       </div>
 
diff --git a/kitsune/kbforums/jinja2/kbforums/new_thread.html b/kitsune/kbforums/jinja2/kbforums/new_thread.html
index 7fddd4d6c52..f3dee8ec2eb 100644
--- a/kitsune/kbforums/jinja2/kbforums/new_thread.html
+++ b/kitsune/kbforums/jinja2/kbforums/new_thread.html
@@ -30,7 +30,7 @@ <h1 class="sumo-page-subheading">{{ _('Create a new thread') }}</h1>
           {{ field.label_tag()|safe }}
           {% if field.name == 'content' %}
             <div class="content-box">
-              {{ content_editor(field) }}
+              {{ content_editor(field, mention_rules=true) }}
             </div>
           {% else %}
             {{ field|safe }}
diff --git a/kitsune/kbforums/jinja2/kbforums/posts.html b/kitsune/kbforums/jinja2/kbforums/posts.html
index ce7f94c683d..c4a0656a72c 100644
--- a/kitsune/kbforums/jinja2/kbforums/posts.html
+++ b/kitsune/kbforums/jinja2/kbforums/posts.html
@@ -92,7 +92,7 @@ <h3 class="sumo-page-subheading" id="thread-reply-title">{{ _('Post a reply') }}
           {% endif %}
 
           <div id="thread-reply">
-            {{ content_editor(form.content) }}
+            {{ content_editor(form.content, mention_rules=true) }}
           </div>
 
           <div class="editor-actions sumo-button-wrap reverse-on-desktop align-end">
diff --git a/kitsune/questions/forms.py b/kitsune/questions/forms.py
index cc0b84113b5..957fa8e1089 100644
--- a/kitsune/questions/forms.py
+++ b/kitsune/questions/forms.py
@@ -43,9 +43,12 @@
     ("EVERY_TIME", _lazy("Every time Firefox opened")),
 ]
 STARTED_LABEL = _lazy("This started when...")
-TITLE_LABEL = _lazy("Subject")
+TITLE_LABEL = _lazy("Summarize your question")
+TITLE_HELP_TEXT = _lazy("Please summarize your question in one sentence:")
 CONTENT_LABEL = _lazy("How can we help?")
+CONTENT_HELP_TEXT = _lazy('Please include as much detail as possible. Also, remember to follow our <a href="https://support.mozilla.org/kb/mozilla-support-rules-guidelines" target="_blank">rules and guidelines</a>.')
 FF_VERSION_LABEL = _lazy("Firefox version")
+TB_VERSION_LABEL = _lazy("Thunderbird version")
 OS_LABEL = _lazy("Operating system")
 PLUGINS_LABEL = _lazy("Installed plugins")
 ADDON_LABEL = _lazy("Extension/plugin you are having trouble with")
@@ -60,9 +63,9 @@
 class EditQuestionForm(forms.ModelForm):
     """Form to edit an existing question"""
 
-    title = forms.CharField(label=TITLE_LABEL, min_length=5)
+    title = forms.CharField(label=TITLE_LABEL, help_text=TITLE_HELP_TEXT, min_length=5)
 
-    content = forms.CharField(label=CONTENT_LABEL, min_length=5, widget=forms.Textarea())
+    content = forms.CharField(label=CONTENT_LABEL, help_text=CONTENT_HELP_TEXT, min_length=5, widget=forms.Textarea())
 
     class Meta:
         model = Question
@@ -75,6 +78,7 @@ def __init__(self, product=None, *args, **kwargs):
         form fields to include depend on the selected product/category.
         """
         super().__init__(*args, **kwargs)
+        self.label_suffix = None
 
         #  Extra fields required by product/category selected
         extra_fields = []
@@ -89,6 +93,12 @@ def __init__(self, product=None, *args, **kwargs):
                 required=False,
             )
 
+        if "tb_version" in extra_fields:
+            self.fields["tb_version"] = forms.CharField(
+                label=TB_VERSION_LABEL,
+                required=False,
+            )
+
         if "os" in extra_fields:
             self.fields["os"] = forms.CharField(
                 label=OS_LABEL,
@@ -110,6 +120,15 @@ def __init__(self, product=None, *args, **kwargs):
             if not field.required:
                 field.label_suffix = _lazy(" (optional):")
 
+        for name, field in self.fields.items():
+            if field.help_text:
+                bound = self[name]
+                bound.help_id = f"{bound.id_for_label}_help"
+                if field.widget.attrs.get("aria-describedby"):
+                    field.widget.attrs["aria-describedby"] += " " + bound.help_id
+                else:
+                    field.widget.attrs["aria-describedby"] = bound.help_id
+
     def clean_content(self):
         """Validate that content field contains actual text, not just HTML markup."""
         content = self.cleaned_data.get("content", "")
diff --git a/kitsune/questions/jinja2/questions/edit_answer.html b/kitsune/questions/jinja2/questions/edit_answer.html
index db6f73eb700..1c72963effd 100644
--- a/kitsune/questions/jinja2/questions/edit_answer.html
+++ b/kitsune/questions/jinja2/questions/edit_answer.html
@@ -49,7 +49,7 @@ <h2 class="sumo-page-heading">{{ _('Edit an answer') }}</h2>
           {{ errorlist(form) }}
 
           <div class="form-widget{% if form.content.errors %} invalid{% endif %}">
-            {{ content_editor(form.content) }}
+            {{ content_editor(form.content, mention_rules=true) }}
           </div>
 
           {{ attachments_form('questions.Answer', answer.pk, answer.images.all(), settings, request.user) }}
diff --git a/kitsune/questions/jinja2/questions/includes/aaq_macros.html b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
index f44697a37a8..b106f6fbfc6 100644
--- a/kitsune/questions/jinja2/questions/includes/aaq_macros.html
+++ b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
@@ -190,24 +190,19 @@ <h2 class="sumo-page-subheading">{{ _('Topics') }}</h2>
 
 {% macro troubleshooting_instructions(field) %}
   <div>
-    <div id="api-section">
-      <div id="troubleshooting-button" class="sumo-button-wrap">
-        <button class="sumo-button" id="share-data" type="button">
-          {{ _('Share Data') }}
-        </button>
-      </div>
-      <p id="troubleshooting-manual" class="hide-until-expanded">
-        {% trans %}
-          We can't automatically get your browser's troubleshooting data, please
-          <a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox">try these manual steps</a>.
-        {% endtrans %}
-      </p>
-      <div id="troubleshooting-field" class="hide-until-expanded field full-width">
-        {{ field }}
-      </div>
-      <p>
-        {{ _('This information gives details about the internal workings of your browser that will help in answering your question.') }}
-      </p>
+    <div id="troubleshooting-button" class="sumo-button-wrap">
+      <button class="sumo-button" id="share-data" type="button" aria-describedby="{{ field.help_id }}">
+        {{ _('Share Data') }}
+      </button>
+    </div>
+    <div id="troubleshooting-manual" class="hide-until-expanded" class="field-help-text">
+      {% trans %}
+        We can't automatically get your browser's troubleshooting data, please
+        <a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox">try these manual steps</a>.
+      {% endtrans %}
+    </div>
+    <div id="troubleshooting-field" class="hide-until-expanded field full-width">
+      {{ field }}
     </div>
   </div>
 {% endmacro %}
diff --git a/kitsune/questions/jinja2/questions/includes/question_editing_frame.html b/kitsune/questions/jinja2/questions/includes/question_editing_frame.html
index d5c49681dfb..19a079c9f14 100644
--- a/kitsune/questions/jinja2/questions/includes/question_editing_frame.html
+++ b/kitsune/questions/jinja2/questions/includes/question_editing_frame.html
@@ -127,9 +127,13 @@ <h1 class="sumo-page-heading">{% block headline %}{% endblock %}</h1>
 
                   <li class="{{ li_class }} {% if field.errors %}has-error invalid{% endif %} cf">
                     {{ field.label_tag()|safe }}
+                    {% if field.help_text and field.name != 'troubleshooting' %}
+                      <div id="{{ field.help_id }}" class="field-help-text">{{ field.help_text|safe }}</div>
+                    {% endif %}
                     {% if field.name == 'content' %}
                       {{ content_editor(field) }}
                     {% elif field.name == 'troubleshooting' %}
+                      <div id="{{ field.help_id }}">{{ field.help_text|safe }}</div>
                       {{ troubleshooting_instructions(field) }}
                     {% elif field.name == 'description' and is_loginless %}
                       <label for="{{ field.id_for_label }}">
@@ -148,10 +152,6 @@ <h1 class="sumo-page-heading">{% block headline %}{% endblock %}</h1>
                       {{ field|safe }}
                     {% endif %}
 
-                    {% if field.help_text and field.name != 'troubleshooting' %}
-                      <p>{{ field.help_text|safe }}</p>
-                    {% endif %}
-
                     {% if field.name != 'content' %}
                       {{ field.errors }}
                     {% endif %}
diff --git a/kitsune/questions/jinja2/questions/question_details.html b/kitsune/questions/jinja2/questions/question_details.html
index 18565c71914..8b2f887e0d8 100644
--- a/kitsune/questions/jinja2/questions/question_details.html
+++ b/kitsune/questions/jinja2/questions/question_details.html
@@ -262,7 +262,7 @@ <h3 class="sumo-card-heading">{{ _('Post a Reply') }}</h3>
           {{ errorlist(form) }}
 
           <div class="main-content">
-            {{ content_editor(form.content) }}
+            {{ content_editor(form.content, mention_rules=true) }}
             {% if question.needs_info %}
             <div class="field checkbox">
               <input id="id_info_provided" type="checkbox" name="clear_needsinfo" {% if user == question.creator %}checked="checked"{% endif %}>
diff --git a/kitsune/sumo/jinja2/includes/common_macros.html b/kitsune/sumo/jinja2/includes/common_macros.html
index 45490a0a436..873878495e8 100644
--- a/kitsune/sumo/jinja2/includes/common_macros.html
+++ b/kitsune/sumo/jinja2/includes/common_macros.html
@@ -671,7 +671,12 @@ <h4 class="mzp-c-menu-item-title">{{ _('Inbox') }}</h4>
 </li>
 {% endmacro %}
 
-{% macro content_editor(field) %}
+{% macro content_editor(field, mention_rules=false) %}
+{% if mention_rules %}
+  <div class="field-help-text">{% trans a_open='<a href="https://support.mozilla.org/kb/mozilla-support-rules-guidelines" target="_blank">'|safe, a_close='</a>'|safe %}
+    Remember to follow our {{ a_open }}rules and guidelines{{ a_close }}.
+  {% endtrans %}</div>
+{% endif %}
 <div class="field has-large-textarea editor{% if field.errors %} invalid{% endif %}"
   data-media-search-url="{{ url('gallery.async') }}" data-media-gallery-url="{{ url('gallery.home') }}">
   <div class="editor-tools"></div>
diff --git a/kitsune/sumo/static/sumo/js/aaq.js b/kitsune/sumo/static/sumo/js/aaq.js
index 18d552b53cc..8a26e3e0a81 100644
--- a/kitsune/sumo/static/sumo/js/aaq.js
+++ b/kitsune/sumo/static/sumo/js/aaq.js
@@ -7,7 +7,7 @@ import RemoteTroubleshooting from "./remote";
 
 export default class AAQSystemInfo {
   static slugs = {
-    desktop: ["/firefox/", "/firefox-enterprise/"],
+    desktop: ["/firefox/", "/firefox-enterprise/", "/thunderbird/"],
     mobile: ["/mobile/", "/ios/", "/focus-firefox/", "/thunderbird-android/"],
   };
 
@@ -15,7 +15,10 @@ export default class AAQSystemInfo {
     this.form = form;
 
     // Autofill the user agent
-    form.querySelector('input[name="useragent"]').value = navigator.userAgent;
+    let userAgentInput = form.querySelector('input[name="useragent"]');
+    if (userAgentInput) {
+      userAgentInput.value = navigator.userAgent;
+    }
 
     this.setupTroubleshootingInfo();
   }
@@ -36,10 +39,13 @@ export default class AAQSystemInfo {
 
     this.form.querySelector('input[name="os"]').value = platform.toString();
 
-    const browser = await detect.getBrowser();
-    if (browser.mozilla) {
-      this.form.querySelector('input[name="ff_version"]').value =
-        browser.version.toString();
+    let ffVersionField = this.form.querySelector('input[name="ff_version"]');
+    if (ffVersionField) {
+      const browser = await detect.getBrowser();
+      if (browser.mozilla) {
+        ffVersionField.value =
+          browser.version.toString();
+      }
     }
   }
 
@@ -66,6 +72,13 @@ export default class AAQSystemInfo {
             "none";
           this.form.querySelector("#troubleshooting-manual").style.display =
             "block";
+          let widget = this.form.querySelector("#id_troubleshooting");
+          const widget_ariaDescribedby = widget.getAttribute("aria-describedby");
+          if (widget_ariaDescribedby) {
+            widget.setAttribute("aria-describedby", widget_ariaDescribedby + " troubleshooting-manual");
+          } else {
+            widget.setAttribute("aria-describedby", "troubleshooting-manual");
+          }
         }
         this.form.querySelector("#troubleshooting-field").style.display =
           "block";
diff --git a/kitsune/sumo/static/sumo/js/browserdetect.js b/kitsune/sumo/static/sumo/js/browserdetect.js
index c7a6d147120..862361ccc96 100644
--- a/kitsune/sumo/static/sumo/js/browserdetect.js
+++ b/kitsune/sumo/static/sumo/js/browserdetect.js
@@ -69,7 +69,7 @@ class OS {
       "nt 6.2": "8",
       "nt 6.3": "8.1",
       "nt 6.4": "10",
-      "nt 10.0": "10",
+      "nt 10.0": "10/11",
     },
   };
 }
diff --git a/kitsune/sumo/static/sumo/js/questions.js b/kitsune/sumo/static/sumo/js/questions.js
index f49c63131d8..43af622c863 100644
--- a/kitsune/sumo/static/sumo/js/questions.js
+++ b/kitsune/sumo/static/sumo/js/questions.js
@@ -86,7 +86,7 @@ function init() {
     new AjaxPreview($('#preview'));
   }
 
-  Marky.createSimpleToolbar('.editor-tools', '#reply-content, #id_content', {cannedResponses: !$body.is('.new-question')});
+  Marky.createSimpleToolbar('.editor-tools', '#reply-content, #id_content', {cannedResponses: !$body.is('.new-question') && !$body.is('.edit-question')});
 
   // product selector page reloading
   $('#product-selector select').on('change', function() {
@@ -114,10 +114,11 @@ function init() {
 function initQuestion(action) {
   const questionForm = document.querySelector('#question-form');
   if (!questionForm) return;
+  let aaq = new AAQSystemInfo(questionForm);
   if (action === "editing") {
     questionForm.querySelector("#troubleshooting-field").style.display = "block";
   } else {
-    new AAQSystemInfo(questionForm).fillDetails();
+    aaq.fillDetails();
     hideDetails(questionForm);
   }
 }
diff --git a/kitsune/sumo/static/sumo/scss/components/_field-help-text.scss b/kitsune/sumo/static/sumo/scss/components/_field-help-text.scss
new file mode 100644
index 00000000000..67bacb2eb2e
--- /dev/null
+++ b/kitsune/sumo/static/sumo/scss/components/_field-help-text.scss
@@ -0,0 +1,5 @@
+@use 'protocol/css/includes/lib' as p;
+
+.field-help-text {
+  margin-bottom: p.$spacing-sm;
+}
\ No newline at end of file
diff --git a/kitsune/sumo/static/sumo/scss/components/_index.scss b/kitsune/sumo/static/sumo/scss/components/_index.scss
index fa33f8de11e..da75f634863 100644
--- a/kitsune/sumo/static/sumo/scss/components/_index.scss
+++ b/kitsune/sumo/static/sumo/scss/components/_index.scss
@@ -21,6 +21,7 @@
 @forward 'progress-bar';
 @forward 'dashboards';
 @forward 'flaggit';
+@forward 'field-help-text';
 
 // for https://support.mozilla.org/en-US/kb/dashboard/metrics/aggregated
 @forward 'jqueryui';

From b8a3e48c94e3606885e700f79f40c7e1220ec47a Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Mon, 8 Dec 2025 20:19:05 +0100
Subject: [PATCH 02/13] Fix OS detecting

---
 kitsune/sumo/static/sumo/js/browserdetect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kitsune/sumo/static/sumo/js/browserdetect.js b/kitsune/sumo/static/sumo/js/browserdetect.js
index 862361ccc96..f7341f8e2f7 100644
--- a/kitsune/sumo/static/sumo/js/browserdetect.js
+++ b/kitsune/sumo/static/sumo/js/browserdetect.js
@@ -260,7 +260,7 @@ export default class BrowserDetect {
 
   async getOS() {
     let os = await this.uaDetector.os();
-    if (os.name === "Windows" && os.version === "10") {
+    if (os.name === "Windows" && os.version === "10/11") {
       // could be windows 11
       let browser = await this.uaDetector.browser();
       if (browser.mozilla && !os.mobile) {

From de9543e55f24da35ff538cace6c7bf2e0c76b606 Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Mon, 8 Dec 2025 20:50:06 +0100
Subject: [PATCH 03/13] Fix win10 detection & Update browserdetecttests.js

---
 kitsune/sumo/static/sumo/js/browserdetect.js            | 4 ++++
 kitsune/sumo/static/sumo/js/tests/browserdetecttests.js | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kitsune/sumo/static/sumo/js/browserdetect.js b/kitsune/sumo/static/sumo/js/browserdetect.js
index f7341f8e2f7..094c55fb789 100644
--- a/kitsune/sumo/static/sumo/js/browserdetect.js
+++ b/kitsune/sumo/static/sumo/js/browserdetect.js
@@ -234,6 +234,10 @@ export class TroubleshootingDetector extends GenericDetector {
       os.name = "Windows";
       os.version = "11";
     }
+    else if (osVersion.includes("Windows_NT 10.0")) {
+      os.name = "Windows";
+      os.version = "10";
+    }
     return os;
   }
 
diff --git a/kitsune/sumo/static/sumo/js/tests/browserdetecttests.js b/kitsune/sumo/static/sumo/js/tests/browserdetecttests.js
index c164cf2cb8e..7644ff78383 100644
--- a/kitsune/sumo/static/sumo/js/tests/browserdetecttests.js
+++ b/kitsune/sumo/static/sumo/js/tests/browserdetecttests.js
@@ -42,7 +42,7 @@ describe("BrowserDetect", () => {
       },
       os: {
         name: "Windows",
-        version: "10",
+        version: "10/11",
       },
     },
     {
@@ -264,7 +264,7 @@ describe("BrowserDetect", () => {
       },
       os: {
         name: "Windows",
-        version: "10",
+        version: "10/11",
       },
     },
     {

From b7a3ea896ab957089d4f2bdd72b4cecb67b15092 Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Mon, 8 Dec 2025 21:05:35 +0100
Subject: [PATCH 04/13] Handle osVersion === undefined

---
 kitsune/sumo/static/sumo/js/browserdetect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kitsune/sumo/static/sumo/js/browserdetect.js b/kitsune/sumo/static/sumo/js/browserdetect.js
index 094c55fb789..963f61e73e3 100644
--- a/kitsune/sumo/static/sumo/js/browserdetect.js
+++ b/kitsune/sumo/static/sumo/js/browserdetect.js
@@ -234,7 +234,7 @@ export class TroubleshootingDetector extends GenericDetector {
       os.name = "Windows";
       os.version = "11";
     }
-    else if (osVersion.includes("Windows_NT 10.0")) {
+    else if (osVersion?.includes("Windows_NT 10.0")) {
       os.name = "Windows";
       os.version = "10";
     }

From d5c5154c83d4c3f34926d3ff7e77daf8ddc9d16b Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Tue, 9 Dec 2025 09:33:04 +0100
Subject: [PATCH 05/13] Add a placeholder for tb_version

---
 kitsune/questions/forms.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kitsune/questions/forms.py b/kitsune/questions/forms.py
index 957fa8e1089..77e7ef3dff2 100644
--- a/kitsune/questions/forms.py
+++ b/kitsune/questions/forms.py
@@ -49,6 +49,7 @@
 CONTENT_HELP_TEXT = _lazy('Please include as much detail as possible. Also, remember to follow our <a href="https://support.mozilla.org/kb/mozilla-support-rules-guidelines" target="_blank">rules and guidelines</a>.')
 FF_VERSION_LABEL = _lazy("Firefox version")
 TB_VERSION_LABEL = _lazy("Thunderbird version")
+TB_VERSION_PLACEHOLDER = _lazy("e.g., 140.5.0esr, 146.1.0 release or 147.0b4")
 OS_LABEL = _lazy("Operating system")
 PLUGINS_LABEL = _lazy("Installed plugins")
 ADDON_LABEL = _lazy("Extension/plugin you are having trouble with")
@@ -97,6 +98,7 @@ def __init__(self, product=None, *args, **kwargs):
             self.fields["tb_version"] = forms.CharField(
                 label=TB_VERSION_LABEL,
                 required=False,
+                widget=forms.TextInput(attrs={"placeholder": TB_VERSION_PLACEHOLDER}),
             )
 
         if "os" in extra_fields:

From fc40affc3a1c893e0ee31aee1aa30969e7a6dd71 Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Wed, 17 Dec 2025 15:52:09 +0100
Subject: [PATCH 06/13] Revert "Merge branch 'main' into improve-aaq-3"

This reverts commit 79e9d8ac70c9955d2aa65a7163726a297f5254f2, reversing
changes made to d5c5154c83d4c3f34926d3ff7e77daf8ddc9d16b.
---
 .../0009_alter_announcement_options.py        |  17 -
 kitsune/customercare/forms.py                 |  78 ++---
 .../0003_alter_supportticket_status.py        |  18 --
 kitsune/customercare/models.py                |   9 +-
 kitsune/customercare/tests/test_forms.py      | 139 ++------
 kitsune/customercare/zendesk.py               |   3 +-
 kitsune/products/admin.py                     | 110 -------
 .../commands/sync_product_versions.py         |  30 +-
 kitsune/products/managers.py                  |  11 +-
 ...desktopic_productsupportconfig_and_more.py |  72 -----
 .../0029_populate_zendesk_configs.py          | 117 -------
 kitsune/products/models.py                    | 169 +---------
 kitsune/products/tests/__init__.py            |  44 +--
 .../tests/test_sync_product_versions.py       |  69 +---
 kitsune/questions/admin.py                    |   1 -
 .../questions/email/new_answer_to_asker.html  |   2 +-
 .../jinja2/questions/includes/aaq_macros.html |  38 +--
 kitsune/sumo/templatetags/jinja_helpers.py    |   7 +-
 .../jinja2/wiki/confirm_revision_delete.html  |   2 +-
 .../jinja2/wiki/includes/document_macros.html |   2 +-
 kitsune/wiki/services.py                      |  13 +-
 kitsune/wiki/tests/test_services.py           |   2 +-
 kitsune/wiki/tests/test_templates.py          |   2 +-
 playwright_tests/core/basepage.py             |   6 +-
 playwright_tests/core/utilities.py            |  17 +-
 .../aaq_flows/aaq_flow.py                     |  99 +-----
 .../article_flows/add_kb_article_flow.py      | 122 +++++--
 .../AAQ_messages/aaq_form_page_messages.py    |   4 +-
 .../kb_translation_messages.py                |   2 +-
 .../ask_a_question/aaq_pages/aaq_form_page.py |  60 ++--
 .../contact_support_page.py                   |  13 +-
 .../posted_question_pages/questions_page.py   | 209 +++++++++---
 .../product_solutions_page.py                 |  35 ++-
 .../product_topics_page.py                    |  11 +-
 playwright_tests/pages/auth_page.py           |   2 +-
 .../common_elements/common_web_elements.py    |  29 +-
 .../forums_pages/all_community_forums_page.py |   9 +-
 .../forums_pages/product_support_forum.py     |  25 +-
 .../contribute_pages/contribute_page.py       |  23 +-
 .../contributor_discussions_page.py           |  19 +-
 .../delete_thread_post_page.py                |   8 +-
 .../edit_thread_post_page.py                  |   8 +-
 .../edit_thread_title_page.py                 |   8 +-
 .../forum_discussions_page.py                 |  12 +-
 .../forum_thread_page.py                      |  25 +-
 .../new_thread_page.py                        |   4 +-
 .../ways_to_contribute_pages.py               |  17 +-
 .../article_discussions_page.py               |   6 +-
 .../community_hub_page.py                     |   7 +-
 .../kb_dashboard_page.py                      |  11 +-
 .../l10n_most_visited_translations.py         |   8 +-
 .../l10n_unreviewed.py                        |   8 +-
 .../moderate_forum_content.py                 |  19 +-
 .../recent_revisions_page.py                  |  43 +--
 .../pages/contribute/groups_page.py           |  41 ++-
 .../articles/kb_article_discussion_page.py    |  60 +++-
 .../articles/kb_article_page.py               |  25 +-
 .../kb_article_review_revision_page.py        |  11 +-
 .../articles/kb_article_show_history_page.py  |  15 +-
 .../articles/kb_category_page.py              |   8 +-
 .../articles/kb_edit_article_meta.py          |   5 +-
 .../articles/kb_edit_article_page.py          |  21 +-
 .../articles/kb_revision_preview_page.py      |  56 +++-
 .../articles/kb_translate_article_page.py     |  21 +-
 .../articles/kb_what_links_here_page.py       |   5 +-
 .../articles/products_page.py                 |  14 +-
 .../articles/submit_kb_article_page.py        |  32 +-
 .../explore_by_topic_page.py                  |  30 +-
 .../product_support_page.py                   |  15 +-
 playwright_tests/pages/footer.py              |   7 +-
 playwright_tests/pages/homepage.py            |  11 +-
 .../messaging_system_pages/inbox_page.py      |  26 ++
 .../mess_system_user_navbar.py                |  21 +-
 .../messaging_system_pages/new_message.py     |  22 +-
 .../messaging_system_pages/sent_messages.py   |  33 +-
 playwright_tests/pages/search/search_page.py  |  27 +-
 playwright_tests/pages/top_navbar.py          |  69 ++--
 .../user_pages/my_profile_answers_page.py     |   4 +-
 .../user_pages/my_profile_documents_page.py   |  11 +-
 .../pages/user_pages/my_profile_edit.py       |  19 +-
 ...my_profile_edit_contribution_areas_page.py |  11 +-
 .../my_profile_edit_settings_page.py          |  11 +-
 .../my_profile_my_questions_page.py           |  22 +-
 .../pages/user_pages/my_profile_page.py       |  51 ++-
 .../user_pages/my_profile_user_navbar.py      |   5 +-
 playwright_tests/test_data/aaq_question.json  |   7 +-
 .../test_data/add_kb_article.json             |  12 +-
 .../aaq_tests/test_aaq_form_page.py           | 113 ++++---
 .../aaq_tests/test_anti_spam_measures.py      |  19 +-
 .../aaq_tests/test_posted_questions.py        | 297 ++++++++++--------
 .../test_community_forums_by_product.py       |  23 +-
 .../test_popular_topics_page.py               |   1 -
 playwright_tests/tests/conftest.py            |  24 +-
 .../test_contributor_discussions_page.py      |  19 +-
 .../test_contributor_discussions_threads.py   |  68 ++--
 .../dashboards_tests/test_kb_dashboard.py     | 161 ++++++----
 .../test_recent_revisions_dashboard.py        | 125 +++++---
 .../tests/contribute_tests/test_groups.py     |  18 +-
 .../articles/test_article_show_history.py     |  72 +++--
 .../articles/test_article_threads.py          | 154 +++++----
 .../articles/test_article_translation.py      |  49 +--
 .../test_kb_article_creation_and_access.py    | 132 ++++----
 .../articles/test_kb_restricted_visibility.py | 202 +++++++-----
 .../articles/test_product_support_page.py     |   2 +
 .../test_explore_by_topics.py                 |   5 +
 .../tests/footer_tests/test_footer.py         |   2 +
 .../tests/homepage_tests/test_homepage.py     |   8 +-
 .../test_messaging_system.py                  | 216 +++++++++----
 .../test_contributor_forums_seach.py          |   5 +-
 .../tests/search_tests/test_main_searchbar.py |  99 ++++--
 .../test_top_navbar.py                        |  20 +-
 .../test_user_deletion_in_community_forums.py |  60 +++-
 ...est_user_deletion_in_contributor_forums.py |  14 +-
 ...user_deletion_and_article_contributions.py |  29 +-
 .../test_user_deletion_in_media_gallery.py    |   2 +
 .../test_user_deletion_in_messaging_system.py |   5 +-
 .../test_edit_contribution_areas.py           |   4 +
 .../user_page_tests/test_edit_my_profile.py   | 183 +++++++----
 .../user_page_tests/test_my_profile_page.py   | 110 ++++---
 .../user_page_tests/test_my_questions.py      |  53 ++--
 120 files changed, 2532 insertions(+), 2314 deletions(-)
 delete mode 100644 kitsune/announcements/migrations/0009_alter_announcement_options.py
 delete mode 100644 kitsune/customercare/migrations/0003_alter_supportticket_status.py
 delete mode 100644 kitsune/products/migrations/0028_zendeskconfig_zendesktopic_productsupportconfig_and_more.py
 delete mode 100644 kitsune/products/migrations/0029_populate_zendesk_configs.py

diff --git a/kitsune/announcements/migrations/0009_alter_announcement_options.py b/kitsune/announcements/migrations/0009_alter_announcement_options.py
deleted file mode 100644
index 31f1e9b5058..00000000000
--- a/kitsune/announcements/migrations/0009_alter_announcement_options.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 4.2.25 on 2025-12-03 03:01
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('announcements', '0008_announcement_product'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='announcement',
-            options={'ordering': ['-created']},
-        ),
-    ]
diff --git a/kitsune/customercare/forms.py b/kitsune/customercare/forms.py
index 27328df1205..3b6c80af6e6 100644
--- a/kitsune/customercare/forms.py
+++ b/kitsune/customercare/forms.py
@@ -6,9 +6,11 @@
 from django.core.validators import validate_email
 from django.utils.translation import gettext_lazy as _lazy
 
+from kitsune.customercare import ZENDESK_CATEGORIES, ZENDESK_CATEGORIES_LOGINLESS
 from kitsune.customercare.models import SupportTicket
 from kitsune.products import PRODUCT_SLUG_ALIASES
-from kitsune.products.models import ProductSupportConfig, ZendeskTopic
+
+PRODUCTS_WITH_OS = ["mozilla-vpn"]
 
 OS_CHOICES = [
     (None, _lazy("Select platform")),
@@ -49,37 +51,23 @@ def __init__(self, *args, product, user=None, **kwargs):
         self.product = product
         self.user = user
 
-        is_loginless = product.slug in settings.LOGIN_EXCEPTIONS and (
-            not user or not user.is_authenticated
-        )
-
-        if is_loginless:
+        if product.slug in settings.LOGIN_EXCEPTIONS and (not user or not user.is_authenticated):
             self.fields["email"].widget = forms.EmailInput()
+            categories_dict = ZENDESK_CATEGORIES_LOGINLESS
         else:
             self.fields["email"].initial = user.email
+            categories_dict = ZENDESK_CATEGORIES
 
-        try:
-            support_config = ProductSupportConfig.objects.get(product=product, is_active=True)
-        except ProductSupportConfig.DoesNotExist:
-            support_config = None
-
-        if support_config and support_config.zendesk_config:
-            zendesk_config = support_config.zendesk_config
+        self.product_categories = categories_dict.get(product.slug, [])
 
-            topics = zendesk_config.topics.filter(loginless_only=is_loginless).order_by(
-                "display_order"
-            )
-
-            category_choices = [(None, _lazy("Select a reason for contacting"))]
-            for topic in topics:
-                category_choices.append((topic.slug, topic.topic))
-
-            self.fields["category"].choices = category_choices
-
-            if not zendesk_config.enable_os_field:
-                self.fields["os"].widget = forms.HiddenInput()
+        category_choices = [(None, _lazy("Select a reason for contacting"))]
+        for category in self.product_categories:
+            category_choices.append((category["slug"], category["topic"]))
 
+        self.fields["category"].choices = category_choices
         self.label_suffix = ""
+        if product.slug not in PRODUCTS_WITH_OS:
+            self.fields["os"].widget = forms.HiddenInput()
 
     def clean_email(self):
         email = self.cleaned_data.get("email")
@@ -108,31 +96,22 @@ def send(self, user, product):
         """Create a SupportTicket record and trigger async classification."""
         selected_category_slug = self.cleaned_data.get("category")
         zendesk_tags = []
-
         if selected_category_slug:
-            try:
-                support_config = ProductSupportConfig.objects.get(product=product, is_active=True)
-            except ProductSupportConfig.DoesNotExist:
-                support_config = None
-
-            if support_config and support_config.zendesk_config:
-                try:
-                    topic = ZendeskTopic.objects.get(
-                        zendesk_config=support_config.zendesk_config,
-                        slug=selected_category_slug,
-                    )
-                except ZendeskTopic.DoesNotExist:
-                    topic = None
-
-                if topic:
-                    tag_data = topic.tags_dict
-
-                    for tag_value in tag_data.values():
-                        if tag_value:
-                            if isinstance(tag_value, list):
-                                zendesk_tags.extend(tag_value)
-                            else:
-                                zendesk_tags.append(tag_value)
+            selected_category_data = None
+            for category in self.product_categories:
+                if category["slug"] == selected_category_slug:
+                    selected_category_data = category
+                    break
+
+            if selected_category_data:
+                tag_data = selected_category_data["tags"]
+
+                for tag_value in tag_data.values():
+                    if tag_value:
+                        if isinstance(tag_value, list):
+                            zendesk_tags.extend(tag_value)
+                        else:
+                            zendesk_tags.append(tag_value)
 
         if settings.STAGE:
             zendesk_tags.append("stage")
@@ -150,6 +129,7 @@ def send(self, user, product):
             status=SupportTicket.STATUS_PENDING,
         )
 
+        # Trigger async classification task
         from kitsune.customercare.tasks import zendesk_submission_classifier
 
         zendesk_submission_classifier.delay(submission.id)
diff --git a/kitsune/customercare/migrations/0003_alter_supportticket_status.py b/kitsune/customercare/migrations/0003_alter_supportticket_status.py
deleted file mode 100644
index 465aec1b0f0..00000000000
--- a/kitsune/customercare/migrations/0003_alter_supportticket_status.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 4.2.25 on 2025-12-03 03:01
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('customercare', '0002_supportticket_topic'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='supportticket',
-            name='status',
-            field=models.CharField(choices=[('pending', 'Ticket Pending Classification'), ('sent', 'Ticket Sent'), ('flagged', 'Ticket under Review'), ('rejected', 'Ticket Rejected')], db_index=True, default='pending', max_length=20),
-        ),
-    ]
diff --git a/kitsune/customercare/models.py b/kitsune/customercare/models.py
index 9fe8f456a9b..d022a94187e 100644
--- a/kitsune/customercare/models.py
+++ b/kitsune/customercare/models.py
@@ -1,5 +1,6 @@
 from django.contrib.auth.models import User
 from django.db import models
+from django.utils.translation import gettext_lazy as _lazy
 
 from kitsune.products.models import Product, Topic
 from kitsune.sumo.models import ModelBase
@@ -14,10 +15,10 @@ class SupportTicket(ModelBase):
     STATUS_REJECTED = "rejected"
 
     STATUS_CHOICES = (
-        (STATUS_PENDING, "Ticket Pending Classification"),
-        (STATUS_SENT, "Ticket Sent"),
-        (STATUS_FLAGGED, "Ticket under Review"),
-        (STATUS_REJECTED, "Ticket Rejected"),
+        (STATUS_PENDING, _lazy("Pending")),
+        (STATUS_SENT, _lazy("Sent")),
+        (STATUS_FLAGGED, _lazy("Flagged for Review")),
+        (STATUS_REJECTED, _lazy("Rejected")),
     )
 
     subject = models.CharField(max_length=255)
diff --git a/kitsune/customercare/tests/test_forms.py b/kitsune/customercare/tests/test_forms.py
index 630acf400da..86e7defb2a1 100644
--- a/kitsune/customercare/tests/test_forms.py
+++ b/kitsune/customercare/tests/test_forms.py
@@ -2,14 +2,10 @@
 
 from django.contrib.auth.models import AnonymousUser
 
+from kitsune.customercare import ZENDESK_CATEGORIES, ZENDESK_CATEGORIES_LOGINLESS
 from kitsune.customercare.forms import ZendeskForm
 from kitsune.customercare.models import SupportTicket
-from kitsune.products.tests import (
-    ProductFactory,
-    ProductSupportConfigFactory,
-    ZendeskConfigFactory,
-    ZendeskTopicFactory,
-)
+from kitsune.products.tests import ProductFactory
 from kitsune.sumo.tests import TestCase
 from kitsune.users.tests import UserFactory
 
@@ -26,115 +22,16 @@ def setUp(self):
         )
         self.user = UserFactory(email="test@example.com")
 
-        # Create ZendeskConfig for VPN
-        self.vpn_zendesk = ZendeskConfigFactory(name="Mozilla VPN Support")
-        ZendeskTopicFactory(
-            zendesk_config=self.vpn_zendesk,
-            slug="vpn-connection-issues",
-            topic="I can't connect to Mozilla VPN",
-            display_order=0,
-            legacy_tag="technical",
-            tier_tags=[
-                "t1-performance-and-connectivity",
-                "t2-connectivity",
-                "t3-connection-failure",
-            ],
-            automation_tag="ssa-connection-issues-automation",
-            segmentation_tag="",
-            loginless_only=False,
-        )
-        ZendeskTopicFactory(
-            zendesk_config=self.vpn_zendesk,
-            slug="vpn-server-selection",
-            topic="I can't choose a VPN location",
-            display_order=1,
-            legacy_tag="technical",
-            tier_tags=[
-                "t1-performance-and-connectivity",
-                "t2-connectivity",
-                "t3-cant-select-server",
-            ],
-            loginless_only=False,
-        )
-        ZendeskTopicFactory(
-            zendesk_config=self.vpn_zendesk,
-            slug="payments",
-            topic="I need help with a billing or subscription question",
-            display_order=2,
-            legacy_tag="payments",
-            tier_tags=["t1-billing-and-subscriptions"],
-            automation_tag="",
-            segmentation_tag="",
-            loginless_only=False,
-        )
-        ProductSupportConfigFactory(
-            product=self.vpn_product, zendesk_config=self.vpn_zendesk, forum_config=None
-        )
-
-        # Create ZendeskConfig for Relay
-        self.relay_zendesk = ZendeskConfigFactory(name="Firefox Relay Support")
-        ZendeskTopicFactory(
-            zendesk_config=self.relay_zendesk,
-            slug="relay-email-forwarding",
-            topic="I'm not receiving emails to my Relay mask",
-            display_order=0,
-            legacy_tag="technical",
-            tier_tags=["t1-privacy-and-security", "t2-masking", "t3-email-masking"],
-            segmentation_tag="seg-relay-no-fwd-deliver",
-            loginless_only=False,
-        )
-        ZendeskTopicFactory(
-            zendesk_config=self.relay_zendesk,
-            slug="relay-domain-change",
-            topic="I want to change my Relay email domain",
-            display_order=1,
-            legacy_tag="technical",
-            tier_tags=["t1-privacy-and-security", "t2-masking", "t3-email-masking"],
-            segmentation_tag="seg-relay-chg-domain",
-            loginless_only=False,
-        )
-        ProductSupportConfigFactory(
-            product=self.relay_product, zendesk_config=self.relay_zendesk, forum_config=None
-        )
-
-        # Create ZendeskConfig for Mozilla Account with loginless topics
-        self.accounts_zendesk = ZendeskConfigFactory(name="Mozilla Account Support")
-        ZendeskTopicFactory(
-            zendesk_config=self.accounts_zendesk,
-            slug="fxa-2fa-lockout",
-            topic="My security code isn't working or is lost",
-            display_order=0,
-            legacy_tag="accounts",
-            tier_tags=[
-                "t1-passwords-and-sign-in",
-                "t2-two-factor-authentication",
-                "t3-two-factor-lockout",
-            ],
-            automation_tag="ssa-2fa-automation",
-            loginless_only=True,
-        )
-        ZendeskTopicFactory(
-            zendesk_config=self.accounts_zendesk,
-            slug="fxa-reset-password",
-            topic="I forgot my password",
-            display_order=1,
-            legacy_tag="accounts",
-            tier_tags=["t1-passwords-and-sign-in", "t2-reset-passwords"],
-            automation_tag="ssa-emailverify-automation",
-            loginless_only=True,
-        )
-        ProductSupportConfigFactory(
-            product=self.accounts_product, zendesk_config=self.accounts_zendesk, forum_config=None
-        )
-
     def test_authenticated_form_gets_correct_categories(self):
         """Test that authenticated users get product-specific categories."""
         form = ZendeskForm(product=self.vpn_product, user=self.user)
 
+        expected_categories = ZENDESK_CATEGORIES["mozilla-vpn"]
+        self.assertEqual(form.product_categories, expected_categories)
+
         category_topics = [choice[1] for choice in form.fields["category"].choices if choice[0]]
         self.assertIn("I can't connect to Mozilla VPN", category_topics)
         self.assertIn("I can't choose a VPN location", category_topics)
-        self.assertEqual(len(category_topics), 3)  # 3 topics for VPN
 
     def test_different_products_get_different_categories(self):
         """Test that different products get different categories."""
@@ -155,10 +52,12 @@ def test_loginless_form_gets_loginless_categories(self):
         anonymous_user = AnonymousUser()
         form = ZendeskForm(product=self.accounts_product, user=anonymous_user)
 
+        expected_categories = ZENDESK_CATEGORIES_LOGINLESS["mozilla-account"]
+        self.assertEqual(form.product_categories, expected_categories)
+
         category_topics = [choice[1] for choice in form.fields["category"].choices if choice[0]]
         self.assertIn("I forgot my password", category_topics)
         self.assertIn("My security code isn't working or is lost", category_topics)
-        self.assertEqual(len(category_topics), 2)  # 2 loginless topics for Mozilla Account
 
     def test_form_stores_product_and_user(self):
         """Test that form stores product and user for later use."""
@@ -288,7 +187,7 @@ def test_send_with_no_category_selected(self, mock_task):
         mock_task.assert_called_once_with(submission.id)
 
     def test_product_without_categories_gets_empty_choices(self):
-        """Test that products without ProductSupportConfig get no choices."""
+        """Test that products not in our categories dict get empty choices."""
         unknown_product = ProductFactory(
             title="Unknown Product", slug="unknown-product", codename="unknown"
         )
@@ -296,20 +195,26 @@ def test_product_without_categories_gets_empty_choices(self):
         form = ZendeskForm(product=unknown_product, user=self.user)
 
         category_choices = form.fields["category"].choices
-        # Without ProductSupportConfig, no categories are populated
-        self.assertEqual(len(category_choices), 0)
+        self.assertEqual(len(category_choices), 1)
+        self.assertEqual(category_choices[0][1], "Select a reason for contacting")
 
     def test_base_categories_are_properly_expanded(self):
-        """Test that topics are properly loaded from database."""
+        """Test that DRY base categories are properly expanded."""
         form = ZendeskForm(product=self.vpn_product, user=self.user)
 
-        category_choices = form.fields["category"].choices
-        category_dict = {slug: topic for slug, topic in category_choices if slug}
+        payments_category = None
+        for category in form.product_categories:
+            if category["slug"] == "payments":
+                payments_category = category
+                break
 
-        self.assertIn("payments", category_dict)
+        self.assertIsNotNone(payments_category)
         self.assertEqual(
-            category_dict["payments"], "I need help with a billing or subscription question"
+            payments_category["topic"], "I need help with a billing or subscription question"
         )
+        self.assertEqual(payments_category["tags"]["tiers"], ["t1-billing-and-subscriptions"])
+        self.assertIsNone(payments_category["tags"]["automation"])
+        self.assertIsNone(payments_category["tags"]["segmentation"])
 
     @patch("django.conf.settings.LOGIN_EXCEPTIONS", ["mozilla-account"])
     @patch("kitsune.customercare.tasks.zendesk_submission_classifier.delay")
diff --git a/kitsune/customercare/zendesk.py b/kitsune/customercare/zendesk.py
index 210929255bf..a3c83055879 100644
--- a/kitsune/customercare/zendesk.py
+++ b/kitsune/customercare/zendesk.py
@@ -1,10 +1,11 @@
 from django.conf import settings
+from django.utils.translation import gettext_lazy as _lazy
 from zenpy import Zenpy
 from zenpy.lib.api_objects import Identity as ZendeskIdentity
 from zenpy.lib.api_objects import Ticket
 from zenpy.lib.api_objects import User as ZendeskUser
 
-NO_RESPONSE = "No response provided."
+NO_RESPONSE = _lazy("No response provided.")
 LOGINLESS_TAG = "loginless_ticket"
 
 
diff --git a/kitsune/products/admin.py b/kitsune/products/admin.py
index 8ef5ea7b9da..c88254f66bf 100644
--- a/kitsune/products/admin.py
+++ b/kitsune/products/admin.py
@@ -8,13 +8,10 @@
 from kitsune.products.models import (
     Platform,
     Product,
-    ProductSupportConfig,
     ProductTopic,
     Topic,
     TopicSlugHistory,
     Version,
-    ZendeskConfig,
-    ZendeskTopic,
 )
 
 
@@ -78,7 +75,6 @@ class ProductAdmin(admin.ModelAdmin):
     readonly_fields = ("id",)
     prepopulated_fields = {"slug": ("title",)}
     list_filter = (ArchivedFilter,)
-    search_fields = ("title", "slug")
     form = MetadataForm
     autocomplete_fields = ("pinned_article_config",)
 
@@ -173,109 +169,3 @@ class TopicSlugHistoryAdmin(admin.ModelAdmin):
 admin.site.register(Topic, TopicAdmin)
 admin.site.register(Version, VersionAdmin)
 admin.site.register(TopicSlugHistory, TopicSlugHistoryAdmin)
-
-
-class ZendeskTopicInline(admin.StackedInline):
-    model = ZendeskTopic
-    extra = 1
-    classes = ("collapse",)
-    fields = (
-        "slug",
-        "topic",
-        "display_order",
-        "legacy_tag",
-        "tier_tags",
-        "automation_tag",
-        "segmentation_tag",
-        "loginless_only",
-    )
-
-
-class ZendeskTopicAdmin(admin.ModelAdmin):
-    list_display = ("topic", "zendesk_config", "slug", "display_order", "loginless_only")
-    list_display_links = ("topic", "slug")
-    list_editable = ("display_order",)
-    list_filter = ("zendesk_config", "loginless_only")
-    search_fields = ("topic", "slug", "zendesk_config__name")
-    prepopulated_fields = {"slug": ("topic",)}
-
-
-class ZendeskConfigAdmin(admin.ModelAdmin):
-    list_display = ("name", "ticket_form_id", "enable_os_field")
-    list_display_links = ("name",)
-    list_editable = ("enable_os_field",)
-    search_fields = ("name",)
-    inlines = [ZendeskTopicInline]
-
-
-class ProductSupportConfigAdmin(admin.ModelAdmin):
-    list_display = (
-        "product",
-        "is_active",
-        "enable_forum_support",
-        "enable_zendesk_support",
-        "is_hybrid",
-        "default_support_type",
-    )
-    list_display_links = ("product",)
-    list_editable = ("is_active",)
-    list_filter = ("is_active", "default_support_type")
-    search_fields = ("product__title", "product__slug")
-    filter_horizontal = ("hybrid_support_groups",)
-    autocomplete_fields = ("product", "forum_config", "zendesk_config")
-    readonly_fields = ("is_hybrid", "enable_forum_support", "enable_zendesk_support")
-
-    fieldsets = (
-        (
-            "Basic Information",
-            {
-                "fields": ("product", "is_active"),
-            },
-        ),
-        (
-            "Support Channels",
-            {
-                "fields": (
-                    "forum_config",
-                    "zendesk_config",
-                    "enable_forum_support",
-                    "enable_zendesk_support",
-                    "is_hybrid",
-                ),
-                "description": "Configure which support channels are available for this product. "
-                "At least one must be selected.",
-            },
-        ),
-        (
-            "Routing Configuration",
-            {
-                "fields": ("default_support_type", "group_default_support_type"),
-                "description": "Set default support type for all users and optionally for hybrid group members.",
-            },
-        ),
-        (
-            "Hybrid Support (Forums + Zendesk)",
-            {
-                "fields": ("hybrid_support_groups",),
-                "description": "Users in these groups can choose between forums and Zendesk when both are enabled. "
-                "Leave empty to allow all users to choose.",
-            },
-        ),
-    )
-
-    @admin.display(boolean=True, description="Forum Enabled")
-    def enable_forum_support(self, obj):
-        return obj.enable_forum_support
-
-    @admin.display(boolean=True, description="Zendesk Enabled")
-    def enable_zendesk_support(self, obj):
-        return obj.enable_zendesk_support
-
-    @admin.display(boolean=True, description="Hybrid (Both)")
-    def is_hybrid(self, obj):
-        return obj.is_hybrid
-
-
-admin.site.register(ZendeskTopic, ZendeskTopicAdmin)
-admin.site.register(ZendeskConfig, ZendeskConfigAdmin)
-admin.site.register(ProductSupportConfig, ProductSupportConfigAdmin)
diff --git a/kitsune/products/management/commands/sync_product_versions.py b/kitsune/products/management/commands/sync_product_versions.py
index 7c13c1d5f60..97aa804824e 100644
--- a/kitsune/products/management/commands/sync_product_versions.py
+++ b/kitsune/products/management/commands/sync_product_versions.py
@@ -63,8 +63,6 @@ def _get_product_configs(self):
                 "slug_prefix": "fx",
                 "version_data": product_details.firefox_versions,
                 "version_key": "LATEST_FIREFOX_VERSION",
-                "beta_version_key": "LATEST_FIREFOX_RELEASED_DEVEL_VERSION",
-                "alpha_version_key": "FIREFOX_NIGHTLY",
                 "history_data": product_details.firefox_history_major_releases,
                 "esr_keys": [],
                 "esr_only": False,
@@ -84,8 +82,6 @@ def _get_product_configs(self):
                 "slug_prefix": "m",
                 "version_data": product_details.mobile_versions,
                 "version_key": "version",
-                "beta_version_key": "beta_version",
-                "alpha_version_key": "nightly_version",
                 "history_data": product_details.firefox_history_major_releases,
                 "esr_keys": [],
                 "esr_only": False,
@@ -95,8 +91,6 @@ def _get_product_configs(self):
                 "slug_prefix": "ios",
                 "version_data": product_details.firefox_versions,
                 "version_key": "LATEST_FIREFOX_VERSION",
-                "beta_version_key": "LATEST_FIREFOX_RELEASED_DEVEL_VERSION",
-                "alpha_version_key": "FIREFOX_NIGHTLY",
                 "history_data": product_details.firefox_history_major_releases,
                 "esr_keys": [],
                 "esr_only": False,
@@ -106,8 +100,6 @@ def _get_product_configs(self):
                 "slug_prefix": "tb",
                 "version_data": product_details.thunderbird_versions,
                 "version_key": "LATEST_THUNDERBIRD_VERSION",
-                "beta_version_key": "LATEST_THUNDERBIRD_DEVEL_VERSION",
-                "alpha_version_key": "LATEST_THUNDERBIRD_NIGHTLY_VERSION",
                 "history_data": product_details.thunderbird_history_major_releases,
                 "esr_keys": ["THUNDERBIRD_ESR"],
                 "esr_only": False,
@@ -125,7 +117,7 @@ def _sync_product(self, product: Product, config: dict, dry_run: bool, verbosity
             return
 
         if verbosity >= 1:
-            self.stdout.write(f"\nSyncing {product.title} (latest release: {latest_version})...")
+            self.stdout.write(f"\nSyncing {product.title} (latest: {latest_version})...")
 
         esr_only = config.get("esr_only", False)
 
@@ -137,22 +129,11 @@ def _sync_product(self, product: Product, config: dict, dry_run: bool, verbosity
             if not esr_only:
                 history_data = config["history_data"]
                 available_versions = self._get_available_versions(history_data, latest_major)
-
-                beta_version = config["version_data"].get(config["beta_version_key"])
-                beta_major = self._parse_major_version(beta_version) if beta_version else None
-                if beta_major:
-                    available_versions.append(beta_major)
-
-                alpha_version = config["version_data"].get(config["alpha_version_key"])
-                alpha_major = self._parse_major_version(alpha_version) if alpha_version else None
-                if alpha_major:
-                    available_versions.append(alpha_major)
-
                 self._create_or_update_versions(
                     product, config, available_versions, dry_run, verbosity
                 )
             self._handle_esr_versions(product, config, dry_run, verbosity)
-            self._update_visibility(product, latest_major, dry_run, verbosity)
+            self._update_visibility(product, dry_run, verbosity)
 
     def _get_available_versions(self, history_data: dict, latest_major: int) -> list:
         """Get list of available major version numbers from history."""
@@ -288,19 +269,18 @@ def _handle_esr_versions(self, product: Product, config: dict, dry_run: bool, ve
                     if verbosity >= 1:
                         self.stdout.write(f"  Created ESR {slug}")
 
-    def _update_visibility(self, product: Product, latest_major: int, dry_run: bool, verbosity: int):
+    def _update_visibility(self, product: Product, dry_run: bool, verbosity: int):
         """Update visibility and default flags for all versions of a product."""
         all_versions = list(Version.objects.filter(product=product).order_by("-max_version"))
         if not all_versions:
             return
 
         esr_versions = [v for v in all_versions if v.slug.endswith("-esr")]
-        regular_versions = [v for v in all_versions if not v.slug.endswith("-esr") and v.min_version <= latest_major]
-        prerelease_versions = [v for v in all_versions if not v.slug.endswith("-esr") and v.min_version > latest_major]
+        regular_versions = [v for v in all_versions if not v.slug.endswith("-esr")]
         top_10 = regular_versions[:10]
 
         for version in all_versions:
-            should_be_visible = version in top_10 or version in esr_versions or version in prerelease_versions
+            should_be_visible = version in top_10 or version in esr_versions
             should_be_default = bool(regular_versions) and version == regular_versions[0]
 
             if version.visible != should_be_visible or version.default != should_be_default:
diff --git a/kitsune/products/managers.py b/kitsune/products/managers.py
index 0c033cc6e76..264023d6621 100644
--- a/kitsune/products/managers.py
+++ b/kitsune/products/managers.py
@@ -11,6 +11,7 @@ def get_queryset(self):
 
 class ProductManager(NonArchivedManager):
     def with_question_forums(self, language_code: str = ""):
+
         q_kwargs: dict[str, Any] = {
             "aaq_configs__is_active": True,
         }
@@ -19,13 +20,3 @@ def with_question_forums(self, language_code: str = ""):
             q_kwargs["aaq_configs__enabled_locales__locale"] = language_code
 
         return self.filter(**q_kwargs).filter(codename="").distinct()
-
-
-class ProductSupportConfigManager(Manager):
-    def locales_list(self):
-        """Returns list of locales that have active forum support configurations."""
-        return (
-            self.filter(forum_config__enabled_locales__locale__isnull=False)
-            .values_list("forum_config__enabled_locales__locale", flat=True)
-            .distinct()
-        )
diff --git a/kitsune/products/migrations/0028_zendeskconfig_zendesktopic_productsupportconfig_and_more.py b/kitsune/products/migrations/0028_zendeskconfig_zendesktopic_productsupportconfig_and_more.py
deleted file mode 100644
index 06613ff972f..00000000000
--- a/kitsune/products/migrations/0028_zendeskconfig_zendesktopic_productsupportconfig_and_more.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by Django 4.2.25 on 2025-12-15 07:27
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('auth', '0012_alter_user_first_name_max_length'),
-        ('questions', '0022_remove_aaqconfig_pinned_articles_and_more'),
-        ('products', '0027_product_pinned_article_config'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ZendeskConfig',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(help_text='Descriptive name for this Zendesk configuration', max_length=255)),
-                ('ticket_form_id', models.CharField(blank=True, help_text='Zendesk ticket form ID to use for this product (leave blank to use global default)', max_length=50)),
-                ('enable_os_field', models.BooleanField(default=False, help_text='Show operating system selector in the support form')),
-            ],
-            options={
-                'verbose_name': 'Zendesk configuration',
-                'ordering': ['name'],
-            },
-        ),
-        migrations.CreateModel(
-            name='ZendeskTopic',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('slug', models.SlugField(help_text='Unique identifier for this topic', max_length=100)),
-                ('topic', models.CharField(help_text='User-facing topic text shown in the dropdown', max_length=255)),
-                ('display_order', models.IntegerField(default=0, help_text='Order in which topics appear (lower numbers first)')),
-                ('legacy_tag', models.CharField(blank=True, help_text='Legacy Zendesk tag', max_length=100)),
-                ('tier_tags', models.JSONField(default=list, help_text="List of tier tags (e.g., ['t1-billing-and-subscriptions'])")),
-                ('automation_tag', models.CharField(blank=True, help_text='Automation tag for Zendesk workflows', max_length=100, null=True)),
-                ('segmentation_tag', models.CharField(blank=True, help_text='Segmentation tag for analytics', max_length=100, null=True)),
-                ('loginless_only', models.BooleanField(default=False, help_text='Only show this topic for loginless (unauthenticated) support flows')),
-                ('zendesk_config', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topics', to='products.zendeskconfig')),
-            ],
-            options={
-                'verbose_name': 'Zendesk topic',
-                'ordering': ['display_order', 'slug'],
-            },
-        ),
-        migrations.CreateModel(
-            name='ProductSupportConfig',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('is_active', models.BooleanField(default=False, help_text='Only one configuration can be active per product')),
-                ('default_support_type', models.CharField(choices=[('forum', 'Community Forums'), ('zendesk', 'Zendesk Support')], default='forum', help_text='Default support channel for users (used when only one channel or no group access)', max_length=20)),
-                ('group_default_support_type', models.CharField(blank=True, choices=[('forum', 'Community Forums'), ('zendesk', 'Zendesk Support')], help_text='Default support type for users in hybrid groups (if not set, uses default_support_type)', max_length=20, null=True)),
-                ('forum_config', models.ForeignKey(blank=True, help_text='Select forum configuration to enable community support', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='support_configs', to='questions.aaqconfig')),
-                ('hybrid_support_groups', models.ManyToManyField(blank=True, help_text='Groups that can choose between forums and Zendesk when both are enabled', related_name='hybrid_support_configs', to='auth.group')),
-                ('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='support_configs', to='products.product')),
-                ('zendesk_config', models.ForeignKey(blank=True, help_text='Select Zendesk configuration to enable Zendesk support', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='support_configs', to='products.zendeskconfig')),
-            ],
-            options={
-                'verbose_name': 'Product support configuration',
-            },
-        ),
-        migrations.AddConstraint(
-            model_name='zendesktopic',
-            constraint=models.UniqueConstraint(fields=('zendesk_config', 'slug'), name='unique_zendesk_topic_per_config'),
-        ),
-        migrations.AddConstraint(
-            model_name='productsupportconfig',
-            constraint=models.UniqueConstraint(fields=('product', 'is_active'), name='unique_active_support_config'),
-        ),
-    ]
diff --git a/kitsune/products/migrations/0029_populate_zendesk_configs.py b/kitsune/products/migrations/0029_populate_zendesk_configs.py
deleted file mode 100644
index 0fc037f826e..00000000000
--- a/kitsune/products/migrations/0029_populate_zendesk_configs.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# Generated by Django 4.2.25 on 2025-12-16 02:49
-
-from django.conf import settings
-from django.db import migrations
-
-
-def populate_zendesk_configs(apps, schema_editor):
-    """
-    Populate ZendeskConfig, ZendeskTopic, and ProductSupportConfig from hardcoded data.
-
-    Reads ZENDESK_CATEGORIES dict and creates database records for products that exist
-    in this environment. Creates ProductSupportConfig for all products with either
-    AAQConfig or ZendeskConfig.
-    """
-    from kitsune.customercare import ZENDESK_CATEGORIES, ZENDESK_CATEGORIES_LOGINLESS
-
-    Product = apps.get_model("products", "Product")
-    ZendeskConfig = apps.get_model("products", "ZendeskConfig")
-    ZendeskTopic = apps.get_model("products", "ZendeskTopic")
-    ProductSupportConfig = apps.get_model("products", "ProductSupportConfig")
-    AAQConfig = apps.get_model("questions", "AAQConfig")
-
-    zendesk_configs_by_slug = {}
-    products_with_os_field = ["mozilla-vpn"]
-
-    for product_slug, categories in ZENDESK_CATEGORIES.items():
-        try:
-            product = Product.objects.get(slug=product_slug)
-        except Product.DoesNotExist:
-            continue
-
-        zendesk_config = ZendeskConfig.objects.create(
-            name=f"{product.title} Support",
-            ticket_form_id=str(settings.ZENDESK_TICKET_FORM_ID),
-            enable_os_field=product_slug in products_with_os_field,
-        )
-        zendesk_configs_by_slug[product_slug] = zendesk_config
-
-        display_order = 0
-        for category in categories:
-            tags = category.get("tags", {})
-            ZendeskTopic.objects.create(
-                zendesk_config=zendesk_config,
-                slug=category["slug"],
-                topic=category["topic"],
-                display_order=display_order,
-                legacy_tag=tags.get("legacy", ""),
-                tier_tags=tags.get("tiers", []),
-                automation_tag=tags.get("automation") or "",
-                segmentation_tag=tags.get("segmentation") or "",
-                loginless_only=False,
-            )
-            display_order += 1
-
-        if product_slug in ZENDESK_CATEGORIES_LOGINLESS:
-            for category in ZENDESK_CATEGORIES_LOGINLESS[product_slug]:
-                tags = category.get("tags", {})
-                ZendeskTopic.objects.create(
-                    zendesk_config=zendesk_config,
-                    slug=category["slug"],
-                    topic=category["topic"],
-                    display_order=display_order,
-                    legacy_tag=tags.get("legacy", ""),
-                    tier_tags=tags.get("tiers", []),
-                    automation_tag=tags.get("automation") or "",
-                    segmentation_tag=tags.get("segmentation") or "",
-                    loginless_only=True,
-                )
-                display_order += 1
-
-    for product in Product.objects.all():
-        zendesk_config = zendesk_configs_by_slug.get(product.slug)
-
-        config_data = None
-
-        if zendesk_config:
-            config_data = {
-                "product": product,
-                "forum_config": None,
-                "zendesk_config": zendesk_config,
-                "default_support_type": "zendesk",
-            }
-        else:
-            aaq_config = AAQConfig.objects.filter(product=product).first()
-            if aaq_config:
-                config_data = {
-                    "product": product,
-                    "forum_config": aaq_config,
-                    "zendesk_config": None,
-                    "default_support_type": "forum",
-                }
-
-        if config_data:
-            ProductSupportConfig.objects.create(
-                is_active=True, group_default_support_type=None, **config_data
-            )
-
-
-def reverse_migration(apps, schema_editor):
-    """Reverse the data migration by deleting all created records."""
-    ProductSupportConfig = apps.get_model("products", "ProductSupportConfig")
-    ZendeskConfig = apps.get_model("products", "ZendeskConfig")
-    ZendeskTopic = apps.get_model("products", "ZendeskTopic")
-
-    ProductSupportConfig.objects.all().delete()
-    ZendeskTopic.objects.all().delete()
-    ZendeskConfig.objects.all().delete()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("products", "0028_zendeskconfig_zendesktopic_productsupportconfig_and_more"),
-    ]
-
-    operations = [
-        migrations.RunPython(populate_zendesk_configs, reverse_migration),
-    ]
diff --git a/kitsune/products/models.py b/kitsune/products/models.py
index 8e04e2c50a2..d2e2f3cf0df 100644
--- a/kitsune/products/models.py
+++ b/kitsune/products/models.py
@@ -1,13 +1,8 @@
 from django.conf import settings
-from django.contrib.auth.models import Group
 from django.core.cache import cache
 from django.db import models
 
-from kitsune.products.managers import (
-    NonArchivedManager,
-    ProductManager,
-    ProductSupportConfigManager,
-)
+from kitsune.products.managers import NonArchivedManager, ProductManager
 from kitsune.sumo.fields import ImagePlusField
 from kitsune.sumo.models import ModelBase
 from kitsune.sumo.urlresolvers import reverse
@@ -260,165 +255,3 @@ class Platform(ModelBase):
 
     def __str__(self):
         return "{}".format(self.name)
-
-
-class ProductSupportConfig(ModelBase):
-    """Configuration for product support routing (forums and/or Zendesk).
-
-    This model acts as a routing layer that determines which support channel(s)
-    are available for a product and handles group-based access control for hybrid support.
-    """
-
-    SUPPORT_TYPE_FORUM = "forum"
-    SUPPORT_TYPE_ZENDESK = "zendesk"
-    SUPPORT_TYPE_CHOICES = [
-        (SUPPORT_TYPE_FORUM, "Community Forums"),
-        (SUPPORT_TYPE_ZENDESK, "Zendesk Support"),
-    ]
-
-    product = models.ForeignKey(Product, on_delete=models.CASCADE, related_name="support_configs")
-    forum_config = models.ForeignKey(
-        "questions.AAQConfig",
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-        related_name="support_configs",
-        help_text="Select forum configuration to enable community support",
-    )
-    zendesk_config = models.ForeignKey(
-        "ZendeskConfig",
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-        related_name="support_configs",
-        help_text="Select Zendesk configuration to enable Zendesk support",
-    )
-    is_active = models.BooleanField(
-        default=False, help_text="Only one configuration can be active per product"
-    )
-    default_support_type = models.CharField(
-        max_length=20,
-        choices=SUPPORT_TYPE_CHOICES,
-        default=SUPPORT_TYPE_FORUM,
-        help_text="Default support channel for users (used when only one channel or no group access)",
-    )
-    hybrid_support_groups = models.ManyToManyField(
-        Group,
-        blank=True,
-        related_name="hybrid_support_configs",
-        help_text="Groups that can choose between forums and Zendesk when both are enabled",
-    )
-    group_default_support_type = models.CharField(
-        max_length=20,
-        choices=SUPPORT_TYPE_CHOICES,
-        null=True,
-        blank=True,
-        help_text="Default support type for users in hybrid groups (if not set, uses default_support_type)",
-    )
-
-    objects = ProductSupportConfigManager()
-
-    class Meta:
-        verbose_name = "Product support configuration"
-        constraints = [
-            models.UniqueConstraint(
-                fields=["product", "is_active"], name="unique_active_support_config"
-            )
-        ]
-
-    def __str__(self):
-        return f"{self.product} Support Configuration"
-
-    @property
-    def is_hybrid(self):
-        """Returns True if both forum and Zendesk support are enabled."""
-        return bool(self.forum_config) and bool(self.zendesk_config)
-
-    @property
-    def enable_forum_support(self):
-        """Returns True if forum support is enabled (forum_config is set)."""
-        return bool(self.forum_config)
-
-    @property
-    def enable_zendesk_support(self):
-        """Returns True if Zendesk support is enabled (zendesk_config is set)."""
-        return bool(self.zendesk_config)
-
-
-class ZendeskConfig(ModelBase):
-    """Configuration for Zendesk support integration.
-
-    Stores per-product Zendesk settings like form IDs and field preferences.
-    Global Zendesk API credentials remain in Django settings.
-    """
-
-    name = models.CharField(
-        max_length=255, help_text="Descriptive name for this Zendesk configuration"
-    )
-    ticket_form_id = models.CharField(
-        max_length=50,
-        blank=True,
-        help_text="Zendesk ticket form ID to use for this product (leave blank to use global default)",
-    )
-    enable_os_field = models.BooleanField(
-        default=False, help_text="Show operating system selector in the support form"
-    )
-
-    class Meta:
-        verbose_name = "Zendesk configuration"
-        ordering = ["name"]
-
-    def __str__(self):
-        return self.name
-
-
-class ZendeskTopic(ModelBase):
-    """Zendesk support topic/category for the support form dropdown."""
-
-    zendesk_config = models.ForeignKey(
-        ZendeskConfig, on_delete=models.CASCADE, related_name="topics"
-    )
-    slug = models.SlugField(max_length=100, help_text="Unique identifier for this topic")
-    topic = models.CharField(
-        max_length=255, help_text="User-facing topic text shown in the dropdown"
-    )
-    display_order = models.IntegerField(
-        default=0, help_text="Order in which topics appear (lower numbers first)"
-    )
-    legacy_tag = models.CharField(max_length=100, blank=True, help_text="Legacy Zendesk tag")
-    tier_tags = models.JSONField(
-        default=list,
-        help_text="List of tier tags (e.g., ['t1-billing-and-subscriptions'])",
-    )
-    automation_tag = models.CharField(
-        max_length=100, blank=True, null=True, help_text="Automation tag for Zendesk workflows"
-    )
-    segmentation_tag = models.CharField(
-        max_length=100, blank=True, null=True, help_text="Segmentation tag for analytics"
-    )
-    loginless_only = models.BooleanField(
-        default=False,
-        help_text="Only show this topic for loginless (unauthenticated) support flows",
-    )
-
-    class Meta:
-        verbose_name = "Zendesk topic"
-        ordering = ["display_order", "slug"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["zendesk_config", "slug"], name="unique_zendesk_topic_per_config"
-            )
-        ]
-
-    def __str__(self):
-        return f"{self.zendesk_config.name}: {self.topic}"
-
-    @property
-    def tags_dict(self):
-        """Returns tags in the format expected by ZendeskForm."""
-        return {
-            "legacy": self.legacy_tag,
-            "tiers": self.tier_tags,
-            "automation": self.automation_tag,
-            "segmentation": self.segmentation_tag,
-        }
diff --git a/kitsune/products/tests/__init__.py b/kitsune/products/tests/__init__.py
index 91256a7244d..c9cf859132d 100644
--- a/kitsune/products/tests/__init__.py
+++ b/kitsune/products/tests/__init__.py
@@ -3,15 +3,7 @@
 import factory.fuzzy
 from django.template.defaultfilters import slugify
 
-from kitsune.products.models import (
-    Platform,
-    Product,
-    ProductSupportConfig,
-    Topic,
-    Version,
-    ZendeskConfig,
-    ZendeskTopic,
-)
+from kitsune.products.models import Platform, Product, Topic, Version
 from kitsune.sumo.tests import FuzzyUnicode
 
 
@@ -76,37 +68,3 @@ class Meta:
     slug = factory.LazyAttribute(lambda o: slugify(o.name))
     visible = True
     display_order = factory.fuzzy.FuzzyInteger(10)
-
-
-class ZendeskConfigFactory(factory.django.DjangoModelFactory):
-    class Meta:
-        model = ZendeskConfig
-
-    name = FuzzyUnicode()
-    ticket_form_id = "360000417171"
-    enable_os_field = False
-
-
-class ZendeskTopicFactory(factory.django.DjangoModelFactory):
-    class Meta:
-        model = ZendeskTopic
-
-    zendesk_config = factory.SubFactory(ZendeskConfigFactory)
-    slug = FuzzyUnicode()
-    topic = FuzzyUnicode()
-    display_order = factory.fuzzy.FuzzyInteger(10)
-    legacy_tag = ""
-    tier_tags: list[str] = []
-    automation_tag = ""
-    segmentation_tag = ""
-    loginless_only = False
-
-
-class ProductSupportConfigFactory(factory.django.DjangoModelFactory):
-    class Meta:
-        model = ProductSupportConfig
-
-    product = factory.SubFactory(ProductFactory)
-    is_active = True
-    default_support_type = ProductSupportConfig.SUPPORT_TYPE_ZENDESK
-    group_default_support_type = None
diff --git a/kitsune/products/tests/test_sync_product_versions.py b/kitsune/products/tests/test_sync_product_versions.py
index 18633f88d0d..3f7c7c5b5c3 100644
--- a/kitsune/products/tests/test_sync_product_versions.py
+++ b/kitsune/products/tests/test_sync_product_versions.py
@@ -26,8 +26,6 @@ def _mock_product_details(self):
         # Firefox versions data
         mock_pd.firefox_versions = {
             "LATEST_FIREFOX_VERSION": "143.0.4",
-            "LATEST_FIREFOX_RELEASED_DEVEL_VERSION": "144.0b7",
-            "FIREFOX_NIGHTLY": "145.0a2",
             "FIREFOX_ESR": "140.3.1esr",
             "FIREFOX_ESR115": "115.20.0esr",
         }
@@ -43,15 +41,11 @@ def _mock_product_details(self):
         # Mobile versions data
         mock_pd.mobile_versions = {
             "version": "143.0",
-            "beta_version": "144.0b2",
-            "nightly_version": "145.0a3",
         }
 
         # Thunderbird versions data
         mock_pd.thunderbird_versions = {
             "LATEST_THUNDERBIRD_VERSION": "128.5.0",
-            "LATEST_THUNDERBIRD_DEVEL_VERSION": "129.0b2",
-            "LATEST_THUNDERBIRD_NIGHTLY_VERSION": "130.0a1",
             "THUNDERBIRD_ESR": "128.5.0esr",
         }
 
@@ -83,27 +77,12 @@ def test_sync_firefox_versions(self, mock_product_details):
         self.assertEqual(v140.min_version, 140.0)
         self.assertEqual(v140.max_version, 141.0)
 
-        # Check latest Release version
         v143 = Version.objects.get(product=self.firefox, slug="fx143")
         self.assertEqual(v143.name, "Version 143")
         self.assertEqual(v143.min_version, 143.0)
         self.assertEqual(v143.max_version, 144.0)
         self.assertTrue(v143.default)
 
-        # Check latest Beta version
-        v144 = Version.objects.get(product=self.firefox, slug="fx144")
-        self.assertEqual(v144.name, "Version 144")
-        self.assertEqual(v144.min_version, 144.0)
-        self.assertEqual(v144.max_version, 145.0)
-        self.assertFalse(v144.default)
-
-        # Check latest Nightly version
-        v145 = Version.objects.get(product=self.firefox, slug="fx145")
-        self.assertEqual(v145.name, "Version 145")
-        self.assertEqual(v145.min_version, 145.0)
-        self.assertEqual(v145.max_version, 146.0)
-        self.assertFalse(v145.default)
-
         # ESR versions should NOT be created under Firefox product
         esr_versions = Version.objects.filter(product=self.firefox, slug__endswith="-esr")
         self.assertEqual(esr_versions.count(), 0)
@@ -152,21 +131,11 @@ def test_sync_mobile_versions(self, mock_product_details):
         versions = Version.objects.filter(product=self.mobile)
         self.assertGreater(versions.count(), 0)
 
-        # Check latest Release version
+        # Check latest version
         v143 = Version.objects.get(product=self.mobile, slug="m143")
         self.assertEqual(v143.name, "Version 143")
         self.assertTrue(v143.default)
 
-        # Check latest Beta version
-        v144 = Version.objects.get(product=self.mobile, slug="m144")
-        self.assertEqual(v144.name, "Version 144")
-        self.assertFalse(v144.default)
-
-        # Check latest Nightly version
-        v145 = Version.objects.get(product=self.mobile, slug="m145")
-        self.assertEqual(v145.name, "Version 145")
-        self.assertFalse(v145.default)
-
     @mock.patch("kitsune.products.management.commands.sync_product_versions.product_details")
     def test_sync_ios_versions(self, mock_product_details):
         """Test syncing Firefox for iOS versions."""
@@ -179,21 +148,11 @@ def test_sync_ios_versions(self, mock_product_details):
         versions = Version.objects.filter(product=self.ios)
         self.assertGreater(versions.count(), 0)
 
-        # Check latest Release version
+        # Check latest version
         v143 = Version.objects.get(product=self.ios, slug="ios143")
         self.assertEqual(v143.name, "Version 143")
         self.assertTrue(v143.default)
 
-        # Check latest Beta version
-        v144 = Version.objects.get(product=self.ios, slug="ios144")
-        self.assertEqual(v144.name, "Version 144")
-        self.assertFalse(v144.default)
-
-        # Check latest Nightly version
-        v145 = Version.objects.get(product=self.ios, slug="ios145")
-        self.assertEqual(v145.name, "Version 145")
-        self.assertFalse(v145.default)
-
     @mock.patch("kitsune.products.management.commands.sync_product_versions.product_details")
     def test_sync_thunderbird_versions(self, mock_product_details):
         """Test syncing Thunderbird versions."""
@@ -206,21 +165,11 @@ def test_sync_thunderbird_versions(self, mock_product_details):
         versions = Version.objects.filter(product=self.thunderbird)
         self.assertGreater(versions.count(), 0)
 
-        # Check latest Release version
+        # Check latest version
         v128 = Version.objects.get(product=self.thunderbird, slug="tb128")
         self.assertEqual(v128.name, "Version 128")
         self.assertTrue(v128.default)
 
-        # Check latest Beta version
-        v129 = Version.objects.get(product=self.thunderbird, slug="tb129")
-        self.assertEqual(v129.name, "Version 129")
-        self.assertFalse(v129.default)
-
-        # Check latest Daily version
-        v130 = Version.objects.get(product=self.thunderbird, slug="tb130")
-        self.assertEqual(v130.name, "Version 130")
-        self.assertFalse(v130.default)
-
         # Check ESR
         esr128 = Version.objects.get(product=self.thunderbird, slug="tb128-esr")
         self.assertEqual(esr128.name, "Version 128 ESR")
@@ -228,7 +177,7 @@ def test_sync_thunderbird_versions(self, mock_product_details):
 
     @mock.patch("kitsune.products.management.commands.sync_product_versions.product_details")
     def test_visibility_rules(self, mock_product_details):
-        """Test that only top 10 versions + ESR + beta/alpha are visible."""
+        """Test that only top 10 versions + ESR are visible."""
         mock_product_details.configure_mock(**self._mock_product_details().__dict__)
 
         out = StringIO()
@@ -236,19 +185,11 @@ def test_visibility_rules(self, mock_product_details):
 
         visible_regular = Version.objects.filter(product=self.firefox, visible=True).exclude(
             slug__endswith="-esr"
-        ).exclude(
-            min_version__gt=143
         )
 
-        # Should have top 10 release visible (or fewer if less than 10 exist)
+        # Should have top 10 visible (or fewer if less than 10 exist)
         self.assertLessEqual(visible_regular.count(), 10)
 
-        # Beta/Nightly should always be visible
-        beta = Version.objects.get(product=self.firefox, slug="fx144")
-        self.assertTrue(beta.visible)
-        nightly = Version.objects.get(product=self.firefox, slug="fx145")
-        self.assertTrue(nightly.visible)
-
         # ESR versions should always be visible
         esr_versions = Version.objects.filter(product=self.firefox, slug__endswith="-esr")
         for esr in esr_versions:
diff --git a/kitsune/questions/admin.py b/kitsune/questions/admin.py
index 65c22aa1b61..318f36c1a1a 100644
--- a/kitsune/questions/admin.py
+++ b/kitsune/questions/admin.py
@@ -53,7 +53,6 @@ class AAQConfigAdmin(admin.ModelAdmin):
     list_display = ("title", "product", "is_active", "pinned_article_config")
     list_editable = ("is_active",)
     inlines = [QuestionLocaleAdmin]
-    search_fields = ("title", "product__title", "product__slug")
     fields = (
         "title",
         "product",
diff --git a/kitsune/questions/jinja2/questions/email/new_answer_to_asker.html b/kitsune/questions/jinja2/questions/email/new_answer_to_asker.html
index 51ba1797cc2..cc22b3a2e5e 100644
--- a/kitsune/questions/jinja2/questions/email/new_answer_to_asker.html
+++ b/kitsune/questions/jinja2/questions/email/new_answer_to_asker.html
@@ -34,7 +34,7 @@ <h1><a href="https://{{ host }}{{ question_url }}">{{ question_title }}</a></h1>
   </div>
   <p>
     <a class="button" href="https://{{ host }}{{ solution_url }}">{{ _('This solves my problem') }}</a>
-    <a href="https://{{ host }}{{ answer_url }}">{{ _('View & reply') }}</a>
+    <a href="https://{{ host }}{{ answer_url }}">{{ _('View the reply') }}</a>
   </p>
   <div class="gi-box">
     <a href="https://{{ host }}/questions?filter=unsolved">{{ _('Browse for unsolved questions and help a Firefox user') }}</a>
diff --git a/kitsune/questions/jinja2/questions/includes/aaq_macros.html b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
index e6f2c58d7aa..b106f6fbfc6 100644
--- a/kitsune/questions/jinja2/questions/includes/aaq_macros.html
+++ b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
@@ -190,31 +190,19 @@ <h2 class="sumo-page-subheading">{{ _('Topics') }}</h2>
 
 {% macro troubleshooting_instructions(field) %}
   <div>
-    <div id="api-section">
-      <div id="troubleshooting-button" class="sumo-button-wrap">
-        <button class="sumo-button" id="share-data" type="button">
-          {{ _('Share Data') }}
-        </button>
-      </div>
-      <p id="troubleshooting-manual" class="hide-until-expanded">
-        {# L10n: Deprecated #}
-        {% set deprecated_share_data_fallback %}
-          {% trans %}
-            We can't automatically get your browser's troubleshooting data, please
-            <a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox">try these manual steps</a>.
-          {% endtrans %}
-        {% endset %}
-        {# L10n: Try these manual steps refers to https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox #}
-        {% trans a_open='<a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox" target="_blank">'|safe, a_close='</a>'|safe %}
-          We can't automatically get your browser's troubleshooting data, please {{ a_open }}try these manual steps{{ a_close }}.
-        {% endtrans %}
-      </p>
-      <div id="troubleshooting-field" class="hide-until-expanded field full-width">
-        {{ field }}
-      </div>
-      <p>
-        {{ _('This information gives details about the internal workings of your browser that will help in answering your question.') }}
-      </p>
+    <div id="troubleshooting-button" class="sumo-button-wrap">
+      <button class="sumo-button" id="share-data" type="button" aria-describedby="{{ field.help_id }}">
+        {{ _('Share Data') }}
+      </button>
+    </div>
+    <div id="troubleshooting-manual" class="hide-until-expanded" class="field-help-text">
+      {% trans %}
+        We can't automatically get your browser's troubleshooting data, please
+        <a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox">try these manual steps</a>.
+      {% endtrans %}
+    </div>
+    <div id="troubleshooting-field" class="hide-until-expanded field full-width">
+      {{ field }}
     </div>
   </div>
 {% endmacro %}
diff --git a/kitsune/sumo/templatetags/jinja_helpers.py b/kitsune/sumo/templatetags/jinja_helpers.py
index f7a39b99b73..3f579227561 100644
--- a/kitsune/sumo/templatetags/jinja_helpers.py
+++ b/kitsune/sumo/templatetags/jinja_helpers.py
@@ -11,6 +11,7 @@
 from babel.dates import format_date, format_datetime, format_time
 from babel.numbers import format_decimal
 from django.conf import settings
+from django.contrib.humanize.templatetags.humanize import naturaltime
 from django.db.models.fields.files import FieldFile
 from django.http import QueryDict
 from django.template.loader import render_to_string
@@ -240,7 +241,7 @@ def _contextual_locale(context):
 
 @jinja2.pass_context
 @library.global_function
-def datetimeformat(context, value, format="shortdatetime", use_timesince=False):
+def datetimeformat(context, value, format="shortdatetime", use_naturaltime=False):
     """
     Returns a formatted date/time using Babel's locale settings. Uses the
     timezone from settings.py, if the user has not been authenticated.
@@ -275,8 +276,8 @@ def datetimeformat(context, value, format="shortdatetime", use_timesince=False):
     convert_value = new_value.astimezone(convert_tzinfo)
     locale = _babel_locale(_contextual_locale(context))
 
-    if use_timesince and (django_now().astimezone(convert_tzinfo) - convert_value).days < 30:
-        return timesince(convert_value)
+    if use_naturaltime and (django_now().astimezone(convert_tzinfo) - convert_value).days < 30:
+        return naturaltime(convert_value)
 
     if format == "shortdatetime" or format == "shortdate":
         # Check if the date is today
diff --git a/kitsune/wiki/jinja2/wiki/confirm_revision_delete.html b/kitsune/wiki/jinja2/wiki/confirm_revision_delete.html
index bea674f0d76..858e9d3c773 100644
--- a/kitsune/wiki/jinja2/wiki/confirm_revision_delete.html
+++ b/kitsune/wiki/jinja2/wiki/confirm_revision_delete.html
@@ -9,7 +9,7 @@
   <div class="grid_9">
     <article id="delete-revision">
       {% if only_revision %}
-        <h1 class="title">{{ _('Unable to delete the only revision of the document') }}</h1>
+        <h1 class="title">{{ _('Unable to delete only revision of the document') }}</h1>
         <p>{{ _('To delete the document, please notify an admin.') }}</p>
         <div class="submit">
           <a href="{{ url('wiki.document_revisions', document.slug) }}">{{ _('Go back to document history') }}</a>
diff --git a/kitsune/wiki/jinja2/wiki/includes/document_macros.html b/kitsune/wiki/jinja2/wiki/includes/document_macros.html
index 3d9ee08e519..73c6d0b3645 100644
--- a/kitsune/wiki/jinja2/wiki/includes/document_macros.html
+++ b/kitsune/wiki/jinja2/wiki/includes/document_macros.html
@@ -24,7 +24,7 @@ <h1 class="sumo-page-heading">{{ document.title }}</h1>
        <img class="pencil" src="{{ webpack_static('sumo/img/pencil.svg') }}" />
        <strong>{% if is_first_revision %}{{ _("Created") }}{% else %}{{ _("Last updated") }}{% endif %}:</strong>
         <span class="time">
-          {{ datetimeformat(created_date, format="shortdate", use_timesince=True) }}
+          {{ datetimeformat(created_date, format="shortdate", use_naturaltime=True) }}
         </span>
       </span>
     {% endif %}
diff --git a/kitsune/wiki/services.py b/kitsune/wiki/services.py
index 456f3268460..d02cad77898 100644
--- a/kitsune/wiki/services.py
+++ b/kitsune/wiki/services.py
@@ -439,23 +439,18 @@ def publish_pending_translations(self, log: logging.Logger | None = None) -> Non
         if not (settings.HYBRID_REVIEW_GRACE_PERIOD and settings.HYBRID_ENABLED_LOCALES):
             return
 
-        grace_period = settings.HYBRID_REVIEW_GRACE_PERIOD
-        if grace_period <= 72:
-            grace_period_string = f"{grace_period} hour{'s' if grace_period > 1 else ''}"
-        else:
-            grace_period = grace_period // 24
-            grace_period_string = f"{grace_period} day{'s' if grace_period > 1 else ''}"
-
+        grace_period = f"{settings.HYBRID_REVIEW_GRACE_PERIOD} hour(s)"
         pending_revisions = self.query_builder.get_pending_translations()
+
         for revision in pending_revisions:
             rev = self.content_manager.publish_revision(
                 revision,
                 comment=(
-                    f"Automatically approved because it was not reviewed within {grace_period_string}."
+                    f"Automatically approved because it was not reviewed within {grace_period}."
                 ),
             )
             if log:
                 log.info(
                     f"Automatically approved {rev.get_absolute_url()} because it was not"
-                    f" reviewed within {grace_period_string}."
+                    f" reviewed within {grace_period}."
                 )
diff --git a/kitsune/wiki/tests/test_services.py b/kitsune/wiki/tests/test_services.py
index 7bc8c9a1705..80b5ebc6a29 100644
--- a/kitsune/wiki/tests/test_services.py
+++ b/kitsune/wiki/tests/test_services.py
@@ -16,7 +16,7 @@
 from kitsune.wiki.strategies import TranslationMethod, TranslationStrategyFactory
 from kitsune.wiki.tests import ApprovedRevisionFactory, DocumentFactory, RevisionFactory
 
-APPROVED_MSG = "Automatically approved because it was not reviewed within 72 hours."
+APPROVED_MSG = "Automatically approved because it was not reviewed within 72 hour(s)."
 REJECTED_MSG = "No longer relevant."
 
 
diff --git a/kitsune/wiki/tests/test_templates.py b/kitsune/wiki/tests/test_templates.py
index 6075f327c8d..a6744538ffe 100644
--- a/kitsune/wiki/tests/test_templates.py
+++ b/kitsune/wiki/tests/test_templates.py
@@ -2813,7 +2813,7 @@ def test_delete_only_revision(self):
         response = get(self.client, "wiki.delete_revision", args=[doc.slug, rev.id])
         self.assertEqual(200, response.status_code)
         self.assertEqual(
-            "Unable to delete the only revision of the document",
+            "Unable to delete only revision of the document",
             pq(response.content)("h1.title").text(),
         )
 
diff --git a/playwright_tests/core/basepage.py b/playwright_tests/core/basepage.py
index 61b04958052..e4268629232 100644
--- a/playwright_tests/core/basepage.py
+++ b/playwright_tests/core/basepage.py
@@ -209,6 +209,7 @@ def _fill(self, locator: Locator, text: str, with_force=False):
         """
         This helper function fills a given text inside a given element locator.
         """
+        self.wait_for_dom_to_load()
         locator.fill(text, force=with_force)
 
     def _type(self, locator: Locator, text: str, delay: int):
@@ -229,16 +230,15 @@ def _clear_field(self, locator: Locator):
         """
         This helper function clears the given element locator input field.
         """
+        self.wait_for_dom_to_load()
         locator.clear()
 
-    def _select_option_by_label(self, locator: Locator, label_name: str, expected_locator=None):
+    def _select_option_by_label(self, locator: Locator, label_name: str):
         """
         This helper function selects an element from a given select box based on label.
         """
         self.wait_for_dom_to_load()
         locator.select_option(label=label_name)
-        if expected_locator:
-            self._wait_for_locator(expected_locator)
 
     def _select_option_by_value(self, locator: Locator, value: str):
         """
diff --git a/playwright_tests/core/utilities.py b/playwright_tests/core/utilities.py
index 3eccfa18348..b02b8b97bc4 100644
--- a/playwright_tests/core/utilities.py
+++ b/playwright_tests/core/utilities.py
@@ -322,7 +322,7 @@ def delete_cookies(self, tried_once=False, retries=3):
 
         # In order to avoid test flakiness we are trying to delete the cookies again if the sign-in
         # sign-up button is not visible after page refresh.
-        if top_navbar.signin_signup_button.is_hidden() and not tried_once:
+        if not top_navbar.is_sign_in_up_button_displayed and not tried_once:
             self.delete_cookies(tried_once=True)
 
     def start_existing_session(self, cookies: dict = None, session_file_name: str = None,
@@ -345,12 +345,12 @@ def start_existing_session(self, cookies: dict = None, session_file_name: str =
                 cookies_data = json.load(file)
             self.page.context.add_cookies(cookies=cookies_data['cookies'])
             self.refresh_page()
-            if top_navbar.signin_signup_button.is_visible() and not tried_once:
+            if top_navbar.is_sign_in_up_button_displayed() and not tried_once:
                 self.start_existing_session(session_file_name=session_file_name, tried_once=True)
         elif cookies is not None:
             self.page.context.add_cookies(cookies=cookies['cookies'])
             self.refresh_page()
-            if top_navbar.signin_signup_button.is_visible() and not tried_once:
+            if top_navbar.is_sign_in_up_button_displayed() and not tried_once:
                 self.start_existing_session(cookies=cookies, tried_once=True)
 
 
@@ -673,17 +673,6 @@ def expect_locator_visibility(self, locator: Locator) -> bool:
         else:
             return False
 
-    def strip_wiki_syntax(self, text: str) -> str:
-        # Handle wiki links.
-        text = re.sub(r"\[\[(?:[^\|\]]*\|)?([^\]]+)\]\]", r"\1", text)
-        # Handle external links.
-        text = re.sub(r"\[(https?://[^\s]+)\s+([^\]]+)\]", r"\2", text)
-        # Handle bold wiki.
-        text = re.sub(r"'''(.*?)'''", r"\1", text)
-        # Handle italic wiki.
-        text = re.sub(r"''(.*?)''", r"\1", text)
-        return " ".join(text.split())  # collapse whitespace
-
 
 def retry_on_502(func):
     """Decorator that retries the wrapped function if a 502 error is encountered."""
diff --git a/playwright_tests/flows/ask_a_question_flows/aaq_flows/aaq_flow.py b/playwright_tests/flows/ask_a_question_flows/aaq_flows/aaq_flow.py
index 8ca34862d9b..111af41ff10 100644
--- a/playwright_tests/flows/ask_a_question_flows/aaq_flows/aaq_flow.py
+++ b/playwright_tests/flows/ask_a_question_flows/aaq_flows/aaq_flow.py
@@ -15,23 +15,13 @@ def __init__(self, page: Page):
         self.top_navbar = TopNavbar(page)
         self.auth_page = AuthPage(page)
 
+
+    # Submitting an aaq question for a product flow.
+    # Mozilla VPN has an extra optional dropdown menu for choosing an operating system.
     @retry_on_502
     def submit_an_aaq_question(self, subject: str, body: str, topic_name='', attach_image=False,
                                is_premium=False, email="", is_loginless=False,
                                expected_locator=None, form_url=None):
-        """
-        Flow for submitting an AAQ question.
-        Args:
-            subject (str): The question subject.
-            body (str): The question body.
-            topic_name (str): The question topic.
-            attach_image (bool): If we should attach an image to the question or not.
-            is_premium (bool): If the form is for a premium product.
-            email: The email to be submitted for the premium product form.
-            is_loginless (bool): If the form is loginless.
-            expected_locator: Acts as a wait until the question is successfully submitted.
-            form_url: The URL of the targeted form.
-        """
         question_subject = ''
         if form_url and self.utilities.get_page_url() != form_url:
             self.utilities.navigate_to_link(form_url)
@@ -55,16 +45,10 @@ def submit_an_aaq_question(self, subject: str, body: str, topic_name='', attach_
             return {"aaq_subject": question_subject, "question_page_url": current_page_url,
                     "question_body": body, "question_id": question_id}
 
+    # Populating the aaq form fields for freemium products with given values without submitting the
+    # form.
     def add__valid_data_to_all_aaq_fields_without_submitting(self, subject: str, topic_value: str,
                                                              body_text: str, attach_image=False):
-        """
-        Flow for adding valid data to all freemium products AAQ fields without submitting the form.
-        Args:
-            subject (str): The subject of the question.
-            topic_value (str): The value of the chosen topic.
-            body_text (str): The body of the question.
-            attach_image (bool): If an image should be attached to the question or not.
-        """
         aaq_subject = subject + self.utilities.generate_random_number(min_value=0, max_value=5000)
         # Adding text to subject field.
         self.aaq_form_page.add_text_to_aaq_form_subject_field(aaq_subject)
@@ -79,7 +63,7 @@ def add__valid_data_to_all_aaq_fields_without_submitting(self, subject: str, top
 
         if attach_image:
             # Uploading an image to the aaq question form.
-            self.aaq_form_page.add_image_browse_button.set_input_files(
+            self.aaq_form_page.get_upload_image_button_locator().set_input_files(
                 self.utilities.aaq_question_test_data["valid_firefox_question"]["image_path"]
             )
 
@@ -89,53 +73,37 @@ def add__valid_data_to_all_aaq_fields_without_submitting(self, subject: str, top
         # Returning the entered question subject for further usage.
         return aaq_subject
 
+    # Flow for adding valid data to premium products forms without submitting the ticket.
+    # We are currently choosing one random topic & os for each product ticket submission.
+    # Note: Some premium products forms (example: Mozilla VPN) has an extra "os" dropdown.
     def add_valid_data_to_all_premium_products_aaq_fields(self, subject: str, body: str,
                                                           is_loginless: bool, email: str):
-        """
-        Flow for adding valid data to all premium products AAQ fields without submitting the form.
-        Args:
-            subject (str): The question subject.
-            body (str): The question body.
-            is_loginless (bool): If the form is loginless or not.
-            email (str): The email to be added to the form.
-        """
         if is_loginless:
-            if self.top_navbar.signin_signup_button.is_visible():
+            if self.top_navbar.is_sign_in_up_button_displayed():
                 self.top_navbar.click_on_signin_signup_button()
                 self.auth_page.click_on_cant_sign_in_to_my_mozilla_account_link()
             self.aaq_form_page.fill_contact_email_field(email)
-        # We are currently choosing one random topic & os for each product ticket submission.
+
         self.aaq_form_page.select_random_topic_by_value()
-        # Note: Some premium products forms (example: Mozilla VPN) has an extra "os" dropdown.
+
         if self.aaq_form_page.is_os_dropdown_menu_visible():
             self.aaq_form_page.select_random_os_by_value()
         self.aaq_form_page.add_text_to_premium_aaq_form_subject_field(subject)
         self.aaq_form_page.add_text_to_premium_aaq_textarea_body_field(body)
 
+    # Adding an image to the aaq form.
     def adding_an_image_to_aaq_form(self):
-        """Flow for adding an image inside the AAQ form."""
-        self.aaq_form_page.add_image_browse_button.set_input_files(
+        self.aaq_form_page.get_upload_image_button_locator().set_input_files(
             self.utilities.aaq_question_test_data["valid_firefox_question"]["image_path"]
         )
 
     @retry_on_502
     def deleting_question_flow(self):
-        """Flow for deleting a question."""
         self.question_page.click_delete_this_question_question_tools_option()
         self.question_page.click_delete_this_question_button()
 
     @retry_on_502
     def editing_question_flow(self, subject='', body='', troubleshoot='', submit_edit=True):
-        """
-        Flow for updating a particular AAQ question.
-        Args:
-            subject: The new AAQ question title.
-            body: The new AAQ body content.
-            troubleshoot: The new content of the Troubleshoot Information info/section.
-            submit_edit: If the edits should be submitted or not.
-        """
-        self.question_page.click_on_edit_this_question_question_tools_option()
-
         if subject:
             self.aaq_form_page.clear_subject_input_field()
             self.aaq_form_page.add_text_to_aaq_form_subject_field(subject)
@@ -151,17 +119,7 @@ def editing_question_flow(self, subject='', body='', troubleshoot='', submit_edi
             self.aaq_form_page.click_aaq_edit_submit_button()
 
     @retry_on_502
-    def editing_reply_flow(self, answer_id: str, reply_body: str, submit_reply=True):
-        """
-        Flow for updating a particular AAQ question reply.
-        Args:
-            answer_id (str): The ID of the targeted AAQ question reply.
-            reply_body (str): The new reply body content.
-            submit_reply: If the edits should be submitted or not.
-        """
-        self.question_page.click_on_reply_more_options_button(answer_id)
-        self.question_page.click_on_edit_this_post_for_a_certain_reply(answer_id)
-
+    def editing_reply_flow(self, reply_body: str, submit_reply=True):
         self.aaq_form_page.clear_the_question_body_textarea_field()
         self.aaq_form_page.add_text_to_aaq_textarea_field(reply_body)
 
@@ -170,12 +128,6 @@ def editing_reply_flow(self, answer_id: str, reply_body: str, submit_reply=True)
 
     @retry_on_502
     def delete_question_reply(self, answer_id: str, delete_reply: bool):
-        """
-        Flow of deleting a question reply.
-        Args:
-            answer_id (str): The ID of the reply that needs to be deleted.
-            delete_reply (bool): If we should delete or cancel the deletion.
-        """
         self.question_page.click_on_reply_more_options_button(answer_id)
         self.question_page.click_on_delete_this_post_for_a_certain_reply(answer_id)
 
@@ -185,16 +137,6 @@ def delete_question_reply(self, answer_id: str, delete_reply: bool):
     @retry_on_502
     def post_question_reply_flow(self, repliant_username: str, reply='', submit_reply=True,
                                  quoted_reply=False, reply_for_id='') -> str:
-        """
-        Flow for posting a question reply.
-        Args:
-            repliant_username (str): The username of the repliant. Acts as a wait until the reply
-            is successfully posted.
-            reply: The content of the reply.
-            submit_reply: If we should submit the question or not.
-            quoted_reply: If we should quote a reply or not.
-            reply_for_id: If we should quote a reply we need the id of the targeted reply.
-        """
 
         if quoted_reply:
             self.question_page.click_on_reply_more_options_button(reply_for_id)
@@ -209,12 +151,6 @@ def post_question_reply_flow(self, repliant_username: str, reply='', submit_repl
             return self.question_page.click_on_post_reply_button(repliant_username)
 
     def report_question_abuse(self, answer_id: str, text=''):
-        """
-        Flow for reporting question as abusive.
-        Args:
-            answer_id (str): The ID of the question.
-            text: Text to be added inside the report.
-        """
         self.question_page.click_on_reply_more_options_button(answer_id)
         self.question_page.click_on_report_abuse_for_a_certain_reply(answer_id)
 
@@ -225,10 +161,5 @@ def report_question_abuse(self, answer_id: str, text=''):
         self.question_page.click_abuse_modal_close_button()
 
     def spam_marking_a_reply(self, reply_id: str):
-        """
-        Flow for marking a reply as spam.
-        Args:
-            reply_id (str): The ID of the reply.
-        """
         self.question_page.click_on_reply_more_options_button(reply_id)
         self.question_page.click_on_mark_as_spam_for_a_certain_reply(reply_id)
diff --git a/playwright_tests/flows/explore_articles_flows/article_flows/add_kb_article_flow.py b/playwright_tests/flows/explore_articles_flows/article_flows/add_kb_article_flow.py
index bccd6ac3bff..3d2802d75e5 100644
--- a/playwright_tests/flows/explore_articles_flows/article_flows/add_kb_article_flow.py
+++ b/playwright_tests/flows/explore_articles_flows/article_flows/add_kb_article_flow.py
@@ -1,7 +1,6 @@
-import random
-import string
 from typing import Any
 from playwright.sync_api import Page
+from slugify import slugify
 from playwright_tests.core.utilities import Utilities, retry_on_502
 from playwright_tests.flows.explore_articles_flows.article_flows.add_kb_media_flow import (
     AddKbMediaFlow,
@@ -41,8 +40,7 @@ def __init__(self, page: Page):
     def submit_simple_kb_article(self, article_title=None, article_slug=None,
                                  article_category=None, article_keyword=None,
                                  allow_discussion=True, allow_translations=True,
-                                 selected_product=True, selected_topics=True, article_topic=None,
-                                 product=None, search_summary=None,
+                                 selected_product=True, selected_topics=True, search_summary=None,
                                  article_content=None, article_content_image=False,
                                  submit_article=True, is_template=False, expiry_date=None,
                                  restricted_to_groups: list[str] = None, single_group="",
@@ -59,9 +57,8 @@ def submit_simple_kb_article(self, article_title=None, article_slug=None,
 
         kb_article_title = (article_title if article_title is not None else
                             kb_article_test_data[
-                                "kb_template_title" if is_template else "kb_article_title"
-                            ]+ ''.join(random.choice(string.ascii_lowercase + string.digits
-                                                     ) for _ in range(10)))
+                                "kb_template_title" if is_template else "kb_article_title"] + self.
+                            utilities.generate_random_number(0, 5000))
 
         if kb_article_title != "":
             self.submit_kb_article_page.add_text_to_article_form_title_field(
@@ -74,13 +71,9 @@ def submit_simple_kb_article(self, article_title=None, article_slug=None,
             self.submit_kb_article_page.add_text_to_article_slug_field(kb_article_slug)
 
         if article_category is None:
-            article_category = (kb_article_test_data["category_options"]
-            ["60" if is_template else "10"])
-        else:
-            try:
-                article_category = kb_article_test_data["category_options"][f"{article_category}"]
-            except KeyError as e:
-                article_category = article_category
+            article_category = kb_article_test_data[
+                "kb_template_category" if is_template else "category_options"
+            ]
         self.submit_kb_article_page.select_category_option_by_text(article_category)
 
         if article_slug == "":
@@ -89,28 +82,23 @@ def submit_simple_kb_article(self, article_title=None, article_slug=None,
         if not allow_translations:
             self.submit_kb_article_page.check_allow_translations_checkbox()
 
-        if not product:
-            product = kb_article_test_data["relevant_to_product"]
+        product = kb_article_test_data["relevant_to_product"]
         if selected_product is True:
             self.submit_kb_article_page.click_on_a_particular_product(product)
 
-        if not article_topic:
-            article_topic = [
-                kb_article_test_data["selected_parent_topic"],
-                kb_article_test_data["selected_child_topic"]
-            ]
-            # Adding Article topic
-            if selected_topics is True:
-                self.submit_kb_article_page.click_on_a_particular_parent_topic_checkbox(
-                    article_topic[0]
-                )
-                self.submit_kb_article_page.click_on_a_particular_child_topic_checkbox(
-                    article_topic[0],
-                    article_topic[1],
-                )
-        else:
+        article_topic = [
+            kb_article_test_data["selected_parent_topic"],
+            kb_article_test_data["selected_child_topic"]
+        ]
+
+        # Adding Article topic
+        if selected_topics is True:
             self.submit_kb_article_page.click_on_a_particular_parent_topic_checkbox(
-                article_topic
+                article_topic[0]
+            )
+            self.submit_kb_article_page.click_on_a_particular_child_topic_checkbox(
+                article_topic[0],
+                article_topic[1],
             )
 
         # Interacting with Allow Discussion checkbox
@@ -184,8 +172,7 @@ def submit_simple_kb_article(self, article_title=None, article_slug=None,
                 "keyword": keyword,
                 "search_results_summary": summary,
                 "expiry_date": kb_article_test_data["expiry_date"],
-                "article_url": article_url.removesuffix("/history"),
-                "article_show_history_url":article_url,
+                "article_url": article_url,
                 "first_revision_id": first_revision_id
                 }
 
@@ -271,6 +258,73 @@ def submit_new_kb_revision(self, keywords=None, search_result_summary=None, cont
                 "changes_description": self.utilities.kb_article_test_data['changes_description']
                 }
 
+    def kb_article_creation_via_api(self, page: Page, approve_revision=False, is_template=False,
+                                    product=None, topic=None, category=None, ready_for_l10n=False,
+                                    significance_type='') -> dict[str, Any]:
+        """
+        Create a new KB article via API.
+        :param page: Page object.
+        :param approve_revision: Approve the first revision of the article.
+        :param ready_for_l10n: Mark the revision as ready for localization.
+        :param significance_type: Add the significance type of the revision.
+        :param is_template: Create a KB template.
+        :param product: Product ID.
+        :param topic: Topic ID.
+        :param category: Category ID.
+        """
+        kb_article_test_data = self.utilities.kb_article_test_data
+        self.utilities.navigate_to_link(KBArticlePageMessages.CREATE_NEW_KB_ARTICLE_STAGE_URL)
+
+        category = category or ("60" if is_template else "10")
+        kb_title = (
+            kb_article_test_data[
+                "kb_template_title" if category == "60" else "kb_article_title"] + self.utilities.
+            generate_random_number(0, 5000))
+
+        topic = topic if topic is not None else "383"
+        product = product if product is not None else "1"
+        slug = slugify(kb_title)
+
+        form_data = {
+            "csrfmiddlewaretoken": self.utilities.get_csrfmiddlewaretoken(),
+            "title": kb_title,
+            "slug": slug,
+            "category": category,
+            "is_localizable": "on",
+            "products": product,
+            "topics": topic,
+            "allow_discussion": "on",
+            "keywords": kb_article_test_data["keywords"],
+            "summary": kb_article_test_data["search_result_summary"],
+            "content": kb_article_test_data["article_content"],
+            "expires": "",
+            "based_on": "",
+            "comment": kb_article_test_data["changes_description"]
+        }
+
+        response = self.utilities.post_api_request(
+            page, KBArticlePageMessages.CREATE_NEW_KB_ARTICLE_STAGE_URL, data=form_data
+        )
+
+        print(response)
+        self.utilities.navigate_to_link(response.url)
+
+        first_revision_id = self.kb_article_show_history_page.get_last_revision_id()
+        if approve_revision:
+            self.approve_kb_revision(revision_id=first_revision_id, ready_for_l10n=ready_for_l10n)
+
+
+        return {"article_title": kb_title,
+                "article_content": kb_article_test_data["article_content"],
+                "article_slug": slug,
+                "keyword": kb_article_test_data["keywords"],
+                "search_results_summary": kb_article_test_data["search_result_summary"],
+                "article_url": response.url.removesuffix("/history"),
+                "article_show_history_url": self.utilities.get_page_url(),
+                "first_revision_id": first_revision_id,
+                "article_review_description": kb_article_test_data["changes_description"]
+                }
+
     def defer_revision(self, revision_id: str):
         self.kb_article_show_history_page.click_on_review_revision(revision_id)
         self.kb_article_review_revision_page.click_on_defer_revision_button()
diff --git a/playwright_tests/messages/ask_a_question_messages/AAQ_messages/aaq_form_page_messages.py b/playwright_tests/messages/ask_a_question_messages/AAQ_messages/aaq_form_page_messages.py
index 8bac92fe907..29515c69824 100644
--- a/playwright_tests/messages/ask_a_question_messages/AAQ_messages/aaq_form_page_messages.py
+++ b/playwright_tests/messages/ask_a_question_messages/AAQ_messages/aaq_form_page_messages.py
@@ -11,5 +11,5 @@ class AAQFormMessages:
     LOGINLESS_RATELIMIT_REACHED_MESSAGE = "You've exceeded the number of submissions for today."
 
     def get_premium_ticket_submission_success_message(self, user_email: str) -> str:
-        return (f"Thank you for reaching out to Mozilla Support. We're reviewing your submission "
-                f"and will send a confirmation email to {user_email} shortly.")
+        return (f"Done! Thank you for reaching out Mozilla Support. We've sent a confirmation "
+                f"email to {user_email}")
diff --git a/playwright_tests/messages/explore_help_articles/kb_translation_messages.py b/playwright_tests/messages/explore_help_articles/kb_translation_messages.py
index d5de764ee59..e83d74ee674 100644
--- a/playwright_tests/messages/explore_help_articles/kb_translation_messages.py
+++ b/playwright_tests/messages/explore_help_articles/kb_translation_messages.py
@@ -2,7 +2,7 @@ class KbTranslationMessages:
     LOCALIZATION_DASHBOARD_NEEDS_REVIEW_STATUS = "Necesită revizuire"
     LOCALIZATION_DASHBOARD_NEEDS_TRANSLATION_STATUS = "Necesită traducere"
     LOCALIZATION_DASHBOARD_NEEDS_ACTUALIZATION_STATUS = "Necesită actualizare"
-    LOCALIZATION_DASHBOARD_TRANSLATED_STATUS = "La zi"
+    LOCALIZATION_DASHBOARD_TRANSLATED_STATUS = "Updated"
 
     def _get_kb_article_translation_ro_page(self, article_slug: str) -> str:
         return f"https://support.allizom.org/ro/kb/{article_slug}/translate"
diff --git a/playwright_tests/pages/ask_a_question/aaq_pages/aaq_form_page.py b/playwright_tests/pages/ask_a_question/aaq_pages/aaq_form_page.py
index debda5dfb9b..8dd768a66a1 100644
--- a/playwright_tests/pages/ask_a_question/aaq_pages/aaq_form_page.py
+++ b/playwright_tests/pages/ask_a_question/aaq_pages/aaq_form_page.py
@@ -1,4 +1,5 @@
 from playwright.sync_api import ElementHandle, Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -9,27 +10,27 @@ def __init__(self, page: Page):
         self.__uploaded_image_title = ""
         self.premium_ticket_message = page.locator("ul[class='user-messages'] p")
 
-        """"Locators belonging to the breadcrumbs section."""
+        # Breadcrumb locators.
         self.in_progress_item_label = page.locator(
             "li[class='progress--item is-current'] span[class='progress--label']")
         self.milestone_by_name = lambda milestone_name: page.locator(
             f'//span[@class="progress--label" and text()="{milestone_name}"]/../..')
 
-        """Locators belonging to the AAQ form page."""
+        # AAQ form page content locators.
         self.aaq_page_logo = page.locator("img[class='page-heading--logo']")
         self.aaq_page_product_heading = page.locator("//div[@id='main-content']/article/h3")
         self.aaq_page_intro_text = page.locator("form#question-form p[class='sumo-page-intro']")
         self.aaq_page_info_card = page.locator("div[class*='info card']")
 
-        """Locators belonging to the AAQ subject form field."""
+        # AAQ Subject locators.
         self.aaq_subject_input_field = page.locator("input#id_title")
         self.premium_aaq_subject_input_field = page.locator("input#id_subject")
         self.aaq_subject_input_field_error_message = page.locator("input#id_title + ul li")
 
-        """Locators belonging to the loginless form."""
+        # Loginless form locators.
         self.loginless_contact_email_input_field = page.locator("input#id_email")
 
-        """"Locators belonging to the product topi dropdown."""
+        # Product topic dropdown locators.
         self.product_topic_options = page.locator("select#id_category option")
         self.product_topic_options_without_default_none = page.locator(
             "select#id_category option:not([value=''])")
@@ -38,27 +39,27 @@ def __init__(self, page: Page):
             "select#id_category ~ ul[class='errorlist'] li"
         )
 
-        """Locators belonging to the product os dropdown (Specific to Mozilla VPN)"""
+        # Product os dropdown locators (Available for Mozilla VPN product only).
         self.product_os_select_dropdown_options = page.locator("select#id_os option")
         self.product_os_select_dropdown = page.locator("select#id_os")
 
-        """Locators belonging to the how can we help textarea field."""
+        # How can we help textarea field locators.
         self.how_can_we_help_textarea = page.locator("textarea#id_content")
         self.tell_us_more_premium_product_textarea = page.locator("textarea#id_description")
         self.how_can_we_help_textarea_error_field = page.locator(
             "//textarea[@id='id_content']/../following-sibling::ul/li")
 
-        """Locators belonging to the 'Add Image' section."""
+        # Add Image locators.
         self.add_image_browse_button = page.locator("//span[text()='Browse...']/..")
         self.uploaded_test_image_preview = page.locator("img[title='{__uploaded_image_title}']")
         self.uploaded_test_image_delete_button = page.locator(
             "form[class='upload-input'] input[class='delete']")
         self.uploaded_image = page.locator("a[class='image'] img")
 
-        """Locators belonging to the Email me when someone answers the thread checkbox."""
+        # Email me when someone answers the thread checkbox locators.
         self.email_me_checkbox = page.locator("input#id_notifications")
 
-        """"Locators belonging to the form buttons."""
+        # Form buttons locators.
         self.form_submit_button = page.get_by_role("button").filter(has_text="Submit")
         self.save_edit_question_button = page.get_by_role(
             "button", name="Save Question", exact=True)
@@ -66,7 +67,7 @@ def __init__(self, page: Page):
             "button", name="Update answer", exact=True)
         self.form_cancel_option = page.get_by_role("link").filter(has_text="Cancel")
 
-        """Locators belonging to the Share Data section."""
+        # Share Data locators.
         self.share_data_button = page.locator("button#share-data")
         self.troubleshooting_information_textarea = page.locator("textarea#id_troubleshooting")
         self.try_these_manual_steps_link = page.locator("p#troubleshooting-manual a")
@@ -74,7 +75,7 @@ def __init__(self, page: Page):
         self.product_version_input = page.locator("input#id_ff_version")
         self.product_os = page.locator("input#id_os")
 
-        """Locators belonging to the Helpful tip section."""
+        # Helpful Tip section locators.
         self.helpful_tip_section = page.locator(
             "aside[class='sumo-l-two-col--sidebar'] div[class='large-only']")
 
@@ -84,14 +85,14 @@ def fill_contact_email_field(self, text: str):
     def get_premium_card_submission_message(self) -> str:
         return self._get_text_of_element(self.premium_ticket_message)
 
-    """Actions against the breadcrumb locators."""
+    # Breadcrumb actions.
     def get_in_progress_item_label(self) -> str:
         return self._get_text_of_element(self.in_progress_item_label)
 
     def click_on_a_particular_completed_milestone(self, milestone_name: str):
         self._click(self.milestone_by_name(milestone_name))
 
-    """Actions against the question subject locators."""
+    # Question subject actions.
     def get_value_of_subject_input_field(self) -> str:
         return self._get_element_input_value(self.aaq_subject_input_field)
 
@@ -110,7 +111,7 @@ def add_text_to_premium_aaq_form_subject_field(self, text: str):
     def add_text_to_premium_aaq_textarea_body_field(self, text: str):
         self._fill(self.tell_us_more_premium_product_textarea, text)
 
-    """Actions against the question body locators."""
+    # Question body actions.
     def get_value_of_question_body_textarea_field(self) -> str:
         return self._get_element_input_value(self.how_can_we_help_textarea)
 
@@ -123,7 +124,7 @@ def get_aaq_form_body_error(self) -> str:
     def add_text_to_aaq_textarea_field(self, text: str):
         self._fill(self.how_can_we_help_textarea, text)
 
-    """Actions against the question image section locators."""
+    # Question image actions.
     def image_preview_element(self) -> ElementHandle:
         return self._get_element_handle(self.uploaded_test_image_preview)
 
@@ -137,7 +138,13 @@ def uploaded_image_locator(self) -> Locator:
     def uploaded_images_handles(self) -> list[ElementHandle]:
         return self._get_element_handles(self.uploaded_image)
 
-    """Actions against the general page content locators."""
+    def get_upload_image_button_locator(self) -> Locator:
+        return self.add_image_browse_button
+
+    # Page content actions.
+    def get_product_image_locator(self) -> Locator:
+        return self.aaq_page_logo
+
     def get_aaq_form_page_heading(self) -> str:
         return self._get_text_of_element(self.aaq_page_product_heading)
 
@@ -147,12 +154,15 @@ def get_aaq_form_page_intro_text(self) -> str:
     def get_aaq_form_info_card_text(self) -> str:
         return self._get_text_of_element(self.aaq_page_info_card)
 
-    """Actions against the question topic locators."""
+    def get_helpful_tip_locator(self) -> Locator:
+        return self.helpful_tip_section
+
+    # Question topic actions.
     def get_aaq_form_topic_select_error(self) -> str:
         return self._get_text_of_element(self.product_topic_select_dropdown_error_message)
 
+    # Returns all the non-default selectable topic options.
     def get_aaq_form_topic_options(self) -> list[str]:
-        # Returns all the non-default selectable topic options.
         return self._get_text_of_elements(self.product_topic_options_without_default_none)
 
     def select_aaq_form_topic_value(self, value: str):
@@ -167,7 +177,7 @@ def add_text_to_os_field(self, text: str):
     def select_aaq_form_os_value(self, value: str):
         self._select_option_by_value(self.product_os_select_dropdown_options, value)
 
-    """Actions against the Troubleshooting information section locators."""
+    # Troubleshooting information actions.
     def add_text_to_troubleshooting_information_textarea(self, text: str):
         self._fill(self.troubleshooting_information_textarea, text)
 
@@ -188,13 +198,13 @@ def click_on_share_data_button(self):
     def click_on_show_details_option(self):
         self._click(self.show_details_option)
 
+    # Instead of clicking on the 'Try these manual steps' button we are going to perform the
+    # assertion by checking that the element has the correct href value. Navigating to prod can
+    # yield a 429 error which we want to avoid.
     def get_try_these_manual_steps_link(self) -> str:
-        # Instead of clicking on the 'Try these manual steps' button we are going to perform the
-        # assertion by checking that the element has the correct href value. Navigating to prod can
-        # yield a 429 error which we want to avoid.
         return self._get_element_attribute_value(self.try_these_manual_steps_link, "href")
 
-    """Actions against the email me when someone answers the thread section locators."""
+    # Email me when someone answers the thread section actions.
     def click_on_email_me_when_someone_answers_the_thread_checkbox(self):
         self._click(self.email_me_checkbox)
 
@@ -205,7 +215,7 @@ def click_aaq_form_submit_button(self, expected_locator=None, with_force=False):
         self._click(self.form_submit_button, expected_locator=expected_locator,
                     with_force=with_force)
 
-    """Actions against the edit question form page locators."""
+    # Edit question form actions.
     def click_aaq_edit_submit_button(self):
         self._click(self.save_edit_question_button)
 
diff --git a/playwright_tests/pages/ask_a_question/contact_support_pages/contact_support_page.py b/playwright_tests/pages/ask_a_question/contact_support_pages/contact_support_page.py
index 05efa49333f..6270d1ed1e0 100644
--- a/playwright_tests/pages/ask_a_question/contact_support_pages/contact_support_page.py
+++ b/playwright_tests/pages/ask_a_question/contact_support_pages/contact_support_page.py
@@ -1,4 +1,5 @@
 from playwright.sync_api import Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,17 +7,17 @@ class ContactSupportPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """"Locators belonging to the breadcrumbs section."""
+        # Breadcrumb locators.
         self.current_milestone = page.locator(
             "li[class='progress--item is-current'] span[class='progress--label']")
 
-        """General page content locators."""
+        # Page content locators.
         self.page_main_heading = page.locator("h1[class='sumo-page-heading']")
         self.page_subheading = page.locator("h2[class='sumo-page-subheading']")
         self.browse_all_product_forums_button = page.get_by_role("link").filter(
             has_text="Browse All Product Forums")
 
-        """Locators belonging to the product cards."""
+        # Product Card Titles locators.
         self.product_cards_titles = page.locator("div#product-picker h3[class='card--title']")
         self.product_card_subtitle = lambda card_name: page.locator(
             f"//a[normalize-space(text()) = '{card_name}']/..//following-sibling::p"
@@ -24,11 +25,11 @@ def __init__(self, page: Page):
         self.product_card_by_name = lambda card_name: page.locator(
             "h3[class='card--title']").get_by_role("link", name=card_name, exact=True)
 
-    """"Actions against the breadcrumb locators."""
+    # Breadcrumb related actions.
     def get_text_of_current_milestone(self) -> str:
         return self._get_text_of_element(self.current_milestone)
 
-    """"Actions against the general page locators."""
+    # Page actions.
     def get_contact_support_main_heading(self) -> str:
         return self._get_text_of_element(self.page_main_heading)
 
@@ -38,7 +39,7 @@ def get_contact_support_subheading_text(self) -> str:
     def click_on_browse_all_product_forums_button(self):
         self._click(self.browse_all_product_forums_button)
 
-    """Actions against the product cards."""
+    # Product card actions.
     def get_all_product_card_titles(self) -> list[str]:
         return self._get_text_of_elements(self.product_cards_titles)
 
diff --git a/playwright_tests/pages/ask_a_question/posted_question_pages/questions_page.py b/playwright_tests/pages/ask_a_question/posted_question_pages/questions_page.py
index 9244dfbdd5b..b6c513583b9 100644
--- a/playwright_tests/pages/ask_a_question/posted_question_pages/questions_page.py
+++ b/playwright_tests/pages/ask_a_question/posted_question_pages/questions_page.py
@@ -1,17 +1,15 @@
-from playwright.sync_api import ElementHandle, Page
+from playwright.sync_api import ElementHandle, Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
 class QuestionPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the page breadcrumbs."""
+        # Breadcrumb locators.
         self.question_breadcrumb = lambda question_title: page.locator(
             "ol#breadcrumbs").get_by_role("listitem", name=question_title, exact=True)
-        self.aaq_page_breadcrumbs = page.locator("ol#breadcrumbs li a")
-
-        """Locators belonging to the 'Posted successfully' green banner."""
+        # "Posted successfully" green banner locators.
         self.posted_questions_success_banner_message = page.locator(
             "ul[class='user-messages'] li p")
         self.posted_questions_success_banner_my_questions_link = page.locator(
@@ -28,7 +26,7 @@ def __init__(self, page: Page):
         self.problem_solved_banner_text = page.locator(
             "li[class='mzp-c-notification-bar mzp-t-success'] p")
 
-        """Locators belonging to the problem solved section."""
+        # Problem solved locators.
         self.problem_solved_reply_text = page.locator("div[class='reply'] p")
         self.problem_solved_reply_section = page.locator("div[class='solution card elevation-00']")
         self.problem_solved_reply_section_header = page.locator("h4[class='is-solution']")
@@ -39,7 +37,7 @@ def __init__(self, page: Page):
         self.reply_solution_header = lambda reply_id: page.locator(
             f"div#{reply_id} h3[class='is-solution']")
 
-        """Genera question locators."""
+        # Question locators.
         self.question_author = page.locator("div[class='question'] span[class='display-name']")
         self.questions_header = page.locator(
             "h2[class='sumo-callout-heading summary no-product-heading']")
@@ -47,11 +45,14 @@ def __init__(self, page: Page):
         self.modified_question_section = page.locator("p[class='edited text-body-sm']")
         self.question = lambda question_id: page.locator(f"div#{question_id}")
 
-        """Locators belonging to the progress bar section."""
+        # Progress bar locators.
         self.complete_progress_items_label = page.locator(
             "li[class='progress--item is-complete'] span[class='progress--label']")
 
-        """Locators belonging to the question details section."""
+        # Breadcrumbs locators.
+        self.aaq_page_breadcrumbs = page.locator("ol#breadcrumbs li a")
+
+        # Question details locators.
         self.question_details_button = page.locator("button[aria-controls='question-details']")
         self.question_details_product = page.locator("//div[@id='question-details']//span"
                                                      "[text()='Product:']/following-sibling::span")
@@ -66,11 +67,11 @@ def __init__(self, page: Page):
             "div[class='about-support'] p").get_by_text(text, exact=True)
         self.question_section = page.locator("article div[class='question']")
 
-        """Locators belonging to the searchbar section."""
+        # Searchbar locators.
         self.search_support_searchbar = page.locator("form#support-search-sidebar input")
         self.search_support_search_button = page.locator("form#support-search-sidebar button")
 
-        """Locators belonging to the Question Tools section."""
+        # Question Tools locators.
         self.edit_this_question_option = page.locator("ul#related-content li[class='edit'] a")
         self.stop_email_updates_option = page.locator("ul#related-content li[class='email'] a")
         self.subscribe_to_feed_option = page.locator("ul#related-content li[class='rss'] a")
@@ -80,7 +81,7 @@ def __init__(self, page: Page):
         self.system_details_options = page.locator("div#system-details ul[class='system'] li")
         self.mark_as_spam_option = page.locator("ul#related-content form[class='spam-form cf'] a")
 
-        """Locators belonging to the tags section."""
+        # Tags section locators.
         self.question_tags_options_for_non_moderators = page.locator("li[class='tag'] a")
         self.question_tags_options_for_moderators = page.locator("div[class='ts-control'] div")
         self.add_a_tag_input_field = page.locator("input[id*='tag-select']")
@@ -93,7 +94,7 @@ def __init__(self, page: Page):
             "//a[@class='tag-name' and normalize-space(text())='test']/following-sibling::"
             "a[@class='remove']")
 
-        """Locators belonging to the post a reply section."""
+        # Post a reply section locators.
         self.post_a_reply_section_heading = page.locator("h3[class='sumo-card-heading']")
         self.post_a_reply_textarea = page.locator("textarea#id_content")
         self.post_a_reply_textarea_bold_button = page.locator("button[title='Bold']")
@@ -128,7 +129,7 @@ def __init__(self, page: Page):
         self.username_of_posted_quote_owner = lambda reply_id: page.locator(
             f"div#{reply_id} div[class='content'] em p")
         self.posted_reply_said_link = lambda reply_id: page.locator(
-            f"//div[@id='{reply_id}']//div[@class='content']//a[text()='said']")
+            f"div#{reply_id} div[class='content'] a")
         self.blockquote_reply = lambda reply_id: page.locator(
             f"div#{reply_id} div[class='content'] blockquote")
         self.modified_by_text = lambda reply_id: page.locator(
@@ -159,7 +160,7 @@ def __init__(self, page: Page):
             f"div#{reply_id} button[name='not-helpful'] strong[class='helpful-count']")
         self.response_time = lambda reply_id: page.locator(f"div#{reply_id} time time")
 
-        """Locators belonging to the Common Responses section."""
+        # Common Responses locators.
         self.common_responses_option = page.locator("a[title='Common responses']")
         self.common_responses_search_field = page.locator("input#filter-responses-field")
         self.common_responses_modal_close_button = page.locator("div#media-modal a")
@@ -178,34 +179,32 @@ def __init__(self, page: Page):
         self.response_option = lambda option: page.locator(
             "ul[class='sidebar-nav'] li").get_by_text(option, exact=True)
 
-        """Locators belonging to the 'I have this problem too' section.'"""
+        # I have this problem too locators.
         self.i_have_this_problem_too_button = page.locator("div[class='me-too'] button")
         self.i_have_this_problem_too_counter = page.locator(
             "span[class='forum--meta-val have-problem']")
-        self.i_have_this_problem_too_no_thanks_button = page.locator(
-            "//section[@id='vote-thanks']//a[text()='No Thanks']")
 
-        """Locators belonging to the 'Needs more information from' section."""
+        # Needs more information from the user locators.
         self.needs_more_information_from_the_user_checkbox = page.locator("input#id_needs_info")
         self.more_information_panel_header = page.locator(
             "section#more-system-details").get_by_role("heading").filter(
             has_text="More Information")
 
-        """Locators belonging to the attached image section."""
+        # Attached image locators.
         self.attached_image = page.locator("a[class='image'] img")
         self.add_image_button = page.locator("div[class='field add-attachment']")
 
-        """Locators belonging to the preview reply button section."""
+        # Preview Reply button locators.
         self.preview_reply_button = page.locator("input#preview")
 
-        """Locators belonging to the post reply button."""
+        # Post Reply button locators.
         self.post_reply_button = page.get_by_role("button", name="Post Reply", exact=True)
 
-        """Locators belonging to the delete question section."""
+        # Delete question locators.
         self.delete_question_delete_button = page.locator("input[value='Delete']")
         self.delete_question_cancel_button = page.get_by_role("link").filter(has_text="Cancel")
 
-        """Locators belonging to the report abuse section."""
+        # Report abuse section.
         self.report_abuse_submit_button = page.locator(
             "div[class='mzp-c-modal-inner'] button[type='submit']")
         self.report_abuse_textarea = page.locator("div[class='mzp-c-modal-inner'] textarea")
@@ -216,7 +215,7 @@ def __init__(self, page: Page):
         self.report_answer_as_abuse = lambda answer_id: page.locator(
             f"div#{answer_id}").get_by_role("link", name="Report Abuse", exact=True)
 
-        """Locators belonging to the signed out card."""
+        # Signed out card locators.
         self.log_in_to_your_account_signed_out_card_option = page.locator(
             "div[class='question-tools ask-a-question card is-shaded'] p").get_by_role(
             "link", name="log in to your account", exact=True)
@@ -230,14 +229,14 @@ def __init__(self, page: Page):
             "div[class='question-tools ask-a-question card is-shaded']").get_by_role(
             "button", name="I have this problem, too", exact=True)
 
-    """Actions against the spam marked banner locators."""
+    # Spam marked banner actions.
     def get_text_of_spam_marked_banner(self) -> str:
         return self._get_text_of_element(self.reply_flagged_as_spam_banner)
 
     def is_spam_marked_banner_displayed(self) -> bool:
         return self._is_element_visible(self.reply_flagged_as_spam_banner)
 
-    """Actions against the report abuse section locators."""
+    # Report abuse actions.
     def click_abuse_modal_close_button(self):
         self._click(self.report_abuse_modal_close_button)
 
@@ -250,47 +249,65 @@ def add_text_to_report_abuse_textarea(self, text: str):
     def click_on_report_abuse_submit_button(self):
         self._click(self.report_abuse_submit_button)
 
-    """Actions against the breadcrumbs locators."""
+    # Breadcrumbs actions.
+    def get_current_breadcrumb_locator(self, question_title: str) -> Locator:
+        return self.question_breadcrumb(question_title)
+
     def click_on_breadcrumb(self, breadcrumb_xpath: str):
         self._click(breadcrumb_xpath)
 
-    """Actions against the Problem solved section locators."""
+    # Get email updates actions.
+    def get_email_updates_option(self) -> Locator:
+        return self.stop_email_updates_option
+
+    # Problem solved actions.
     def get_problem_solved_section_header_text(self) -> str:
         return self._get_text_of_element(self.problem_solved_reply_section_header)
 
     def click_on_undo_button(self):
         self._click(self.undo_solves_problem)
 
+    def get_undo_button_locator(self) -> Locator:
+        return self.undo_solves_problem
+
     def click_read_this_answer_in_context_link(self):
         self._click(self.problem_solved_reply_reply_link)
 
     def get_chosen_solution_text(self) -> str:
         return self._get_text_of_element(self.problem_solved_reply_text)
 
+    def get_chosen_solution_section_locator(self) -> Locator:
+        return self.problem_solved_reply_section
+
     def is_solution_section_displayed(self) -> bool:
         return self._is_element_visible(self.problem_solved_reply_section)
 
     def get_solved_problem_banner_text(self) -> str:
         return self._get_text_of_element(self.problem_solved_banner_text)
 
+    def get_solved_the_problem_button_locator(self, target_reply_id: str) -> Locator:
+        return self.reply_solves_the_problem(target_reply_id)
+
     def get_chosen_solution_reply_message(self, reply_id: str) -> str:
         return self._get_text_of_element(self.reply_solution_header(reply_id))
 
-    """Actions against the I have this problem too locators."""
+    def get_chosen_solution_reply_message_locator(self, reply_id: str) -> Locator:
+        return self.reply_solution_header(reply_id)
+
+    # I have this problem too actions.
+    def get_i_have_this_problem_too_locator(self) -> Locator:
+        return self.i_have_this_problem_too_button
+
     def click_i_have_this_problem_too_button(self):
-        self._click(self.i_have_this_problem_too_button,
-                    expected_locator=self.i_have_this_problem_too_no_thanks_button)
+        self._click(self.i_have_this_problem_too_button)
 
     def get_i_have_this_problem_too_counter(self) -> int:
         return int(self._get_text_of_element(self.i_have_this_problem_too_counter))
 
-    def click_on_i_have_this_problem_no_thanks_button(self):
-        self._click(self.i_have_this_problem_too_no_thanks_button)
-
     def get_last_reply_by_text(self) -> str:
         return self._get_text_of_element(self.last_reply_by)
 
-    """Actions against the general page locators."""
+    # Page content actions.
     def get_question_header(self) -> str:
         return self._get_text_of_element(self.questions_header)
 
@@ -306,9 +323,15 @@ def get_question_author_name(self) -> str:
     def get_question_id(self) -> str:
         return self._get_element_attribute_value(self.question_section, 'id')
 
+    def get_modified_question_locator(self) -> Locator:
+        return self.modified_question_section
+
     def get_modified_by_text(self) -> str:
         return self._get_text_of_element(self.modified_question_section)
 
+    def get_add_image_section_locator(self) -> Locator:
+        return self.add_image_button
+
     def click_on_my_questions_banner_option(self):
         self._click(self.posted_questions_success_banner_my_questions_link)
 
@@ -328,27 +351,52 @@ def get_text_content_of_reply(self, reply_id: str) -> str:
     def get_display_name_of_question_reply_author(self, reply_id: str) -> str:
         return self._get_text_of_element(self.reply_author_display_name(reply_id))
 
+    def get_displayed_user_title_of_question_reply_locator(self, reply_id: str) -> Locator:
+        return self.reply_user_title(reply_id)
+
     def get_displayed_user_title_of_question_reply(self, reply_id: str) -> str:
         return self._get_text_of_element(self.reply_user_title(reply_id))
 
-    """Actions against the question tag section locators."""
+    # Question tag actions.
     def get_question_tag_options(self, is_moderator: bool) -> list[str]:
         return [tag.replace("\n×", "") for tag in self._get_text_of_elements(
             self.question_tags_options_for_moderators if is_moderator else self
             .question_tags_options_for_non_moderators)]
 
+    def get_remove_tag_button_locator(self, tag_name: str) -> Locator:
+        return self.delete_tag(tag_name)
+
     def add_text_to_add_a_tag_input_field(self, text: str):
         self._fill(self.add_a_tag_input_field, text)
         self._wait_for_given_timeout(2000)
         self._press_a_key(self.add_a_tag_input_field, "Enter")
 
+    def get_add_a_tag_input_field(self) -> Locator:
+        return self.add_a_tag_input_field
+
     def click_on_a_certain_tag(self, tag_name: str, expected_locator):
         self._click(self.tag_by_name(tag_name), expected_locator=expected_locator)
 
+    def get_a_certain_tag(self, tag_name: str) -> Locator:
+        return self.tag(tag_name)
+
     def click_on_tag_remove_button(self, tag_name: str):
         self._click(self.delete_tag(tag_name))
 
-    """Actions against the more information section locators."""
+    # Attached image actions.
+    def get_attached_image(self) -> Locator:
+        return self.attached_image
+
+    # Question more information actions.
+    def get_more_information_with_text_locator(self, text: str) -> Locator:
+        return self.more_information_with_text(text)
+
+    def get_question_details_button_locator(self) -> Locator:
+        return self.question_details_button
+
+    def get_more_information_locator(self) -> Locator:
+        return self.more_information_panel_header
+
     def get_user_agent_information(self) -> str:
         self._wait_for_locator(self.more_system_details_modal)
         return self._get_text_of_element(self.user_agent_information)
@@ -371,43 +419,70 @@ def click_on_more_system_details_option(self):
     def click_on_the_additional_system_panel_close(self):
         self._click(self.close_additional_system_details_button)
 
+    def get_reply_section_locator(self, answer_id: str) -> Locator:
+        return self.reply_section(answer_id)
+
     def click_on_reply_more_options_button(self, answer_id: str):
         self._click(self.more_options_for_answer(answer_id))
 
     def click_on_report_abuse_for_a_certain_reply(self, answer_id: str):
         self._click(self.report_answer_as_abuse(answer_id))
 
+    def get_click_on_report_abuse_reply_locator(self, answer_id: str) -> Locator:
+        return self.report_answer_as_abuse(answer_id)
+
     def click_on_quote_for_a_certain_reply(self, answer_id: str):
         self._click(self.quote_reply(answer_id))
 
+    def get_quote_reply_locator(self, answer_id: str) -> Locator:
+        return self.quote_reply(answer_id)
+
     def click_on_mark_as_spam_for_a_certain_reply(self, answer_id: str):
         self._click(self.mark_reply_as_spam(answer_id))
 
+    def get_mark_as_spam_reply_locator(self, answer_id: str) -> Locator:
+        return self.mark_reply_as_spam(answer_id)
+
+    def get_marked_as_spam_locator(self, answer_id: str) -> Locator:
+        return self.marked_as_spam(answer_id)
+
     def get_marked_as_spam_text(self, answer_id: str) -> str:
         return self._get_text_of_element(self.marked_as_spam(answer_id))
 
     def click_on_edit_this_post_for_a_certain_reply(self, answer_id: str):
         self._click(self.edit_this_post_for_answer(answer_id))
 
+    def get_edit_this_post_reply_locator(self, answer_id: str) -> Locator:
+        return self.edit_this_post_for_answer(answer_id)
+
     def click_on_delete_this_post_for_a_certain_reply(self, answer_id: str):
         self._click(self.delete_this_post_for_answer(answer_id))
 
+    def get_delete_this_post_reply_locator(self, answer_id: str) -> Locator:
+        return self.delete_this_post_for_answer(answer_id)
+
     def click_on_cancel_delete_button(self):
         self._click(self.delete_question_cancel_button)
 
-    """Actions against the post a reply section locators."""
+    # Post a reply actions.
     def add_text_to_post_a_reply_textarea(self, text: str):
         self._fill(self.post_a_reply_textarea, text)
 
     def type_inside_the_post_a_reply_textarea(self, text: str):
         self._type(self.post_a_reply_textarea, text, 100)
 
+    def get_post_a_reply_textarea_locator(self) -> Locator:
+        return self.post_a_reply_textarea
+
     def get_post_a_reply_textarea_text(self) -> str:
         return self._get_text_of_element(self.post_a_reply_textarea)
 
     def get_post_a_reply_textarea_value(self) -> str:
         return self._get_element_input_value(self.post_a_reply_textarea)
 
+    def get_posted_reply_locator(self, question_id: str) -> Locator:
+        return self.question(question_id)
+
     def get_posted_reply_text(self, reply_id: str) -> str:
         return self._get_text_of_element(self.posted_reply_text(reply_id))
 
@@ -423,19 +498,46 @@ def get_blockquote_reply_text(self, reply_id: str) -> str:
     def get_posted_reply_modified_by_text(self, reply_id: str) -> str:
         return self._get_text_of_element(self.modified_by_text(reply_id))
 
+    def get_posted_reply_modified_by_locator(self, reply_id: str) -> Locator:
+        return self.modified_by_text(reply_id)
+
     def click_on_post_reply_button(self, repliant_username) -> str:
         self._click(self.post_reply_button,
                     expected_locator=self.repliant_username(repliant_username))
         return self._get_element_attribute_value(self.answer_by_username(repliant_username), "id")
 
-    """Actions against the question tools section locators."""
+    # Question Tools actions.
+    def get_edit_this_question_option_locator(self) -> Locator:
+        return self.edit_this_question_option
+
+    def get_delete_this_question_locator(self) -> Locator:
+        return self.delete_this_question_option
+
+    def get_lock_this_question_locator(self) -> Locator:
+        return self.lock_this_question_option
+
+    # Stands for archived banner as well
     def get_thread_locked_text(self) -> str:
-        # Stands for archived banner as well
         return self._get_text_of_element(self.lock_this_thread_banner)
 
+    def get_thread_locked_locator(self) -> Locator:
+        return self.lock_this_thread_banner
+
     def is_thread_locked_banner_displayed(self) -> bool:
         return self._is_element_visible(self.lock_this_thread_banner)
 
+    def get_archive_this_question_locator(self) -> Locator:
+        return self.archive_this_question_option
+
+    def get_needs_more_information_checkbox_locator(self) -> Locator:
+        return self.needs_more_information_from_the_user_checkbox
+
+    def get_mark_as_spam_locator(self) -> Locator:
+        return self.mark_as_spam_option
+
+    def get_marked_as_spam_banner_locator(self) -> Locator:
+        return self.marked_as_spam_banner
+
     def get_marked_as_spam_banner_text(self) -> str:
         return self._get_text_of_element(self.marked_as_spam_banner)
 
@@ -469,7 +571,10 @@ def is_reply_displayed(self, reply_id: str) -> bool:
     def is_reply_with_content_displayed(self, reply_content: str) -> bool:
         return self._is_element_visible(self.reply_by_content(reply_content))
 
-    """Actions against the reply votes section locators."""
+    # Votes reply section
+    def get_reply_votes_section_locator(self, reply_id: str) -> Locator:
+        return self.reply_vote_section(reply_id)
+
     def get_reply_vote_heading(self, reply_id: str) -> str:
         return self._get_text_of_element(self.reply_vote_heading(reply_id))
 
@@ -479,6 +584,11 @@ def click_reply_vote_thumbs_up_button(self, reply_id: str):
     def get_thumbs_up_vote_message(self, reply_id: str) -> str:
         return self._get_text_of_element(self.reply_vote_thumbs_up_message(reply_id))
 
+    def get_thumbs_up_button_locator(self, reply_id: str) -> Locator:
+        return self.reply_vote_thumbs_up(reply_id)
+
+    def get_thumbs_down_button_locator(self, reply_id: str) -> Locator:
+        return self.reply_vote_thumbs_down(reply_id)
 
     def click_reply_vote_thumbs_down_button(self, reply_id):
         self._click(self.reply_vote_thumbs_down(reply_id))
@@ -489,7 +599,7 @@ def get_helpful_count(self, reply_id) -> str:
     def get_not_helpful_count(self, reply_id) -> str:
         return self._get_text_of_element(self.unhelpful_count(reply_id))
 
-    """Actions against the signed out card locators."""
+    # Signed out card actions.
     def click_on_log_in_to_your_account_signed_out_card_link(self):
         self._click(self.log_in_to_your_account_signed_out_card_option)
 
@@ -499,10 +609,17 @@ def click_on_start_a_new_question_signed_out_card_link(self):
     def click_on_ask_a_question_signed_out_card_option(self):
         self._click(self.ask_a_question_signed_out_card_option)
 
+    def ask_a_question_signed_out_card_option_locator(self) -> Locator:
+        return self.ask_a_question_signed_out_card_option
+
     def click_on_i_have_this_problem_too_signed_out_card_option(self):
         self._click(self.i_have_this_problem_too_signed_out_card_option)
 
-    """Actions against the common responses section locators."""
+    def get_i_have_this_problem_too_signed_out_card_locator(self) -> Locator:
+        return self.i_have_this_problem_too_signed_out_card_option
+
+    # Common responses actions.
+
     def click_on_common_responses_option(self):
         self._click(self.common_responses_option)
 
@@ -524,8 +641,8 @@ def click_on_a_particular_category_option(self, option: str):
     def click_on_a_particular_response_option(self, option: str):
         self._click(self.response_option(option))
 
+    # Removing both newline characters and link syntax format.
     def get_text_of_response_editor_textarea_field(self) -> str:
-        # Removing both newline characters and link syntax format.
         return (self._get_element_input_value(self.common_responses_textarea_field)
                 .replace("\n", "")
                 .replace("[", "")
diff --git a/playwright_tests/pages/ask_a_question/product_solutions_pages/product_solutions_page.py b/playwright_tests/pages/ask_a_question/product_solutions_pages/product_solutions_page.py
index 99dd21e025f..a864fba180f 100644
--- a/playwright_tests/pages/ask_a_question/product_solutions_pages/product_solutions_page.py
+++ b/playwright_tests/pages/ask_a_question/product_solutions_pages/product_solutions_page.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import ElementHandle, Page
+from playwright.sync_api import ElementHandle, Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,24 +7,24 @@ class ProductSolutionsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the page breadcrumbs."""
+        # Page breadcrumb locators.
         self.complete_progress_item = page.locator("li[class='progress--item is-complete'] a")
         self.complete_progress_item_label = page.locator(
             "li[class='progress--item is-complete'] span.progress--label")
         self.current_progress_item_label = page.locator(
             "li[class='progress--item is-current'] span.progress--label")
 
-        """General page content locators."""
+        # Page content locators.
         self.product_title_heading = page.locator("span.product-title-text")
         self.page_heading_intro_text = page.locator("p.page-heading--intro-text")
 
-        """Locators belonging to the Find Help section."""
+        # Find help locators.
         self.product_solutions_find_help_searchbar = page.locator(
             "form#question-search-masthead input")
         self.product_solutions_find_help_search_button = page.locator(
             "form#question-search-masthead button")
 
-        """Locators belonging to the featured articles section."""
+        # Featured articles locators.
         self.featured_article_section_title = page.get_by_role("heading").filter(
             has_text="Featured Articles")
         self.featured_articles_cards = page.locator(
@@ -32,7 +33,7 @@ def __init__(self, page: Page):
             f'//h2[contains(text(),"Featured Articles")]/../..//a[normalize-space(text())='
             f'"{card_name}"]')
 
-        """Locators belonging to the popular topics section."""
+        # Popular topics locators.
         self.popular_topics_section_title = page.get_by_role("heading").filter(
             has_text="Popular Topics")
         self.popular_topics_cards = page.locator(
@@ -41,18 +42,18 @@ def __init__(self, page: Page):
             f"//h2[contains(text(),'Popular Topics')]/../..//a[normalize-space(text()) = "
             f"'{card_name}']")
 
-        """Locators belonging to the support scam banner."""
+        # Support scam banner locators.
         self.support_scams_banner = page.locator("div#id_scam_alert")
         self.support_scam_banner_learn_more_button = page.locator("div#id_scam_alert a")
 
-    """Actions against the page breadcrumbs locators."""
+    # Breadcrumb actions.
     def click_on_the_completed_milestone(self):
         self._click(self.complete_progress_item)
 
     def get_current_milestone_text(self) -> str:
         return self._get_text_of_element(self.current_progress_item_label)
 
-    """Actions against the featured article section locators."""
+    # Featured article actions.
     def click_on_a_featured_article_card(self, card_name: str):
         self._click(self.featured_article_card(card_name))
 
@@ -62,7 +63,7 @@ def get_all_featured_articles_titles(self) -> list[str]:
     def is_featured_article_section_displayed(self) -> bool:
         return self._is_element_visible(self.featured_article_section_title)
 
-    """Actions against the popular topic section locators."""
+    # Popular topic actions.
     def click_on_a_popular_topic_card(self, card_name: str):
         self._click(self.popular_topic_card(card_name))
 
@@ -72,17 +73,21 @@ def get_popular_topics(self) -> list[str]:
     def is_popular_topics_section_displayed(self) -> bool:
         return self._is_element_visible(self.popular_topics_section_title)
 
-    """Actions against the product solutions section locators."""
+    # Product solutions actions.
     def get_product_solutions_heading(self) -> str:
         return self._get_text_of_element(self.product_title_heading)
 
     def is_product_solutions_page_header_displayed(self) -> ElementHandle:
         return self._get_element_handle(self.product_title_heading)
 
-    """Actions against the scam banner locators."""
+    # Support scam banner actions
+
+    # Instead of clicking on the 'Learn More' button we are going to perform the assertion
+    # by checking that the element has the correct href value. Navigating to prod can yield
+    # a 429 error which we want to avoid.
     def get_scam_alert_banner_link(self) -> str:
-        # Instead of clicking on the 'Learn More' button we are going to perform the assertion
-        # by checking that the element has the correct href value. Navigating to prod can yield
-        # a 429 error which we want to avoid.
         return self._get_element_attribute_value(self.support_scam_banner_learn_more_button,
                                                  "href")
+
+    def get_scam_banner_locator(self) -> Locator:
+        return self.support_scams_banner
diff --git a/playwright_tests/pages/ask_a_question/product_topics_pages/product_topics_page.py b/playwright_tests/pages/ask_a_question/product_topics_pages/product_topics_page.py
index 74b18eb9e79..eff5bc3167c 100644
--- a/playwright_tests/pages/ask_a_question/product_topics_pages/product_topics_page.py
+++ b/playwright_tests/pages/ask_a_question/product_topics_pages/product_topics_page.py
@@ -1,4 +1,5 @@
 from playwright.sync_api import Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,7 +7,7 @@ class ProductTopicPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the product topic page."""
+        # Product topic page content locators.
         self.page_title = page.locator("h1[class='topic-title sumo-page-heading']")
         self.page_subheading = page.locator("div[class='sumo-article-header--text'] p")
         self.all_articles = page.locator("section[class='topic-list'] article h2 a")
@@ -14,18 +15,18 @@ def __init__(self, page: Page):
             "h2[class='sumo-card-heading']").get_by_role(
             "link", name=article_title, exact=True)
 
-        """Locators belonging to the product topic page navbar."""
+        # Product topic page navbar locators.
         self.navbar_links = page.locator("//ul[@class='sidebar-nav--list']/li/a")
         self.selected_nav_link = page.locator("a[class*='selected']")
         self.navbar_option = lambda option_name: page.locator(
             "ul[class='sidebar-nav--list'] li").get_by_role("link").filter(has_text=option_name)
 
-        """Locators belonging to the product topic page article metadata."""
+        # Product topic page article metadata locators.
         self.article_helpfulness_count = lambda article_name: page.locator(
             f"//a[normalize-space(text())='{article_name}']/../../div[@id='document_metadata']//"
             f"span[@class='helpful-count']")
 
-    """Actions against the general product topic page locators."""
+    # Page content actions.
     def get_all_listed_article_titles(self) -> list[str]:
         """Returns a list of all the article titles displayed on the page."""
         return self._get_text_of_elements(self.all_articles)
@@ -41,7 +42,7 @@ def get_a_particular_article_locator(self, article_title: str):
     def click_on_a_particular_article(self, article_title: str):
         self._click(self.article_link(article_title))
 
-    """Actions against the navbar locators."""
+    # Navbar actions.
     def get_selected_navbar_option(self) -> str:
         """Returns the text of the selected navbar option."""
         return self._get_text_of_element(self.selected_nav_link)
diff --git a/playwright_tests/pages/auth_page.py b/playwright_tests/pages/auth_page.py
index 0a2c8586972..4d08ead335e 100644
--- a/playwright_tests/pages/auth_page.py
+++ b/playwright_tests/pages/auth_page.py
@@ -7,7 +7,7 @@ class AuthPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the general content of the auth page."""
+        # Auth page content
         self.auth_page_section = page.locator("section.sumo-auth--wrap")
         self.fxa_sign_in_page_header = page.locator("h1.fxa-signin-password-header")
         self.auth_page_main_header = page.locator("h1.sumo-page-heading")
diff --git a/playwright_tests/pages/common_elements/common_web_elements.py b/playwright_tests/pages/common_elements/common_web_elements.py
index 2a9389584e7..68a0cbcdca3 100644
--- a/playwright_tests/pages/common_elements/common_web_elements.py
+++ b/playwright_tests/pages/common_elements/common_web_elements.py
@@ -1,6 +1,8 @@
 import random
 from typing import Literal
-from playwright.sync_api import Page
+
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -8,16 +10,16 @@ class CommonWebElements(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the spam banner."""
+        # Avoid spam banner locators.
         self.scam_banner = page.locator("div#id_scam_alert")
         self.scam_banner_text = page.locator("div#id_scam_alert p[class='heading']")
         self.learn_more_button = page.locator("div#id_scam_alert").get_by_role("link")
 
-        """Locators belonging to the Still need help widget."""
+        # Still need help widget locators.
         self.aaq_button = page.locator("div[class*='aaq-widget']").get_by_role("link")
         self.still_need_help_subheading = page.locator("div.aaq-widget p")
 
-        """Locators belonging to the Learn more card."""
+        # Learn more card locators.
         self.volunteer_learn_more_card_heading = page.locator(
             "//div[@class='card--details']//a[text()='Learn More']//../../../h3")
         self.volunteer_learn_more_card_text = page.locator(
@@ -26,9 +28,6 @@ def __init__(self, page: Page):
             "div[class='card--details']").get_by_role("link", name="Learn More")
 
         # Frequent Topics locators applicable to product & product solutions pages.
-        """Locators belonging to the Frequent Topics applicable to product & product solutions
-         pages.
-         """
         self.frequent_topics_section_title = page.get_by_role(
             "heading", name="Topics", exact=True)
         self.frequent_topics_section_subtitle = page.get_by_role(
@@ -49,7 +48,7 @@ def __init__(self, page: Page):
             f"//div[@class='card--topic']/div[@class='topic-header']/h3[@class='card--title']/a"
             f"[normalize-space(text())='{card_title}']/../../following-sibling::a")
 
-        """Locators belonging to the pagination elements."""
+        # Pagination page locators
         self.pagination_item = lambda pagination_item: page.locator(
             "ol[class='pagination']").get_by_role("link").filter(has_text=pagination_item)
         self.selected_pagination_item = page.locator(
@@ -59,12 +58,12 @@ def __init__(self, page: Page):
         self.next_pagination_item= page.locator(
             "//ol[@class='pagination']//span[text()='Next']/..")
 
-    """Actions against the Avoid Spam banner locators."""
+    # Actions against the Avoid Spam Banner
     def get_scam_banner_text(self) -> str:
         """Returns the scam banner text."""
         return self._get_text_of_element(self.scam_banner_text)
 
-    """Actions against the Still Need Help widget locators."""
+    # Actions against the Still Need Help Widget
     def click_on_aaq_button(self):
         """Click on the 'Still Need Help?' button."""
         self._click(self.aaq_button)
@@ -76,7 +75,13 @@ def get_aaq_widget_text(self) -> str:
     def get_aaq_widget_button_name(self) -> str:
         return self._get_text_of_element(self.aaq_button)
 
-    """Actions against the learn more section locators."""
+    def get_still_need_help_locator(self) -> Locator:
+        return self.still_need_help_subheading
+
+    # Actions against the Learn More card
+    def get_learn_more_button_locator(self) -> Locator:
+        return self.learn_more_button
+
     def click_on_volunteer_learn_more_link(self):
         self._click(self.volunteer_learn_more_link)
 
@@ -92,7 +97,7 @@ def get_volunteer_learn_more_card_header(self) -> str:
         """
         return self._get_text_of_element(self.volunteer_learn_more_card_heading)
 
-    """Actions against the Frequent Topics Section locators."""
+    # Actions against the Frequent Topics Section.
     def is_frequent_topics_section_displayed(self) -> bool:
         """Check if the frequent topics section is displayed on the page."""
         return self._is_element_visible(self.frequent_topics_section_title)
diff --git a/playwright_tests/pages/community_forums/forums_pages/all_community_forums_page.py b/playwright_tests/pages/community_forums/forums_pages/all_community_forums_page.py
index d70c525f553..2fd823d69c0 100644
--- a/playwright_tests/pages/community_forums/forums_pages/all_community_forums_page.py
+++ b/playwright_tests/pages/community_forums/forums_pages/all_community_forums_page.py
@@ -1,4 +1,5 @@
 from playwright.sync_api import Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,11 +7,11 @@ class SupportForumsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the page heading section."""
+        # Locators belonging to the page heading section.
         self.page_main_heading = page.locator("h1[class='sumo-page-heading']")
         self.page_intro = page.locator("p[class='sumo-page-intro']")
 
-        """Locators belonging to the product community forum cards."""
+        # Locators belonging to the product community forums cards.
         self.product_card_titles = page.locator("h3[class='card--title']")
         self.product_card = lambda card_name: page.locator(
             f"//a[normalize-space(.)='{card_name}']")
@@ -19,7 +20,7 @@ def __init__(self, page: Page):
         self.all_products_support_forum_button = page.get_by_role("link").filter(
             has_text="All Products Community Forums")
 
-    """Actions against the page heading locators."""
+    # Page heading actions.
     def get_page_heading_text(self) -> str:
         """Get the text of the page title."""
         return self._get_text_of_element(self.page_main_heading)
@@ -28,7 +29,7 @@ def get_page_intro_text(self) -> str:
         """Get the text of the page subtitle."""
         return self._get_text_of_element(self.page_intro)
 
-    """Actions against the product cards section."""
+    # Product cards actions.
     def click_on_a_particular_product_card(self, card_name: str):
         """
         Click on a particular product community forum card.
diff --git a/playwright_tests/pages/community_forums/forums_pages/product_support_forum.py b/playwright_tests/pages/community_forums/forums_pages/product_support_forum.py
index 26240fb1775..c57d6969ae4 100644
--- a/playwright_tests/pages/community_forums/forums_pages/product_support_forum.py
+++ b/playwright_tests/pages/community_forums/forums_pages/product_support_forum.py
@@ -1,5 +1,7 @@
 import re
-from playwright.sync_api import Page
+
+from playwright.sync_api import Page, Locator
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,12 +9,12 @@ class ProductSupportForum(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """General page locators."""
+        # General page locators.
         self.ask_the_community_button = page.get_by_role("link").filter(
             has_text="Ask the Community")
         self.community_forum_header = page.locator("//span[@class='product-title-text']")
 
-        """Locators belonging to the displayed questions."""
+        # Locators related to the displayed questions.
         self.showing_questions_tagged_tag = page.locator("div#tagged a[class='tag']")
         self.all_question_list_tags = page.locator("li[class='tag']")
         self.show_all_questions_option = page.locator("a[class='show-all']")
@@ -34,7 +36,8 @@ def __init__(self, page: Page):
         self.question_locked_indicator = lambda question_id: page.locator(
             f"//article[@id='{question_id}']//li[@class='thread-locked']")
 
-        """Locators belonging to the filter options sections."""
+
+        # Locators belonging to the filter options.
         self.selected_tab_filter = page.locator(
             "//ul[@class='tabs--list subtopics']/li[@class='tabs--item']/a[@class='selected']")
         self.tab_filter_by_name = lambda filter_name: page.locator(
@@ -45,7 +48,7 @@ def __init__(self, page: Page):
             "select#products-topics-dropdown").get_by_role("option", selected=True)
 
 
-    """Actions against the general product community forum page locators."""
+    # General product community forum actions.
     def get_text_of_product_community_forum_header(self) -> str:
         """Get the text of the product community forum header."""
         return self._get_text_of_element(self.community_forum_header)
@@ -54,7 +57,7 @@ def click_on_the_ask_the_community_button(self):
         """Click on the 'Ask the Community' button."""
         self._click(self.ask_the_community_button)
 
-    """Actions against the filter tab section locators."""
+    # Actions against the filter tab section.
     def get_text_of_selected_tab_filter(self) -> str:
         """Get the text of the currently selected tab filter."""
         return self._get_text_of_element(self.selected_tab_filter)
@@ -75,13 +78,13 @@ def is_tab_filter_displayed(self, filter_name: str) -> bool:
         """
         return self._is_element_visible(self.tab_filter_by_name(filter_name))
 
-    """Actions against the filter section locators."""
+    # Actions against the filter section.
     def get_selected_topic_option(self) -> str:
         """Get the selected topic filter option."""
         option = super()._get_text_of_element(self.topic_dropdown_selected_option)
         return re.sub(r'\s+', ' ', option).strip()
 
-    """Actions against the filter by tag section locators."""
+    # Actions against the filter by tag section.
     def get_text_of_selected_tag_filter_option(self) -> str:
         """Get the text of the applied tag filter option."""
         return super()._get_text_of_element(self.showing_questions_tagged_tag)
@@ -90,7 +93,7 @@ def click_on_the_show_all_questions_option(self):
         """Click on the 'Show all questions' option displayed when filtering by tags."""
         super()._click(self.show_all_questions_option)
 
-    """Actions against the displayed questions locators."""
+    # Actions against the displayed questions.
     def get_all_question_list_tags(self, question_id: str) -> list[str]:
         """
         Get the tags associated with a particular question.
@@ -135,6 +138,10 @@ def get_ids_of_all_listed_questions(self) -> list[str]:
             """
             return []
 
+    def get_list_of_is_spam_locators(self) -> list[Locator]:
+        """Get the list of spam locators"""
+        return self.is_spam_locator.all()
+
     def is_spam_flag_for_question(self, question_id: str) -> bool:
         """
         Return if the is-spam flag is set for a certain question or not.
diff --git a/playwright_tests/pages/contribute/contribute_pages/contribute_page.py b/playwright_tests/pages/contribute/contribute_pages/contribute_page.py
index aaaf7ffc662..f6198958862 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contribute_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contribute_page.py
@@ -1,4 +1,5 @@
 from playwright.sync_api import ElementHandle, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,11 +7,11 @@ class ContributePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the breadcrumbs section."""
+        # Breadcrumbs
         self.breadcrumbs = page.locator("ol#breadcrumbs li")
         self.breadcrumb_homepage = page.locator("ol#breadcrumbs li").first
 
-        """Locators belonging to the page hero section."""
+        # Page Hero
         self.page_hero_main_header = page.locator("div[class*='hero'] div h1")
         self.page_hero_main_header_subtext = page.locator(
             "//div[contains(@class, 'hero')]/div/h1/following-sibling::p[1]")
@@ -18,29 +19,29 @@ def __init__(self, page: Page):
         self.page_hero_need_help_subtext = page.locator(
             "//div[contains(@class,'hero')]/div/h1/following-sibling::p[2]")
 
-        """Locators belonging to the Ways to contribute messages section."""
+        # Ways to contribute_messages
         self.way_to_contribute_header = page.locator("//nav/preceding-sibling::h2")
         self.way_to_contribute_cards = page.locator(
             "//h2[contains(text(),'Pick a way to contribute_messages')]/following-sibling::"
             "nav/ul/a")
         self.way_to_contribute_card_titles = page.locator("nav ul a li span")
 
-        """Locators belonging to the about us section."""
+        # About us
         self.about_us_header = page.get_by_role("heading").filter(has_text="About us")
         self.about_us_subtext = page.locator(
             "//h2[contains(text(),'About us')]/following-sibling::p")
 
-        """Locators belonging to the page images."""
+        # All page images
         self.all_page_images = page.locator("div#svelte img")
 
-    """Actions against the breadcrumbs locators."""
+    # Breadcrumbs
     def _get_breadcrumbs_text(self) -> list[str]:
         return super()._get_text_of_elements(self.breadcrumbs)
 
     def _click_on_home_breadcrumb(self):
         super()._click(self.breadcrumb_homepage)
 
-    """Actions against the page hero locators."""
+    # Page Hero
     def _get_page_hero_main_header_text(self) -> str:
         return super()._get_text_of_element(self.page_hero_main_header)
 
@@ -53,25 +54,25 @@ def _get_page_hero_need_help_header_text(self) -> str:
     def _get_page_hero_need_help_subtext(self) -> str:
         return super()._get_text_of_element(self.page_hero_need_help_subtext)
 
-    """"Actions against the page images locators."""
+    # Page images
     def _get_all_page_links(self) -> list[ElementHandle]:
         return super()._get_element_handles(self.all_page_images)
 
-    """Actions against the ways to contribute messages section locators."""
+    # Way to contribute_messages
     def _get_way_to_contribute_header_text(self) -> str:
         return super()._get_text_of_element(self.way_to_contribute_header)
 
     def _get_way_to_contribute_cards(self) -> list[str]:
         return super()._get_text_of_elements(self.way_to_contribute_card_titles)
 
-    """Actions against the about us section locators."""
+    # About us
     def _get_about_us_header_text(self) -> str:
         return super()._get_text_of_element(self.about_us_header)
 
     def _get_about_us_subtext(self) -> str:
         return super()._get_text_of_element(self.about_us_subtext)
 
-    """Actions against the contribute cards locators."""
+    # Contribute cards
     def _get_list_of_contribute_cards(self) -> list[ElementHandle]:
         return super()._get_element_handles(self.way_to_contribute_cards)
 
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/contributor_discussions_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/contributor_discussions_page.py
index fc84d2f1d2a..4f417ec027d 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/contributor_discussions_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/contributor_discussions_page.py
@@ -1,17 +1,19 @@
 from playwright.sync_api import Page
+
 from playwright_tests.core.basepage import BasePage
 
-"""This class contains the locators and actions for the general "Contributor Discussions" page."""
+"""
+    This class contains the locators and actions for the general "Contributor Discussions" page.
+"""
 
 
 class ContributorDiscussionPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the page breadcrumbs."""
+        # Contributor Discussions breadcrumb locators.
         self.contributor_discussions_page_breadcrumbs = page.locator('ol#breadcrumbs li')
 
-        """Locators belonging to the contributor discussions side-navbar."""
+        # Contributor Discussions side navbar locators.
         self.contributor_discussions_side_navbar_header = page.locator(
             "#for-contributors-sidebar ul li.sidebar-subheading")
         self.contributor_discussions_side_navbar_items = page.locator(
@@ -20,7 +22,7 @@ def __init__(self, page: Page):
             "#for-contributors-sidebar ul li:not(.sidebar-subheading)").get_by_role(
             "link", name=item_name, exact=True)
 
-        """Locators belonging to the contributor discussions forums list."""
+        # Contributor Discussions forums list locators.
         self.contributor_discussions_page_title = page.locator("div#forums h1")
         self.contributor_discussions_forum_names = page.locator("h5[class='sumo-card-heading']")
         self.contributor_discussions_forum_name = lambda forum: page.locator(
@@ -35,7 +37,7 @@ def __init__(self, page: Page):
             f"//h5[@class='sumo-card-heading']/a[text()='{forum}']/../../"
             f"following-sibling::td[@class='last-post']/a").nth(1)
 
-    """Actions against the Contributor Discussions breadcrumb locators."""
+    # Actions against the Contributor Discussions breadcrumb locators.
     def get_contributor_discussions_breadcrumbs(self) -> list[str]:
         """
         Get the text of all the breadcrumbs on the Contributor Discussions page.
@@ -50,7 +52,7 @@ def click_on_first_breadcrumb(self):
         """
         self._click(self.contributor_discussions_page_breadcrumbs.first)
 
-    """Actions against the Contributor Discussions forums list locators."""
+    # Actions against the Contributor Discussions forums list locators.
     def get_contributor_discussions_page_title(self) -> str:
         """
         Get the title of the Contributor Discussions page.
@@ -134,8 +136,7 @@ def click_on_last_post_by(self, forum: str):
         """
         self._click(self.contributor_discussions_forum_last_post_by(forum))
 
-
-    """Actions against the Contributor Discussions side-navbar locators."""
+    # Actions against the Contributor Discussions side navbar locators.
     def get_contributor_discussions_side_navbar_header(self) -> str:
         """
         Get the header text of the Contributor Discussions side navbar.
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/delete_thread_post_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/delete_thread_post_page.py
index 163825ce77d..a1bde09eccc 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/delete_thread_post_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/delete_thread_post_page.py
@@ -2,18 +2,16 @@
 
 
 class DeleteThreadPostPage(BasePage):
-    """ This class contains the locators and actions for the Delete Thread Post page."""
+    """
+        This class contains the locators and actions for the Delete Thread Post page.
+    """
 
     def __init__(self, page):
         super().__init__(page)
-
-        """Locators belonging to the delete thread post page."""
         self.delete_page_header = page.locator("article#confirm-delete h1")
         self.delete_button = page.locator("//input[@type='submit']")
         self.cancel_option = page.get_by_role("link", name="Cancel")
 
-
-    """Actions against the delete thread post page."""
     def click_on_delete_button(self):
         """
             Click on the 'Delete' button.
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_post_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_post_page.py
index c24ad47e18a..b6cc70aa13a 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_post_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_post_page.py
@@ -2,19 +2,17 @@
 
 
 class EditThreadPostPage(BasePage):
-    """ This class contains the locators and actions for the Edit Thread Post page."""
+    """
+        This class contains the locators and actions for the Edit Thread Post page.
+    """
     def __init__(self, page):
         super().__init__(page)
-
-        """Locators belonging to the edit thread post page."""
         self.edit_post_header = page.locator("div#edit-post h1")
         self.edit_post_textarea = page.locator("textarea#id_content")
         self.edit_post_cancel_button = page.get_by_role("link", name="Cancel")
         self.edit_post_update_post_button = page.get_by_role("button", name="Update post")
         self.edit_post_preview_button = page.get_by_role("button", name="Preview")
 
-
-    """Actions against the edit thread post page locators."""
     def add_text_inside_the_edit_post_textarea(self, text: str):
         """
             Add text inside the edit post textarea.
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_title_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_title_page.py
index d4778214a10..83e76223851 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_title_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_title_page.py
@@ -2,17 +2,19 @@
 
 
 class EditThreadTitle(BasePage):
-    """This class contains the locators and actions for the Edit Thread Title page."""
+    """
+        This class contains the locators and actions for the Edit Thread Title page.
+    """
 
     def __init__(self, page):
         super().__init__(page)
 
-        """Locators belonging to the page breadcrumbs section."""
+        # Locators related to the breadcrumbs section.
         self.edit_thread_title_breadcrumbs = page.locator("ol#breadcrumbs li a")
         self.edit_thread_title_breadcrumb = lambda breadcrumb : page.locator(
             "ol#breadcrumbs li").get_by_role("link", name=breadcrumb)
 
-        """Locators belonging to the edit thread title page."""
+        # Locators related to the edit thread title page.
         self.edit_thread_title_page_title = page.locator("div#edit-thread h1")
         self.edit_thread_title_input_field = page.locator("input#id_title")
         self.edit_thread_title_update_thread_button = page.get_by_role(
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_discussions_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_discussions_page.py
index c811ff59125..e08ee7b411c 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_discussions_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_discussions_page.py
@@ -1,21 +1,25 @@
 import re
+
 from playwright.sync_api import Page, ElementHandle
+
 from playwright_tests.core.basepage import BasePage
 
-"""This class contains the locators and actions for the {x} discussions page."""
+"""
+    This class contains the locators and actions for the {x} discussions page.
+"""
 
 
 class ForumDiscussionsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the forum discussions page."""
+        # Locators related to the forum discussions page.
         self.forum_page_title = page.locator("article#threads h1")
         self.forum_side_nav_selected_option = page.locator(
             "nav#for-contributors-sidebar a.selected")
         self.post_a_new_thread_button = page.locator("a#new-thread")
 
-        """Locators belonging to the search section."""
+        # Locators related to the search section.
         self.search_this_forum_search_field = page.locator("form#find-thread input#search-q")
         self.search_this_forum_search_button = page.locator("form#find-thread input.search-button")
         self.search_results_headers = page.locator(
@@ -23,7 +27,7 @@ def __init__(self, page: Page):
         self.search_results_body = page.locator(
             "//div[@id='search-results']//div[@class='topic-article--text']/p")
 
-        """Locators belonging to the threads table section."""
+        # Locators related to the threads table.
         self.thread_title = lambda thread_name : page.locator(
             "tbody.threads td.title").get_by_role("link", name=thread_name, exact=True)
         self.thread_type = lambda thread_name, type_image: page.locator(
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_thread_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_thread_page.py
index d1912a8785f..559003121ea 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_thread_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_thread_page.py
@@ -1,22 +1,26 @@
 import re
 from datetime import datetime
+
 from playwright_tests.core.basepage import BasePage
 from playwright_tests.core.utilities import Utilities
 
-"""This class contains the locators and actions for the {x} discussions thread page."""
+"""
+    This class contains the locators and actions for the {x} discussions thread page.
+"""
+
 
 class ForumThreadPage(BasePage):
     def __init__(self, page):
         super().__init__(page)
         self.utilities = Utilities(page)
 
-        """Locators belonging to the page breadcrumbs."""
+        # Locators related to the page breadcrumb.
         self.breadcrumb_options = page.locator("ol#breadcrumbs li")
         self.breadcrumb_links = page.locator("ol#breadcrumbs li a")
         self.breadcrumb_link = lambda breadcrumb_name: page.locator(
             "ol#breadcrumbs li").get_by_role("link", name=breadcrumb_name)
 
-        """Locators belonging to the Contributor Discussions side-navbar section."""
+        # Locators related to the Contributor Discussions side navbar.
         self.contributor_discussions_side_navbar_header = page.locator(
             "#for-contributors-sidebar ul li.sidebar-subheading")
         self.contributor_discussions_side_navbar_items = page.locator(
@@ -25,7 +29,7 @@ def __init__(self, page):
             "#for-contributors-sidebar ul li:not(.sidebar-subheading)").get_by_role(
             "link", name=item_name, exact=True)
 
-        """Locators belonging to the thread-actions section."""
+        # Locators related to the thread-actions section.
         self.edit_thread_title_option = page.get_by_role("link", name="Edit Thread Title")
         self.delete_this_thread_option = page.get_by_role("link", name="Delete this thread")
         self.lock_this_thread_option = page.locator("//a[text()='Lock this thread']")
@@ -34,14 +38,14 @@ def __init__(self, page):
         self.sticky_this_thread_option = page.locator("//a[text()='Sticky this thread']")
         self.unsticky_this_thread_option = page.locator("//a[text()='Unsticky this thread']")
 
-        """Locators belonging to the delete thread page."""
+        # Delete thread page.
         self.delete_button = page.locator("input[value='Delete']")
 
-        """Locators belonging to the move thread section."""
+        # Locators related to the move thread section.
         self.move_thread_dropdown = page.locator("select[name='forum']")
         self.move_thread_button = page.locator("input[value='Move Thread']")
 
-        """General thread page locators."""
+        # Thread locators
         self.forum_title = page.locator("p#forum-title")
         self.thread_title = page.locator("h1.sumo-page-heading")
         self.thread_posted_thread_title = page.locator("h1#sumo-page-heading")
@@ -64,7 +68,7 @@ def __init__(self, page):
         self.quoted_thread_post_quote = lambda post_id: page.locator(
             f"li#post-{post_id} div.content blockquote")
 
-        """Locators belonging to the more options section from the thread post."""
+        # Thread post more options locators
         self.post_3_dotted_menu = lambda post_id: page.locator(f"li#post-{post_id}").get_by_role(
             "button", name="more options")
         self.post_3_dotted_menu_expanded = lambda post_id: page.locator(
@@ -88,13 +92,11 @@ def __init__(self, page):
             f"li#post-{post_id} li.mzp-c-menu-list-item").get_by_role(
             "link", name="Link to this post")
 
-        """Locators belonging to the post a reply section."""
+        # Post a reply locators
         self.post_reply_textarea = page.locator("textarea#id_content")
         self.preview_reply_button = page.locator("button#preview")
         self.post_reply_button = page.get_by_role("button", name="Post Reply")
 
-
-    """Actions against the page breadcrumbs locators."""
     def get_breadcrumb_options(self) -> list[str]:
         """
             Get the breadcrumb options.
@@ -119,7 +121,6 @@ def get_all_breadcrumb_link_names(self) -> list[str]:
         """
         return self._get_text_of_elements(self.breadcrumb_links)
 
-    """Actions against the general thread page locators."""
     def get_thread_meta_information(self) -> list[str]:
         return self._get_text_of_elements(self.thread_meta)
 
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/new_thread_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/new_thread_page.py
index a7643e4fe56..dec39577340 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/new_thread_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/new_thread_page.py
@@ -5,15 +5,13 @@ class NewThreadPage(BasePage):
     def __init__(self, page):
         super().__init__(page)
 
-        """Locators belonging to the create a new thread page."""
+        # Locators related to the create a new thread page
         self.title_input_field = page.locator("input#id_title")
         self.content_textarea_field = page.locator("textarea#id_content")
         self.cancel_button = page.get_by_role("link", name="Cancel")
         self.preview_button = page.locator("button#preview")
         self.post_thread_button = page.get_by_role("button").filter(has_text="Post Thread")
 
-
-    """Actions against the create a new thread page locators."""
     def fill_title_input_field(self, title: str):
         self._fill(self.title_input_field, title)
 
diff --git a/playwright_tests/pages/contribute/contribute_pages/ways_to_contribute_pages.py b/playwright_tests/pages/contribute/contribute_pages/ways_to_contribute_pages.py
index fcf71e886ce..942d25885b4 100644
--- a/playwright_tests/pages/contribute/contribute_pages/ways_to_contribute_pages.py
+++ b/playwright_tests/pages/contribute/contribute_pages/ways_to_contribute_pages.py
@@ -1,4 +1,5 @@
 from playwright.sync_api import ElementHandle, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,17 +7,17 @@ class WaysToContributePages(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the page breadcrumbs section."""
+        # Breadcrumbs
         self.interactable_breadcrumbs = page.locator("ol#breadcrumbs li a")
         self.all_breadcrumbs = page.locator("ol#breadcrumbs li")
 
-        """Locators belonging to the page content."""
+        # Page Content
         self.hero_main_header = page.locator("div[class*='hero'] div h1")
         self.hero_second_header = page.locator("div[class*='hero'] div h2")
         self.hero_text = page.locator("div[class*='hero'] div p")
         self.all_page_images = page.locator("div#svelte img")
 
-        """Locators belonging to the How to contribute messages section."""
+        # How to contribute_messages section
         self.how_to_contribute_header = page.locator("section[class='mzp-l-content'] > h2")
         self.all_how_to_contribute_option_links = page.locator("section.mzp-l-content div ol li a")
         self.start_answering_how_to_contribute_option_text = page.locator(
@@ -24,14 +25,14 @@ def __init__(self, page: Page):
         self.first_fact_text = page.locator("//div[contains(@class,'fact')]/span[1]")
         self.second_fact_text = page.locator("//div[contains(@class,'fact')]/span[2]")
 
-        """Locators belonging to the other ways to contribute messages section."""
+        # Other ways to contribute_messages section
         self.other_ways_to_contribute_header = page.locator("//div[@id='svelte']/section[2]/h2")
         self.other_ways_to_contribute_card_titles = page.locator(
             "//div[@id='svelte']/section[2]//nav//span")
         self.other_ways_to_contribute_card_list = page.locator("//div[@id='svelte']/section[2]//"
                                                                "ul/a")
 
-    """Actions against the breadcrumbs locators."""
+    # Breadcrumbs
     def get_text_of_all_breadcrumbs(self) -> list[str]:
         return self._get_text_of_elements(self.all_breadcrumbs)
 
@@ -41,7 +42,7 @@ def get_interactable_breadcrumbs(self) -> list[ElementHandle]:
     def click_on_breadcrumb(self, element: ElementHandle):
         element.click()
 
-    """Actions against the page content locators."""
+    # Page content
     def get_hero_main_header_text(self) -> str:
         return self._get_text_of_element(self.hero_main_header)
 
@@ -54,7 +55,7 @@ def get_hero_text(self) -> str:
     def get_all_page_image_links(self) -> list[ElementHandle]:
         return self._get_element_handles(self.all_page_images)
 
-    """Actions against the How to contribute messages section locators."""
+    # How to contribute_messages section
     def get_how_to_contribute_header_text(self) -> str:
         return self._get_text_of_element(self.how_to_contribute_header)
 
@@ -70,7 +71,7 @@ def get_first_fact_text(self) -> str:
     def get_second_fact_text(self) -> str:
         return self._get_text_of_element(self.second_fact_text)
 
-    """Actions against the Other ways to contribute messages section locators."""
+    # Other ways to contribute_messages section
     def get_other_ways_to_contribute_header(self) -> str:
         return self._get_text_of_element(self.other_ways_to_contribute_header)
 
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/article_discussions_page.py b/playwright_tests/pages/contribute/contributor_tools_pages/article_discussions_page.py
index a97f4066889..a7232d50e9b 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/article_discussions_page.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/article_discussions_page.py
@@ -1,4 +1,5 @@
 from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,7 +7,8 @@ class ArticleDiscussionsPage(BasePage):
 
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the Article Discussions page."""
         self.article_discussion_title = lambda article_title: page.locator(
             "td[class='title']").get_by_role("link", name=article_title, exact=True)
+
+    def is_title_for_article_discussion_displayed(self, article_title: str) -> Locator:
+        return self.article_discussion_title(article_title)
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/community_hub_page.py b/playwright_tests/pages/contribute/contributor_tools_pages/community_hub_page.py
index d3ee0578d6b..a64a3b76da7 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/community_hub_page.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/community_hub_page.py
@@ -6,15 +6,15 @@ class CommunityHubPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the Community Hub searchbar section."""
+        # Locators belonging to the Community Hub searchbar.
         self.find_contributor_searchbar = page.locator(
             "//form[@id='find-contributor']//input[@id='search']")
 
-        """Locators belonging to the search results cards."""
+        # Locators belonging to search result cards
         self.user_titles_from_returned_cards = page.locator(
             "section[class='card elevation-01 results-user'] h2[class='card--title']")
 
-    """Actions against the Community Hub searchbar locators."""
+
     def search_for_contributor(self, search_string: str):
         """
         Search for a contributor
@@ -29,7 +29,6 @@ def clear_search(self):
         """Clear the searchbar."""
         self._clear_field(self.find_contributor_searchbar)
 
-    """Actions against the search results cards locators."""
     def get_all_users_from_user_cards(self) -> list[str]:
         """Returns all user titles from user cards."""
         return self._get_text_of_elements(self.user_titles_from_returned_cards)
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/kb_dashboard_page.py b/playwright_tests/pages/contribute/contributor_tools_pages/kb_dashboard_page.py
index bea26cfec06..974d4e5859c 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/kb_dashboard_page.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/kb_dashboard_page.py
@@ -1,4 +1,5 @@
 from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,7 +7,7 @@ class KBDashboard(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators related to the top-level filter section."""
+        # Top-level filter locators
         self.products_filter_button = page.locator(
             "article#localize div[class='mzp-c-menu-list featured-dropdown is-details'] button")
         self.products_filter_complete_overview = page.locator("div#product-selector select")
@@ -33,7 +34,10 @@ def __init__(self, page: Page):
             f"//td/a[text()='{article_name}']/../following-sibling::td/a[contains(text(),"
             f"'Show translations')]")
 
-    """Actions against the kb dashboard locators."""
+    # KB Dashboard actions
+    def get_a_particular_article_title_locator(self, article_name: str) -> Locator:
+        return self.article_title(article_name)
+
     def click_on_article_title(self, article_name: str):
         self._click(self.article_title(article_name))
 
@@ -58,6 +62,9 @@ def is_stale_status_empty(self, article_name: str) -> bool:
     def get_existing_expiry_date(self, article_name: str) -> str:
         return self._get_text_of_element(self.expiry_date(article_name))
 
+    def get_expiry_date_locator(self, article_name: str) -> Locator:
+        return self.expiry_date(article_name)
+
     def click_on_show_translations_option(self, article_name: str):
         self._click(self.show_translations_option(article_name))
 
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/l10n_most_visited_translations.py b/playwright_tests/pages/contribute/contributor_tools_pages/l10n_most_visited_translations.py
index 1690dd7c182..b4e051b1529 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/l10n_most_visited_translations.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/l10n_most_visited_translations.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,8 +7,6 @@ class MostVisitedTranslations(BasePage):
 
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the most visited translations page."""
         self.article_title = lambda article_name: page.locator("td").get_by_role(
             "link", name=article_name, exact=True)
         self.updated_localization_status = lambda article_name: page.locator(
@@ -15,8 +14,9 @@ def __init__(self, page: Page):
         self.translation_status = lambda article_name: page.locator(
             f"//td/a[text()='{article_name}']/../following-sibling::td[@class='status']/a")
 
+    def get_a_particular_article_title_locator(self, article_name: str) -> Locator:
+        return self.article_title(article_name)
 
-    """Actions against the most visited translations page locators."""
     def get_updated_localization_status(self, article_name: str) -> str:
         return self._get_text_of_element(self.updated_localization_status(article_name))
 
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/l10n_unreviewed.py b/playwright_tests/pages/contribute/contributor_tools_pages/l10n_unreviewed.py
index a2027da521c..56fbec04fef 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/l10n_unreviewed.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/l10n_unreviewed.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,16 +7,15 @@ class UnreviewedLocalizationPage(BasePage):
 
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the unreviewed localization page."""
         self.listed_article = lambda title: page.locator("td[class='doc-title']").get_by_role(
             "link", name=title, exact=True)
         self.modified_by_text = lambda title: page.locator(
             "td[class='doc-title']").get_by_role("link", name=title, exact=True).locator(
             "+ div[class='users']")
 
+    def get_listed_article(self, title: str) -> Locator:
+        return self.listed_article(title)
 
-    """Actions against the unreviewed localization page locators."""
     def click_on_a_listed_article(self, title: str):
         self._click(self.listed_article(title))
 
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/moderate_forum_content.py b/playwright_tests/pages/contribute/contributor_tools_pages/moderate_forum_content.py
index 4380aa06615..d8e9c71bf65 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/moderate_forum_content.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/moderate_forum_content.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,10 +7,10 @@ class ModerateForumContent(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the View All deactivated users page."""
+        # View all deactivated users button
         self.view_all_deactivated_users_button = page.locator("div[class='sumo-button-wrap'] a")
 
-        """Locators belonging to the flagged questions page."""
+        # Flagged questions
         self.flagged_question = lambda question_info: page.locator("p").get_by_text(
             question_info, exact=True)
         self.flagged_reason = lambda question_title: page.locator(
@@ -37,8 +38,9 @@ def __init__(self, page: Page):
         self.update_status_button = lambda question_info: page.locator(
             f"//p[normalize-space(text())='{question_info}']/ancestor::div"
             f"[@class='flagged-item-content']//following-sibling::form/input[@value='Update']")
-        self.paginator_section = page.locator("//ol[@class='pagination cf']")
-        self.last_paginator_option = page.locator("//ol[@class='pagination cf']/li/a").last
+
+    def get_flagged_question_locator(self, question_info) -> Locator:
+        return self.flagged_question(question_info)
 
     def get_flag_reason(self, question_title: str) -> str:
         return self._get_text_of_element(self.flagged_reason(question_title))
@@ -75,10 +77,3 @@ def click_on_the_update_button(self, question_info: str):
 
     def click_view_all_deactivated_users_button(self):
         self._click(self.view_all_deactivated_users_button)
-
-    def is_paginator_visible(self) -> bool:
-        self.wait_for_dom_to_load()
-        return self._is_element_visible(self.paginator_section)
-
-    def click_on_last_pagination_element(self):
-        self._click(self.last_paginator_option)
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/recent_revisions_page.py b/playwright_tests/pages/contribute/contributor_tools_pages/recent_revisions_page.py
index cdf932768ee..515df41925b 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/recent_revisions_page.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/recent_revisions_page.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,7 +7,7 @@ class RecentRevisions(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators related to the right-side menu."""
+        # Right-side menu locators
         self.kb_dashboard_option = page.get_by_role("link", name="KB Dashboard", exact=True)
         self.locale_metrics_option = page.get_by_role("link", name="Locale Metrics", exact=True)
         self.kb_team_option = page.get_by_role("link").filter(has_text="KB Team")
@@ -14,8 +15,7 @@ def __init__(self, page: Page):
             "li#editing-tools-sidebar li[class='selected'] a")
         self.aggregated_metrics = page.get_by_role("link", name="Aggregated Metrics", exact=True)
 
-        """Locators related to the Recent Revisions table."""
-        self.revisions_table = page.locator("//div[@id='revisions-fragment']")
+        # Recent Revisions table locators.
         self.locale_select_field = page.locator("select#id_locale")
         self.locale_tag = page.locator("span[class='locale']")
         self.all_editors = page.locator("div[class='creator'] a")
@@ -50,13 +50,11 @@ def __init__(self, page: Page):
             f"//div[@id='revisions-fragment']//div[@class='title']/a[text()='{article_title}']/../"
             f"../div[@class='creator']/a[contains(text(),'{username}')]/../../"
             f"div[@class='comment wider']")
-        self.loading_icon = page.locator(
-            "//article[@id='revision-list']/form/img[@class='loading']")
 
-        """Locators related to the revision diff section."""
+        # Revision diff locators.
         self.revision_diff_section = page.locator("div[class='revision-diff']")
 
-    """Actions against the right-side menu locators."""
+    # Right-side menu actions.
     def click_on_kb_dashboard_option(self):
         self._click(self.kb_dashboard_option)
 
@@ -72,7 +70,7 @@ def get_text_of_selected_menu_option(self) -> str:
     def click_on_aggregated_metrics_option(self):
         self._click(self.aggregated_metrics)
 
-    """Actions against the recent revisions table locators."""
+    # Recent Revisions table actions.
     def get_all_revision_dates(self) -> list[str]:
         return self._get_text_of_elements(self.all_dates)
 
@@ -84,29 +82,26 @@ def get_list_of_all_editors(self) -> list[str]:
 
     def select_locale_option(self, locale_value: str):
         self._select_option_by_value(self.locale_select_field, locale_value)
-        self._wait_for_locator(self.loading_icon, timeout=3000)
-        self._wait_for_locator_to_be_hidden(self.loading_icon, timeout=5000)
 
     def fill_in_users_field(self, username: str):
         self._fill(self.users_input_field, username)
         self._press_a_key(self.users_input_field, "Enter")
-        self._wait_for_locator(self.loading_icon, timeout=3000)
-        self._wait_for_locator_to_be_hidden(self.loading_icon, timeout=5000)
 
     def clearing_the_user_field(self):
         self._clear_field(self.users_input_field)
-        self._wait_for_locator(self.loading_icon, timeout=3000)
-        self._wait_for_locator_to_be_hidden(self.loading_icon, timeout=5000)
 
     def add_start_date(self, start_date: str):
         self._type(self.start_date_input_field, start_date, 0)
-        self._wait_for_locator(self.loading_icon, timeout=3000)
-        self._wait_for_locator_to_be_hidden(self.loading_icon, timeout=5000)
 
     def add_end_date(self, end_date: str):
         self._type(self.end_date_input_field, end_date, 0)
-        self._wait_for_locator(self.loading_icon, timeout=3000)
-        self._wait_for_locator_to_be_hidden(self.loading_icon, timeout=5000)
+
+    def get_recent_revision_based_on_article(self, title: str) -> Locator:
+        return self.recent_revision_based_on_article(title)
+
+    def get_recent_revision_based_on_article_title_and_user(self, title: str,
+                                                            username: str) -> Locator:
+        return self.recent_revisions_based_on_article_and_user(title, username)
 
     def click_on_article_title(self, article_title: str, creator: str):
         self._click(self.article_title(creator, article_title))
@@ -117,6 +112,9 @@ def click_article_creator_link(self, article_title: str, creator: str):
     def click_on_show_diff_for_article(self, article_title: str, creator: str):
         self._click(self.show_diff(article_title, creator))
 
+    def get_show_diff_article_locator(self, article_title: str, creator: str) -> Locator:
+        return self.show_diff(article_title, creator)
+
     def click_on_hide_diff_for_article(self, article_title: str, creator: str):
         self._click(self.close_diff(article_title, creator))
 
@@ -126,3 +124,10 @@ def click_on_revision_date_for_article(self, article_title: str, username: str):
     def get_revision_comment(self, article_title: str, username: str) -> str:
         return self._get_element_inner_text_from_page(
             self.revision_comment(article_title, username))
+
+    def get_revision_and_username_locator(self, article_title: str, username: str) -> Locator:
+        return self.recent_revisions_based_on_article_and_user(article_title, username)
+
+    # Diff section actions
+    def get_diff_section_locator(self) -> Locator:
+        return self.revision_diff_section
diff --git a/playwright_tests/pages/contribute/groups_page.py b/playwright_tests/pages/contribute/groups_page.py
index a23270a1f3c..926ef957404 100644
--- a/playwright_tests/pages/contribute/groups_page.py
+++ b/playwright_tests/pages/contribute/groups_page.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,9 +7,11 @@ class GroupsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """General locators belonging to the groups page."""
+        # General Groups Page Locators
         self.add_group_profile_button = page.get_by_role(
             "link", name="Add group profile", exact=True)
+
+        # Group Page Locators
         self.group_avatar_image = page.locator("section#avatar-area img")
         self.change_uploaded_group_image_option = page.locator(
             "section#avatar-area p").get_by_role("link", name="Change", exact=True)
@@ -47,7 +50,7 @@ def __init__(self, page: Page):
         self.listed_group_leader = lambda username: page.locator(
             "div#group-leaders").get_by_role("link", name=username, exact=True)
 
-        """Locators belonging to the change avatar page."""
+        # Change Avatar Page Locators
         self.upload_avatar_page_header = page.locator("article#change-avatar h1")
         self.upload_avatar_image_preview = page.locator(
             "//input[@id='id_avatar']/preceding-sibling::img")
@@ -55,7 +58,7 @@ def __init__(self, page: Page):
         self.upload_avatar_button = page.locator("input[type='submit']")
         self.upload_avatar_cancel_option = page.get_by_role("link", name="Cancel", exact=True)
 
-        """Locators belonging to the delete avatar page."""
+        # Delete Avatar Page Locators
         self.delete_uploaded_avatar_page_header = page.locator("article#avatar-delete h1")
         self.delete_uploaded_avatar_image_preview = page.locator("div#avatar-preview img")
         self.delete_uploaded_avatar_page_info = page.locator("form p")
@@ -63,7 +66,7 @@ def __init__(self, page: Page):
         self.delete_uploaded_avatar_cancel_button = page.get_by_role(
             "link", name="Cancel", exact=True)
 
-        """Locators belonging to the remove user page."""
+        # Remove User Page Locators
         self.remove_leader_page_header = page.locator("article#remove-leader h1")
         self.remove_user_page_header = page.locator("article#remove-member h1")
         self.remove_leader_button = page.locator("input[value='Remove leader']")
@@ -78,7 +81,7 @@ def __init__(self, page: Page):
             f"group']"
         )
 
-    """Actions against the all groups listing page locators."""
+    # Actions against the all groups page.
     def is_add_group_profile_button_visible(self) -> bool:
         """Check if the add group profile button is visible"""
         return self._is_element_visible(self.add_group_profile_button)
@@ -91,7 +94,7 @@ def click_on_a_particular_group(self, group_name):
         """
         self._click(self.group_by_name(group_name))
 
-    """Actions against a specific group page locators."""
+    # Actions against the group page.
     def get_all_leaders_name(self) -> list[str]:
         """Get the names of all the leaders in the group"""
         return self._get_text_of_elements(self.group_leader_list)
@@ -100,6 +103,10 @@ def get_all_members_name(self) -> list[str]:
         """Get the names of all the members in the group"""
         return self._get_text_of_elements(self.group_members_list)
 
+    def get_group_avatar_locator(self) -> Locator:
+        """Get the locator of the group avatar image"""
+        return self.group_avatar_image
+
     def is_change_avatar_button_visible(self) -> bool:
         """Check if the change avatar button is visible"""
         return self._is_element_visible(self.change_avatar_button)
@@ -175,11 +182,15 @@ def click_on_pm_for_a_particular_user(self, username: str):
         """
         self._click(self.pm_a_group_user(username))
 
-    """Actions against the add group member locators."""
+    # Add Group member
     def get_group_update_notification(self) -> str:
         """Get the text of the user added successfully message"""
         return self._get_text_of_element(self.user_notification)
 
+    def get_pm_group_members_button(self) -> Locator:
+        """Get the locator of the PM group members button"""
+        return self.private_message_group_members_button
+
     def click_on_change_uploaded_avatar_button(self):
         """Click on the change uploaded avatar button"""
         self._click(self.change_uploaded_group_image_option,
@@ -197,7 +208,11 @@ def click_on_edit_group_members(self):
         """Click on the edit group members option"""
         self._click(self.edit_group_members_option)
 
-    """Actions against the change avatar page locators."""
+    # Actions against the change avatar page.
+    def get_change_avatar_image_preview_locator(self) -> Locator:
+        """Get the locator of the change avatar image preview"""
+        return self.upload_avatar_image_preview
+
     def get_upload_avatar_page_header(self) -> str:
         """Get the text of the upload avatar page header"""
         return self._get_text_of_element(self.upload_avatar_page_header)
@@ -210,7 +225,11 @@ def click_on_upload_avatar_cancel_button(self):
         """Click on the upload avatar cancel button"""
         self._click(self.upload_avatar_cancel_option)
 
-    """Actions against the delete avatar page locators."""
+    # Actions against the delete avatar page.
+    def get_delete_avatar_image_preview_locator(self) -> Locator:
+        """Get the locator of the delete avatar image preview"""
+        return self.delete_uploaded_avatar_image_preview
+
     def click_on_cancel_delete_avatar_button(self):
         """Click on the cancel delete avatar button"""
         self._click(self.delete_uploaded_avatar_cancel_button)
@@ -231,7 +250,7 @@ def click_on_delete_avatar_button(self):
         """Click on the delete avatar button"""
         self._click(self.delete_uploaded_avatar_button)
 
-    """Actions against the removal or user addition related locators."""
+    # Actions against the removal or user addition
     def click_on_remove_a_user_from_group_button(self, username: str, from_leaders=False):
         """Click on the remove a user from group button
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_article_discussion_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_article_discussion_page.py
index c04020564fc..e58d43a14c8 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_article_discussion_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_article_discussion_page.py
@@ -1,5 +1,7 @@
 import re
-from playwright.sync_api import Page
+
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,25 +9,25 @@ class KBArticleDiscussionPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the filters section."""
+        # Filters locators
         self.article_thread_author_filter = page.locator("th[class*='author'] a")
         self.article_thread_replies_filter = page.locator("th[class*='replies'] a")
 
-        """Locators belonging to the post a new thread section."""
+        # Post a new thread locator.
         self.post_a_new_thread_option = page.locator("a#new-thread")
 
-        """Locators belonging to the new thread section."""
+        # New Thread related locators.
         self.new_thread_title_input_field = page.locator("input#id_title")
         self.new_thread_body_input_field = page.locator("textarea#id_content")
         self.new_thread_submit_button = page.get_by_role("button", name="Post Thread", exact=True)
         self.new_thread_cancel_button = page.get_by_role("link", name="Cancel", exact=True)
 
-        """Locators belonging to the thread editing tools section."""
+        # Thread Editing tools
         self.delete_thread = page.get_by_role("link", name="Delete this thread", exact=True)
         self.lock_this_thread = page.locator("a[data-form='thread-lock-form']")
         self.sticky_this_thread = page.locator("a[data-form='thread-sticky-form']")
 
-        """Locators belonging to the thread content section."""
+        # Thread content locators.
         self.article_thread_edit_this_thread = page.get_by_role(
             "link", name="Edit this thread", exact=True)
         self.article_thread_sticky_status = page.locator(
@@ -41,7 +43,7 @@ def __init__(self, page: Page):
         self.thread_body_content = page.locator("div[class='content'] p")
         self.thread_body_content_title = page.locator("h1[class='sumo-page-heading']")
 
-        """Locators belonging to the thread replies section."""
+        # Thread replies locators.
         self.delete_thread_reply_confirmation_page_button = page.locator("input[value='Delete']")
         self.thread_post_a_reply_textarea_field = page.locator("textarea#id_content")
         self.article_thread_locked_message = page.locator("p#thread-locked")
@@ -58,7 +60,7 @@ def __init__(self, page: Page):
             f"li#{thread_id} div[class='mzp-c-menu-list is-details']").get_by_role(
             "link", name="Delete this post", exact=True)
 
-        """Locators belonging to the article discussions content section."""
+        # Article discussions content locators.
         self.all_article_threads_titles = page.locator("td[class='title'] a")
         self.all_article_threads_authors = page.locator("td[class='author'] a")
         self.all_article_thread_replies = page.locator("td[class='replies']")
@@ -66,14 +68,17 @@ def __init__(self, page: Page):
             f"//tr[@class='threads']/td[@class='title']//a[contains(@href, '{thread_id}')]/../"
             f"following-sibling::td[@class='replies']")
 
-        """Locators belonging to the edit thread page."""
+        # Edit thread page
         self.edit_article_thread_title_field = page.locator("input#id_title")
         self.edit_article_thread_cancel_button = page.get_by_role(
             "link", name="Cancel", exact=True)
         self.edit_article_thread_update_thread_button = page.get_by_role(
             "button", name="Update thread", exact=True)
 
-    """Actions against the edit thread page locators."""
+    # Edit thread page actions
+    def get_edit_this_thread_locator(self) -> Locator:
+        return self.article_thread_edit_this_thread
+
     def click_on_edit_this_thread_option(self):
         self._click(self.article_thread_edit_this_thread)
 
@@ -87,14 +92,14 @@ def click_on_edit_article_thread_cancel_button(self):
     def click_on_edit_article_thread_update_button(self):
         self._click(self.edit_article_thread_update_thread_button)
 
-    """Actions against the filter sections."""
+    # Filter actions.
     def click_on_article_thread_author_replies_filter(self):
         self._click(self.article_thread_author_filter)
 
     def click_on_article_thread_replies_filter(self):
         self._click(self.article_thread_replies_filter)
 
-    """Actions against the post a new thread section."""
+    # Post a new thread button action.
     def click_on_post_a_new_thread_option(self):
         self._click(self.post_a_new_thread_option)
 
@@ -104,7 +109,7 @@ def click_on_thread_post_reply_button(self):
     def get_thread_reply_id(self, url: str) -> str:
         return re.search(r'post-(\d+)', url).group(0)
 
-    """Actions against the posting a new thread section."""
+    # Actions related to posting a new thread.
     def add_text_to_new_thread_title_field(self, text: str):
         self._fill(self.new_thread_title_input_field, text)
 
@@ -123,26 +128,46 @@ def click_on_cancel_new_thread_button(self):
     def click_on_submit_new_thread_button(self):
         self._click(self.new_thread_submit_button)
 
+    def get_posted_thread_locator(self, thread_id: str) -> Locator:
+        return self.posted_thread(thread_id)
+
+    def get_thread_by_title_locator(self, thread_title: str) -> Locator:
+        return self.thread_by_title(thread_title)
+
     def click_on_a_particular_thread(self, thread_id: str):
         self._click(self.posted_thread(thread_id))
 
-    """Actions against the thread content locators."""
     # Actions related to thread content
     def get_thread_title_text(self) -> str:
         return self._get_text_of_element(self.thread_body_content_title)
 
+    def get_locked_article_status(self) -> Locator:
+        return self.article_thread_locked_status
+
     def get_lock_this_article_thread_option_text(self) -> str:
         return self._get_text_of_element(self.lock_this_thread)
 
+    def get_lock_this_article_thread_locator(self) -> Locator:
+        return self.lock_this_thread
+
     def click_on_lock_this_article_thread_option(self):
         self._click(self.lock_this_thread)
 
+    def get_sticky_this_thread_locator(self) -> Locator:
+        return self.sticky_this_thread
+
     def get_text_of_sticky_this_thread_option(self) -> str:
         return self._get_text_of_element(self.sticky_this_thread)
 
+    def get_sticky_this_thread_status_locator(self) -> Locator:
+        return self.article_thread_sticky_status
+
     def click_on_sticky_this_thread_option(self):
         self._click(self.sticky_this_thread)
 
+    def get_thread_post_a_reply_textarea_field(self) -> Locator:
+        return self.thread_post_a_reply_textarea_field
+
     def fill_the_thread_post_a_reply_textarea(self, text: str):
         self._fill(self.thread_post_a_reply_textarea_field, text)
 
@@ -152,7 +177,7 @@ def get_thread_page_counter_replies_text(self) -> str:
     def get_thread_page_replied_by_text(self) -> str:
         return self._get_text_of_element(self.thread_page_last_reply_by_text)
 
-    """Actions against the article discussions page content locators."""
+    # Article discussions page content actions
     def get_article_discussions_thread_counter(self, thread_id: str) -> str:
         return self._get_text_of_element(self.discussions_thread_counter(thread_id))
 
@@ -168,7 +193,10 @@ def get_all_article_threads_replies(self) -> list[str]:
     def get_text_of_locked_article_thread_text(self) -> str:
         return self._get_text_of_element(self.article_thread_locked_message)
 
-    """Actions against the thread replies section."""
+    def get_text_of_locked_article_thread_locator(self) -> Locator:
+        return self.article_thread_locked_message
+
+    # Actions related to thread replies.
     def click_on_dotted_menu_for_a_certain_reply(self, thread_id: str):
         self._click(self.dotted_menu_for_thread(thread_id))
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_article_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_article_page.py
index ed1338080ce..e7291b1fd9c 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_article_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_article_page.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,7 +7,7 @@ class KBArticlePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """General locators belonging to the KB article page."""
+        # General page locators.
         self.article_breadcrumb = lambda breadcrumb_name: page.locator(
             "ol#breadcrumbs").get_by_role("link", name=f"{breadcrumb_name}")
         self.kb_article_heading = page.locator("h1.sumo-page-heading")
@@ -22,11 +23,11 @@ def __init__(self, page: Page):
             "div[class='document--contributors-list text-body-xs']").get_by_role(
             "link", name=f'{username}', exact=True)
 
-        """Locators belonging to the article metadata."""
+        # Article metadata locators.
         self.kb_article_helpfulness_count = page.locator(
             "div#document_metadata span[class='helpful-count']")
 
-        """Locators belonging to the editing tools options section."""
+        # Editing Tools options locators.
         self.editing_tools_article_option = page.get_by_role("link", name="Article",
                                                              exact=True)
         self.editing_tools_edit_article_option = page.get_by_role("link", name="Edit Article",
@@ -44,7 +45,7 @@ def __init__(self, page: Page):
         self.editing_tools_show_history_option = page.get_by_role("link", name="Show History",
                                                                   exact=True)
 
-        """Locators belonging to the helpfulness widget section."""
+        # Helpfulness widget section locators.
         self.helpfulness_widget = page.locator("form[class='document-vote--form helpful']")
         self.helpful_button = page.locator("button[class='btn helpful-button']")
         self.unhelpful_button = page.locator("button[class='btn not-helpful-button']")
@@ -56,7 +57,7 @@ def __init__(self, page: Page):
             "//div[@class='sumo-button-wrap align-full']/button[normalize-space(text())='Submit']")
         self.survey_message = page.locator("div[class='survey-message']")
 
-        """Locators belonging to the related articles section."""
+        # Related Articles section locators.
         self.related_articles_section = page.locator("section#related-documents")
         self.related_article_cards = page.locator("section#related-documents h3.card--title a")
         self.related_article = lambda article_title: page.locator(
@@ -64,7 +65,7 @@ def __init__(self, page: Page):
             f'text())="{article_title}"]'
         )
 
-    """Actions against the kb article page content locators."""
+    # KB Article page content actions.
     def click_on_a_particular_breadcrumb(self, breadcrumb_name: str):
         self._click(self.article_breadcrumb(breadcrumb_name))
 
@@ -104,7 +105,7 @@ def get_what_links_here_locator(self):
     def is_article_content_image_displayed(self, image_title: str):
         return self._is_element_visible(self.kb_article_content_image(image_title))
 
-    """Actions against the kb article editing tools section locators."""
+    # KB Article editing tools section actions.
     def click_on_show_history_option(self):
         self._click(self.editing_tools_show_history_option)
 
@@ -135,13 +136,19 @@ def get_show_translations_option_locator(self):
     def click_on_article_option(self):
         self._click(self.editing_tools_article_option)
 
+    def get_article_option_locator(self) -> Locator:
+        return self.editing_tools_article_option
+
+    def editing_tools_discussion_locator(self) -> Locator:
+        return self.editing_tools_discussion_option
+
     def click_on_editing_tools_discussion_option(self):
         self._click(self.editing_tools_discussion_option)
 
     def get_url(self) -> str:
         return self._get_current_page_url()
 
-    """Actions against the helpfulness widget locators."""
+    # Helpfulness widget actions.
     def is_helpfulness_widget_displayed(self) -> bool:
         return self._is_element_visible(self.helpfulness_widget)
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_article_review_revision_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_article_review_revision_page.py
index 4709f5d3e98..491315ffebb 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_article_review_revision_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_article_review_revision_page.py
@@ -1,4 +1,5 @@
 from playwright.sync_api import Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,7 +7,6 @@ class KBArticleReviewRevisionPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """"General Review revision page locators."""
         self.revision_header = page.locator("h1[class='sumo-page-heading']")
         self.reviewing_revision_text = page.locator(
             "//article[@id='review-revision']//a[text()='Back to History']/..")
@@ -36,11 +36,11 @@ def __init__(self, page: Page):
         self.defer_revision_button = page.locator("button#btn-reject")
         self.approve_revision_button = page.locator("button#btn-approve")
 
-        """Locators belonging to the defer revision modal."""
+        # Defer revision modal
         self.defer_button = page.locator("form#reject-modal button")
         self.cancel_defer = page.locator("form#reject-modal a")
 
-        """Locators belonging to the approve revision modal."""
+        # Approve revision modal
         self.accept_revision_modal_header = page.locator("div[class='kbox-title']")
 
         # Need to add locators for approving own edit revision warning.
@@ -51,12 +51,11 @@ def __init__(self, page: Page):
         self.modal_accept_button = page.locator("form#approve-modal div button")
         self.modal_cancel_button = page.locator("form#approve-modal div a")
 
-        """Locators belonging to the revision significance section."""
+        # Revision significance
         self.minor_significance = page.locator("input#id_significance_0")
         self.normal_significance = page.locator("input#id_significance_1")
         self.major_significance = page.locator("input#id_significance_2")
 
-    """Actions against the general review revision page locators."""
     def get_revision_header(self) -> str:
         return self._get_text_of_element(self.revision_header)
 
@@ -116,7 +115,7 @@ def click_on_cancel_defer_button(self):
     def click_on_approve_revision_button(self):
         self._click(self.approve_revision_button)
 
-    """Actions against the review revision modal locators."""
+    # Modal actions
     def get_accept_revision_modal_header(self) -> str:
         return self._get_text_of_element(self.accept_revision_modal_header)
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_article_show_history_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_article_show_history_page.py
index 15684e86c5a..9eca03a6dbc 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_article_show_history_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_article_show_history_page.py
@@ -7,7 +7,7 @@ class KBArticleShowHistoryPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the show history section."""
+        # Show History page locators.
         self.show_history_page_header = page.locator("h1[class='title sumo-page-subheading']")
         self.show_history_category_link = page.locator(
             "//dt[text()='Category:']/following-sibling::dd/a")
@@ -42,7 +42,7 @@ def __init__(self, page: Page):
         self.revision_significance = lambda revision_id: page.locator(
             f"tr#{revision_id} td[class='significance']")
 
-        """Locators belonging to the document contributors section."""
+        # Document contributors locators
         self.show_history_page_banner = page.locator(
             "li[class='mzp-c-notification-bar mzp-t-success'] p")
         self.all_contributors_list_items = page.locator("ul[class='avatar-wrap'] li")
@@ -62,7 +62,7 @@ def __init__(self, page: Page):
         self.delete_contributor = lambda username: page.locator(
             f"//span[text()='{username}']/../..//a[@class='remove-button']")
 
-        """Locators belonging to the delete document locators."""
+        # Show History delete document section locators.
         self.delete_this_document_button = page.locator("div#delete-doc a")
         self.delete_this_document_confirmation_delete_button = page.locator(
             "div[class='submit'] input")
@@ -76,7 +76,7 @@ def __init__(self, page: Page):
         self.unable_to_delete_revision_page_go_back_to_document_history = page.locator(
             "div[class='submit'] a")
 
-    """Actions against the Show History page locators."""
+    # Page actions.
     def get_show_history_page_banner(self) -> str:
         return self._get_text_of_element(self.show_history_page_banner)
 
@@ -108,7 +108,7 @@ def click_on_submit_l10n_readiness_button(self, revision_id: str):
         self._click(self.ready_for_l10_modal_submit_button,
                     expected_locator=self.revision_ready_for_l10n_status(revision_id))
 
-    """Actions against the delete document section locators."""
+    # Delete document actions.
     def click_on_delete_this_document_button(self):
         self._click(self.delete_this_document_button)
 
@@ -128,7 +128,7 @@ def get_last_revision_id(self) -> str:
             revisions[0], "id"
         )
 
-    """# For unreviewed revisions but user session doesn't permit review."""
+    # For unreviewed revisions but user session doesn't permit review.
     def click_on_a_revision_date(self, revision_id):
         self._click(self.revision_date(revision_id))
 
@@ -150,7 +150,6 @@ def is_revision_current(self, revision_id: str) -> bool:
         return self._is_element_visible(self.revision_current_status(revision_id))
 
     # For unreviewed revisions but user session permits review.
-    """# For unreviewed revisions but user session permits review."""
     def get_status_of_reviewable_revision(self, revision_id):
         return self._get_text_of_element(self.reviewable_revision(revision_id))
 
@@ -169,7 +168,7 @@ def get_unable_to_delete_revision_subheader(self) -> str:
     def click_go_back_to_document_history_option(self):
         self._click(self.unable_to_delete_revision_page_go_back_to_document_history)
 
-    """Actions against the article contribution section locators."""
+    # Article contribution actions.
     def click_on_edit_contributors_option(self):
         self._click(self.edit_contributors_option)
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_category_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_category_page.py
index 9584dd0f3ea..07550dcef35 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_category_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_category_page.py
@@ -1,11 +1,13 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
 class KBCategoryPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the KB Category page."""
         self.article_from_list = lambda article_name: page.locator(
             "ul[class='documents'] li").get_by_role("link", name=article_name, exact=True)
+
+    def get_a_particular_article_locator_from_list(self, article_name: str) -> Locator:
+        return self.article_from_list(article_name)
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_meta.py b/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_meta.py
index e8e3308a090..c689d16b295 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_meta.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_meta.py
@@ -1,4 +1,5 @@
 from playwright.sync_api import Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,7 +7,7 @@ class KBArticleEditMetadata(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the edit article metadata page."""
+        # Edit article metadata page locators.
         self.edit_article_metadata_error = page.locator("ul[class='errorlist']")
         self.edit_article_metadata_page_header = page.locator("h1[class='sumo-page-heading']")
         self.restrict_visibility_input_field = page.locator(
@@ -44,7 +45,7 @@ def __init__(self, page: Page):
         self.relevant_product_checkbox = lambda product_name: page.locator(
             f"//section[@id='relevant-products']//label[normalize-space(text())='{product_name}']")
 
-    """Actions against the edit article metadata page locators."""
+    # Edit article metadata page actions.
     def get_error_message(self) -> str:
         return self._get_text_of_element(self.edit_article_metadata_error)
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_page.py
index 1e9969dde6f..74d0ee34501 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_page.py
@@ -1,18 +1,19 @@
 from playwright.sync_api import Page
-from playwright_tests.core.basepage import BasePage
+
+from playwright_tests.core.basepage import BasePage, Locator
 
 
 class EditKBArticlePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the kb article edit page."""
+        # KB Article edit page locators.
         self.edit_article_page_header = page.locator("h1")
         self.edit_by_another_user_warning_banner = page.locator("div#locked-warning")
         self.edit_by_another_user_warning_message = page.locator("div#locked-warning p")
         self.edit_by_another_user_edit_anyway_option = page.locator("a#unlock-button")
 
-        """Locators belonging to the kb article edit page field section."""
+        # KB Article edit page field locators.
         self.edit_article_keywords_field = page.locator("input#id_keywords")
         self.edit_article_search_result_summary_field = page.locator("textarea#id_summary")
         self.edit_article_content_textarea_field = page.locator("textarea#id_content")
@@ -23,16 +24,18 @@ def __init__(self, page: Page):
             "article#edit-document").get_by_role(
             "button", name="Submit for Review", exact=True)
 
-        """Locators belonging to the submit your changes section."""
+        # Submit your changes locators.
         self.edit_article_submit_changes_panel_comment_field = page.locator("input#id_comment")
         self.edit_article_submit_changes_panel_submit_button = page.locator(
             "button#submit-document-form")
 
-    """Actions against the edit kb article page locators."""
     # Edit kb article page actions.
     def get_edit_article_page_header(self) -> str:
         return self._get_text_of_element(self.edit_article_page_header)
 
+    def get_warning_banner_locator(self) -> Locator:
+        return self.edit_by_another_user_warning_banner
+
     def get_edit_article_warning_message(self) -> str:
         paragraphs = self._get_text_of_elements(self.edit_by_another_user_warning_message)
         return ' '.join(paragraphs)
@@ -43,7 +46,7 @@ def click_on_edit_anyway_option(self):
     def is_edit_anyway_option_visible(self) -> bool:
         return self._is_element_visible(self.edit_by_another_user_edit_anyway_option)
 
-    """Actions against the kb article page field locators."""
+    # Edit kb article page field actions.
     def get_edit_article_keywords_field_value(self) -> str:
         return self._get_element_input_value(self.edit_article_keywords_field)
 
@@ -51,6 +54,9 @@ def fill_edit_article_keywords_field(self, text: str):
         self._clear_field(self.edit_article_keywords_field)
         self._fill(self.edit_article_keywords_field, text)
 
+    def get_edit_keywords_field_locator(self) -> Locator:
+        return self.edit_article_keywords_field
+
     def get_edit_article_search_result_summary_text(self) -> str:
         return self._get_text_of_element(self.edit_article_search_result_summary_field)
 
@@ -73,10 +79,11 @@ def get_edit_article_expiry_date_value(self) -> str:
     def fill_edit_article_expiry_date(self, text: str):
         self._type(self.edit_article_expiry_date_field, text, 0)
 
-    """Actions against the submit your changes section locators."""
+    # Edit kb button actions.
     def click_submit_for_review_button(self):
         self._click_on_first_item(self.edit_article_submit_for_review_button)
 
+    # Submit you changes panel actions.
     def fill_edit_article_changes_panel_comment(self, text: str):
         self._fill(self.edit_article_submit_changes_panel_comment_field, text)
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_revision_preview_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_revision_preview_page.py
index 6e04dced654..fe2dfa8a614 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_revision_preview_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_revision_preview_page.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,10 +7,10 @@ class KBArticleRevisionsPreviewPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the 'Preview Revision' page."""
+        # Preview Revision page locators.
         self.preview_revision_page_header = page.locator("h1[class='sumo-page-heading']")
 
-        """Locators belonging to the revision information section."""
+        # Revision Information locators.
         self.revision_information_foldout_section = page.locator(
             "//summary[text()='Revision Information']")
         self.revision_information_content = page.locator("div[class='revision-info']")
@@ -36,23 +37,26 @@ def __init__(self, page: Page):
         self.edit_article_based_on_revision_link = page.get_by_role(
             "link", name="Edit article based on this revision", exact=True)
 
-        """Locators belonging to the revision source section."""
+        # Revision Source locators.
         self.revision_source_foldout_section = page.locator("//summary[text()='Revision Source']")
         self.revision_source_textarea = page.locator("div#doc-source textarea")
 
-        """Locators belonging to the revision content section."""
+        # Revision Content locators.
         self.revision_content_foldout_section = page.locator(
             "//summary[text()='Revision Content']")
         self.revision_content_html_section = page.locator("div#doc-content")
 
-    """Actions against the 'Preview Revision' page locators."""
+    # Preview Revision page actions.
     def get_preview_revision_header(self) -> str:
         return self._get_text_of_element(self.preview_revision_page_header)
 
-    """Actions against the revision information section locators."""
+    # Revision Information actions.
     def click_on_revision_information_foldout_section(self):
         self._click(self.revision_information_foldout_section)
 
+    def get_revision_information_content_locator(self) -> Locator:
+        return self.revision_information_content
+
     def get_preview_revision_id_text(self) -> str:
         return self._get_text_of_element(self.revision_id)
 
@@ -71,36 +75,62 @@ def get_preview_revision_comment_text(self) -> str:
     def get_preview_revision_reviewed_text(self) -> str:
         return self._get_text_of_element(self.reviewed)
 
-    """
-    This locator is available inside the page only when a review was performed.
-    The text returned is the username extracted from the e-mail address.
-    """
+    # This locator is available inside the page only when a review was performed.
+    def get_preview_revision_reviewed_date_locator(self) -> Locator:
+        return self.reviewed_time
+
+    # This locator is available inside the page only when a review was performed.
+    # The text returned is the username extracted from the e-mail address.
     def get_reviewed_by_text(self) -> str:
         return self._get_text_of_element(self.reviewed_by)
 
+    def get_reviewed_by_locator(self) -> Locator:
+        return self.reviewed_by
+
     def get_is_approved_text(self) -> str:
         return self._get_text_of_element(self.is_approved)
 
+    def get_is_approved_text_locator(self) -> Locator:
+        return self.is_approved
+
     def get_is_current_revision_text(self) -> str:
         return self._get_text_of_element(self.is_current_revision)
 
+    def is_current_revision_locator(self) -> Locator:
+        return self.is_current_revision
+
     def get_preview_revision_ready_for_localization_text(self) -> str:
         return self._get_text_of_element(self.ready_for_localization)
 
+    # Is displayed only if the revision was marked as ready for localization
+    def ready_for_localization_date(self) -> Locator:
+        return self.readied_for_localization_date
+
     def readied_for_localization_by_text(self) -> str:
         return self._get_text_of_element(self.readied_for_localization_by)
 
+    def readied_for_localization_by_locator(self) -> Locator:
+        return self.readied_for_localization_by
+
+    def get_edit_article_based_on_this_revision_link_locator(self) -> Locator:
+        return self.edit_article_based_on_revision_link
+
     def click_on_edit_article_based_on_this_revision_link(self):
         self._click(self.edit_article_based_on_revision_link)
 
-    """Actions against the revision source section locators."""
+    # Revision Source actions.
     def click_on_revision_source_foldout_section(self):
         self._click(self.revision_source_foldout_section)
 
     def get_preview_revision_source_textarea_content(self) -> str:
         return self._get_element_input_value(self.revision_source_textarea)
 
-    """Actions against the revision content section locators."""
+    def get_preview_revision_source_textarea_locator(self) -> Locator:
+        return self.revision_source_textarea
+
+    # Revision Content actions.
     def click_on_revision_content_foldout_section(self):
         self._click(self.revision_content_foldout_section)
 
+    def get_revision_content_html_locator(self) -> Locator:
+        return self.revision_content_html_section
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_translate_article_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_translate_article_page.py
index 2dab6ef3dbd..1f88e6efaee 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_translate_article_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_translate_article_page.py
@@ -1,32 +1,21 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
 class TranslateArticlePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """General page locators."""
         self.translating_an_unready_article_banner = page.locator("ul[class='user-messages'] li")
         self.article_translation_page_title = page.locator("h1[class='sumo-page-heading']")
-
-        """Locators belonging to the title and slug sections."""
         self.translation_title_field = page.locator("input#id_title")
         self.translation_slug_field = page.locator("input#id_slug")
-
-        """Locators belonging to the allow comments section."""
         self.allow_article_comments_label = page.locator("label[for='id_allow_discussion']")
-
-        """Locators belonging to the keywords and search summary sections."""
         self.translation_keyword_field = page.locator("input#id_keywords")
         self.translation_summary_field = page.locator("textarea#id_summary")
-
-        """Locators belonging to the translation content sections."""
         self.translation_english_readonly_field = page.locator("div#content-or-diff textarea")
         self.translation_text = page.locator("textarea#id_content")
         self.change_body_view = page.locator("div#editor_wrapper + a")
-
-        """Locators belonging to the action buttons section."""
         self.send_translation_for_approval_button = page.locator(
             "button[class*='btn-submit']").first
         self.save_translation_as_draft_button = page.locator("button[class*='btn-draft']").first
@@ -43,6 +32,9 @@ def click_on_locale_from_list(self, locale: str):
     def get_text_of_article_unready_for_translation_banner(self) -> str:
         return self._get_text_of_element(self.translating_an_unready_article_banner)
 
+    def get_unready_for_translation_banner(self) -> Locator:
+        return self.translating_an_unready_article_banner
+
     def get_translate_page_title(self) -> str:
         return self._get_text_of_element(self.article_translation_page_title)
 
@@ -80,3 +72,6 @@ def click_on_description_submit_button(self):
 
     def click_on_save_translation_as_draft_button(self):
         self.save_translation_as_draft_button.first.click()
+
+    def get_draft_success_message_locator(self) -> Locator:
+        return self.draft_saved_successfully_message
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_what_links_here_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_what_links_here_page.py
index e4c7467f97a..60b5fdbe5d4 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_what_links_here_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_what_links_here_page.py
@@ -6,8 +6,9 @@
 class WhatLinksHerePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the 'What links here' page."""
         self.what_links_here_list = self.page.locator("article[id] li a")
         self.what_links_here_for_article = lambda article_name: self.page.locator(
             "article[id] li").get_by_role("link").filter(has_text=article_name)
+
+    def get_a_particular_what_links_here_article_locator(self, article_name: str) -> Locator:
+        return self.what_links_here_for_article(article_name)
diff --git a/playwright_tests/pages/explore_help_articles/articles/products_page.py b/playwright_tests/pages/explore_help_articles/articles/products_page.py
index 87b6fb65928..a2109cc162c 100644
--- a/playwright_tests/pages/explore_help_articles/articles/products_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/products_page.py
@@ -1,18 +1,18 @@
 from playwright.sync_api import Page
+
 from playwright_tests.core.basepage import BasePage
 
 
 class ProductsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the page breadcrumbs."""
+        # Page breadcrumb locators.
         self.first_breadcrumb = page.locator("ol#breadcrumbs li a")
 
-        """General page locators."""
+        # Page content locators.
         self.page_header = page.locator("h1.sumo-page-heading-xl")
 
-        """Locators belonging to the product cards."""
+        # Product cards locators.
         self.all_product_card_titles = page.locator("h3.card--title")
         self.card_subheading = lambda card_title: page.locator(
             f"//a[normalize-space(text())='{card_title}']/../following-sibling::p[@class='card--"
@@ -20,15 +20,15 @@ def __init__(self, page: Page):
         self.card = lambda card_title: page.locator(
             "div.card--details").get_by_role("link", name=card_title, exact=True)
 
-    """Actions against the page breadcrumb locators."""
+    # Page breadcrumbs actions.
     def click_on_first_breadcrumb(self):
         self._click(self.first_breadcrumb)
 
-    """Actions against the general page content locators."""
+    # Page content actions.
     def get_page_header(self) -> str:
         return self._get_text_of_element(self.page_header)
 
-    """Actions against the product cards locators."""
+    # Product card actions.
     def get_subheading_of_card(self, card_title: str) -> str:
         return self._get_text_of_element(self.card_subheading(card_title))
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/submit_kb_article_page.py b/playwright_tests/pages/explore_help_articles/articles/submit_kb_article_page.py
index c98dc35a444..20e3af6398e 100644
--- a/playwright_tests/pages/explore_help_articles/articles/submit_kb_article_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/submit_kb_article_page.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,7 +8,7 @@ def __init__(self, page: Page):
         super().__init__(page)
         self.kb_article_for_contributors_sidebar = page.locator("nav#for-contributors-sidebar")
 
-        """Locators belonging to the new kb article form."""
+        # New KB article form locators.
         self.kb_article_restrict_visibility_field = page.locator(
             "input#id_restrict_to_groups-ts-control")
         self.kb_article_restrict_visibility_delete_all_groups = page.locator(
@@ -23,7 +24,7 @@ def __init__(self, page: Page):
         self.kb_article_keyword_input = page.locator("input#id_keywords")
         self.kb_article_search_result_summary_textarea = page.locator("textarea#id_summary")
 
-        """Locators belonging to the new kb article content form locators."""
+        # New KB article content locators.
         self.kb_article_content_textarea = page.locator("textarea#id_content")
         self.kb_article_insert_media = page.locator("button[class*='btn-media']")
         self.kb_article_insert_media_modal_images = page.locator("div#media-modal img")
@@ -62,17 +63,27 @@ def __init__(self, page: Page):
             f"//section[@id='relevant-topics']//label[normalize-space(text())='{parent_topic}']/"
             f"../../..//label[normalize-space(text())='{child_topic_checkbox}']")
 
-    """Actions against the page error locators."""
+    # Page error actions.
     def get_all_kb_errors(self) -> list[str]:
         return self._get_text_of_elements(self.all_kb_errors)
 
+    def get_kb_title_error_locator(self) -> Locator:
+        return self.kb_title_error
+
     def get_kb_title_error_text(self) -> str:
         return self._get_text_of_element(self.kb_title_error)
 
+    def get_kb_slug_error(self) -> Locator:
+        return self.kb_slug_error
+
     def get_kb_slug_error_text(self) -> str:
         return self._get_text_of_element(self.kb_slug_error)
 
-    """Actions against the new KB form locators."""
+    # For Contributors side navbar actions.
+    def for_contributors_section(self) -> Locator:
+        return self.kb_article_for_contributors_sidebar
+
+    # New KB form actions.
     def add_and_select_restrict_visibility_group(self, group_name: str):
         self._fill(self.kb_article_restrict_visibility_field, group_name)
         self._click(self.restrict_visibility_to_group(group_name))
@@ -130,6 +141,12 @@ def click_on_submit_for_review_button(self):
     def click_on_changes_submit_button(self):
         self._click(self.kb_submit_changes_button)
 
+    def is_showfor_panel_displayed(self) -> Locator:
+        return self.kb_article_showfor_panel
+
+    def is_preview_content_section_displayed(self) -> Locator:
+        return self.kb_article_preview_content
+
     def get_text_of_label_for_relevant_to_checkbox(self, option_to_click) -> str:
         return self._get_text_of_element(self.relevant_to_product_checkbox(option_to_click))
 
@@ -139,8 +156,9 @@ def click_on_a_particular_product(self, product_name: str):
     def click_on_a_particular_parent_topic_checkbox(self, parent_topic_name: str):
         self._click(self.parent_topic_checkbox(parent_topic_name))
 
-    def click_on_a_particular_child_topic_checkbox(self, parent_topic: str,
-                                                   child_topic_checkbox: str):
+    def click_on_a_particular_child_topic_checkbox(
+        self, parent_topic: str, child_topic_checkbox: str
+    ):
         self._click(self.child_topic_checkbox(parent_topic, child_topic_checkbox))
 
     def click_on_insert_media_textarea_option(self):
diff --git a/playwright_tests/pages/explore_help_articles/explore_by_topic_page.py b/playwright_tests/pages/explore_help_articles/explore_by_topic_page.py
index d6399b63cb2..4a4750e65ac 100644
--- a/playwright_tests/pages/explore_help_articles/explore_by_topic_page.py
+++ b/playwright_tests/pages/explore_help_articles/explore_by_topic_page.py
@@ -1,5 +1,7 @@
 import re
+
 from playwright.sync_api import Page
+
 from playwright_tests.core.basepage import BasePage
 
 """
@@ -10,18 +12,13 @@
 class ExploreByTopicPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the page breadcrumb section."""
-        self.product_breadcrumb = lambda product: page.locator(
-            f"//ol[@id='breadcrumbs']/li/a[text()='{product}']")
-
-        """Locators belonging to the page header section."""
+        # Locators belonging to the header section.
         self.explore_by_topic_page_header = page.locator("div.documents-product-title h1")
 
-        """Locators belonging to the listed KB articles."""
+        # Locators belonging to the listed KB articles.
         self.article_metadata_info = page.locator("div#document_metadata span.tooltip")
 
-        """Locators belonging to the page side-navbar section."""
+        # Locators belonging to the page side-navbar section.
         self.filter_by_product_dropdown = page.locator("select#products-topics-dropdown")
         self.filter_by_product_dropdown_selected_option = page.locator(
             "select#products-topics-dropdown option[selected]")
@@ -32,12 +29,16 @@ def __init__(self, page: Page):
         self.topic_filter = lambda option: page.locator(
             "ul.sidebar-nav--list li").get_by_role("link", name=option, exact=True)
 
-    """Actions against the page header section."""
+    """
+        Actions against the page header section.
+    """
     def get_explore_by_topic_page_header(self) -> str:
         """Get the text of the page header."""
         return self._get_text_of_element(self.explore_by_topic_page_header)
 
-    """Actions against the listed KB articles."""
+    """
+       Actions against the listed KB articles.
+    """
     def get_metadata_of_all_listed_articles(self) -> list[list[str]]:
         """Get the metadata of all listed articles."""
         elements = [
@@ -47,7 +48,9 @@ def get_metadata_of_all_listed_articles(self) -> list[list[str]]:
         ]
         return elements
 
-    """Actions against the page side-navbar section."""
+    """
+        Actions against the page side-navbar section.
+    """
     def get_selected_topic_side_navbar_option(self) -> str:
         """Get the text of the selected topic in the side-navbar."""
         return self._get_text_of_element(self.all_topics_selected_option)
@@ -62,7 +65,7 @@ def click_on_a_topic_filter(self, option: str):
         Args:
             option (str): The topic filter to click on.
         """
-        self._click(self.topic_filter(option), expected_locator=self.explore_by_topic_page_header)
+        self._click(self.topic_filter(option))
 
     def get_current_product_filter_dropdown_option(self) -> str:
         """Get the text of the selected option in the product filter dropdown."""
@@ -79,5 +82,4 @@ def select_a_filter_by_product_option(self, option: str):
         Args:
             option (str): The option to select in the dropdown
         """
-        self._select_option_by_label(self.filter_by_product_dropdown, option,
-                                     expected_locator=self.product_breadcrumb(option))
+        self._select_option_by_label(self.filter_by_product_dropdown, option)
diff --git a/playwright_tests/pages/explore_help_articles/product_support_page.py b/playwright_tests/pages/explore_help_articles/product_support_page.py
index 3a26efafc36..3520e769224 100644
--- a/playwright_tests/pages/explore_help_articles/product_support_page.py
+++ b/playwright_tests/pages/explore_help_articles/product_support_page.py
@@ -1,4 +1,4 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
 
 from playwright_tests.core.basepage import BasePage
 
@@ -6,14 +6,13 @@
 class ProductSupportPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the product support breadcrumbs."""
+        # Product support breadcrumb locators.
         self.home_breadcrumb = page.locator("ol#breadcrumbs li").get_by_role("link")
 
-        """General page content locators."""
+        # Page content locators.
         self.product_title = page.locator("span.product-title-text")
 
-        """Locators belonging to the featured articles cards."""
+        # Feature article locators.
         self.featured_article_section_title = page.get_by_role("heading").filter(
             has_text="Featured Articles")
         self.featured_articles_cards = page.locator(
@@ -22,7 +21,7 @@ def __init__(self, page: Page):
             f'//h2[contains(text(),"Featured Articles")]/..//a[normalize-space(text())'
             f'="{card_title}"]')
 
-        """Locators belonging to the 'Still Need Help' widget."""
+        # Still need help widget locators.
         self.still_need_help_widget = page.locator(
             "section[class='support-callouts mzp-l-content sumo-page-section--inner']")
         self.still_need_help_widget_title = page.locator(
@@ -43,6 +42,10 @@ def get_product_support_title_text(self) -> str:
         """Get the product title text on the product support page."""
         return self._get_text_of_element(self.product_title)
 
+    def product_product_title_element(self) -> Locator:
+        """Get the product title element locator on the product support page."""
+        return self.product_title
+
     def get_featured_articles_header_text(self) -> str:
         """Get the featured articles section title text."""
         return self._get_text_of_element(self.featured_article_section_title)
diff --git a/playwright_tests/pages/footer.py b/playwright_tests/pages/footer.py
index aede7fd4d31..2513d99dc3f 100644
--- a/playwright_tests/pages/footer.py
+++ b/playwright_tests/pages/footer.py
@@ -1,5 +1,6 @@
 from playwright.sync_api import ElementHandle, Page
 from playwright.sync_api import TimeoutError as PlaywrightTimeoutError
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,13 +8,13 @@ class FooterSection(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the footer section locators."""
+        # Footer section locators.
         self.all_footer_links = page.locator("footer a")
         self.language_selector = page.locator("select#mzp-c-language-switcher-select")
         self.language_selector_options = page.locator(
             "select#mzp-c-language-switcher-select option").all()
 
-    """Actions against the footer section."""
+    # Footer section actions.
     def get_all_footer_links(self) -> list[ElementHandle]:
         """Returns all footer links."""
         return self._get_element_handles(self.all_footer_links)
@@ -24,6 +25,7 @@ def get_all_footer_locales(self) -> list[str]:
 
     def switch_to_a_locale(self, locale: str, max_retries=3) -> None:
         """Switches to a locale with a retry mechanism."""
+        print("Trying to switch the locale")
         attempts = 0
         while attempts < max_retries:
             self._select_option_by_value(self.language_selector, locale)
@@ -31,6 +33,7 @@ def switch_to_a_locale(self, locale: str, max_retries=3) -> None:
                 self.page.wait_for_url("**/" + locale + "/**", timeout=4000)
                 return
             except PlaywrightTimeoutError:
+                print("Switching to locale failed, retrying...")
                 self.page.reload()
                 if locale in self.page.url:
                     return
diff --git a/playwright_tests/pages/homepage.py b/playwright_tests/pages/homepage.py
index bd88fefcc10..a7ad78ba6ba 100644
--- a/playwright_tests/pages/homepage.py
+++ b/playwright_tests/pages/homepage.py
@@ -1,24 +1,23 @@
 from playwright.sync_api import Page
+
 from playwright_tests.core.basepage import BasePage
 
 
 class Homepage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the product list section."""
+        # Product list section locators.
         self.product_list = page.locator("div.card--product")
         self.product_card_titles = page.locator("div.card--product h3.card--title"
                                                 ).get_by_role("link")
         self.product_card = lambda card_title: page.get_by_role(
             "link", name=f'{card_title}', exact=True)
 
-        """Locators belonging to the featured articles section."""
+        # Featured articles section locators.
         self.featured_articles_list = page.locator("div.card--article")
         self.featured_articles_card_titles = page.locator("div.card--article").get_by_role("link")
 
-
-    """Actions against the product cards."""
+    # Product Cards
     def get_text_of_product_card_titles(self) -> list[str]:
         """Get text of all product card titles"""
         return self._get_text_of_elements(self.product_card_titles)
@@ -31,7 +30,7 @@ def click_on_product_card_by_title(self, card_title: str):
         """Click on a product card by its title"""
         self._click(self.product_card(card_title))
 
-    """Actions against the featured articles cards."""
+    # Featured articles
     def get_number_of_featured_articles(self) -> int:
         """Get the number of featured articles"""
         return self._get_elements_count(self.featured_articles_list)
diff --git a/playwright_tests/pages/messaging_system_pages/inbox_page.py b/playwright_tests/pages/messaging_system_pages/inbox_page.py
index a22b21cce54..945796b57cf 100644
--- a/playwright_tests/pages/messaging_system_pages/inbox_page.py
+++ b/playwright_tests/pages/messaging_system_pages/inbox_page.py
@@ -1,4 +1,5 @@
 from playwright.sync_api import ElementHandle, Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -83,6 +84,10 @@ def click_on_scam_alert_close_button(self):
         """Click on the close button of the scam alert banner."""
         self._click(self.scam_alert_close_button)
 
+    def get_scam_banner_message_locator(self) -> Locator:
+        """Get the locator of the inbox message scam banner."""
+        return self.scam_alert_banner_text
+
     """Actions against the general Inbox page locators."""
     def get_text_of_main_header(self) -> str:
         """Get the text of the main header of the inbox page."""
@@ -230,6 +235,22 @@ def click_on_cancel_button_inside_the_confirmation_page(self):
         """
         self._press_a_key(self.delete_confirmation_page_cancel_button, 'Enter')
 
+    def get_inbox_message_locator_based_on_sender(self, username: str) -> Locator:
+        """
+            Get the locator of the inbox message based on the sender's username.
+            Args:
+                username (str): The username of the message sender.
+        """
+        return self.sender_username(username)
+
+    def get_inbox_message_locator_based_on_excerpt(self, excerpt: str) -> Locator:
+        """
+            Get the locator of the inbox message based on the excerpt.
+            Args:
+                excerpt (str): The excerpt of the message.
+        """
+        return self.inbox_message_by_excerpt(excerpt)
+
 
     def get_inbox_message_element_handles_based_on_excerpt(self,
                                                            excerpt: str) -> list[ElementHandle]:
@@ -257,6 +278,11 @@ def check_a_particular_message_based_on_excerpt(self, excerpt=''):
         inbox_checkbox = self.get_message_select_checkbox_element(excerpt)
         self._checkbox_interaction(inbox_checkbox[0], True)
 
+    def get_all_unread_messages(self) -> list[Locator]:
+        """Get all the unread messages."""
+        return self.all_unread_messages.all()
+
+
     """Actions against the read inbox message page."""
     def get_the_deleted_user_message_sender_text(self) -> str:
         """Returns the name of the message sender (which should be the deleted user)"""
diff --git a/playwright_tests/pages/messaging_system_pages/mess_system_user_navbar.py b/playwright_tests/pages/messaging_system_pages/mess_system_user_navbar.py
index ca41096539a..0d038bedc3b 100644
--- a/playwright_tests/pages/messaging_system_pages/mess_system_user_navbar.py
+++ b/playwright_tests/pages/messaging_system_pages/mess_system_user_navbar.py
@@ -1,12 +1,12 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
 class MessagingSystemUserNavbar(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the messaging system navbar."""
+        # Messaging system navbar locators.
         self.messaging_system_user_navbar_inbox_option = page.locator(
             "ul#pm-nav").get_by_role("link").filter(has_text="Inbox")
         self.messaging_system_user_navbar_sent_messages_option = page.locator(
@@ -14,7 +14,7 @@ def __init__(self, page: Page):
         self.messaging_system_user_navbar_new_message_option = page.locator(
             "ul#pm-nav").get_by_role("link").filter(has_text="New Message")
 
-    """Actions against the messaging system navbar locators."""
+    # Messaging system navbar actions.
     def click_on_messaging_system_navbar_inbox(self):
         """Click on the inbox option in the messaging system navbar."""
         self._click(self.messaging_system_user_navbar_inbox_option)
@@ -26,3 +26,16 @@ def click_on_messaging_system_nav_sent_messages(self):
     def click_on_messaging_system_nav_new_message(self):
         """Click on the new message option in the messaging system navbar."""
         self._click(self.messaging_system_user_navbar_new_message_option)
+
+    # Need to add logic for fetching the background color of selected navbar elements
+    def get_inbox_navbar_element(self) -> Locator:
+        """Get the locator for the inbox option in the messaging system navbar."""
+        return self.messaging_system_user_navbar_inbox_option
+
+    def get_sent_messages_navbar_element(self) -> Locator:
+        """Get the locator for the sent messages option in the messaging system navbar."""
+        return self.messaging_system_user_navbar_sent_messages_option
+
+    def get_new_message_navbar_element(self) -> Locator:
+        """Get the locator for the new message option in the messaging system navbar."""
+        return self.messaging_system_user_navbar_new_message_option
diff --git a/playwright_tests/pages/messaging_system_pages/new_message.py b/playwright_tests/pages/messaging_system_pages/new_message.py
index a212aa3dda9..d5822012e8b 100644
--- a/playwright_tests/pages/messaging_system_pages/new_message.py
+++ b/playwright_tests/pages/messaging_system_pages/new_message.py
@@ -1,4 +1,4 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
 
 from playwright_tests.core.basepage import BasePage
 
@@ -55,6 +55,10 @@ def get_to_user_text(self) -> str:
         """Get the text of the targeted user from the 'To' field."""
         return self._get_text_of_element(self.added_to_user_text)
 
+    def get_no_user_message_locator(self) -> Locator:
+        """Get the locator of the no user message from the 'To' search field."""
+        return self.no_user_search_results_text
+
     def get_text_of_search_result_bolded_character(self) -> str:
         """Get the text of the search result bolded character."""
         return self._get_text_of_element(self.user_search_results_bolded_characters)
@@ -88,6 +92,10 @@ def get_characters_remaining_text(self) -> str:
         """Get the text of the characters remaining message from the New Message textarea."""
         return self._get_text_of_element(self.textarea_remaining_characters_message)
 
+    def get_characters_remaining_text_locator(self) -> Locator:
+        """Get the locator of the characters remaining message from the New Message textarea."""
+        return self.textarea_remaining_characters_message
+
     def click_cancel_button(self):
         """Click on the 'Cancel' button from the New Messages page."""
         self._click(self.cancel_button)
@@ -154,6 +162,18 @@ def click_on_preview_internal_link(self):
         """Click on the internal link from the New Message preview section."""
         self._click(self.preview_internal_link)
 
+    def get_preview_section_locator(self) -> Locator:
+        """Get the locator of the message preview section."""
+        return self.preview_section
+
     def is_message_preview_time_displayed(self) -> bool:
         """Check if the message preview time is displayed."""
         return self._is_element_visible(self.preview_time)
+
+    def get_preview_internal_link_test_data_locator(self) -> Locator:
+        """Get the locator of the internal link displayed inside the New Message page preview."""
+        return self.preview_internal_link
+
+    def get_preview_external_link_test_data_locator(self) -> Locator:
+        """Get the locator of the external link displayed inside the New Message page preview"""
+        return self.preview_external_link
diff --git a/playwright_tests/pages/messaging_system_pages/sent_messages.py b/playwright_tests/pages/messaging_system_pages/sent_messages.py
index 6387cc50654..1b9a8cfb1c1 100644
--- a/playwright_tests/pages/messaging_system_pages/sent_messages.py
+++ b/playwright_tests/pages/messaging_system_pages/sent_messages.py
@@ -1,4 +1,4 @@
-from playwright.sync_api import ElementHandle, Page
+from playwright.sync_api import ElementHandle, Locator, Page
 
 from playwright_tests.core.basepage import BasePage
 
@@ -7,6 +7,8 @@ class SentMessagePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
+        # Sent messages page locators.
+
         """Locators belonging to the breadcrumbs section."""
         self.all_breadcrumbs = page.locator("ol#breadcrumbs li")
 
@@ -160,6 +162,22 @@ def click_on_delete_page_cancel_button(self):
         """Click on the cancel button on the delete message page."""
         self._click(self.delete_confirmation_cancel_button)
 
+    def sent_messages_by_username(self, username: str) -> Locator:
+        """Get the locator of the sent messages by the username of the recipient.
+
+        Args:
+            username (str): The username of the recipient.
+        """
+        return self.sender_username(username)
+
+    def sent_messages_by_excerpt_locator(self, excerpt: str) -> Locator:
+        """Get the locator of the sent messages by the excerpt of the message.
+
+        Args:
+            excerpt (str): The excerpt of the message.
+        """
+        return self.sent_message_by_subject(excerpt)
+
     def sent_messages_by_excerpt_element_handles(self, excerpt: str) -> list[ElementHandle]:
         """Get the element handle list of the sent messages by the excerpt of the message.
 
@@ -169,6 +187,19 @@ def sent_messages_by_excerpt_element_handles(self, excerpt: str) -> list[Element
         return list(self._get_element_handles(
             self.sent_message_by_subject(excerpt)))
 
+    def sent_messages_to_group(self, group: str, excerpt: str) -> Locator:
+        """Get the locator of the sent message by the group name of the recipient and the excerpt
+
+        Args:
+            group (str): The name of the group.
+            excerpt (str): The excerpt of the message.
+        """
+        return self.sent_message_by_group(group, excerpt)
+
+    def sent_message_banner(self) -> Locator:
+        """Get the locator of the sent message banner."""
+        return self.banner_text
+
     def are_sent_messages_displayed(self) -> bool:
         """Check if the sent messages are displayed."""
         return self._is_element_visible(self.sent_messages_section)
diff --git a/playwright_tests/pages/search/search_page.py b/playwright_tests/pages/search/search_page.py
index e12153f46a9..5ce68c8f4de 100644
--- a/playwright_tests/pages/search/search_page.py
+++ b/playwright_tests/pages/search/search_page.py
@@ -7,7 +7,7 @@ class SearchPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the searchbar."""
+        # Locators belonging to the searchbar.
         self.searchbar_homepage = page.locator("form#support-search-masthead input#search-q")
         self.searchbar_aaq = page.locator("form#question-search-masthead input#search-q")
         self.searchbar_sidebar = page.locator("form#support-search-sidebar input#search-q")
@@ -19,7 +19,7 @@ def __init__(self, page: Page):
             "p[class='popular-searches']").get_by_role("link", name=option, exact=True)
         self.search_results_section = page.locator("main#search-results-list")
 
-        """Locators belonging to the search results filter."""
+        # Locators belonging to the search results filter
         self.selected_filter_locator = page.locator(
             "//ul[@id='doctype-filter']/li[@class='tabs--item']/a[@class='selected']/span")
         self.view_all_filter = page.locator(
@@ -31,7 +31,7 @@ def __init__(self, page: Page):
             "//ul[@id='doctype-filter']/li[@class='tabs--item']/a/span[text()='Community "
             "Discussion Only']")
 
-        """Locators belonging to the search results."""
+        # Locators belonging to the search results
         self.search_results_titles = page.locator(
             "section[class='topic-list content-box'] a[class='title']")
         self.search_results_articles_summary = page.locator("div[class='topic-article--text'] p")
@@ -48,7 +48,7 @@ def __init__(self, page: Page):
             "//ul[@class='topic-article--meta-list thread-meta']/li[contains(text(),"
             "'people have this problem')]")
 
-        """Locators belonging to the side navbar."""
+        # Locators belonging to the side navbar
         self.search_results_side_nav_header = page.locator("h3[class='sidebar-subheading']")
         self.search_results_side_nav_selected_item = page.locator(
             "ul#product-filter li[class='selected'] a")
@@ -56,14 +56,16 @@ def __init__(self, page: Page):
         self.search_results_side_nav_element = lambda product_name: page.locator(
             "ul#product-filter").get_by_role("link", name=product_name, exact=True)
 
-        """General page locators."""
+        # General page locators
         self.page_header = page.locator("h1[class='sumo-page-heading-xl']")
 
 
     def _wait_for_visibility_of_search_results_section(self):
         self._wait_for_locator(self.search_results_section)
 
-    """Actions against the search results."""
+    """
+        Actions against the search results
+    """
     def click_on_a_particular_popular_search(self, popular_search_option: str):
         """Click on a particular popular search option
 
@@ -162,7 +164,9 @@ def is_search_content_section_displayed(self) -> bool:
         """Check if the search content section is displayed"""
         return self._is_element_visible(self.search_results_content)
 
-    """Actions against the search bar."""
+    """
+        Actions against the search bar
+    """
 
     def get_text_of_searchbar_field(self) -> str:
         """Get the text of the search bar field"""
@@ -184,7 +188,6 @@ def fill_into_searchbar(self, text: str, is_aaq=False, is_sidebar=False):
         else:
             self.clear_the_searchbar()
             self._fill(self.searchbar_homepage, text)
-        self._wait_for_visibility_of_search_results_section()
 
     def clear_the_searchbar(self, is_aaq=False, is_sidebar=False):
         """Clear the search bar
@@ -216,7 +219,9 @@ def click_on_a_popular_search(self, popular_search_name: str):
         """
         self._click(self.popular_search(popular_search_name))
 
-    """Actions against the side navbar."""
+    """
+        Actions against the side navbar
+    """
     def get_the_highlighted_side_nav_item(self) -> str:
         """Get the highlighted side nav item"""
         return self._get_text_of_element(self.search_results_side_nav_selected_item)
@@ -229,7 +234,9 @@ def click_on_a_particular_side_nav_item(self, product_name: str):
         """
         self._click(self.search_results_side_nav_element(product_name))
 
-    """General page actions."""
+    """
+        General page actions
+    """
     def get_search_results_header(self) -> str:
         """Get the search results header"""
         self._wait_for_visibility_of_search_results_section()
diff --git a/playwright_tests/pages/top_navbar.py b/playwright_tests/pages/top_navbar.py
index 0ac72ac0fb8..f5f856d91d9 100644
--- a/playwright_tests/pages/top_navbar.py
+++ b/playwright_tests/pages/top_navbar.py
@@ -1,20 +1,18 @@
 from playwright.sync_api import ElementHandle, Locator, Page
+
 from playwright_tests.core.basepage import BasePage
-from playwright_tests.pages.contribute.contributor_tools_pages.recent_revisions_page import \
-    RecentRevisions
 
 
 class TopNavbar(BasePage):
     def __init__(self, page: Page):
-        self.recent_revisions = RecentRevisions(page)
         super().__init__(page)
 
-        """General page locators."""
+        # General page locators
         self.menu_titles = page.locator("div#main-navigation a.mzp-c-menu-title")
         self.sumo_nav_logo = page.locator(
             "div.sumo-nav--logo").get_by_role("link").get_by_role("img")
 
-        """Locators belonging to the 'Explore Help Articles' top-navbar section."""
+        # Locators belonging to the 'Explore Help Articles' top-navbar section.
         self.explore_by_topic_top_navbar_header = page.locator(
             "h4.mzp-c-menu-item-title").filter(has_text="Explore by topic")
         self.explore_by_product_top_navbar_header = page.locator(
@@ -29,7 +27,7 @@ def __init__(self, page: Page):
         self.explore_by_topic_top_navbar_options = page.locator(
             "//h4[text()='Explore by topic']/../following-sibling::ul/li/a")
 
-        """Locators belonging to the 'Ask a Question' top-navbar section."""
+        # Locators belonging to the 'Ask a Question' top-navbar section.
         self.ask_a_question_top_navbar = page.locator(
             "li[class='mzp-c-menu-category mzp-has-drop-down mzp-js-expandable']").filter(
             has_text="Ask a Question")
@@ -43,7 +41,7 @@ def __init__(self, page: Page):
         self.browse_all_products_option = page.locator(
             "div#main-navigation").get_by_role("link", name="View all", exact=True)
 
-        """Locators belonging to the 'Community Forums' top-navbar section."""
+        # Locators belonging to the 'Community Forums' top-navbar section.
         self.browse_by_product_top_navbar_header = page.locator(
             "h4.mzp-c-menu-item-title").filter(has_text="Browse by product")
         self.browse_all_forum_threads_by_topic_top_navbar_header = page.locator(
@@ -57,7 +55,7 @@ def __init__(self, page: Page):
         self.firefox_desktop_option = page.locator("//a[text()='Firefox desktop']")
         self.view_all_forums = page.locator("//a[normalize-space(text())='View all forums']")
 
-        """Locators belonging to the 'Contribute' top-navbar section."""
+        # Locators belonging to the 'Contribute' top-navbar section.
         self.contribute_option = page.get_by_role("link").filter(has_text="Contribute")
         self.contributor_discussions_top_navbar_header = page.locator(
             "h4.mzp-c-menu-item-title").filter(has_text="Contributor discussions")
@@ -85,7 +83,7 @@ def __init__(self, page: Page):
             "ul[class='mzp-c-menu-item-list sumo-nav--sublist']").get_by_role("link").filter(
             has_text="Community hub")
 
-        """Locators belonging to the 'Sign in/up' top-navbar section."""
+        # Locators belonging to the 'Sign In/Up' top-navbar section.
         self.signin_signup_button = page.locator("div#profile-navigation").get_by_role(
             "link").filter(has_text="Sign In/Up")
         self.signed_in_username = page.locator("span.sumo-nav--username")
@@ -104,7 +102,9 @@ def __init__(self, page: Page):
             "div#profile-navigation div.avatar-container-message-alert")
         self.unread_message_count = page.locator("span.message-count-alert")
 
-    """Actions against the top-navbar logo."""
+    """
+        Actions against the top-navbar logo.
+    """
     def get_sumo_nav_logo(self) -> ElementHandle:
         """Get sumo nav logo element handle"""
         return self._get_element_handle(self.sumo_nav_logo)
@@ -113,7 +113,9 @@ def click_on_sumo_nav_logo(self):
         """Click on the sumo nav logo"""
         self._click(self.sumo_nav_logo)
 
-    """Actions against the 'Explore Help Articles' top-navbar section."""
+    """
+        Actions against the 'Explore Help Articles' top-navbar section.
+    """
     def hover_over_explore_by_product_top_navbar_option(self):
         """Hover over the 'Explore by product' top-navbar option"""
         self._hover_over_element(self.explore_help_articles_top_navbar_option)
@@ -133,8 +135,9 @@ def click_on_explore_our_help_articles_view_all_option(self):
         """Click on the 'View all products' option"""
         self.hover_over_explore_by_product_top_navbar_option()
         self._click(self.explore_our_help_articles_view_all_option)
-
-    """Actions against the 'Community Forums' top-navbar section."""
+    """
+        Actions against the 'Community Forums' top-navbar section.
+    """
     def hover_over_community_forums_top_navbar_option(self):
         """Hover over the 'Community Forums' top-navbar option"""
         self._hover_over_element(self.community_forums_top_navbar_option)
@@ -160,7 +163,10 @@ def click_on_view_all_forums_option(self):
         self.hover_over_community_forums_top_navbar_option()
         self._click(self.view_all_forums)
 
-    """Actions against the 'Ask a Question' top-navbar section."""
+
+    """
+        Actions against the 'Ask a Question' top-navbar section.
+    """
     def hover_over_ask_a_question_top_navbar(self):
         """Hover over the 'Ask a Question' top-navbar option"""
         self._hover_over_element(self.ask_a_question_top_navbar)
@@ -176,7 +182,9 @@ def click_on_browse_all_products_option(self):
         self.hover_over_ask_a_question_top_navbar()
         self._click(self.browse_all_products_option)
 
-    """Actions against the 'Contribute' top-navbar section."""
+    """
+        Actions against the 'Contribute' top-navbar section.
+    """
     def hover_over_contribute_top_navbar(self):
         """Hover over the 'Contribute' top-navbar option"""
         self._hover_over_element(self.contribute_option)
@@ -201,7 +209,7 @@ def click_on_article_discussions_option(self):
         self.hover_over_contribute_top_navbar()
         self._click(self.article_discussions_option)
 
-    """Actions against the Contributor Tools."""
+    # Contributor tools
     def click_on_moderate_forum_content_option(self):
         """Click on the 'Moderate forum content' option"""
         self.hover_over_contribute_top_navbar()
@@ -211,7 +219,6 @@ def click_on_recent_revisions_option(self):
         """Click on the 'Recent revisions' option"""
         self.hover_over_contribute_top_navbar()
         self._click(self.recent_revisions_option)
-        self._wait_for_locator(self.recent_revisions.revisions_table, 5000)
 
     def click_on_dashboards_option(self):
         """Click on the 'Knowledge base dashboards' option"""
@@ -233,7 +240,9 @@ def click_on_community_hub_option(self):
         self.hover_over_contribute_top_navbar()
         self._click(self.community_hub_option)
 
-    """Actions against the sign-in/sign-up top-navbar section."""
+    """
+        Actions against the sign-in/sign-up top-navbar section.
+    """
     def click_on_signin_signup_button(self):
         """Click on the 'Sign In/Up' button"""
         self._click(self.signin_signup_button)
@@ -248,7 +257,17 @@ def click_on_sign_out_button(self):
         self.mouse_over_profile_avatar()
         self._click(self.sign_out_button)
 
-    """Actions against the user profile top-navbar section."""
+    def sign_in_up_button_displayed_element(self) -> Locator:
+        """Get the 'Sign In/Up' button displayed element locator"""
+        return self.signin_signup_button
+
+    def is_sign_in_up_button_displayed(self) -> bool:
+        """Check if the 'Sign In/Up' button is displayed"""
+        return self._is_element_visible(self.signin_signup_button)
+
+    """
+        Actions against the user profile top-navbar section.
+    """
     def click_on_view_profile_option(self):
         """Click on the 'View Profile' option"""
         self.mouse_over_profile_avatar()
@@ -293,11 +312,21 @@ def get_text_of_logged_in_username(self) -> str:
         """Get the text of the logged in username"""
         return self._get_text_of_element(self.signed_in_username)
 
+    def is_unread_message_notification_displayed(self) -> bool:
+        """Check if the unread message notification is displayed"""
+        return self._is_element_visible(self.unread_message_profile_notification)
+
     def get_unread_message_notification_counter_value(self) -> int:
         """Get the unread message notification counter value"""
         return int(self._get_text_of_element(self.unread_message_count))
 
-    """General actions against the top-navbar section."""
+    def is_unread_message_notification_counter_visible(self) -> bool:
+        """Check if the unread message notification counter is visible"""
+        return self._is_element_visible(self.unread_message_count)
+
+    """
+        General actions against the top-navbar section.
+    """
     def get_available_menu_titles(self) -> list[str]:
         """Get the available menu titles"""
         return self._get_text_of_elements(self.menu_titles)
diff --git a/playwright_tests/pages/user_pages/my_profile_answers_page.py b/playwright_tests/pages/user_pages/my_profile_answers_page.py
index bf130016edb..c8fe594862a 100644
--- a/playwright_tests/pages/user_pages/my_profile_answers_page.py
+++ b/playwright_tests/pages/user_pages/my_profile_answers_page.py
@@ -7,14 +7,14 @@ class MyProfileAnswersPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the Answers page."""
+        # My Profile Answers locators.
         self.my_answers_page_header = page.locator("h2[class='sumo-page-subheading']")
         self.my_answers_question_subject_links = page.locator("article#profile li a")
         self.answer_by_id = lambda id: page.locator(f"article#profile a[href*='{id}']")
         self.answer_text = lambda id: page.locator(
             f"//article[@id='profile']//a[contains(@href, '{id}')]/following-sibling::blockquote")
 
-    """Actions against the profile answers page locators."""
+    # My Profile Answers actions.
     def get_page_header(self) -> str:
         """Get the header of the My Profile Answers page."""
         return self._get_text_of_element(self.my_answers_page_header)
diff --git a/playwright_tests/pages/user_pages/my_profile_documents_page.py b/playwright_tests/pages/user_pages/my_profile_documents_page.py
index 6d7c4a4bf98..3ac067ed06f 100644
--- a/playwright_tests/pages/user_pages/my_profile_documents_page.py
+++ b/playwright_tests/pages/user_pages/my_profile_documents_page.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,12 +7,12 @@ class MyProfileDocumentsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the my profile documents page."""
+        # My profile documents locators.
         self.documents_link_list = page.locator("main a")
         self.document_by_name = lambda document_name: page.locator("main").get_by_role(
             "link").filter(has_text=document_name)
 
-    """Actions against the my profile documents page locators."""
+    # My profile documents actions.
     def click_on_a_particular_document(self, document_name: str):
         """Click on a particular document"""
         self._click(self.document_by_name(document_name))
@@ -19,3 +20,7 @@ def click_on_a_particular_document(self, document_name: str):
     def get_text_of_document_links(self) -> list[str]:
         """Get text of all document links"""
         return self._get_text_of_elements(self.documents_link_list)
+
+    def get_a_particular_document_locator(self, document_name: str) -> Locator:
+        """Get a particular document locator"""
+        return self.document_by_name(document_name)
diff --git a/playwright_tests/pages/user_pages/my_profile_edit.py b/playwright_tests/pages/user_pages/my_profile_edit.py
index 118c2c028de..71fa9a01bd5 100644
--- a/playwright_tests/pages/user_pages/my_profile_edit.py
+++ b/playwright_tests/pages/user_pages/my_profile_edit.py
@@ -1,5 +1,5 @@
-import re
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,15 +7,15 @@ class MyProfileEdit(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the Access Denied section."""
+        # Access denied section
         self.access_denied_main_header = page.locator("article#error-page h1")
         self.access_denied_subheading_message = page.locator("div[class='center-on-mobile'] p")
 
-        """Locators belonging to the navbar section."""
+        # Navbar section
         self.my_profile_user_navbar_options = page.locator("ul#user-nav li a")
         self.my_profile_user_navbar_selected_element = page.locator("a[class='selected']")
 
-        """Locators belonging to the edit profile page."""
+        # Edit profile page
         self.edit_my_profile_edit_input_form = page.locator("article#edit-profile form")
         self.edit_my_profile_main_header = page.locator("h1[class='sumo-page-heading']")
         self.manage_firefox_account_button = page.get_by_role("link").filter(
@@ -45,7 +45,7 @@ def __init__(self, page: Page):
         self.update_my_profile_button = page.get_by_role("button").filter(
             has_text="Update My Profile")
 
-        """Locators belonging to the close account modal."""
+        # Locators belonging to the close account modal.
         self.close_account_and_delete_all_profile_information_link = page.locator(
             "p.delete-account-link a")
         self.close_account_username_modal = page.locator("input#delete-profile-confirmation-input")
@@ -285,7 +285,8 @@ def clear_confirmation_code_from_close_account_modal(self):
 
     def click_close_account_button(self):
         """Click the close account button in the close account modal"""
-        self._click(self.close_account_delete_button, expected_url=re.compile(r"close_account$"),
+        self._click(self.close_account_delete_button,
+                    expected_url="https://support.allizom.org/en-US/users/close_account",
                     retries=2)
 
     def is_delete_your_account_button_disabled(self) -> bool:
@@ -307,3 +308,7 @@ def click_make_email_visible_checkbox(self, check: bool):
     def is_make_email_visible_checkbox_selected(self) -> bool:
         """Return True if the make email visible checkbox is selected"""
         return self._is_checkbox_checked(self.make_email_visible_to_logged_in_users_checkbox)
+
+    def get_my_profile_edit_form_locator(self) -> Locator:
+        """Return the locator of the edit profile form"""
+        return self.edit_my_profile_edit_input_form
diff --git a/playwright_tests/pages/user_pages/my_profile_edit_contribution_areas_page.py b/playwright_tests/pages/user_pages/my_profile_edit_contribution_areas_page.py
index 7a43c7add8b..1e16ba2d8e0 100644
--- a/playwright_tests/pages/user_pages/my_profile_edit_contribution_areas_page.py
+++ b/playwright_tests/pages/user_pages/my_profile_edit_contribution_areas_page.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,7 +7,7 @@ class MyProfileEditContributionAreasPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the my profile contribution areas page."""
+        # My profile contribution areas page locators.
         self.edit_contribution_areas_page_header = page.locator("h3[class='sumo-page-heading']")
         self.edit_contribution_areas_checkboxes = page.locator("input[type='checkbox']")
         self.edit_contribution_areas_kb_contributors = page.locator(
@@ -26,7 +27,7 @@ def __init__(self, page: Page):
         self.edit_contribution_areas_preferences_saved_banner_close_button = page.locator(
             "ul[class='user-messages'] li button")
 
-    """Actions against the my profile contribution areas page locators."""
+    # My profile contribution areas page actions.
     def edit_con_areas_pref_banner_txt(self) -> str:
         """Get the display pref banner text"""
         return self._get_text_of_element(
@@ -65,6 +66,10 @@ def click_on_edit_cont_pref_banner_close_button(self):
         """Click on the close button of the edit contribution areas preferences saved banner"""
         self._click(self.edit_contribution_areas_preferences_saved_banner_close_button)
 
+    def is_edit_cont_pref_banner_displayed(self) -> Locator:
+        """Check if the edit contribution areas preferences saved banner is displayed"""
+        return self.edit_contribution_areas_preferences_saved_banner
+
     def is_kb_contributors_checkbox_checked(self) -> bool:
         """Check if the kb contributors checkbox is checked"""
         return self._is_checkbox_checked(self.edit_contribution_areas_kb_contributors)
diff --git a/playwright_tests/pages/user_pages/my_profile_edit_settings_page.py b/playwright_tests/pages/user_pages/my_profile_edit_settings_page.py
index 41f1b3c75ad..32d50000ae2 100644
--- a/playwright_tests/pages/user_pages/my_profile_edit_settings_page.py
+++ b/playwright_tests/pages/user_pages/my_profile_edit_settings_page.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,7 +7,7 @@ class MyProfileEditSettingsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the edit profile settings page."""
+        # My profile edit settings page locators.
         self.edit_settings_page_header = page.locator("h3[class='sumo-page-heading']")
         self.edit_settings_checkbox_options_label = page.locator(
             "div[class='field checkbox'] label")
@@ -33,7 +34,7 @@ def __init__(self, page: Page):
         self.my_profile_user_navbar = page.locator("ul#user-nav li")
         self.my_profile_user_navbar_selected_element = page.locator("a[class='selected']")
 
-    """Actions against the edit profile settings page locators."""
+    # My profile edit settings page actions.
     def get_edit_settings_page_header(self) -> str:
         """Get edit settings page header text"""
         return self._get_text_of_element(self.edit_settings_page_header)
@@ -107,6 +108,10 @@ def is_send_emails_for_private_messages_checkbox_checked(self) -> bool:
         """Check if send emails for private messages checkbox is checked"""
         return self._is_checkbox_checked(self.send_emails_for_private_messages_checkbox)
 
+    def notification_banner_element(self) -> Locator:
+        """Get the notification banner element"""
+        return self.your_settings_have_been_saved_notification_banner
+
     def are_all_checkbox_checked(self) -> bool:
         """Check if all checkboxes are checked"""
         return all([
diff --git a/playwright_tests/pages/user_pages/my_profile_my_questions_page.py b/playwright_tests/pages/user_pages/my_profile_my_questions_page.py
index 9cc72b73177..e5dd71b9f56 100644
--- a/playwright_tests/pages/user_pages/my_profile_my_questions_page.py
+++ b/playwright_tests/pages/user_pages/my_profile_my_questions_page.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,7 +7,7 @@ class MyProfileMyQuestionsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the My Questions profile page."""
+        # My profile my questions page locators.
         self.questions_page_heading = page.locator("h2[class='sumo-page-subheading']")
         self.questions_no_question_message = page.locator("article#profile p")
         self.questions_list = page.locator("article#profile ul a")
@@ -16,7 +17,15 @@ def __init__(self, page: Page):
         self.question_by_name = lambda name: page.locator("article#profile ul a li").get_by_text(
             name, exact=True)
 
-    """Actions against the My Questions profile page locators."""
+    # My profile my questions page actions.
+    def get_list_of_profile_questions_locators(self) -> Locator:
+        """Returns the locator of the question list."""
+        return self.questions_list
+
+    def get_list_of_profile_no_question_message_locator(self) -> Locator:
+        """Returns the locator of the no question message."""
+        return self.questions_no_question_message
+
     def get_text_of_no_question_message(self) -> str:
         """Returns the text of the no question message."""
         return self._get_text_of_element(self.questions_no_question_message)
@@ -33,10 +42,13 @@ def click_on_a_question_by_name(self, question_title: str):
         """Clicks on a question by its title."""
         self._click(self.question_by_name(question_title))
 
-    def get_text_of_listed_question_by_index(self, index: int) -> str:
+    def get_text_of_first_listed_question(self) -> str:
         """Returns the text of the first listed question."""
-        return self._get_element_inner_text_from_page(self.questions_by_index(index))
+        return self._get_element_inner_text_from_page(self.questions_by_index(1))
 
+    def get_listed_question(self, question_name: str) -> Locator:
+        """Returns the locator of a question by its name."""
+        return self.question_by_name(question_name)
 
     def get_all_my_posted_questions(self) -> list[str]:
         """Returns a list of all the posted questions."""
diff --git a/playwright_tests/pages/user_pages/my_profile_page.py b/playwright_tests/pages/user_pages/my_profile_page.py
index b829617fe1d..ca209de5c6b 100644
--- a/playwright_tests/pages/user_pages/my_profile_page.py
+++ b/playwright_tests/pages/user_pages/my_profile_page.py
@@ -1,4 +1,5 @@
-from playwright.sync_api import ElementHandle, Page
+from playwright.sync_api import ElementHandle, Locator, Page
+
 from playwright_tests.core.basepage import BasePage
 
 
@@ -6,11 +7,11 @@ class MyProfilePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        """Locators belonging to the sidebar."""
+        # Sidebar locators
         self.user_navbar_options = page.locator("ul#user-nav li a")
         self.user_navbar_selected_element = page.locator("a.selected")
 
-        """Locators available for admin & other users."""
+        # Admin/other user actions locators
         self.edit_user_profile_option = page.locator("div#admin-actions").get_by_role(
             "link").filter(has_text="Edit user profile")
         self.report_abuse_profile_option = page.locator("article#profile").get_by_role(
@@ -20,7 +21,7 @@ def __init__(self, page: Page):
             "input[value='Deactivate this user and mark all content as spam']")
         self.private_message_button = page.locator("p.pm").get_by_role("link")
 
-        """Locators belonging to the 'Report Abuse' section."""
+        # Report Abuse locators
         self.report_abuse_panel = page.locator("section#report-abuse-")
         self.spam_or_other_unrelated_content_option = page.locator("label").filter(
             has_text="Spam or other unrelated content")
@@ -35,7 +36,7 @@ def __init__(self, page: Page):
             "section#report-abuse- button[type='submit']")
         self.reported_user_confirmation_message = page.locator("span[class='message']")
 
-        """Locators belonging to the contributions section."""
+        # Contributions section locators
         self.questions_link = page.locator("section[class='contributions']").get_by_role(
             "link").filter(has_text="question")
         self.answers_link = page.locator("section[class='contributions']").get_by_role(
@@ -45,7 +46,7 @@ def __init__(self, page: Page):
         self.provided_documents_link = page.locator("section[class='contributions']").get_by_role(
             "link").filter(has_text="document")
 
-        """Locators belonging to the My profile page details section."""
+        # My Profile page details locators
         self.page_header = page.locator("h1[class='sumo-page-heading']")
         self.page_subheading = page.locator("article#profile h2[class*='sumo-page-subheading']")
         self.email_address = page.locator("p strong")
@@ -75,11 +76,19 @@ def __init__(self, page: Page):
         self.group_by_name = lambda group_name: page.locator(
             "section[class='groups']").get_by_role("link", name=group_name, exact=True)
 
-    """Actions against the My Profile page locators."""
+    # My profile page actions.
     def get_my_profile_display_name_header_text(self) -> str:
         """Get the display name header text."""
         return self._get_text_of_element(self.display_name_header)
 
+    def get_expected_header_locator(self, expected_username: str) -> Locator:
+        """Get the expected header locator.
+
+        Args:
+            expected_username (str): The expected username
+        """
+        return self.display_name_by_username(expected_username)
+
     def get_my_profile_display_name_username_text(self) -> str:
         """Get the display name username text."""
         return self._get_text_of_element(self.username_info)
@@ -240,10 +249,18 @@ def click_on_private_message_button(self, expected_url=None):
         """
         self._click(self.private_message_button, expected_url=expected_url)
 
+    def publicly_displayed_email_element(self) -> Locator:
+        """Get the locator for the publicly displayed email element."""
+        return self.displayed_email_address
+
     def is_website_information_displayed(self) -> bool:
         """Check if the website information is displayed."""
         return self._is_element_visible(self.website_info)
 
+    def groups_section_element(self) -> Locator:
+        """Get the locator for the groups section."""
+        return self.groups_section
+
     def click_on_a_particular_profile_group(self, group_name: str):
         """Click on a particular profile group.
 
@@ -251,3 +268,23 @@ def click_on_a_particular_profile_group(self, group_name: str):
             group_name (str): The name of the group to click on
         """
         self._click(self.group_by_name(group_name))
+
+    def edit_user_profile_option_element(self) -> Locator:
+        """Get the locator for the edit user profile option."""
+        return self.edit_user_profile_option
+
+    def is_report_user_option_displayed(self) -> Locator:
+        """Get the locator for the report user option."""
+        return self.report_abuse_profile_option
+
+    def is_report_abuse_panel_displayed(self) -> Locator:
+        """Get the locator for the report abuse panel."""
+        return self.report_abuse_panel
+
+    def is_deactivate_this_user_button_displayed(self) -> Locator:
+        """Get the locator for the deactivate this user button."""
+        return self.deactivate_this_user_button
+
+    def deactivate_user_and_mark_content_as_spam_button(self) -> Locator:
+        """Get the locator for the deactivate user and mark content as spam button."""
+        return self.deactivate_this_user_and_mark_all_content_as_spam
diff --git a/playwright_tests/pages/user_pages/my_profile_user_navbar.py b/playwright_tests/pages/user_pages/my_profile_user_navbar.py
index 59d412c1434..caae85e4f02 100644
--- a/playwright_tests/pages/user_pages/my_profile_user_navbar.py
+++ b/playwright_tests/pages/user_pages/my_profile_user_navbar.py
@@ -1,12 +1,11 @@
 from playwright.sync_api import Page
+
 from playwright_tests.core.basepage import BasePage
 
 
 class UserNavbar(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-
-        """Locators belonging to the profile navbar section."""
         self.my_profile_option = page.locator("ul#user-nav").get_by_role(
             "link", name="My profile", exact=True)
         self.edit_my_profile_option = page.locator("ul#user-nav").get_by_role(
@@ -20,7 +19,7 @@ def __init__(self, page: Page):
         self.edit_my_profile_my_questions_option = page.locator("ul#user-nav").get_by_role(
             "link", name="My questions", exact=True)
 
-    """Actions against the My Profile navbar section."""
+    # My profile navbar actions.
     def click_on_my_profile_option(self):
         """Click on my profile option in the navbar."""
         self._click(self.my_profile_option)
diff --git a/playwright_tests/test_data/aaq_question.json b/playwright_tests/test_data/aaq_question.json
index 0ced4917cce..abd1f212ffc 100644
--- a/playwright_tests/test_data/aaq_question.json
+++ b/playwright_tests/test_data/aaq_question.json
@@ -1,10 +1,11 @@
 {
   "valid_firefox_question": {
-    "subject": "Screen Reader Output Not Working on a specific page with Firefox version ",
+    "subject": "NVDA does not work with Firefox ",
     "subject_updated": "NVDA does not work with Firefox Updated",
     "topic_value": "Accessibility",
-    "question_body": "I'm experiencing an accessibility '''issue''' when ''accessing'', the following link: [https://www.mozilla.org/en-US/ adipiscing]. When I open the page in Firefox, the browser does not output any of the messages from my screen reader. I've reviewed the following article: [[Stage test owl|sed]] but it didn't clarify what might be causing the problem or how to resolve the missing content. I'm not sure whether this is an issue with the webpage, the browser or my screen reader configuration. Could someone help me identify the root cause and suggest how to fix this accessibility issue?",
+    "question_body": "'''I have a problem''' when I ''access'', the following link: [https://www.mediafax.ro adipiscing], the Firefox browser is unable to output the messages coming from the screen reader. I've tried reading the following article: [[Stage test owl|sed]] but it doesn't help me understand what is the root cause and how can I fix the missing content. Can somebody please help me with this accessibility issue?",
     "body_updated": "I have a problem when I access, any links on the internet, the Firefox browser is unable to output the messages coming from the screen reader. I've tried reading an article but it doesn't help me understand what is the root cause and how can I fix the missing content. Can somebody please help me with this accessibility issue? Updated",
+    "simple_body_text": "Firefox doesn't work in combination with the NVDA screen reader",
     "image_name": "test.image.jpg",
     "image_path": "test_data/test-image.png",
     "question_reply": "Test reply to question",
@@ -126,4 +127,4 @@
       "default_slug": "focus-firefox"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/playwright_tests/test_data/add_kb_article.json b/playwright_tests/test_data/add_kb_article.json
index ddb5497c54c..09251fd425e 100644
--- a/playwright_tests/test_data/add_kb_article.json
+++ b/playwright_tests/test_data/add_kb_article.json
@@ -1,18 +1,10 @@
 {
   "kb_article_title": "Automation test article ",
   "kb_template_title": "Template: Automation test article",
+  "kb_template_category": "Templates",
   "updated_kb_article_title": "Updated test article",
   "different_slug": "different-slug-",
-  "category_options": {
-      "10": "Troubleshooting",
-      "20": "How To",
-      "30": "How to contribute",
-      "40": "Administration",
-      "50": "Navigation",
-      "60": "Templates",
-      "70": "Canned Responses",
-      "ro-translation-category": "Depanare"
-  },
+  "category_options": "Troubleshooting",
   "relevant_to_product": "Firefox",
   "selected_parent_topic": "Accounts",
   "selected_child_topic": "Profiles",
diff --git a/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_aaq_form_page.py b/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_aaq_form_page.py
index 6a9e79896f1..b7e638ec2c9 100644
--- a/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_aaq_form_page.py
+++ b/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_aaq_form_page.py
@@ -18,6 +18,7 @@
 @pytest.mark.aaqPage
 def test_community_card_and_helpful_tip_are_displayed_for_freemium_product(page: Page,
                                                                            create_user_factory):
+
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -31,9 +32,9 @@ def test_community_card_and_helpful_tip_are_displayed_for_freemium_product(page:
                 utilities.aaq_question_test_data["products_aaq_url"][freemium_product]
             )
 
-            with check, allure.step(f"Verifying that the helpful tip card is displayed for the "
-                                    f"{freemium_product} product"):
-                expect(sumo_pages.aaq_form_page.helpful_tip_section).to_be_visible()
+            with allure.step(f"Verifying that the helpful tip card is displayed for the "
+                             f"{freemium_product} product"):
+                expect(sumo_pages.aaq_form_page.get_helpful_tip_locator()).to_be_visible()
 
             with allure.step("Clicking on the 'Learn More' button from the community help "
                              "card and verifying that we are on the contribute messages page"):
@@ -59,27 +60,32 @@ def test_community_card_and_helpful_tip_not_displayed_for_premium_products(page:
                 utilities.aaq_question_test_data["products_aaq_url"][premium_product]
             )
 
-            with check, allure.step(f"Verifying that the helpful tip options is not displayed for"
-                                    f" the {premium_product}"):
-                expect(sumo_pages.aaq_form_page.helpful_tip_section).to_be_hidden()
+            with allure.step(f"Verifying that the helpful tip options is displayed for the "
+                             f"{premium_product}"):
+                expect(sumo_pages.aaq_form_page.get_helpful_tip_locator()).to_be_hidden()
 
             with allure.step("Verifying that the 'Learn More' button from the community help "
                              "banner is not displayed"):
-                expect(sumo_pages.common_web_elements.learn_more_button).to_be_hidden()
+                expect(sumo_pages.common_web_elements.get_learn_more_button_locator()
+                       ).to_be_hidden()
 
 
 # C1511570
 @pytest.mark.aaqPage
-@pytest.mark.parametrize("user_type", ['','Simple User', 'Forum Moderator'])
-def test_scam_banner_premium_products_not_displayed(page: Page, user_type, create_user_factory):
+@pytest.mark.parametrize("user_type", ['', 'Simple user', 'Forum Moderator'])
+def test_scam_banner_premium_products_not_displayed(page: Page, user_type,
+                                                    create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory(groups=["Forum Moderators"])
-    user_map = {'Simple User': test_user, 'Forum Moderator': test_user_two}
 
-    with allure.step("Signing in to SUMO"):
-        utilities.start_existing_session(cookies=user_map.get(user_type))
+    if user_type == "Simple user":
+        with allure.step("Singing in a simple user"):
+            utilities.start_existing_session(cookies=test_user)
+    elif user_type == "Forum Moderator":
+        with allure.step("Signing in with a Forum Moderator"):
+            utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Navigating to each premium product solutions page"):
         for premium_product in utilities.general_test_data["premium_products"]:
@@ -87,9 +93,9 @@ def test_scam_banner_premium_products_not_displayed(page: Page, user_type, creat
                 utilities.general_test_data["product_solutions"][premium_product]
             )
 
-            with check, allure.step(f"Verifying that the sam banner is not displayed for "
-                                    f"{premium_product} card"):
-                expect(sumo_pages.product_solutions_page.support_scams_banner).to_be_hidden()
+            with allure.step(f"Verifying that the sam banner is not displayed for "
+                             f"{premium_product} card"):
+                expect(sumo_pages.product_solutions_page.get_scam_banner_locator()).to_be_hidden()
 
             if user_type != '':
                 with allure.step("Clicking on the Ask Now button and verifying that the scam "
@@ -98,22 +104,26 @@ def test_scam_banner_premium_products_not_displayed(page: Page, user_type, creat
                     utilities.wait_for_url_to_be(
                         utilities.aaq_question_test_data["products_aaq_url"][premium_product]
                     )
-                    expect(sumo_pages.product_solutions_page.support_scams_banner).to_be_hidden()
+                    expect(sumo_pages.product_solutions_page.get_scam_banner_locator()
+                           ).to_be_hidden()
 
 
 # C2190040
 @pytest.mark.aaqPage
-@pytest.mark.parametrize("user_type", ['', 'Simple User', 'Forum Moderator'])
+@pytest.mark.parametrize("user_type", ['', 'Simple user', 'Forum Moderator'])
 def test_scam_banner_for_freemium_products_is_displayed(page: Page, user_type,
                                                         create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory(groups=["Forum Moderators"])
-    user_map = {'Simple User': test_user, 'Forum Moderator': test_user_two}
 
-    with allure.step("Sign in to SUMO"):
-        utilities.start_existing_session(cookies=user_map.get(user_type))
+    if user_type == "Simple user":
+        with allure.step("Signing in with a simple user"):
+            utilities.start_existing_session(cookies=test_user)
+    elif user_type == "Forum Moderator":
+        with allure.step("Signing in with a Forum Moderator"):
+            utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Navigating to each freemium product solutions page"):
         for freemium_product in utilities.general_test_data["freemium_products"]:
@@ -139,7 +149,8 @@ def test_scam_banner_for_freemium_products_is_displayed(page: Page, user_type,
 
 # T5696596
 @pytest.mark.aaqPage
-def test_corresponding_aaq_product_name_and_image_are_displayed(page: Page, create_user_factory):
+def test_corresponding_aaq_product_name_and_image_are_displayed(page: Page,
+                                                                create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -154,12 +165,12 @@ def test_corresponding_aaq_product_name_and_image_are_displayed(page: Page, crea
 
             # This needs to change when we add the Mozilla Account icon/product.
             if product != "Mozilla Account":
-                with check, allure.step("Verifying that the product image is displayed"):
-                    expect(sumo_pages.aaq_form_page.aaq_page_logo).to_be_visible()
+                with allure.step("Verifying that the product image is displayed"):
+                    expect(sumo_pages.aaq_form_page.get_product_image_locator()).to_be_visible()
             else:
-                with check, allure.step("Verifying that the product image is hidden for Mozilla "
-                                        "Account product"):
-                    expect(sumo_pages.aaq_form_page.aaq_page_logo).to_be_visible()
+                with allure.step("Verifying that the product image is hidden for Mozilla "
+                                 "Account product"):
+                    expect(sumo_pages.aaq_form_page.get_product_image_locator()).to_be_visible()
 
             with check, allure.step("Verifying that the correct product header is displayed"):
                 assert sumo_pages.aaq_form_page.get_aaq_form_page_heading() == product
@@ -185,12 +196,13 @@ def test_progress_milestone_redirect(page: Page, create_user_factory):
                 assert sumo_pages.aaq_form_page.get_in_progress_item_label(
                 ) == AAQFormMessages.IN_PROGRESS_MILESTONE
 
-            with check, allure.step(f"Clicking on the {AAQFormMessages.COMPLETED_MILESTONE_TWO} "
-                                    f"milestone and verifying that we are on the correct product "
-                                    f"solutions page"):
+            with allure.step(f"Clicking on the {AAQFormMessages.COMPLETED_MILESTONE_TWO} "
+                             f"milestone and verifying that we are on the correct product "
+                             f"solutions page"):
                 sumo_pages.aaq_form_page.click_on_a_particular_completed_milestone(
                     AAQFormMessages.COMPLETED_MILESTONE_TWO)
-                expect(page).to_have_url(utilities.general_test_data["product_solutions"][product])
+                expect(page).to_have_url(
+                    utilities.general_test_data["product_solutions"][product])
 
             with allure.step(f"Navigating back to the aaq form and clicking on the "
                              f"{AAQFormMessages.COMPLETED_MILESTONE_ONE} milestone"):
@@ -219,7 +231,8 @@ def test_aaq_form_cancel_button_freemium_products(page: Page, create_user_factor
             with allure.step("Adding data inside the AAQ form fields and clicking on the "
                              "cancel button"):
                 sumo_pages.aaq_flow.add__valid_data_to_all_aaq_fields_without_submitting(
-                    subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
+                    subject=utilities.aaq_question_test_data["valid_firefox_question"]
+                    ["subject"],
                     topic_value=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
                     body_text=utilities.aaq_question_test_data["valid_firefox_question"]
                     ["question_body"]
@@ -228,17 +241,20 @@ def test_aaq_form_cancel_button_freemium_products(page: Page, create_user_factor
 
             with allure.step("Verifying that we are redirected back to the correct product "
                              "solutions page"):
-                expect(page).to_have_url(utilities.general_test_data["product_solutions"][product])
+                expect(page).to_have_url(
+                    utilities.general_test_data["product_solutions"][product])
 
             with check, allure.step("Navigating back to the My Profile page and verifying "
-                                    "that the correct number of posted questions is displayed"):
+                                    "that the correct number of posted questions is "
+                                    "displayed"):
                 sumo_pages.top_navbar.click_on_view_profile_option()
                 expect(sumo_pages.my_profile_page.questions_link).to_be_hidden()
 
 
 # T5696597, T5696601, T5696602
 @pytest.mark.aaqPage
-def test_post_aaq_questions_for_all_freemium_products_topics(page: Page, create_user_factory):
+def test_post_aaq_questions_for_all_freemium_products_topics(page: Page,
+                                                             create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
@@ -288,7 +304,7 @@ def test_post_aaq_questions_for_all_freemium_products_topics(page: Page, create_
                                  "that the posted question is displayed inside the 'My "
                                  "Questions page"):
                     sumo_pages.question_page.click_on_my_questions_banner_option()
-                    expect(sumo_pages.my_questions_page.question_by_name(
+                    expect(sumo_pages.my_questions_page.get_listed_question(
                         question_info['aaq_subject'])).to_be_visible()
 
                 with allure.step(f"Navigating back to the {product} product aa form"):
@@ -321,7 +337,8 @@ def test_share_firefox_data_functionality(page: Page, create_user_factory):
         sumo_pages.aaq_flow.add__valid_data_to_all_aaq_fields_without_submitting(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_value=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body_text=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"]
+            body_text=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["question_body"]
         )
 
     with allure.step("Adding text inside the troubleshooting information field and "
@@ -338,13 +355,15 @@ def test_share_firefox_data_functionality(page: Page, create_user_factory):
     with allure.step("Verifying that the troubleshooting information is displayed"):
         sumo_pages.question_page.click_on_question_details_button()
         sumo_pages.question_page.click_on_more_system_details_option()
-        expect(sumo_pages.question_page.more_information_with_text(
-            utilities.aaq_question_test_data["troubleshooting_information"])).to_be_visible()
+        expect(
+            sumo_pages.question_page.get_more_information_with_text_locator(
+                utilities.aaq_question_test_data["troubleshooting_information"]
+            )
+        ).to_be_visible()
 
-    with allure.step("Closing the additional details panel and verifying that the panel is no "
-                     "longer displayed"):
+    with allure.step("Closing the additional details panel and deleting the posted question"):
         sumo_pages.question_page.click_on_the_additional_system_panel_close()
-        expect(sumo_pages.question_page.more_system_details_modal).to_be_hidden()
+        sumo_pages.aaq_flow.deleting_question_flow()
 
 
 @pytest.mark.aaqPage
@@ -363,7 +382,8 @@ def test_additional_system_details_user_agent_information(page: Page, create_use
 
             with allure.step(f"Submitting a question for the {product} product"):
                 sumo_pages.aaq_flow.submit_an_aaq_question(
-                    subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
+                    subject=utilities.aaq_question_test_data["valid_firefox_question"]
+                    ["subject"],
                     topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
                     body=utilities.aaq_question_test_data["valid_firefox_question"]
                     ["question_body"],
@@ -411,10 +431,12 @@ def test_system_details_information(page: Page, create_user_factory):
                                  "product version and OS fields"):
                     sumo_pages.aaq_form_page.click_on_show_details_option()
                     sumo_pages.aaq_form_page.add_text_to_product_version_field(
-                        utilities.aaq_question_test_data["troubleshoot_product_and_os_versions"][1]
+                        utilities.aaq_question_test_data[
+                            "troubleshoot_product_and_os_versions"][1]
                     )
                     sumo_pages.aaq_form_page.add_text_to_os_field(
-                        utilities.aaq_question_test_data["troubleshoot_product_and_os_versions"][0]
+                        utilities.aaq_question_test_data[
+                            "troubleshoot_product_and_os_versions"][0]
                     )
 
                 with check, allure.step("Submitting the AAQ question and verifying that the "
@@ -431,6 +453,9 @@ def test_system_details_information(page: Page, create_user_factory):
                     assert sumo_pages.question_page.get_system_details_information(
                     ) == troubleshooting_info
 
+                with allure.step("Deleting the posted question"):
+                    sumo_pages.aaq_flow.deleting_question_flow()
+
 
 # T5696704
 @pytest.mark.aaqPage
diff --git a/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_anti_spam_measures.py b/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_anti_spam_measures.py
index 2df56c92941..ed495d462ba 100644
--- a/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_anti_spam_measures.py
+++ b/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_anti_spam_measures.py
@@ -2,6 +2,7 @@
 import pytest
 from playwright.sync_api import Page
 from pytest_check import check
+
 from playwright_tests.core.utilities import Utilities
 from playwright_tests.messages.ask_a_question_messages.AAQ_messages.question_page_messages import (
     QuestionPageMessages,
@@ -12,7 +13,7 @@
 
 # C946237
 @pytest.mark.antiSpamTests
-@pytest.mark.parametrize("user_type", ['', 'Simple User'])
+@pytest.mark.parametrize("user_type", ['', 'Simple user'])
 def test_anti_spam_banner(page: Page, user_type, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
@@ -26,7 +27,8 @@ def test_anti_spam_banner(page: Page, user_type, create_user_factory):
         question_info_one = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["simple_body_text"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -36,8 +38,8 @@ def test_anti_spam_banner(page: Page, user_type, create_user_factory):
     else:
         utilities.delete_cookies()
 
-    with check, allure.step("Navigating to each available product support forum and verifying that"
-                            " the scam banner is displayed"):
+    with allure.step("Navigating to each available product support forum and verifying that the "
+                     "scam banner is displayed"):
         for product, url in utilities.general_test_data["product_forums"].items():
             utilities.navigate_to_link(url)
             assert sumo_pages.common_web_elements.get_scam_banner_text() == (
@@ -68,7 +70,8 @@ def test_valid_tld_in_question_comment(page: Page, create_user_factory):
         sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["simple_body_text"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -79,7 +82,8 @@ def test_valid_tld_in_question_comment(page: Page, create_user_factory):
 
     with allure.step("Leaving a comment with an invalid TLD"):
         reply_one = sumo_pages.aaq_flow.post_question_reply_flow(
-            repliant_username=test_user_two["username"], reply=invalid_tld
+            repliant_username=test_user_two["username"],
+            reply=invalid_tld
         )
 
     with check, allure.step("Verifying that the invalid TLD comment is not marked as spam "
@@ -89,7 +93,8 @@ def test_valid_tld_in_question_comment(page: Page, create_user_factory):
 
     with allure.step("Leaving a comment with a valid TLD"):
         sumo_pages.aaq_flow.post_question_reply_flow(
-            repliant_username=test_user_two["username"], reply=valid_tld
+            repliant_username=test_user_two["username"],
+            reply=valid_tld
         )
 
     with check, allure.step("Verifying that the valid TLD comment is marked as spam and the "
diff --git a/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_posted_questions.py b/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_posted_questions.py
index 9042ebccc58..59cf9a3a8ad 100644
--- a/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_posted_questions.py
+++ b/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_posted_questions.py
@@ -19,7 +19,7 @@
 
 # C2191086, C2191094, C2191263,  C2191263, C2191087, C2191088
 @pytest.mark.postedQuestions
-@pytest.mark.parametrize("user_type", ['Simple User', ''])
+@pytest.mark.parametrize("user_type", ['simple user', ''])
 def test_posted_question_details(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
@@ -34,10 +34,10 @@ def test_posted_question_details(page: Page, user_type, create_user_factory):
         utilities.delete_cookies()
 
     with allure.step("Verifying that the scam banner is displayed"):
-        expect(sumo_pages.product_solutions_page.support_scams_banner).to_be_visible()
+        expect(sumo_pages.product_solutions_page.get_scam_banner_locator()).to_be_visible()
 
     with allure.step("Verifying that the still need help banner is displayed"):
-        expect(sumo_pages.common_web_elements.still_need_help_subheading).to_be_visible()
+        expect(sumo_pages.common_web_elements.get_still_need_help_locator()).to_be_visible()
 
     with check, allure.step("Verifying that the Learn More button contains the correct link"):
         assert sumo_pages.product_solutions_page.get_scam_alert_banner_link(
@@ -46,8 +46,8 @@ def test_posted_question_details(page: Page, user_type, create_user_factory):
     with allure.step("Signing in with a Forum Moderator and verifying that the scam banner is "
                      "displayed and the still need help banner is displayed"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.product_solutions_page.support_scams_banner).to_be_visible()
-        expect(sumo_pages.common_web_elements.still_need_help_subheading).to_be_visible()
+        expect(sumo_pages.product_solutions_page.get_scam_banner_locator()).to_be_visible()
+        expect(sumo_pages.common_web_elements.get_still_need_help_locator()).to_be_visible()
 
     with check, allure.step("Verifying that the Learn More button contains the correct link"):
         assert sumo_pages.product_solutions_page.get_scam_alert_banner_link(
@@ -68,26 +68,28 @@ def test_edit_this_question_functionality_not_signed_in(page: Page, create_user_
     with allure.step("Deleting user session and verifying that the 'edit this question' nav "
                      "option is not available"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.edit_this_question_option).to_be_hidden()
+        expect(sumo_pages.question_page.get_edit_this_question_option_locator()).to_be_hidden()
 
     with allure.step("Navigating to the edit endpoint and verifying that the user is "
                      "redirected to the auth page"):
         utilities.navigate_to_link(
             utilities.get_page_url() + QuestionPageMessages.EDIT_QUESTION_URL_ENDPOINT
         )
-        assert FxAPageMessages.AUTH_PAGE_URL in utilities.get_page_url()
+        assert (
+            FxAPageMessages.AUTH_PAGE_URL in utilities.get_page_url()
+        )
 
 
-# C2191262, C2436105, C2191263
+# C2191262, C2436105,  C2191263
 # To add image tests
 @pytest.mark.postedQuestions
 @pytest.mark.parametrize("user_type", ['Simple User', 'Forum Moderator'])
-def test_cancel_edit_this_question_functionality(page: Page, user_type, create_user_factory):
+def test_cancel_edit_this_question_functionality(page: Page, user_type,
+                                                 create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_three = create_user_factory(groups=["Forum Moderators"])
-
     with allure.step("Signing in with a simple user account and posting a Firefox product "
                      "question"):
         posted_question = post_firefox_product_question_flow(page, test_user)
@@ -110,7 +112,8 @@ def test_cancel_edit_this_question_functionality(page: Page, user_type, create_u
 
     with allure.step("Editing the question with new data"):
         sumo_pages.aaq_flow.editing_question_flow(
-            subject=utilities.aaq_question_test_data['valid_firefox_question']['subject_updated'],
+            subject=utilities.aaq_question_test_data['valid_firefox_question']
+            ['subject_updated'],
             body=utilities.aaq_question_test_data['valid_firefox_question']['body_updated'],
             troubleshoot=utilities.aaq_question_test_data['troubleshooting_information'],
             submit_edit=False
@@ -119,22 +122,24 @@ def test_cancel_edit_this_question_functionality(page: Page, user_type, create_u
     with check, allure.step("Clicking on the 'Cancel' button and verifying that the modified "
                             "text is not displayed"):
         sumo_pages.aaq_form_page.click_aaq_form_cancel_button()
-        expect(sumo_pages.question_page.modified_question_section).to_be_hidden()
+        expect(sumo_pages.question_page.get_modified_question_locator()).to_be_hidden()
         assert sumo_pages.question_page.get_question_header(
         ) == posted_question['question_details']['aaq_subject']
         assert sumo_pages.question_page.get_question_body(
-        ) == utilities.strip_wiki_syntax(posted_question['question_details']['question_body']
-                                         ) + "\n"
+        ) == posted_question['question_details']['question_body'] + '\n'
 
     if user_type == 'Simple User':
         with allure.step("Verifying that the additional question details option is hidden"):
-            expect(sumo_pages.question_page.question_details_button).to_be_hidden()
+            expect(sumo_pages.question_page.get_question_details_button_locator()).to_be_hidden()
     elif user_type == "Forum Moderator":
         with allure.step("Verifying that the more information section from the 'More System "
                          "Details' is not displayed"):
             sumo_pages.question_page.click_on_question_details_button()
             sumo_pages.question_page.click_on_more_system_details_option()
-            expect(sumo_pages.question_page.more_information_panel_header).to_be_hidden()
+            expect(sumo_pages.question_page.get_more_information_locator()).to_be_hidden()
+
+        with allure.step("Closing the more information panel"):
+            sumo_pages.question_page.click_on_the_additional_system_panel_close()
 
 
 # C2191263
@@ -151,14 +156,15 @@ def test_edit_other_user_question_non_admin(page: Page, create_user_factory):
     with allure.step("Signing in with a non Forum Moderator user account and verifying that the "
                      "'Edit this question' option is not available"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.question_page.edit_this_question_option).to_be_hidden()
+        expect(sumo_pages.question_page.get_edit_this_question_option_locator()).to_be_hidden()
 
     with check, allure.step("Manually navigating to the '/edit' endpoint and verifying that "
                             "403 is returned"):
         with page.expect_navigation() as navigation_info:
-            utilities.navigate_to_link(posted_question['question_details']
-                                       ['question_page_url'] + QuestionPageMessages.
-                                       EDIT_QUESTION_URL_ENDPOINT)
+            utilities.navigate_to_link(
+                posted_question['question_details']
+                ['question_page_url'] + QuestionPageMessages.
+                EDIT_QUESTION_URL_ENDPOINT)
         response = navigation_info.value
         assert response.status == 403
 
@@ -194,11 +200,12 @@ def test_edit_this_question_functionality(page: Page, user_type, create_user_fac
                             "modified text is displayed and the username is displayed inside"
                             " the modified text"):
         sumo_pages.aaq_flow.editing_question_flow(
-            subject=utilities.aaq_question_test_data['valid_firefox_question']['subject_updated'],
+            subject=utilities.aaq_question_test_data['valid_firefox_question']
+            ['subject_updated'],
             body=utilities.aaq_question_test_data['valid_firefox_question']['body_updated'],
             troubleshoot=utilities.aaq_question_test_data['troubleshooting_information']
         )
-        expect(sumo_pages.question_page.modified_question_section).to_be_visible()
+        expect(sumo_pages.question_page.get_modified_question_locator()).to_be_visible()
 
         username = (test_user["username"] if user_type == "Simple User" else test_user_two
                     ["username"])
@@ -210,14 +217,18 @@ def test_edit_this_question_functionality(page: Page, user_type, create_user_fac
 
     if user_type == 'Simple User':
         with allure.step("Verifying that the additional question details option is hidden"):
-            expect(sumo_pages.question_page.question_details_button).to_be_hidden()
+            expect(sumo_pages.question_page.get_question_details_button_locator()).to_be_hidden()
     else:
         with allure.step("Verifying that the more information section displays the updated "
                          "information"):
             sumo_pages.question_page.click_on_question_details_button()
             sumo_pages.question_page.click_on_more_system_details_option()
-            expect(sumo_pages.question_page.more_information_with_text(
-                utilities.aaq_question_test_data['troubleshooting_information'])).to_be_visible()
+            expect(sumo_pages.question_page.get_more_information_with_text_locator(
+                utilities.aaq_question_test_data['troubleshooting_information']
+            )
+            ).to_be_visible()
+
+        sumo_pages.question_page.click_on_the_additional_system_panel_close()
 
 
 # T5696750, T5696779, T5696752
@@ -239,7 +250,7 @@ def test_delete_question_cancel_button(page: Page, create_user_factory):
     with allure.step("Navigating to the posted question by a different user an verifying "
                      "that the 'Delete this question' option is not available"):
         utilities.navigate_to_link(posted_question_one['question_details']['question_page_url'])
-        expect(sumo_pages.question_page.delete_this_question_option).to_be_hidden()
+        expect(sumo_pages.question_page.get_delete_this_question_locator()).to_be_hidden()
 
     with check, allure.step("Manually navigating to the delete endpoint and verifying that "
                             "403 is returned"):
@@ -253,7 +264,7 @@ def test_delete_question_cancel_button(page: Page, create_user_factory):
     with allure.step("Navigating to the posted question by self and verifying that the "
                      "'Delete this question' option is not available"):
         utilities.navigate_to_link(posted_question_two['question_details']['question_page_url'])
-        expect(sumo_pages.question_page.delete_this_question_option).to_be_hidden()
+        expect(sumo_pages.question_page.get_delete_this_question_locator()).to_be_hidden()
 
     with check, allure.step("Manually navigating to the delete endpoint and verifying that "
                             "403 is returned"):
@@ -296,7 +307,8 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
         question_info_two = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["simple_body_text"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -307,11 +319,11 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
     if status == "locked":
         with allure.step("Verifying that the 'Lock this question' option is not available for "
                          "other posted questions"):
-            expect(sumo_pages.question_page.lock_this_question_option).to_be_hidden()
+            expect(sumo_pages.question_page.get_lock_this_question_locator()).to_be_hidden()
     elif status == "archived":
         with allure.step("Verifying that the 'Archive this question' option is not available "
                          "for other posted questions"):
-            expect(sumo_pages.question_page.archive_this_question_option).to_be_hidden()
+            expect(sumo_pages.question_page.get_archive_this_question_locator()).to_be_hidden()
 
     with allure.step("Navigating to the question posted by self"):
         utilities.navigate_to_link(question_info_two['question_page_url'])
@@ -319,11 +331,11 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
     if status == "locked":
         with allure.step("Verifying that the 'Lock this question is not available for self "
                          "posted questions"):
-            expect(sumo_pages.question_page.lock_this_question_option).to_be_hidden()
+            expect(sumo_pages.question_page.get_lock_this_question_locator()).to_be_hidden()
     elif status == "archived":
         with allure.step("Verifying that the 'Archive this question' is not available for "
                          "self posted questions"):
-            expect(sumo_pages.question_page.archive_this_question_option).to_be_hidden()
+            expect(sumo_pages.question_page.get_archive_this_question_locator()).to_be_hidden()
 
     with allure.step("Signing in with a superuser account"):
         utilities.start_existing_session(
@@ -360,32 +372,32 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
 
     if status == "locked":
         with allure.step("Verifying that the 'Unlock this question option' is not available'"):
-            expect(sumo_pages.question_page.lock_this_question_option).to_be_hidden()
+            expect(sumo_pages.question_page.get_lock_this_question_locator()).to_be_hidden()
     elif status == "archived":
         with allure.step("Verifying that the 'Archive this question' options is not "
                          "available"):
-            expect(sumo_pages.question_page.archive_this_question_option).to_be_hidden()
+            expect(sumo_pages.question_page.get_archive_this_question_locator()).to_be_hidden()
 
     with allure.step("Verifying that the post a reply textarea field is not displayed"):
-        expect(sumo_pages.question_page.post_a_reply_textarea).to_be_hidden()
+        expect(sumo_pages.question_page.get_post_a_reply_textarea_locator()).to_be_hidden()
 
     with allure.step("Verifying that the 'needs more information from the user' checkbox is "
                      "not displayed"):
-        expect(sumo_pages.question_page.needs_more_information_from_the_user_checkbox
+        expect(sumo_pages.question_page.get_needs_more_information_checkbox_locator()
                ).to_be_hidden()
 
     with allure.step("Verifying that the 'Add images section is not displayed'"):
-        expect(sumo_pages.question_page.add_image_button).to_be_hidden()
+        expect(sumo_pages.question_page.get_add_image_section_locator()).to_be_hidden()
 
     with allure.step("Signing in with a superuser account and verifying that the 'needs more"
                      " information from the user' checkbox is available"):
         utilities.start_existing_session(
             session_file_name=utilities.username_extraction_from_email(utilities.staff_user))
-        expect(sumo_pages.question_page.needs_more_information_from_the_user_checkbox
+        expect(sumo_pages.question_page.get_needs_more_information_checkbox_locator()
                ).to_be_visible()
 
     with allure.step("Verifying that the 'Add images' section is available"):
-        expect(sumo_pages.question_page.add_image_button).to_be_visible()
+        expect(sumo_pages.question_page.get_add_image_section_locator()).to_be_visible()
 
     with allure.step("Submitting a reply to the question and verifying that the posted reply "
                      "is visible"):
@@ -393,12 +405,12 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
             repliant_username=utilities.username_extraction_from_email(utilities.staff_user),
             reply=utilities.aaq_question_test_data['valid_firefox_question']['question_reply']
         )
-        expect(sumo_pages.question_page.question(reply_id)).to_be_visible()
+        expect(sumo_pages.question_page.get_posted_reply_locator(reply_id)).to_be_visible()
 
     with allure.step("Signing in with a normal user account and verifying that the admin's "
                      "reply is visible"):
         utilities.start_existing_session(test_user)
-        expect(sumo_pages.question_page.question(reply_id)).to_be_visible()
+        expect(sumo_pages.question_page.get_posted_reply_locator(reply_id)).to_be_visible()
 
     with allure.step("Signing in with a superuser account"):
         utilities.start_existing_session(
@@ -414,7 +426,7 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
     with allure.step("Signing in with a non-admin account and verifying that the 'Thread "
                      "locked' banner is not displayed"):
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.question_page.lock_this_thread_banner).to_be_hidden()
+        expect(sumo_pages.question_page.get_thread_locked_locator()).to_be_hidden()
 
     with allure.step("Submitting a reply to the question and verifying that the posted reply "
                      "is visible"):
@@ -422,7 +434,7 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
             repliant_username=test_user["username"],
             reply=utilities.aaq_question_test_data['valid_firefox_question']['question_reply']
         )
-        expect(sumo_pages.question_page.question(reply_id_two)).to_be_visible()
+        expect(sumo_pages.question_page.get_posted_reply_locator(reply_id_two)).to_be_visible()
 
 
 # T5696750, T5696783, T5696752, T5696764
@@ -443,7 +455,8 @@ def test_subscribe_to_feed_option(page: Page, is_firefox, create_user_factory):
         question_info_one = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["simple_body_text"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -456,7 +469,8 @@ def test_subscribe_to_feed_option(page: Page, is_firefox, create_user_factory):
         question_info_two = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["simple_body_text"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -567,12 +581,12 @@ def test_mark_as_spam_functionality(page: Page, create_user_factory):
     with allure.step("Deleting user session and verifying that the 'Mark as spam' option is "
                      "not displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.mark_as_spam_option).to_be_hidden()
+        expect(sumo_pages.question_page.get_mark_as_spam_locator()).to_be_hidden()
 
     with allure.step("Signing in with a user account and verifying that the 'Mark as spam' option"
                      " is not displayed"):
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.question_page.mark_as_spam_option).to_be_hidden()
+        expect(sumo_pages.question_page.get_mark_as_spam_locator()).to_be_hidden()
 
     with check, allure.step("Signing in with a Forum Moderator account, clicking on the 'mark as "
                             "spam' option and verifying that the correct spam banner message"
@@ -603,17 +617,17 @@ def test_mark_as_spam_functionality(page: Page, create_user_factory):
                      "option and verifying that the 'Mark as spam' banner is not displayed"):
         utilities.start_existing_session(cookies=test_user_two)
         sumo_pages.question_page.click_on_mark_as_spam_option()
-        expect(sumo_pages.question_page.marked_as_spam_banner).to_be_hidden()
+        expect(sumo_pages.question_page.get_marked_as_spam_banner_locator()).to_be_hidden()
 
     with allure.step("Deleting the user session and verifying that the 'Marked as spam' "
                      "banner is not displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.marked_as_spam_banner).to_be_hidden()
+        expect(sumo_pages.question_page.get_marked_as_spam_banner_locator()).to_be_hidden()
 
     with allure.step("Signing in with user account and verifying that the 'Marked as spam'"
                      " banner is not displayed"):
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.question_page.marked_as_spam_banner).to_be_hidden()
+        expect(sumo_pages.question_page.get_marked_as_spam_banner_locator()).to_be_hidden()
 
 
 # T5696756, T5696758, T5696760
@@ -631,7 +645,7 @@ def test_question_topics(page: Page, user_type, create_user_factory):
         posted_question = post_firefox_product_question_flow(page, test_user_three)
 
     with allure.step("Verifying that Tags cannot be added by OP user"):
-        expect(sumo_pages.question_page.add_a_tag_input_field).to_be_hidden()
+        expect(sumo_pages.question_page.get_add_a_tag_input_field()).to_be_hidden()
 
     with allure.step("Deleting user session"):
         utilities.delete_cookies()
@@ -642,11 +656,11 @@ def test_question_topics(page: Page, user_type, create_user_factory):
 
     with allure.step("Verifying that the 'Add a tag' input field is not displayed for "
                      "permissionless accounts"):
-        expect(sumo_pages.question_page.add_a_tag_input_field).to_be_hidden()
+        expect(sumo_pages.question_page.get_add_a_tag_input_field()).to_be_hidden()
 
     with allure.step("Verifying that the remove tag button is not displayed"):
         for tag in sumo_pages.question_page.get_question_tag_options(is_moderator=False):
-            expect(sumo_pages.question_page.delete_tag(tag)).to_be_hidden()
+            expect(sumo_pages.question_page.get_remove_tag_button_locator(tag)).to_be_hidden()
 
     with allure.step("Signing in with a Forum Moderator account, adding data inside the 'Add a "
                      "tag' input field"):
@@ -698,7 +712,7 @@ def test_question_topics(page: Page, user_type, create_user_factory):
         utilities.wait_for_given_timeout(1000)
 
     with allure.step("Verifying that the tag was removed"):
-        expect(sumo_pages.question_page.tag(
+        expect(sumo_pages.question_page.get_a_certain_tag(
             utilities.aaq_question_test_data['valid_firefox_question']['custom_tag']
         )
         ).to_be_hidden()
@@ -711,7 +725,7 @@ def test_question_topics(page: Page, user_type, create_user_factory):
             utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Verifying that the tag was removed"):
-        expect(sumo_pages.question_page.tag(
+        expect(sumo_pages.question_page.get_a_certain_tag(
             utilities.aaq_question_test_data['valid_firefox_question']['custom_tag']
         )
         ).to_be_hidden()
@@ -733,17 +747,17 @@ def test_email_updates_option_visibility(page: Page, create_user_factory):
     with allure.step("Deleting user session and verifying that the 'Get  email updates' "
                      "option is displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.stop_email_updates_option).to_be_visible()
+        expect(sumo_pages.question_page.get_email_updates_option()).to_be_visible()
 
     with allure.step("Signing in with another user account and verifying that the 'Get email"
                      " updates' option is displayed"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.question_page.stop_email_updates_option).to_be_visible()
+        expect(sumo_pages.question_page.get_email_updates_option()).to_be_visible()
 
     with allure.step("Signing in with a Forum Moderator and verifying that the 'Get email "
                      "updated' options is displayed"):
         utilities.start_existing_session(cookies=test_user_three)
-        expect(sumo_pages.question_page.stop_email_updates_option).to_be_visible()
+        expect(sumo_pages.question_page.get_email_updates_option()).to_be_visible()
 
     with allure.step("Deleting the posted question"):
         sumo_pages.aaq_flow.deleting_question_flow()
@@ -780,14 +794,14 @@ def test_mark_reply_as_spam(page: Page, create_user_factory):
     with allure.step("Clicking on the self reply menu and verifying that the 'mark as spam' "
                      "option is not displayed for non-admin users"):
         sumo_pages.question_page.click_on_reply_more_options_button(reply_id_two)
-        expect(sumo_pages.question_page.mark_reply_as_spam(reply_id_two)
+        expect(sumo_pages.question_page.get_mark_as_spam_reply_locator(reply_id_two)
                ).to_be_hidden()
         sumo_pages.question_page.click_on_reply_more_options_button(reply_id_two)
 
     with allure.step("Clicking on other user posted reply menu and verifying that the 'mark "
                      "as spam' option is not displayed for non-admin users"):
         sumo_pages.question_page.click_on_reply_more_options_button(reply_id_one)
-        expect(sumo_pages.question_page.mark_reply_as_spam(reply_id_one)
+        expect(sumo_pages.question_page.get_mark_as_spam_reply_locator(reply_id_one)
                ).to_be_hidden()
         sumo_pages.question_page.click_on_reply_more_options_button(reply_id_one)
 
@@ -802,47 +816,47 @@ def test_mark_reply_as_spam(page: Page, create_user_factory):
     with allure.step("Deleting user session and verifying that the reply marked as spam is "
                      "no longer displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.reply_section(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.get_reply_section_locator(reply_id_one)).to_be_hidden()
 
     with allure.step("Signing in with a simple user and verifying that reply marked as spam "
                      "is no longer displayed"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.question_page.reply_section(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.get_reply_section_locator(reply_id_one)).to_be_hidden()
 
     with allure.step("Signing in with the reply OP user account and verifying that the reply "
                      "marked as spam is no longer displayed"):
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.question_page.reply_section(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.get_reply_section_locator(reply_id_one)).to_be_hidden()
 
     with allure.step("Signing in with the Forum Moderator, unmarking the reply from spam and "
                      "verifying that the 'Marked as spam' message is no longer displayed"):
         utilities.start_existing_session(cookies=test_user_three)
         sumo_pages.aaq_flow.spam_marking_a_reply(reply_id_one)
-        expect(sumo_pages.question_page.marked_as_spam(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.get_marked_as_spam_locator(reply_id_one)).to_be_hidden()
 
     with allure.step("Deleting the user session and verifying that the reply is visible to "
                      "the logged out users"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.reply_section(reply_id_one)).to_be_visible()
+        expect(sumo_pages.question_page.get_reply_section_locator(reply_id_one)).to_be_visible()
 
     with allure.step("Verifying that the 'Marked as spam' message is no longer displayed"):
-        expect(sumo_pages.question_page.marked_as_spam(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.get_marked_as_spam_locator(reply_id_one)).to_be_hidden()
 
     with allure.step("Signing in with a different simple user and verifying that the reply is "
                      "visible again"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.question_page.reply_section(reply_id_one)).to_be_visible()
+        expect(sumo_pages.question_page.get_reply_section_locator(reply_id_one)).to_be_visible()
 
     with allure.step("Verifying that the 'Marked as spam' message is no longer displayed"):
-        expect(sumo_pages.question_page.marked_as_spam(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.get_marked_as_spam_locator(reply_id_one)).to_be_hidden()
 
     with allure.step("Signing in with the reply OP and verifying that the reply is visible "
                      "again"):
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.question_page.reply_section(reply_id_one)).to_be_visible()
+        expect(sumo_pages.question_page.get_reply_section_locator(reply_id_one)).to_be_visible()
 
     with allure.step("Verifying that the 'Marked as spam' message is no longer displayed"):
-        expect(sumo_pages.question_page.marked_as_spam(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.get_marked_as_spam_locator(reply_id_one)).to_be_hidden()
 
 
 # Need to expand this to contain additional text format.
@@ -885,7 +899,8 @@ def test_edit_reply(page: Page, user_type, create_user_factory):
         with allure.step("Clicking on the more options for the reply posted by another user "
                          "and verifying that the 'edit this post' option is not displayed"):
             sumo_pages.question_page.click_on_reply_more_options_button(reply_id)
-            expect(sumo_pages.question_page.edit_this_post_for_answer(reply_id)).to_be_hidden()
+            expect(sumo_pages.question_page.get_edit_this_post_reply_locator(reply_id)
+                   ).to_be_hidden()
 
         with check, allure.step("Manually navigating to edit reply endpoint and verifying "
                                 "that 403 is returned"):
@@ -902,12 +917,17 @@ def test_edit_reply(page: Page, user_type, create_user_factory):
             utilities.navigate_to_link(page_url)
             reply_id = sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user_two["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']['question_reply']
+                reply=utilities.aaq_question_test_data['valid_firefox_question']
+                ['question_reply']
             )
             assert sumo_pages.question_page.get_display_name_of_question_reply_author(
                 reply_id
             ) == test_user_two["username"]
-            expect(sumo_pages.question_page.reply_user_title(reply_id)).to_be_hidden()
+            expect(
+                sumo_pages.question_page.get_displayed_user_title_of_question_reply_locator(
+                    reply_id
+                )
+            ).to_be_hidden()
     else:
         utilities.start_existing_session(cookies=test_user_three)
         user_two = test_user_three["username"]
@@ -921,8 +941,9 @@ def test_edit_reply(page: Page, user_type, create_user_factory):
 
     with allure.step("Editing the question reply"):
         sumo_pages.aaq_flow.editing_reply_flow(
-            reply_body=utilities.aaq_question_test_data['valid_firefox_question']['updated_reply'],
-            submit_reply=False, answer_id=reply_id
+            reply_body=utilities.aaq_question_test_data['valid_firefox_question']
+            ['updated_reply'],
+            submit_reply=False
         )
 
     with check, allure.step("Verifying that the question reply is the original one"):
@@ -931,7 +952,8 @@ def test_edit_reply(page: Page, user_type, create_user_factory):
 
     with allure.step("Verifying that the 'Modified by' message is not displayed for the "
                      "reply"):
-        expect(sumo_pages.question_page.modified_by_text(reply_id)).to_be_hidden()
+        expect(sumo_pages.question_page.get_posted_reply_modified_by_locator(reply_id)
+               ).to_be_hidden()
 
     with check, allure.step("Clicking on the 'Edit this post option' and verifying that the "
                             "textarea contains the original reply"):
@@ -943,8 +965,8 @@ def test_edit_reply(page: Page, user_type, create_user_factory):
     with check, allure.step("Editing the reply and verifying that the reply contains the "
                             "updated text"):
         sumo_pages.aaq_flow.editing_reply_flow(
-            reply_body=utilities.aaq_question_test_data['valid_firefox_question']['updated_reply'],
-            answer_id=reply_id
+            reply_body=utilities.aaq_question_test_data['valid_firefox_question']
+            ['updated_reply']
         )
         assert sumo_pages.question_page.get_posted_reply_text(reply_id).strip(
         ) == utilities.aaq_question_test_data['valid_firefox_question']['updated_reply']
@@ -976,7 +998,8 @@ def test_delete_reply(page: Page, user_type, create_user_factory):
             repliant_username=test_user["username"],
             reply=utilities.aaq_question_test_data['valid_firefox_question']['question_reply']
         )
-        expect(sumo_pages.question_page.delete_this_post_for_answer(reply_id)).to_be_hidden()
+        expect(sumo_pages.question_page.get_delete_this_post_reply_locator(reply_id)
+               ).to_be_hidden()
 
     with check, allure.step("Verifying that manually navigating to the delete page for the "
                             "posted reply returns 403"):
@@ -995,13 +1018,14 @@ def test_delete_reply(page: Page, user_type, create_user_factory):
             utilities.start_existing_session(cookies=test_user_two)
             sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user_two["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']['question_reply']
+                reply=utilities.aaq_question_test_data['valid_firefox_question']
+                ['question_reply']
             )
 
             with allure.step("Verifying that the 'Delete this post' option is not available "
                              "for replies posted by others"):
                 sumo_pages.question_page.click_on_reply_more_options_button(reply_id)
-                expect(sumo_pages.question_page.delete_this_post_for_answer(reply_id)
+                expect(sumo_pages.question_page.get_delete_this_post_reply_locator(reply_id)
                        ).to_be_hidden()
 
             with check, allure.step("Verifying that manually navigating to the delete page "
@@ -1020,14 +1044,15 @@ def test_delete_reply(page: Page, user_type, create_user_factory):
                      "delete reply confirmation box and verifying that the reply was not deleted"):
         utilities.start_existing_session(cookies=test_user_three)
         sumo_pages.aaq_flow.delete_question_reply(answer_id=reply_id, delete_reply=False)
-        expect(sumo_pages.question_page.question(reply_id)).to_be_visible()
+        expect(sumo_pages.question_page.get_posted_reply_locator(reply_id)).to_be_visible()
 
     with allure.step("Deleting the reply and verifying that the reply is no longer displayed"):
         sumo_pages.aaq_flow.delete_question_reply(answer_id=reply_id, delete_reply=True)
-        expect(sumo_pages.question_page.question(reply_id)).to_be_hidden()
+        expect(sumo_pages.question_page.get_posted_reply_locator(reply_id)).to_be_hidden()
 
 
 # T5696788, T5696767
+# Need to re-verify this for signed out case before submitting this
 @pytest.mark.postedQuestions
 def test_i_have_this_problem_too(page: Page, create_user_factory):
     utilities = Utilities(page)
@@ -1043,7 +1068,7 @@ def test_i_have_this_problem_too(page: Page, create_user_factory):
     with allure.step("Verifying that the 'I have this problem too' button is not displayed "
                      "for self posted questions"):
         problem_counter = sumo_pages.question_page.get_i_have_this_problem_too_counter()
-        expect(sumo_pages.question_page.i_have_this_problem_too_button).to_be_hidden()
+        expect(sumo_pages.question_page.get_i_have_this_problem_too_locator()).to_be_hidden()
 
     with check, allure.step("Deleting the user session, clicking on the 'I have this problem "
                             "too' button and verifying tha the 'have this problem' counter "
@@ -1065,7 +1090,7 @@ def test_i_have_this_problem_too(page: Page, create_user_factory):
 
     with allure.step("Verifying that the 'I have this problem too' button is no longer "
                      "displayed"):
-        expect(sumo_pages.question_page.i_have_this_problem_too_button).to_be_hidden()
+        expect(sumo_pages.question_page.get_i_have_this_problem_too_locator()).to_be_hidden()
 
     with check, allure.step("Signing in with an Forum Moderator account, clicking on the 'I have "
                             "this problem too' and verifying that the 'have this problem' counter "
@@ -1078,7 +1103,7 @@ def test_i_have_this_problem_too(page: Page, create_user_factory):
 
     with allure.step("Verifying that the 'I have this problem too' button is no longer "
                      "displayed"):
-        expect(sumo_pages.question_page.i_have_this_problem_too_button).to_be_hidden()
+        expect(sumo_pages.question_page.get_i_have_this_problem_too_locator()).to_be_hidden()
 
 
 # T5696789
@@ -1104,12 +1129,14 @@ def test_solves_this_problem(page: Page, create_user_factory):
     with allure.step("Deleting user session and verifying that the 'Solved the problem' "
                      "button is not displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.reply_solves_the_problem(reply_id)).to_be_hidden()
+        expect(sumo_pages.question_page.get_solved_the_problem_button_locator(reply_id)
+               ).to_be_hidden()
 
     with allure.step("Signing in with a different user account and verifying that the "
                      "'Solved the problem' button is not displayed"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.question_page.reply_solves_the_problem(reply_id)).to_be_hidden()
+        expect(sumo_pages.question_page.get_solved_the_problem_button_locator(reply_id)
+               ).to_be_hidden()
 
     with check, allure.step("Signing in with the first username, clicking on the 'Solved the "
                             "problem' button and verifying that the correct banner is "
@@ -1147,15 +1174,15 @@ def test_solves_this_problem(page: Page, create_user_factory):
         ) == QuestionPageMessages.UNDOING_A_SOLUTION
 
     with allure.step("Verifying that the 'Solved the problem' option is not displayed"):
-        expect(sumo_pages.question_page.problem_solved_reply_section).to_be_hidden()
+        expect(sumo_pages.question_page.get_chosen_solution_section_locator()).to_be_hidden()
 
     with allure.step("Verifying that the 'Chosen solution' banner is not displayed for the "
                      "previously provided solution"):
-        expect(sumo_pages.question_page.reply_solution_header(reply_id)
+        expect(sumo_pages.question_page.get_chosen_solution_reply_message_locator(reply_id)
                ).to_be_hidden()
 
     with allure.step("Verifying that the 'Undo' option is not available"):
-        expect(sumo_pages.question_page.undo_solves_problem).to_be_hidden()
+        expect(sumo_pages.question_page.get_undo_button_locator()).to_be_hidden()
 
     with check, allure.step("Signing in with a Forum Moderator, clicking on the 'solved this "
                             "problem option' and verifying the chosen solution text"):
@@ -1179,22 +1206,15 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
     # any group in order to catch cases like https://github.com/mozilla/sumo/issues/1676
     with allure.step("Signing in with a non admin user account and posting a Firefox product "
                      "question"):
-        utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
-        question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
-            subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
-            topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["body_updated"],
-            attach_image=False,
-            expected_locator=sumo_pages.question_page.questions_header
-        )
+        posted_question = post_firefox_product_question_flow(page, test_user)
     question_id = sumo_pages.question_page.get_question_id()
 
     if quote_on == "reply":
         with allure.step("Posting a reply to the question"):
             reply_id = sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']['question_reply']
+                reply=utilities.aaq_question_test_data['valid_firefox_question']
+                ['question_reply']
             )
     with allure.step("Signing in with a simple user"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -1203,7 +1223,8 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
         with allure.step("Posting a quoted reply for question reply"):
             quote_id = sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user_two["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']['updated_reply'],
+                reply=utilities.aaq_question_test_data['valid_firefox_question']
+                ['updated_reply'],
                 quoted_reply=True,
                 reply_for_id=reply_id
             )
@@ -1211,7 +1232,8 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
         with allure.step("Posting a quoted reply for question"):
             quote_id = sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user_two["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']['updated_reply'],
+                reply=utilities.aaq_question_test_data['valid_firefox_question']
+                ['updated_reply'],
                 quoted_reply=True,
                 reply_for_id=question_id
             )
@@ -1231,7 +1253,7 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
         with check, allure.step("Verifying that the question details is displayed inside the "
                                 "quote"):
             assert (utilities.aaq_question_test_data['valid_firefox_question']
-                    ['body_updated'] == sumo_pages.question_page
+                    ['simple_body_text'] == sumo_pages.question_page
                     .get_blockquote_reply_text(quote_id).strip())
 
     with check, allure.step("Verifying that the new reply text is also displayed"):
@@ -1245,12 +1267,12 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
     if quote_on == "reply":
         with check, allure.step("Verifying that the correct url is displayed"):
             expect(page).to_have_url(
-                question_details['question_page_url'] + "#" + reply_id
+                posted_question['question_details']['question_page_url'] + "#" + reply_id
             )
     else:
         with check, allure.step("Verifying that the correct url is displayed"):
             expect(page).to_have_url(
-                question_details['question_page_url'] + "#" + question_id
+                posted_question['question_details']['question_page_url'] + "#" + question_id
             )
 
     with allure.step("Signing in with a Forum Moderator account"):
@@ -1260,7 +1282,8 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
         with allure.step("Posting a quoted reply for question reply"):
             quote_id = sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user_two["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']['updated_reply'],
+                reply=utilities.aaq_question_test_data['valid_firefox_question']
+                ['updated_reply'],
                 quoted_reply=True,
                 reply_for_id=reply_id
             )
@@ -1268,7 +1291,8 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
         with allure.step("Posting a quoted reply for question reply"):
             quote_id = sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user_two["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']['updated_reply'],
+                reply=utilities.aaq_question_test_data['valid_firefox_question']
+                ['updated_reply'],
                 quoted_reply=True,
                 reply_for_id=question_id
             )
@@ -1287,7 +1311,7 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
     else:
         with check, allure.step("Verifying that the question is displayed inside the quote"):
             assert (utilities.aaq_question_test_data['valid_firefox_question']
-                    ['body_updated'] == sumo_pages.question_page
+                    ['simple_body_text'] == sumo_pages.question_page
                     .get_blockquote_reply_text(quote_id).strip())
 
     with check, allure.step("Verifying that the new reply text is also displayed"):
@@ -1301,12 +1325,12 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
     if quote_on == "reply":
         with allure.step("Verifying that the correct url is displayed"):
             expect(page).to_have_url(
-                question_details['question_page_url'] + "#" + reply_id
+                posted_question['question_details']['question_page_url'] + "#" + reply_id
             )
     else:
         with allure.step("Verifying that the correct url is displayed"):
             expect(page).to_have_url(
-                question_details['question_page_url'] + "#" + question_id
+                posted_question['question_details']['question_page_url'] + "#" + question_id
             )
 
 
@@ -1333,13 +1357,14 @@ def test_quote_reply_functionality_signed_out(page: Page, create_user_factory):
             posted_question['question_details']['question_page_url'] + "#question-reply")
 
     with allure.step("Verifying that the reply textarea field is not displayed"):
-        expect(sumo_pages.question_page.post_a_reply_textarea).to_be_hidden()
+        expect(sumo_pages.question_page.get_post_a_reply_textarea_locator()).to_be_hidden()
 
     with allure.step("Verifying that the 'Ask a question' signed out card is not displayed"):
-        expect(sumo_pages.question_page.ask_a_question_signed_out_card_option).to_be_hidden()
+        expect(sumo_pages.question_page.ask_a_question_signed_out_card_option_locator()
+               ).to_be_hidden()
 
     with allure.step("Verifying that the 'I have this problem, too' option is not displayed"):
-        expect(sumo_pages.question_page.i_have_this_problem_too_signed_out_card_option
+        expect(sumo_pages.question_page.get_i_have_this_problem_too_signed_out_card_locator()
                ).to_be_hidden()
 
     with allure.step("Clicking on the 'start a new question' signed out card link and "
@@ -1367,13 +1392,14 @@ def test_quote_reply_functionality_signed_out(page: Page, create_user_factory):
         )
 
     with allure.step("Verifying that the reply textarea field is not displayed"):
-        expect(sumo_pages.question_page.post_a_reply_textarea).to_be_hidden()
+        expect(sumo_pages.question_page.get_post_a_reply_textarea_locator()).to_be_hidden()
 
     with allure.step("Verifying that the 'Ask a question' signed out card is displayed"):
-        expect(sumo_pages.question_page.ask_a_question_signed_out_card_option).to_be_visible()
+        expect(sumo_pages.question_page.ask_a_question_signed_out_card_option_locator()
+               ).to_be_visible()
 
     with allure.step("Verifying that the 'I have this problem, too' option is displayed"):
-        expect(sumo_pages.question_page.i_have_this_problem_too_signed_out_card_option
+        expect(sumo_pages.question_page.get_i_have_this_problem_too_signed_out_card_locator()
                ).to_be_visible()
 
     with allure.step("Clicking on the 'Ask a question' and verifying that we are redirected "
@@ -1394,7 +1420,7 @@ def test_quote_reply_functionality_signed_out(page: Page, create_user_factory):
         expect(page).to_have_url(posted_question['question_details']['question_page_url'])
 
     with allure.step("Verifying that the textarea field is displayed"):
-        expect(sumo_pages.question_page.post_a_reply_textarea).to_be_visible()
+        expect(sumo_pages.question_page.get_post_a_reply_textarea_locator()).to_be_visible()
 
 
 # T5696770
@@ -1421,7 +1447,7 @@ def test_question_reply_votes(page: Page, create_user_factory):
         reply_id = sumo_pages.question_page.click_on_post_reply_button(test_user["username"])
 
     with allure.step("Verifying the vote reply is not available for self posted questions"):
-        expect(sumo_pages.question_page.reply_vote_section(reply_id)).to_be_hidden()
+        expect(sumo_pages.question_page.get_reply_votes_section_locator(reply_id)).to_be_hidden()
 
     with check, allure.step("Signing in a different user and verifying that the correct vote "
                             "header is displayed"):
@@ -1449,11 +1475,11 @@ def test_question_reply_votes(page: Page, create_user_factory):
                     get_not_helpful_count(reply_id)) == number_of_thumbs_down_votes)
 
     with allure.step("Verifying that the thumbs up button contains the disabled attribute"):
-        expect(sumo_pages.question_page.reply_vote_thumbs_up(reply_id)
+        expect(sumo_pages.question_page.get_thumbs_up_button_locator(reply_id)
                ).to_have_attribute(name="disabled", value="")
 
     with allure.step("Verifying that the thumbs down button contains the disabled attribute"):
-        expect(sumo_pages.question_page.reply_vote_thumbs_down(reply_id)
+        expect(sumo_pages.question_page.get_thumbs_down_button_locator(reply_id)
                ).to_have_attribute(name="disabled",value="")
 
     with check, allure.step("Refreshing the page and verifying that the correct number of "
@@ -1484,11 +1510,11 @@ def test_question_reply_votes(page: Page, create_user_factory):
                     get_not_helpful_count(reply_id)) == number_of_thumbs_down_votes)
 
     with allure.step("Verifying that the thumbs up button contains the disabled attribute"):
-        expect(sumo_pages.question_page.reply_vote_thumbs_up(reply_id)
+        expect(sumo_pages.question_page.get_thumbs_up_button_locator(reply_id)
                ).to_have_attribute(name="disabled", value="")
 
     with allure.step("Verifying that the thumbs down button contains the disabled attribute"):
-        expect(sumo_pages.question_page.reply_vote_thumbs_down(reply_id)
+        expect(sumo_pages.question_page.get_thumbs_down_button_locator(reply_id)
                ).to_have_attribute(name="disabled", value="")
 
     with check, allure.step("Refreshing the page and verifying that the correct number of "
@@ -1559,7 +1585,7 @@ def test_report_abuse(page: Page, flagged_content, user_type, create_user_factor
                 sumo_pages.question_page.get_question_id()
             )
             expect(
-                sumo_pages.question_page.report_answer_as_abuse(
+                sumo_pages.question_page.get_click_on_report_abuse_reply_locator(
                     sumo_pages.question_page.get_question_id()
                 )
             ).to_be_hidden()
@@ -1568,7 +1594,8 @@ def test_report_abuse(page: Page, flagged_content, user_type, create_user_factor
         with allure.step("Clicking on the more options for the reply and verifying that the "
                          "report abuse options is not displayed for signed out users"):
             sumo_pages.question_page.click_on_reply_more_options_button(reply_id)
-            expect(sumo_pages.question_page.report_answer_as_abuse(reply_id)).to_be_hidden()
+            expect(sumo_pages.question_page.get_click_on_report_abuse_reply_locator(
+                reply_id)).to_be_hidden()
 
     if user_type == "Forum Moderator":
         with allure.step("Signing in with a Forum Moderator account"):
@@ -1599,17 +1626,15 @@ def test_report_abuse(page: Page, flagged_content, user_type, create_user_factor
     with allure.step("Navigating to 'Moderate forum content page' and verifying that the "
                      "question exists inside the moderate forum content page"):
         sumo_pages.top_navbar.click_on_moderate_forum_content_option()
-        if sumo_pages.moderate_forum_content_page.is_paginator_visible():
-            sumo_pages.moderate_forum_content_page.click_on_last_pagination_element()
         if flagged_content == "question_content":
             expect(
-                sumo_pages.moderate_forum_content_page.flagged_question(
+                sumo_pages.moderate_forum_content_page.get_flagged_question_locator(
                     posted_question['question_details']['aaq_subject']
                 )
             ).to_be_visible()
         else:
             expect(
-                sumo_pages.moderate_forum_content_page.flagged_question(
+                sumo_pages.moderate_forum_content_page.get_flagged_question_locator(
                     reply_content
                 )
             ).to_be_visible()
@@ -1631,19 +1656,21 @@ def test_report_abuse(page: Page, flagged_content, user_type, create_user_factor
                 posted_question['question_details']['aaq_subject']
             )
         else:
-            sumo_pages.moderate_forum_content_page.click_on_the_update_button(reply_content)
+            sumo_pages.moderate_forum_content_page.click_on_the_update_button(
+                reply_content
+            )
 
     with allure.step("Verifying that the question no longer exists inside the moderate forum "
                      "content page"):
         if flagged_content == "question_content":
             expect(
-                sumo_pages.moderate_forum_content_page.flagged_question(
+                sumo_pages.moderate_forum_content_page.get_flagged_question_locator(
                     posted_question['question_details']['aaq_subject']
                 )
             ).to_be_hidden()
         else:
             expect(
-                sumo_pages.moderate_forum_content_page.flagged_question(
+                sumo_pages.moderate_forum_content_page.get_flagged_question_locator(
                     reply_content
                 )
             ).to_be_hidden()
@@ -1740,7 +1767,8 @@ def post_firefox_product_question_flow(page: Page, user: Union[dict, str]):
         username = user["username"]
     else:
         username = utilities.username_extraction_from_email(user)
-        utilities.start_existing_session(session_file_name=username)
+        utilities.start_existing_session(
+            session_file_name=username)
 
     with allure.step("Posting a Firefox product question"):
         utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
@@ -1748,7 +1776,8 @@ def post_firefox_product_question_flow(page: Page, user: Union[dict, str]):
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["simple_body_text"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
diff --git a/playwright_tests/tests/ask_a_question_tests/community_forums/test_community_forums_by_product.py b/playwright_tests/tests/ask_a_question_tests/community_forums/test_community_forums_by_product.py
index 9d5e84fb41e..6b80b365565 100644
--- a/playwright_tests/tests/ask_a_question_tests/community_forums/test_community_forums_by_product.py
+++ b/playwright_tests/tests/ask_a_question_tests/community_forums/test_community_forums_by_product.py
@@ -45,6 +45,7 @@ def test_ask_the_community_button_redirect(page: Page):
     with allure.step("Navigating to the all products community forums page"):
         sumo_pages.top_navbar.click_on_view_all_forums_option()
 
+
     with check, allure.step("Clicking on the 'Ask the Community' button for each community forum "
                             "and verifying that the user is redirected to the correct product "
                             "solutions page"):
@@ -77,7 +78,8 @@ def test_question_transitions_from_attention_needed_to_responded(page: Page, cre
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["simple_body_text"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -151,13 +153,15 @@ def test_spam_tab_filter_visibility(page: Page, create_user_factory):
     test_user = create_user_factory()
     test_user_two = create_user_factory(groups=["Forum Moderators"])
 
+
     with allure.step("Creating a question and marking it as spam"):
         utilities.start_existing_session(cookies=test_user_two)
         utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["simple_body_text"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -169,7 +173,7 @@ def test_spam_tab_filter_visibility(page: Page, create_user_factory):
         utilities.navigate_to_link(utilities.general_test_data['product_forums']
                                    ['All Products Forum'])
         sumo_pages.product_support_forum.click_on_a_certain_tab_filter("All")
-        assert len(sumo_pages.product_support_forum.is_spam_locator.all()) == 0
+        assert len(sumo_pages.product_support_forum.get_list_of_is_spam_locators()) == 0
 
     with check, allure.step("Clicking on the 'Spam' filter and verifying that the spam-marked"
                             " question is displayed with the correct spam tag"):
@@ -180,13 +184,13 @@ def test_spam_tab_filter_visibility(page: Page, create_user_factory):
     with check, allure.step("Signing out from SUMO and verifying that spam questions and the Spam"
                             " tab filter is not displayed"):
         utilities.delete_cookies()
-        assert len(sumo_pages.product_support_forum.is_spam_locator.all()) == 0
+        assert len(sumo_pages.product_support_forum.get_list_of_is_spam_locators()) == 0
         assert not sumo_pages.product_support_forum.is_tab_filter_displayed("Spam")
 
     with check, allure.step("Signing in with a normal user and verifying that the spam questions"
                             " and the spam tab filter is not displayed"):
         utilities.start_existing_session(cookies=test_user)
-        assert len(sumo_pages.product_support_forum.is_spam_locator.all()) == 0
+        assert len(sumo_pages.product_support_forum.get_list_of_is_spam_locators()) == 0
 
 
 # C3171622
@@ -203,7 +207,8 @@ def test_question_transitions_to_spam_tab_filter(page: Page, create_user_factory
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["simple_body_text"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -272,7 +277,8 @@ def test_spam_marked_question_does_not_transition_from_spam_tab_filter(page: Pag
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["simple_body_text"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -340,7 +346,8 @@ def test_questions_transitions_on_status_change(page: Page, create_user_factory,
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["simple_body_text"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
             )
diff --git a/playwright_tests/tests/ask_a_question_tests/popular_topics_page_tests/test_popular_topics_page.py b/playwright_tests/tests/ask_a_question_tests/popular_topics_page_tests/test_popular_topics_page.py
index 9c1ca6875e6..7d2dc19d253 100644
--- a/playwright_tests/tests/ask_a_question_tests/popular_topics_page_tests/test_popular_topics_page.py
+++ b/playwright_tests/tests/ask_a_question_tests/popular_topics_page_tests/test_popular_topics_page.py
@@ -16,7 +16,6 @@
 def test_popular_topics_navbar(page: Page):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-
     with allure.step("Navigating to product topics pages"):
         for product_topic in utilities.general_test_data["product_topics"]:
             topic_url = utilities.general_test_data["product_topics"][product_topic]
diff --git a/playwright_tests/tests/conftest.py b/playwright_tests/tests/conftest.py
index 40db4a173b2..ae9dfba3ef0 100644
--- a/playwright_tests/tests/conftest.py
+++ b/playwright_tests/tests/conftest.py
@@ -15,14 +15,14 @@
 @pytest.fixture(autouse=True)
 def navigate_to_homepage(page: Page):
     """
-    This fixture is used in all functions.
-    1. Sets the default navigation timeout to 30 seconds.
-    2. Blocks all requests to pontoon in the current page context.
-    3. Handles 502 errors by reloading the page after 5 seconds.
-    4. It navigates to the SuMo homepage and returns the page object for further usage.
+    This fixture is used in all functions. It navigates to the SuMo homepage and returns the page
+    object.
     """
     utilities = Utilities(page)
+    # Set default navigation timeout to 30 seconds.
     page.set_default_navigation_timeout(30000)
+
+    # Block pontoon requests in the current page context.
     page.route("**/pontoon.mozilla.org/**", utilities.block_request)
 
     def handle_502_error(response):
@@ -43,7 +43,10 @@ def handle_502_error(response):
                     print("TimeoutError encountered after reload.")
 
     page.context.on("response", handle_502_error)
+
+    # Navigate to the SUMO stage homepage.
     page.goto(HomepageMessages.STAGE_HOMEPAGE_URL)
+
     return page
 
 @pytest.hookimpl(hookwrapper=True)
@@ -95,12 +98,12 @@ def create_user_factory(page: Page, request):
 
     def _create_user(username: str = None, groups: [str] = None, permissions: [str] = None):
         """
-        This helper function creates a test user account.
+        This helper function which creates a test user account.
 
         Args:
-            username (str): The username of the test user account.
-            groups (list[str]): The groups to which the user belongs.
-            permissions (list[str]): The permissions of the user.
+            username (str): The username of the test user account
+            groups (list[str]): The groups to which the user belongs
+            permissions (list[str]): The permissions of the user
         """
         if username is None:
             username = ''.join(random.choice(
@@ -132,9 +135,6 @@ def _create_user(username: str = None, groups: [str] = None, permissions: [str]
                 utilities.wait_for_given_timeout(5000)
 
     def _cleanup():
-        """
-        Test finalizer function which triggers the deletion of the newly created test accounts.
-        """
         endpoint = HomepageMessages.STAGE_HOMEPAGE_URL_EN_US + "users/api/trigger-delete"
         for username in created_users:
             print("Deleting created users")
diff --git a/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_page.py b/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_page.py
index 311e9293053..1c1b755e15c 100644
--- a/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_page.py
+++ b/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_page.py
@@ -119,20 +119,22 @@ def test_contributor_discussions_forums_title_redirect(page: Page, create_user_f
 
 @pytest.mark.smokeTest
 @pytest.mark.contributorDiscussions
-@pytest.mark.parametrize("user", [None, 'Simple User', 'Forum Moderator'])
+@pytest.mark.parametrize("user", [None, 'simple_user', 'moderator'])
 def test_forum_moderators_availability(page: Page, user, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory(groups=["forum-contributors", "Forum Moderators"])
-    user_map = {'Simple User': test_user, 'Forum Moderator': test_user_two}
 
-    utilities.start_existing_session(cookies=user_map.get(user))
+    if user == 'simple_user':
+        utilities.start_existing_session(cookies=test_user)
+    elif user == 'moderator':
+        utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Navigating to the Contributor Discussions forum"):
         utilities.navigate_to_link(ConDiscussionsMessages.PAGE_URL)
 
-    if user == 'Simple User' or user is None:
+    if user == 'simple_user' or user is None:
         with check, allure.step("Verifying that the 'Forum Moderators' forum is not available"):
             assert (ForumModerators.PAGE_TITLE not in sumo_pages.contributor_discussions_page.
                     get_contributor_discussions_forums_titles())
@@ -187,7 +189,8 @@ def test_threads_number_and_last_post_details(page: Page, create_user_factory):
 
     with allure.step("Creating a new thread to the 'Off topic' forum"):
         post_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     thread_link = utilities.get_page_url()
@@ -270,7 +273,8 @@ def test_number_of_threads_and_last_post_details_updates_when_moving_a_thread(pa
 
     with allure.step("Creating a new thread to the 'Localization Discussions' forum"):
         post_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     thread_link = utilities.get_page_url()
@@ -369,7 +373,8 @@ def test_contributor_discussions_last_post_redirects(page: Page, create_user_fac
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         post_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
     thread_link = utilities.get_page_url()
 
diff --git a/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_threads.py b/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_threads.py
index bcdc676709b..0b85e908602 100644
--- a/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_threads.py
+++ b/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_threads.py
@@ -104,7 +104,8 @@ def test_new_thread_creation_cancel_button(page: Page, create_user_factory):
     with allure.step("Adding valid data to both title and body fields and clicking on the 'Cancel'"
                      " button"):
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body'],
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body'],
             cancel=True
         )
 
@@ -133,7 +134,8 @@ def test_thread_title_edit(page: Page, create_user_factory):
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     thread_url = urlsplit(utilities.get_page_url())._replace(query="").geturl()
@@ -216,7 +218,8 @@ def test_thread_deletion(page: Page, create_user_factory):
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     thread_url = urlsplit(utilities.get_page_url())._replace(query="").geturl()
@@ -272,7 +275,8 @@ def test_thread_locking(page: Page, create_user_factory):
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     thread_url = utilities.get_page_url()
@@ -363,7 +367,8 @@ def test_sticky_this_thread(page: Page, create_user_factory):
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     thread_link = utilities.get_page_url()
@@ -450,7 +455,8 @@ def test_thread_breadcrumbs(page: Page, create_user_factory):
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     with check, allure.step("Verifying that the thread title is displayed inside the list of "
@@ -489,7 +495,8 @@ def test_forum_post_side_navbar_redirects(page: Page, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     navbar_items = sumo_pages.forum_thread_page.get_contributor_discussions_side_navbar_items()
@@ -511,7 +518,7 @@ def test_forum_post_side_navbar_redirects(page: Page, create_user_factory):
 
 # C3010846
 @pytest.mark.contributorDiscussionsThreads
-@pytest.mark.parametrize("user_type", [None, 'Simple User', 'Forum Moderator'])
+@pytest.mark.parametrize("user_type", [None, 'simple_user', 'moderator'])
 def test_forum_moderators_availability_inside_the_forum_post_page(page: Page, user_type,
                                                                   create_user_factory):
     sumo_pages = SumoPages(page)
@@ -529,13 +536,14 @@ def test_forum_moderators_availability_inside_the_forum_post_page(page: Page, us
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     utilities.delete_cookies()
 
-    if user_type in ['Simple User', None]:
-        account = test_user if user_type == 'Simple User' else None
+    if user_type in ['simple_user', None]:
+        account = test_user if user_type == 'simple_user' else None
         if account:
             utilities.start_existing_session(cookies=account)
         with check, allure.step("Verifying that the 'Forum Moderators' forum is not available "
@@ -552,7 +560,7 @@ def test_forum_moderators_availability_inside_the_forum_post_page(page: Page, us
 
 # C3016247
 @pytest.mark.contributorDiscussionsThreads
-@pytest.mark.parametrize("user_type", ['Simple User', 'Forum Moderator'])
+@pytest.mark.parametrize("user_type", ['simple_user', 'moderator'])
 def test_edit_own_forum_post(page: Page, user_type, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
@@ -560,7 +568,7 @@ def test_edit_own_forum_post(page: Page, user_type, create_user_factory):
     test_user_two = create_user_factory(groups=["forum-contributors", "Forum Moderators"])
 
     with allure.step("Signing in to SUMO"):
-        account = test_user if user_type == 'Simple User' else test_user_two
+        account = test_user if user_type == 'simple_user' else test_user_two
         utilities.start_existing_session(cookies=account)
 
     with allure.step("Creating a new forum thread"):
@@ -568,11 +576,15 @@ def test_edit_own_forum_post(page: Page, user_type, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         thread_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     with allure.step("Editing the own forum thread post"):
-        sumo_pages.contributor_thread_flow.edit_thread_post(thread_id, "Edited thread body")
+        sumo_pages.contributor_thread_flow.edit_thread_post(
+            thread_id,
+            "Edited thread body"
+        )
 
     with check, allure.step("Verifying that the edited post is displayed"):
         assert sumo_pages.forum_thread_page.is_thread_post_by_name_visible("Edited thread body")
@@ -598,7 +610,8 @@ def test_edit_forum_posts(page: Page, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         thread_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
         thread_url = utilities.get_page_url()
 
@@ -653,7 +666,8 @@ def test_delete_this_post(page: Page, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
         thread_url = utilities.get_page_url()
 
@@ -720,7 +734,8 @@ def test_delete_this_post_option_availability(page: Page, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         first_thread_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     with allure.step("Creating a new thread post"):
@@ -759,7 +774,8 @@ def test_quote_this_post(page: Page, create_user_factory):
             utilities.generate_random_number(1, 1000))
         thread_body = utilities.discussion_thread_data['thread_body']
         thread_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=thread_body
+            thread_title=thread_title,
+            thread_body=thread_body
         )
 
     with check, allure.step("Signing in with a different account and quoting the first post"):
@@ -798,7 +814,8 @@ def test_link_to_this_post_option(page: Page, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         thread_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     with check, allure.step("Signing in with a different user and clicking on the 'Link to this "
@@ -829,7 +846,8 @@ def test_private_message_option(page: Page, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         thread_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body']
         )
         thread_url = utilities.get_page_url()
 
@@ -839,19 +857,21 @@ def test_private_message_option(page: Page, create_user_factory):
 
         sumo_pages.forum_thread_page.click_on_private_message_option(thread_id)
         sumo_pages.messaging_system_flow.complete_send_message_form_with_data(
-            message_body=message, expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL
+            message_body=message,
+            expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL
         )
 
     with check, allure.step("Verifying that the sent message is displayed inside the sent "
                             "messages page"):
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
-        expect(sumo_pages.sent_message_page.sent_message_by_subject(message)).to_be_visible()
+        expect(sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message)
+               ).to_be_visible()
 
     with check, allure.step("Signing in with the receiver account and verifying that the message "
                             "is displayed inside the inbox section"):
         utilities.start_existing_session(cookies=test_user)
         sumo_pages.top_navbar.click_on_inbox_option()
-        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message)).to_be_visible()
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message)).to_be_visible()
 
     with check, allure.step("Navigating back to the thread, signing out and verifying that the "
                             "'Private message' option redirects the user to the auth page"):
diff --git a/playwright_tests/tests/contribute_tests/dashboards_tests/test_kb_dashboard.py b/playwright_tests/tests/contribute_tests/dashboards_tests/test_kb_dashboard.py
index 7824bb6cad4..132271e8f5f 100644
--- a/playwright_tests/tests/contribute_tests/dashboards_tests/test_kb_dashboard.py
+++ b/playwright_tests/tests/contribute_tests/dashboards_tests/test_kb_dashboard.py
@@ -23,7 +23,7 @@ def test_unreviewed_articles_visibility_in_kb_dashboard(page: Page, create_user_
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Create a new simple article"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page)
 
     with allure.step("Navigating to the kb dashboards and clicking on the 'Complete "
                      "overview' option"):
@@ -43,8 +43,11 @@ def test_unreviewed_articles_visibility_in_kb_dashboard(page: Page, create_user_
     with allure.step("Signing out and verifying that the article is not displayed since it "
                      "is not live yet"):
         utilities.delete_cookies()
-        expect(sumo_pages.kb_dashboard_page.article_title(
-                article_details['article_title'])).to_be_hidden()
+        expect(
+            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+                article_details['article_title']
+            )
+        ).to_be_hidden()
 
     with allure.step("Navigating to the homepage and performing the sign in step since the "
                      "kb overview takes quite a bit to refresh/load"):
@@ -55,8 +58,10 @@ def test_unreviewed_articles_visibility_in_kb_dashboard(page: Page, create_user_
                      "displayed since it is not live yet"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         expect(
-            sumo_pages.kb_dashboard_page.article_title(
-                article_details['article_title'])).to_be_hidden()
+            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+                article_details['article_title']
+            )
+        ).to_be_hidden()
 
     with allure.step("Signing in with a Knowledge Base Reviewer account"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
@@ -77,13 +82,16 @@ def test_unreviewed_articles_visibility_in_kb_dashboard(page: Page, create_user_
                             "correct live status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_a_particular_article_status(
-            article_details['article_title']).strip() == kb_dashboard_page_messages.KB_LIVE_STATUS
+            article_details['article_title']
+        ).strip() == kb_dashboard_page_messages.KB_LIVE_STATUS
 
     with allure.step("Signing out and verifying that the article is visible"):
         utilities.delete_cookies()
         expect(
-            sumo_pages.kb_dashboard_page.article_title(
-                article_details['article_title'])).to_be_visible()
+            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+                article_details['article_title']
+            )
+        ).to_be_visible()
 
     with allure.step("Signing in with a non-admin user"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
@@ -94,8 +102,10 @@ def test_unreviewed_articles_visibility_in_kb_dashboard(page: Page, create_user_
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['kb_overview'])
         expect(
-            sumo_pages.kb_dashboard_page.article_title(
-                article_details['article_title'])).to_be_visible()
+            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+                article_details['article_title']
+            )
+        ).to_be_visible()
 
 
 # C2266376
@@ -110,8 +120,8 @@ def test_kb_dashboard_articles_status(page: Page, create_user_factory):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new simple article"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page,approve_revision=True)
 
     with allure.step("Creating a new revision for the document"):
         second_revision = sumo_pages.submit_kb_article_flow.submit_new_kb_revision()
@@ -137,7 +147,8 @@ def test_kb_dashboard_articles_status(page: Page, create_user_factory):
                             "status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_a_particular_article_status(
-            article_details['article_title']).strip() == kb_dashboard_page_messages.KB_LIVE_STATUS
+            article_details['article_title']
+        ).strip() == kb_dashboard_page_messages.KB_LIVE_STATUS
 
 
 # C2496647
@@ -152,8 +163,8 @@ def test_kb_dashboard_revision_deferred_status(page: Page, create_user_factory):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new simple article"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page,approve_revision=True)
 
     article_show_history_url = utilities.get_page_url()
 
@@ -180,7 +191,8 @@ def test_kb_dashboard_revision_deferred_status(page: Page, create_user_factory):
                             "correct status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_a_particular_article_status(
-            article_details['article_title']) == kb_dashboard_page_messages.KB_LIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.KB_LIVE_STATUS
 
 
 # C2496646
@@ -194,8 +206,8 @@ def test_kb_dashboard_needs_update_when_reviewing_a_revision(page: Page, create_
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new simple article"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page,approve_revision=True)
 
     with allure.step("Creating an new article revision for the document"):
         second_revision = sumo_pages.submit_kb_article_flow.submit_new_kb_revision()
@@ -223,8 +235,8 @@ def test_kb_dashboard_needs_update_edit_metadata(page: Page, create_user_factory
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Create a new simple article"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
 
     with allure.step("Clicking on the 'Edit Article Metadata' option and enabling the 'Needs "
                      "change with comment' option"):
@@ -259,7 +271,9 @@ def test_kb_dashboard_needs_update_edit_metadata(page: Page, create_user_factory
     with check, allure.step("Navigating to the kb overview page and verifying that the "
                             "correct needs change status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
-        assert sumo_pages.kb_dashboard_page.is_needs_change_empty(article_details['article_title'])
+        assert sumo_pages.kb_dashboard_page.is_needs_change_empty(
+            article_details['article_title']
+        )
 
 
 # C2266378, C2489548
@@ -275,7 +289,7 @@ def test_ready_for_l10n_kb_dashboard_revision_approval(page: Page, create_user_f
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Create a new simple article"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
 
     revision_id = article_details['first_revision_id']
 
@@ -287,7 +301,8 @@ def test_ready_for_l10n_kb_dashboard_revision_approval(page: Page, create_user_f
                             "the correct l10n status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
 
 # C2266378
@@ -303,14 +318,15 @@ def test_ready_for_l10n_kb_dashboard_revision_l10n_status(page: Page, create_use
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
 
     with check, allure.step("Navigating to the kb dashboard overview page and verifying that "
                             "the correct l10n status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Navigating back to the article page and marking the revision as ready "
                      "for l10n"):
@@ -325,7 +341,8 @@ def test_ready_for_l10n_kb_dashboard_revision_l10n_status(page: Page, create_use
                      "correct l10n status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
 
 # C2875533
@@ -342,14 +359,15 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
 
     with allure.step("Creating a new kb article and approving the first revision without marking "
                      "it as ready for l10n"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=False)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=False)
 
     with check, allure.step("Verifying that the correct kb dashboard l10n status is displayed "
                             "(No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with check, allure.step("Approving the KB article without marking it as ready for l10n and "
                             "verifying that the correct l10N status is displayed inside the KB "
@@ -359,7 +377,8 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
             revision_id=article_details["first_revision_id"])
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new revision and approve it as minor significance"):
         utilities.navigate_to_link(article_details["article_url"])
@@ -370,7 +389,8 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "(No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new revision and approving it as normal significance and ready "
                      "for localization"):
@@ -383,7 +403,8 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "(Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
     with allure.step("Creating a new revision and approving it as normal significance and not "
                      "ready for localization"):
@@ -396,7 +417,8 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new minor revision and approving it"):
         utilities.navigate_to_link(article_details["article_url"])
@@ -408,7 +430,8 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new major revision and not marking it as ready for localization"):
         utilities.navigate_to_link(article_details["article_url"])
@@ -420,7 +443,8 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new minor revision and approving it"):
         utilities.navigate_to_link(article_details["article_url"])
@@ -432,7 +456,8 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new major revision and marking it as ready for localization"):
         utilities.navigate_to_link(article_details["article_url"])
@@ -444,7 +469,8 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "dashboard (Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
 
 # C2875537
@@ -461,8 +487,8 @@ def test_ready_for_l10n_status_update_via_history_page(page: Page, create_user_f
 
     with allure.step("Creating a new kb article and approving the first revision without marking "
                      "it as ready for l10n"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
 
     with allure.step("Creating a new revision and approving it as Normal significance and not"
                      "ready for localization"):
@@ -474,7 +500,8 @@ def test_ready_for_l10n_status_update_via_history_page(page: Page, create_user_f
                             "displayed inside the KB dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Marking the newly submitted revision as ready for localization via the"
                      " /history page"):
@@ -488,7 +515,8 @@ def test_ready_for_l10n_status_update_via_history_page(page: Page, create_user_f
                             "inside the KB dashboard (Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
     with check, allure.step("Creating a new minor revision"):
         utilities.navigate_to_link(article_details["article_show_history_url"])
@@ -500,7 +528,8 @@ def test_ready_for_l10n_status_update_via_history_page(page: Page, create_user_f
                             " inside the KB dashboard (Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
     with allure.step("Creating a new major significance revision"):
         utilities.navigate_to_link(article_details["article_show_history_url"])
@@ -512,7 +541,8 @@ def test_ready_for_l10n_status_update_via_history_page(page: Page, create_user_f
                             " inside the KB dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Marking the newly submitted revision as ready for localization via the"
                      " /history page"):
@@ -526,7 +556,8 @@ def test_ready_for_l10n_status_update_via_history_page(page: Page, create_user_f
                             " inside the KB dashboard (Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
 
 # C2875536
@@ -543,8 +574,8 @@ def test_deferring_revision_does_not_impact_l10n_kb_dashboard_status(page: Page,
 
     with allure.step("Creating a new kb article and approving the first revision without marking "
                      "it as ready for l10n"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
 
     with allure.step("Creating a new kb article revision and deferring it instead of approving"):
         second_revision = sumo_pages.submit_kb_article_flow.submit_new_kb_revision()
@@ -554,7 +585,8 @@ def test_deferring_revision_does_not_impact_l10n_kb_dashboard_status(page: Page,
                             " inside the KB dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new revision of normal significance and approving it by marking"
                      "it as ready for localization"):
@@ -567,7 +599,8 @@ def test_deferring_revision_does_not_impact_l10n_kb_dashboard_status(page: Page,
                             " inside the KB dashboard (Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
     with allure.step("Creating a new revision and deferring it instead of approving"):
         utilities.navigate_to_link(article_details["article_show_history_url"])
@@ -578,7 +611,8 @@ def test_deferring_revision_does_not_impact_l10n_kb_dashboard_status(page: Page,
                             " inside the KB dashboard (Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
 
 # C2266378
@@ -594,14 +628,16 @@ def test_article_translation_not_allowed_kb_dashboard(page: Page, create_user_fa
 
     with allure.step("Creating a new simple article & unchecking the allow translations"):
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            allow_translations=False, approve_first_revision=True
+            allow_translations=False,
+            approve_first_revision=True
         )
 
     with allure.step("Navigating to the kb dashboard overview page and verifying that the "
                      "correct l10n status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']
+        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
 
 # C2266379, C2266380
@@ -639,13 +675,16 @@ def test_article_stale_kb_dashboard(page: Page, create_user_factory):
                      "non-stale expiry date"):
         utilities.navigate_to_link(article_url)
         sumo_pages.submit_kb_article_flow.submit_new_kb_revision(
-            expiry_date=utilities.kb_article_test_data['expiry_date'], approve_revision=True
+            expiry_date=utilities.kb_article_test_data['expiry_date'],
+            approve_revision=True
         )
 
     with check, allure.step("Navigating to the kb dashboard and verifying that the correct "
                             "stale status and date is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
-        assert sumo_pages.kb_dashboard_page.is_stale_status_empty(article_details['article_title'])
+        assert sumo_pages.kb_dashboard_page.is_stale_status_empty(
+            article_details['article_title']
+        )
         assert sumo_pages.kb_dashboard_page.get_existing_expiry_date(
             article_details['article_title']
         ) == utilities.convert_string_to_datetime(utilities.kb_article_test_data['expiry_date'])
@@ -661,15 +700,17 @@ def test_article_title_update(page: Page, create_user_factory):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
 
     with allure.step("Navigating to the kb dashboard overview page and verifying that the "
                      "correct title is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         expect(
-            sumo_pages.kb_dashboard_page.article_title(
-                article_details['article_title'])).to_be_visible()
+            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+                article_details['article_title']
+            )
+        ).to_be_visible()
 
     with allure.step("Navigating to the article's 'Edit Metadata page' page and changing the "
                      "title"):
@@ -680,4 +721,6 @@ def test_article_title_update(page: Page, create_user_factory):
     with allure.step("Navigating back to the kb dashboard page and verifying that the "
                      "correct title is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
-        expect(sumo_pages.kb_dashboard_page.article_title(new_article_title)).to_be_visible()
+        expect(sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+            new_article_title)
+        ).to_be_visible()
diff --git a/playwright_tests/tests/contribute_tests/dashboards_tests/test_recent_revisions_dashboard.py b/playwright_tests/tests/contribute_tests/dashboards_tests/test_recent_revisions_dashboard.py
index fadd96bd8ea..1f5392ae30f 100644
--- a/playwright_tests/tests/contribute_tests/dashboards_tests/test_recent_revisions_dashboard.py
+++ b/playwright_tests/tests/contribute_tests/dashboards_tests/test_recent_revisions_dashboard.py
@@ -2,6 +2,7 @@
 import pytest
 from playwright.sync_api import Page, expect
 from pytest_check import check
+
 from playwright_tests.core.utilities import Utilities
 from playwright_tests.messages.explore_help_articles.kb_article_revision_page_messages import (
     KBArticleRevision,
@@ -27,7 +28,7 @@ def test_recent_revisions_revision_availability(page: Page, create_user_factory)
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
 
     with allure.step("Navigating to the recent revisions dashboard and verifying that the "
                      "posted article is displayed for admin accounts"):
@@ -35,22 +36,29 @@ def test_recent_revisions_revision_availability(page: Page, create_user_factory)
             utilities.general_test_data['dashboard_links']['recent_revisions']
         )
         expect(
-            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
-                article_details['article_title'])).to_be_visible()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
+                article_details['article_title']
+            )
+        ).to_be_visible()
 
     with allure.step("Deleting the user session and verifying that the revision is not "
                      "displayed for signed out users"):
         utilities.delete_cookies()
         expect(
-            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
-                article_details['article_title'])).to_be_hidden()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
+                article_details['article_title']
+            )
+        ).to_be_hidden()
 
     with allure.step("Typing the article creator username inside the 'Users' field and "
                      "verifying that the article is not displayed"):
         sumo_pages.recent_revisions_page.fill_in_users_field(test_user["username"])
+        utilities.wait_for_given_timeout(2000)
         expect(
-            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
-                article_details['article_title'])).to_be_hidden()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
+                article_details['article_title']
+            )
+        ).to_be_hidden()
 
     with allure.step("Clearing the user search field and signing in with a different "
                      "non-admin account"):
@@ -59,15 +67,20 @@ def test_recent_revisions_revision_availability(page: Page, create_user_factory)
 
     with allure.step("Verifying that the revision is not displayed for non-admin accounts"):
         expect(
-            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
-                article_details['article_title'])).to_be_hidden()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
+                article_details['article_title']
+            )
+        ).to_be_hidden()
 
     with allure.step("Typing the article creator username inside the 'Users' field and "
                      "verifying that the article is not displayed"):
         sumo_pages.recent_revisions_page.fill_in_users_field(test_user["username"])
+        utilities.wait_for_given_timeout(2000)
         expect(
-            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
-                article_details['article_title'])).to_be_hidden()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
+                article_details['article_title']
+            )
+        ).to_be_hidden()
 
     with allure.step("Clearing the user search field and signing in back with a Knowledge Base"
                      " Reviewer account"):
@@ -84,8 +97,10 @@ def test_recent_revisions_revision_availability(page: Page, create_user_factory)
             utilities.general_test_data['dashboard_links']['recent_revisions']
         )
         expect(
-            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
-                article_details['article_title'])).to_be_hidden()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
+                article_details['article_title']
+            )
+        ).to_be_hidden()
 
 
 # C2266240
@@ -102,8 +117,8 @@ def test_second_revisions_availability(page: Page, create_user_factory):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
 
     with allure.step("Signing in with simple user account"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -119,29 +134,37 @@ def test_second_revisions_availability(page: Page, create_user_factory):
             utilities.general_test_data['dashboard_links']['recent_revisions']
         )
         expect(
-            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
-                article_details['article_title'], username)).to_be_visible()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
+                article_details['article_title'], username
+            )
+        ).to_be_visible()
 
     with allure.step("Deleting user session and verifying that the recent revision is "
                      "displayed"):
         utilities.delete_cookies()
         expect(
-            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
-                article_details['article_title'], username)).to_be_visible()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
+                article_details['article_title'], username
+            )
+        ).to_be_visible()
 
     with allure.step("Signing in with a different non-admin user and verifying that the "
                      "revision is displayed"):
         utilities.start_existing_session(cookies=test_user_three)
         expect(
-            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
-                article_details['article_title'], username)).to_be_visible()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
+                article_details['article_title'], username
+            )
+        ).to_be_visible()
 
     with allure.step("Signing in with an admin account and verifying that the revision is "
                      "displayed"):
         utilities.start_existing_session(cookies=test_user)
         expect(
-            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
-                article_details['article_title'], username)).to_be_visible()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
+                article_details['article_title'], username
+            )
+        ).to_be_visible()
 
     with allure.step("Navigating to the article and approving the revision"):
         utilities.navigate_to_link(article_details["article_show_history_url"])
@@ -155,15 +178,19 @@ def test_second_revisions_availability(page: Page, create_user_factory):
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['recent_revisions'])
         expect(
-            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
-                article_details['article_title'], username)).to_be_visible()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
+                article_details['article_title'], username
+            )
+        ).to_be_visible()
 
     with allure.step("Signing in with a different non-admin user account and verifying that "
                      "the revision is visible"):
         utilities.start_existing_session(cookies=test_user_three)
         expect(
-            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
-                article_details['article_title'], username)).to_be_visible()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
+                article_details['article_title'], username
+            )
+        ).to_be_visible()
 
     with allure.step("Signing back in with an admin account an deleting the article"):
         utilities.start_existing_session(cookies=test_user)
@@ -176,19 +203,22 @@ def test_second_revisions_availability(page: Page, create_user_factory):
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['recent_revisions']
         )
-        sumo_pages.recent_revisions_page._wait_for_locator(
-            sumo_pages.recent_revisions_page.revisions_table)
+        utilities.wait_for_given_timeout(1000)
         utilities.delete_cookies()
         expect(
-            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
-                article_details['article_title'], username)).to_be_hidden()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
+                article_details['article_title'], username
+            )
+        ).to_be_hidden()
 
     with allure.step("Signing in with a different non-admin account and verifying that the "
                      "revision is no longer displayed for the deleted kb article"):
         utilities.start_existing_session(cookies=test_user_two)
         expect(
-            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
-                article_details['article_title'], username)).to_be_hidden()
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
+                article_details['article_title'], username
+            )
+        ).to_be_hidden()
 
 
 # C2266240
@@ -204,15 +234,15 @@ def test_recent_revisions_dashboard_links(page: Page, create_user_factory):
     first_username = sumo_pages.top_navbar.get_text_of_logged_in_username()
 
     with allure.step("Creating a new kb article"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
 
     with allure.step("Navigating to the recent revisions dashboard and verifying that the "
                      "'Show Diff' option is not available for first revisions"):
         sumo_pages.top_navbar.click_on_recent_revisions_option()
         utilities.wait_for_given_timeout(3000)
         expect(
-            sumo_pages.recent_revisions_page.show_diff(
+            sumo_pages.recent_revisions_page.get_show_diff_article_locator(
                 article_title=article_details['article_title'], creator=first_username
             )
         ).to_be_hidden()
@@ -228,6 +258,7 @@ def test_recent_revisions_dashboard_links(page: Page, create_user_factory):
                      "on the revision date link and verifying that the user is redirected to"
                      "the correct page"):
         sumo_pages.top_navbar.click_on_recent_revisions_option()
+        utilities.wait_for_given_timeout(3000)
         utilities.delete_cookies()
         sumo_pages.recent_revisions_page.click_on_revision_date_for_article(
             article_title=article_details['article_title'], username=username
@@ -271,7 +302,7 @@ def test_recent_revisions_dashboard_links(page: Page, create_user_factory):
         sumo_pages.recent_revisions_page.click_on_show_diff_for_article(
             article_title=article_details['article_title'], creator=username
         )
-        expect(sumo_pages.recent_revisions_page.revision_diff_section).to_be_visible()
+        expect(sumo_pages.recent_revisions_page.get_diff_section_locator()).to_be_visible()
 
 
 # C2266240, C2243449
@@ -285,8 +316,8 @@ def test_recent_revisions_dashboard_title_and_username_update(page: Page, create
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
 
     with allure.step("Changing the article title via the 'Edit Article Metadata' page"):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(
@@ -305,11 +336,12 @@ def test_recent_revisions_dashboard_title_and_username_update(page: Page, create
     with allure.step("Navigating to the recent revisions dashboard and verifying that the "
                      "correct new username and article title arte displayed"):
         sumo_pages.top_navbar.click_on_recent_revisions_option()
+        utilities.wait_for_given_timeout(3000)
         expect(
-            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
+            sumo_pages.recent_revisions_page.get_revision_and_username_locator(
                 article_title=(utilities.kb_article_test_data
                                ['updated_kb_article_title'] + article_details['article_title']),
-                user=new_username
+                username=new_username
             )
         ).to_be_visible()
 
@@ -320,6 +352,7 @@ def test_recent_revisions_dashboard_title_and_username_update(page: Page, create
             expected_url=MyProfileMessages.get_my_profile_stage_url(test_user["username"])
         )
 
+
 # C2266241
 @pytest.mark.recentRevisionsDashboard
 def test_recent_revisions_dashboard_filters(page: Page):
@@ -332,11 +365,11 @@ def test_recent_revisions_dashboard_filters(page: Page):
             utilities.general_test_data['dashboard_links']['recent_revisions']
         )
 
-    sumo_pages.recent_revisions_page._wait_for_locator(
-        sumo_pages.recent_revisions_page.revisions_table)
+    utilities.wait_for_given_timeout(3000)
     with check, allure.step("Selecting the ro locale from the locale filter and verifying "
                             "that all the displayed revisions are for the 'ro' locale"):
         sumo_pages.recent_revisions_page.select_locale_option("ro")
+        utilities.wait_for_given_timeout(5000)
         for tag in sumo_pages.recent_revisions_page.get_list_of_all_locale_tage():
             assert tag == "ro"
 
@@ -344,11 +377,13 @@ def test_recent_revisions_dashboard_filters(page: Page):
                             "'Users' filter and verifying that all the displayed revisions are "
                             "for the posted user"):
         sumo_pages.recent_revisions_page.select_locale_option("en-US")
+        utilities.wait_for_given_timeout(5000)
         display_name_one = "Smith"
         display_name_two = "Ryan Johnson"
         username_one = "sellis1"
         username_two = "ryanjohnson"
         sumo_pages.recent_revisions_page.fill_in_users_field(display_name_one)
+        utilities.wait_for_given_timeout(5000)
         for user in sumo_pages.recent_revisions_page.get_list_of_all_editors():
             assert user == display_name_one
 
@@ -356,20 +391,24 @@ def test_recent_revisions_dashboard_filters(page: Page):
                             "content is returned"):
         sumo_pages.recent_revisions_page.fill_in_users_field(f"{display_name_one}, "
                                                              f"{display_name_two}")
+        utilities.wait_for_given_timeout(5000)
         for user in sumo_pages.recent_revisions_page.get_list_of_all_editors():
             assert user in [display_name_one, display_name_two]
 
     with check, allure.step("Clearing the username filter and adding both usernames inside the "
                             "filter and verifying that the correct content is displayed"):
         sumo_pages.recent_revisions_page.fill_in_users_field(f"{username_one}, {username_two}")
+        utilities.wait_for_given_timeout(5000)
         for user in sumo_pages.recent_revisions_page.get_list_of_all_editors():
             assert user in [display_name_one, display_name_two]
 
     with allure.step("Clearing the user filter, adding data inside the start and end fields"):
         sumo_pages.recent_revisions_page.clearing_the_user_field()
+        utilities.wait_for_given_timeout(5000)
 
         sumo_pages.recent_revisions_page.add_start_date("04052023")
         sumo_pages.recent_revisions_page.add_end_date("05012023")
+        utilities.wait_for_given_timeout(5000)
     with check, allure.step("Verifying that the displayed revision dates are between ("
                             "inclusive) the set start and end date filters"):
         extracted_date = []
diff --git a/playwright_tests/tests/contribute_tests/test_groups.py b/playwright_tests/tests/contribute_tests/test_groups.py
index 50003383ac9..5c5703170d6 100644
--- a/playwright_tests/tests/contribute_tests/test_groups.py
+++ b/playwright_tests/tests/contribute_tests/test_groups.py
@@ -123,7 +123,7 @@ def test_change_group_avatar(page: Page, create_user_factory):
     with allure.step("Signing in with a group leader and accessing the test group"):
         utilities.start_existing_session(cookies=test_user)
         group_url = utilities.get_page_url()
-        utilities.screenshot_the_locator(sumo_pages.user_groups.group_avatar_image,
+        utilities.screenshot_the_locator(sumo_pages.user_groups.get_group_avatar_locator(),
                                          displayed_image)
 
     with allure.step("Clicking on the 'Change' avatar button, uploading the image and clicking on"
@@ -146,7 +146,7 @@ def test_change_group_avatar(page: Page, create_user_factory):
 
     with check, allure.step("Verifying that the uploaded image is successfully displayed inside "
                             "the group"):
-        utilities.screenshot_the_locator(sumo_pages.user_groups.group_avatar_image,
+        utilities.screenshot_the_locator(sumo_pages.user_groups.get_group_avatar_locator(),
                                          displayed_image)
         assert not utilities.are_images_different(displayed_image, first_uploaded_image)
 
@@ -154,9 +154,11 @@ def test_change_group_avatar(page: Page, create_user_factory):
                             "uploaded image is successfully displayed inside the image preview"):
         sumo_pages.user_groups.click_on_change_uploaded_avatar_button()
         utilities.screenshot_the_locator(
-            sumo_pages.user_groups.upload_avatar_image_preview, displayed_image
+            sumo_pages.user_groups.get_change_avatar_image_preview_locator(),
+            displayed_image
         )
-        assert not utilities.are_images_different(displayed_image, first_uploaded_image)
+        assert not utilities.are_images_different(displayed_image,
+                                                  first_uploaded_image)
 
     with check, allure.step("Verifying that the correct page header is displayed"):
         assert (sumo_pages.user_groups.get_upload_avatar_page_header() == UserGroupMessages.
@@ -176,7 +178,7 @@ def test_change_group_avatar(page: Page, create_user_factory):
                               second_uploaded_image)
         sumo_pages.user_groups.click_on_upload_avatar_button(expected_url=group_url)
 
-        utilities.screenshot_the_locator(sumo_pages.user_groups.group_avatar_image,
+        utilities.screenshot_the_locator(sumo_pages.user_groups.get_group_avatar_locator(),
                                          displayed_image)
         assert not utilities.are_images_different(displayed_image, second_uploaded_image)
 
@@ -190,13 +192,13 @@ def test_change_group_avatar(page: Page, create_user_factory):
                 DELETE_AVATAR_PAGE_INFO)
 
         utilities.screenshot_the_locator(
-            sumo_pages.user_groups.delete_uploaded_avatar_image_preview, displayed_image)
+            sumo_pages.user_groups.get_delete_avatar_image_preview_locator(), displayed_image)
         assert not utilities.are_images_different(displayed_image, second_uploaded_image)
 
     with allure.step("Clicking on the 'Cancel' button and verifying that the image was not "
                      "deleted"):
         sumo_pages.user_groups.click_on_cancel_delete_avatar_button()
-        utilities.screenshot_the_locator(sumo_pages.user_groups.group_avatar_image,
+        utilities.screenshot_the_locator(sumo_pages.user_groups.get_group_avatar_locator(),
                                          displayed_image)
         assert not utilities.are_images_different(displayed_image, second_uploaded_image)
 
@@ -204,7 +206,7 @@ def test_change_group_avatar(page: Page, create_user_factory):
                      "verifying that the image was deleted"):
         sumo_pages.user_groups.click_on_delete_uploaded_avatar_button()
         sumo_pages.user_groups.click_on_delete_avatar_button()
-        utilities.screenshot_the_locator(sumo_pages.user_groups.group_avatar_image,
+        utilities.screenshot_the_locator(sumo_pages.user_groups.get_group_avatar_locator(),
                                          displayed_image)
         assert utilities.are_images_different(displayed_image, second_uploaded_image)
 
diff --git a/playwright_tests/tests/explore_help_articles_tests/articles/test_article_show_history.py b/playwright_tests/tests/explore_help_articles_tests/articles/test_article_show_history.py
index 4f295898976..425e5650ab4 100644
--- a/playwright_tests/tests/explore_help_articles_tests/articles/test_article_show_history.py
+++ b/playwright_tests/tests/explore_help_articles_tests/articles/test_article_show_history.py
@@ -32,7 +32,7 @@ def test_kb_article_removal(page: Page, create_user_factory):
 
     utilities.start_existing_session(cookies=test_user)
 
-    article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
+    article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
     revision_id_number = utilities.number_extraction_from_string(
         article_details['first_revision_id']
     )
@@ -41,7 +41,8 @@ def test_kb_article_removal(page: Page, create_user_factory):
                      "revision"):
         expect(
             sumo_pages.kb_article_show_history_page.delete_revision(
-                article_details['first_revision_id'])
+                article_details['first_revision_id']
+            )
         ).to_be_hidden()
 
     with allure.step("Verifying that manually navigating to the delete revision endpoint returns "
@@ -57,8 +58,7 @@ def test_kb_article_removal(page: Page, create_user_factory):
     with allure.step("Navigating back and verifying that the delete button for the article "
                      "is not displayed"):
         utilities.navigate_to_link(article_details["article_show_history_url"])
-        expect(sumo_pages.kb_article_show_history_page.delete_this_document_button
-        ).to_be_hidden()
+        expect(sumo_pages.kb_article_show_history_page.delete_this_document_button).to_be_hidden()
 
     with allure.step("Verifying that manually navigating to the delete endpoint returns 403"):
         with page.expect_navigation() as navigation_info:
@@ -217,7 +217,7 @@ def test_kb_article_contributor_removal(page: Page, create_user_factory):
     test_user_two = create_user_factory(permissions=["add_revision"])
 
     utilities.start_existing_session(cookies=test_user)
-    article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
+    article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
 
     with allure.step("Verifying that no users are added inside the contributors list"):
         expect(sumo_pages.kb_article_show_history_page.all_contributors_list_items).to_be_hidden()
@@ -390,7 +390,7 @@ def test_contributors_can_be_manually_added(page: Page, create_user_factory):
 
     with allure.step("Clicking on the 'Edit Contributors' option, adding and selecting the "
                      "username from the search field"):
-        sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
+        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
         sumo_pages.kb_article_show_history_page.click_on_edit_contributors_option()
         (sumo_pages.kb_article_show_history_page
          .add_a_new_contributor_inside_the_contributor_field(test_user_two["username"]))
@@ -427,7 +427,7 @@ def test_kb_article_contributor_profile_access(page: Page, create_user_factory):
 
     utilities.start_existing_session(cookies=test_user)
 
-    sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
+    sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page, approve_revision=True)
     sumo_pages.kb_article_page.click_on_article_option()
     article_url = utilities.get_page_url()
 
@@ -512,8 +512,8 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
     with allure.step(f"Signing in with {test_user['username']} account and creating a new "
                      f"article and approving it's first revision"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
 
     with allure.step(f"Signing in with {test_user_two['username']} user account"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -543,23 +543,25 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
 
     with allure.step("Verifying that the revision information content is expanded by default"):
         expect(
-            sumo_pages.kb_article_preview_revision_page.revision_information_content
-        ).to_be_visible()
+            sumo_pages.kb_article_preview_revision_page.get_revision_information_content_locator(
+            )).to_be_visible()
 
     with allure.step("Clicking on the 'Revision Information' foldout section and Verifying "
                      "that the revision information content is collapsed/no longer displayed"):
-        sumo_pages.kb_article_preview_revision_page.click_on_revision_information_foldout_section()
+        (sumo_pages.kb_article_preview_revision_page
+         .click_on_revision_information_foldout_section())
         expect(
-            sumo_pages.kb_article_preview_revision_page.revision_information_content
-            ).to_be_hidden()
+            sumo_pages.kb_article_preview_revision_page.get_revision_information_content_locator(
+            )).to_be_hidden()
 
     with allure.step("Clicking on the 'Revision Information' foldout section"):
-        sumo_pages.kb_article_preview_revision_page.click_on_revision_information_foldout_section()
+        (sumo_pages.kb_article_preview_revision_page
+         .click_on_revision_information_foldout_section())
 
     with allure.step("Verifying that the revision information content is displayed"):
         expect(
-            sumo_pages.kb_article_preview_revision_page.revision_information_content
-            ).to_be_visible()
+            sumo_pages.kb_article_preview_revision_page.get_revision_information_content_locator(
+            )).to_be_visible()
 
     with allure.step("Verifying that the revision id is the correct one"):
         assert (sumo_pages.kb_article_preview_revision_page.
@@ -593,13 +595,18 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
                 KB_ARTICLE_REVISION_NO_STATUS)
 
     with allure.step("Verifying that the reviewed by locator is hidden"):
-        expect(sumo_pages.kb_article_preview_revision_page.reviewed_by).to_be_hidden()
+        expect(
+            sumo_pages.kb_article_preview_revision_page.get_reviewed_by_locator()).to_be_hidden()
 
     with allure.step("Verifying that the is approved locator is hidden"):
-        expect(sumo_pages.kb_article_preview_revision_page.is_approved).to_be_hidden()
+        expect(
+            sumo_pages.kb_article_preview_revision_page.get_is_approved_text_locator()
+        ).to_be_hidden()
 
     with allure.step("Verifying that the is current revision locator is hidden"):
-        expect(sumo_pages.kb_article_preview_revision_page.is_current_revision).to_be_hidden()
+        expect(
+            sumo_pages.kb_article_preview_revision_page.is_current_revision_locator()
+        ).to_be_hidden()
 
     with allure.step("Verifying that the correct ready for localization locator is displayed"):
         assert (sumo_pages.kb_article_preview_revision_page.
@@ -607,16 +614,18 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
                 KB_ARTICLE_REVISION_NO_STATUS)
 
     with allure.step("Verifying that the readied for localization by is hidden"):
-        expect(sumo_pages.kb_article_preview_revision_page.readied_for_localization_by
-        ).to_be_hidden()
+        expect(sumo_pages.kb_article_preview_revision_page.readied_for_localization_by_locator(
+        )).to_be_hidden()
 
     with allure.step("Verifying that the 'Edit article based on this revision' is not "
                      "displayed"):
-        expect(sumo_pages.kb_article_preview_revision_page.edit_article_based_on_revision_link
-               ).to_be_hidden()
+        expect(
+            (sumo_pages.kb_article_preview_revision_page
+             .get_edit_article_based_on_this_revision_link_locator())).to_be_hidden()
 
     with allure.step("Verifying that the 'Revision Source' section is hidden by default"):
-        expect(sumo_pages.kb_article_preview_revision_page.revision_source_textarea).to_be_hidden()
+        expect((sumo_pages.kb_article_preview_revision_page
+                .get_preview_revision_source_textarea_locator())).to_be_hidden()
 
     with allure.step("Clicking on the 'Revision Source' foldout section option and verifying that "
                      "the 'Revision Source' textarea contains the correct details"):
@@ -626,14 +635,14 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
                 kb_article_test_data['updated_article_content'])
 
     with allure.step("Verifying that the 'Revision Content' section is hidden by default"):
-        expect(sumo_pages.kb_article_preview_revision_page.revision_content_html_section
-               ).to_be_hidden()
+        expect(sumo_pages.kb_article_preview_revision_page.get_revision_content_html_locator(
+        )).to_be_hidden()
 
     with allure.step("Clicking on the 'Revision Content' foldout option and verifying that "
                      "the 'Revision Content' section is visible"):
         sumo_pages.kb_article_preview_revision_page.click_on_revision_content_foldout_section()
-        expect(sumo_pages.kb_article_preview_revision_page.revision_content_html_section
-        ).to_be_visible()
+        expect(sumo_pages.kb_article_preview_revision_page.get_revision_content_html_locator(
+        )).to_be_visible()
 
     with allure.step(f"Signing in with {test_user['username']} user account and approving the "
                      f"revision"):
@@ -654,7 +663,8 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
                 KB_ARTICLE_REVISION_YES_STATUS)
 
     with allure.step("Verifying that the reviewed by date is displayed"):
-        expect(sumo_pages.kb_article_preview_revision_page.reviewed_time).to_be_visible()
+        expect((sumo_pages.kb_article_preview_revision_page
+                .get_preview_revision_reviewed_date_locator())).to_be_visible()
 
     with allure.step("Verifying that the correct 'Reviewed by' text is displayed"):
         assert (sumo_pages.kb_article_preview_revision_page.
@@ -675,7 +685,7 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
 
     with allure.step("Verifying that the 'Readied for localization' date is displayed"):
         expect(
-            sumo_pages.kb_article_preview_revision_page.readied_for_localization_date
+            sumo_pages.kb_article_preview_revision_page.ready_for_localization_date()
         ).to_be_visible()
 
     with allure.step("Verifying that the correct localization by text is displayed"):
diff --git a/playwright_tests/tests/explore_help_articles_tests/articles/test_article_threads.py b/playwright_tests/tests/explore_help_articles_tests/articles/test_article_threads.py
index 3c102db6d9f..c859ff5ef75 100644
--- a/playwright_tests/tests/explore_help_articles_tests/articles/test_article_threads.py
+++ b/playwright_tests/tests/explore_help_articles_tests/articles/test_article_threads.py
@@ -17,8 +17,8 @@ def test_article_thread_field_validation(page: Page, create_user_factory):
     with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
 
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
         sumo_pages.kb_article_page.click_on_editing_tools_discussion_option()
 
@@ -86,7 +86,7 @@ def test_article_thread_field_validation(page: Page, create_user_factory):
             utilities.kb_new_thread_test_data['new_thread_reduced_title']
         )
         sumo_pages.kb_article_discussion_page.click_on_cancel_new_thread_button()
-        expect(sumo_pages.kb_article_discussion_page.thread_by_title(
+        expect(sumo_pages.kb_article_discussion_page.get_thread_by_title_locator(
             utilities.kb_new_thread_test_data['new_thread_reduced_title']
         )
         ).to_be_hidden()
@@ -111,7 +111,7 @@ def test_article_thread_field_validation(page: Page, create_user_factory):
         )
         utilities.navigate_to_link(
             article_details["article_url"] + KBArticlePageMessages.KB_ARTICLE_DISCUSSIONS_ENDPOINT)
-        expect(sumo_pages.kb_article_discussion_page.posted_thread(thread_id)
+        expect(sumo_pages.kb_article_discussion_page.get_posted_thread_locator(thread_id)
                ).to_be_visible()
 
 
@@ -125,8 +125,8 @@ def test_thread_replies_counter_increment(page: Page, create_user_factory):
     with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
 
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
 
     with allure.step("Manually navigating to the article endpoint and clicking on the "
                      "article option"):
@@ -174,8 +174,8 @@ def test_thread_replies_counter_decrement(page: Page, create_user_factory):
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
         utilities.navigate_to_link(article_details["article_url"])
 
     with allure.step("Clicking on the 'Post a new thread button' and posting a new kb "
@@ -223,17 +223,18 @@ def test_thread_replies_counter_decrement(page: Page, create_user_factory):
 
 
 @pytest.mark.articleThreads
-@pytest.mark.parametrize("user_type", ['Simple User', 'Forum Moderator', ''])
+@pytest.mark.parametrize("user_type", ['Simple user', 'Forum Moderator', ''])
 def test_article_thread_author_filter(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-    test_user = create_user_factory(groups=["Forum Moderators"], permissions=["review_revision"])
+    test_user = create_user_factory(groups=["Forum Moderators"],
+                                    permissions=["review_revision"])
     test_user_two = create_user_factory()
 
     with allure.step(f"Signing in with with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
         utilities.navigate_to_link(article_details["article_url"])
 
     with allure.step("Posting a new kb article discussion thread"):
@@ -253,7 +254,7 @@ def test_article_thread_author_filter(page: Page, user_type, create_user_factory
     if user_type == 'Forum Moderator':
         with allure.step(f"Signing in with the {test_user['username']} user account"):
             utilities.start_existing_session(cookies=test_user)
-    elif user_type != 'Simple User':
+    elif user_type != 'Simple user':
         with allure.step("Signing out from SUMO"):
             utilities.delete_cookies()
 
@@ -271,17 +272,18 @@ def test_article_thread_author_filter(page: Page, user_type, create_user_factory
 
 
 @pytest.mark.articleThreads
-@pytest.mark.parametrize("user_type", ['Simple User', 'Forum Moderator', ''])
+@pytest.mark.parametrize("user_type", ['Simple user', 'Forum Moderator', ''])
 def test_article_thread_replies_filter(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-    test_user = create_user_factory(groups=["Forum Moderators"], permissions=["review_revision"])
+    test_user = create_user_factory(groups=["Forum Moderators"],
+                                    permissions=["review_revision"])
     test_user_two = create_user_factory()
 
     with allure.step(f"Signing in with the {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
         utilities.navigate_to_link(article_details["article_url"])
 
     with allure.step("Clicking on the 'Post a new thread button' and posting a new kb "
@@ -300,7 +302,7 @@ def test_article_thread_replies_filter(page: Page, user_type, create_user_factor
     with allure.step("Navigating back to the article discussion page"):
         utilities.navigate_to_link(thread_info['article_discussion_url'])
 
-    if user_type == "Simple User":
+    if user_type == "Simple user":
         with allure.step(f"Signing in with the {test_user_two['username']} account"):
             utilities.start_existing_session(cookies=test_user_two)
     elif user_type == '':
@@ -330,7 +332,7 @@ def test_article_lock_thread_non_admin_users(page: Page, create_user_factory):
     with allure.step(f"Signing in with {test_user['username']} user account and creating a new"
                      f" article"):
         utilities.start_existing_session(cookies=test_user)
-    article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
+    article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
 
     with allure.step(f"Signing in with the {test_user_two['username']} user account and approving"
                      f" the article"):
@@ -357,7 +359,8 @@ def test_article_lock_thread_non_admin_users(page: Page, create_user_factory):
         utilities.navigate_to_link(thread_info_one["article_discussion_url"])
         sumo_pages.kb_article_discussion_page.click_on_a_particular_thread(
             thread_info_one['thread_id'])
-        expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator()
+               ).to_be_hidden()
 
     with allure.step("Navigating back to the article discussions page, clicking on the "
                      "thread posted by self and verifying that the 'Lock thread' option is "
@@ -365,26 +368,30 @@ def test_article_lock_thread_non_admin_users(page: Page, create_user_factory):
         utilities.navigate_to_link(thread_info_one["article_discussion_url"])
         sumo_pages.kb_article_discussion_page.click_on_a_particular_thread(
             thread_info_two['thread_id'])
-        expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator()
+               ).to_be_hidden()
 
     with allure.step("Deleting user sessions and verifying that the 'Lock thread' options is "
                      "not available"):
         utilities.delete_cookies()
-        expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator()
+               ).to_be_hidden()
 
 
 #  C2260810
 @pytest.mark.articleThreads
-@pytest.mark.parametrize("user_type", ['Forum Moderator', 'Simple User', ''])
+@pytest.mark.parametrize("user_type", ['Forum Moderator', 'Simple user', ''])
 def test_article_lock_thread_functionality(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-    test_user = create_user_factory(groups=["Forum Moderators"], permissions=["review_revision"])
+    test_user = create_user_factory(groups=["Forum Moderators"],
+                                    permissions=["review_revision"])
     test_user_two = create_user_factory()
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
-        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
+        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page,
+                                                                      approve_revision=True)
 
     with allure.step("Posting a new kb article discussion thread"):
         thread_info_one = sumo_pages.kb_article_thread_flow.add_new_kb_discussion_thread()
@@ -408,7 +415,7 @@ def test_article_lock_thread_functionality(page: Page, user_type, create_user_fa
             thread_info_one['thread_id'])
         sumo_pages.kb_article_discussion_page.click_on_lock_this_article_thread_option()
 
-    if user_type == 'Simple User':
+    if user_type == 'Simple user':
         with allure.step("Signing in with a non-admin account and verifying that the correct"
                          " thread locked message is displayed"):
             utilities.start_existing_session(cookies=test_user_two)
@@ -420,11 +427,11 @@ def test_article_lock_thread_functionality(page: Page, user_type, create_user_fa
             utilities.delete_cookies()
 
     with allure.step("Verifying that the 'Post a reply' textarea field is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.thread_post_a_reply_textarea_field
+        expect(sumo_pages.kb_article_discussion_page.get_thread_post_a_reply_textarea_field()
                ).to_be_hidden()
 
     with allure.step("Verifying that the 'Locked' status is displayed under article header"):
-        expect(sumo_pages.kb_article_discussion_page.article_thread_locked_status).to_be_visible()
+        expect(sumo_pages.kb_article_discussion_page.get_locked_article_status()).to_be_visible()
 
     with allure.step("Navigating back to the discussions page"):
         utilities.navigate_to_link(thread_info_one["article_discussion_url"])
@@ -439,7 +446,7 @@ def test_article_lock_thread_functionality(page: Page, user_type, create_user_fa
             thread_info_two['thread_id'])
         sumo_pages.kb_article_discussion_page.click_on_lock_this_article_thread_option()
 
-    if user_type == 'Simple User':
+    if user_type == 'Simple user':
         with allure.step("Signing in with a non-admin account and verifying that the correct"
                          " thread locked message is displayed"):
             utilities.start_existing_session(cookies=test_user_two)
@@ -450,27 +457,29 @@ def test_article_lock_thread_functionality(page: Page, user_type, create_user_fa
             utilities.delete_cookies()
 
     with allure.step("Verifying that the 'Locked' status is displayed under article header"):
-        expect(sumo_pages.kb_article_discussion_page.article_thread_locked_status).to_be_visible()
+        expect(sumo_pages.kb_article_discussion_page.get_locked_article_status()).to_be_visible()
 
     with allure.step("Verifying that the 'Post a reply' textarea field is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.thread_post_a_reply_textarea_field
+        expect(sumo_pages.kb_article_discussion_page.get_thread_post_a_reply_textarea_field()
                ).to_be_hidden()
 
 
 # C2260810
 @pytest.mark.articleThreads
-@pytest.mark.parametrize("user_type", ['Forum Moderator', 'Simple User', ''])
+@pytest.mark.parametrize("user_type", ['Forum Moderator', 'Simple user', ''])
 def test_article_unlock_thread_functionality(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-    test_user = create_user_factory(groups=["Forum Moderators"], permissions=["review_revision"])
+    test_user = create_user_factory(groups=["Forum Moderators"],
+                                    permissions=["review_revision"])
     test_user_two = create_user_factory()
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Navigating to the article endpoint"):
-        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
+        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page,
+                                                                      approve_revision=True)
 
     with allure.step("Posting a new kb article discussion thread"):
         thread_info_one = sumo_pages.kb_article_thread_flow.add_new_kb_discussion_thread()
@@ -503,16 +512,18 @@ def test_article_unlock_thread_functionality(page: Page, user_type, create_user_
         assert (sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_option_text(
         ) == KBArticlePageMessages.KB_ARTICLE_UNLOCK_THIS_THREAD_OPTION)
 
-    if user_type == 'Simple User':
+    if user_type == 'Simple user':
         with allure.step(f"Signing in with {test_user_two['username']} user account and verifying"
                          f" that the 'Unlock this thread' option is not displayed"):
             utilities.start_existing_session(cookies=test_user_two)
-            expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator(
+            )).to_be_hidden()
     if user_type == '':
         with allure.step("Deleting user session and verifying that the 'Unlock this thread' "
                          "option is no displayed"):
             utilities.delete_cookies()
-            expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator(
+            )).to_be_hidden()
 
     if user_type != 'Forum Moderator':
         with allure.step(f"Signing in with {test_user['username']} user account"):
@@ -521,24 +532,25 @@ def test_article_unlock_thread_functionality(page: Page, user_type, create_user_
     with allure.step("Clicking on the 'Unlock this thread'"):
         sumo_pages.kb_article_discussion_page.click_on_lock_this_article_thread_option()
 
-    if user_type == 'Simple User':
+    if user_type == 'Simple user':
         with allure.step(f"Signing in with {test_user_two['username']} user account and verifying"
                          f" that the textarea field is available"):
             utilities.start_existing_session(cookies=test_user_two)
-            expect(sumo_pages.kb_article_discussion_page.thread_post_a_reply_textarea_field
-            ).to_be_visible()
+            expect(sumo_pages.kb_article_discussion_page.get_thread_post_a_reply_textarea_field(
+            )).to_be_visible()
     if user_type == '':
         with allure.step("Deleting user session and verifying that the textarea field is not "
                          "available"):
             utilities.delete_cookies()
-            expect(sumo_pages.kb_article_discussion_page.thread_post_a_reply_textarea_field
-            ).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.get_thread_post_a_reply_textarea_field(
+            )).to_be_hidden()
 
     with allure.step("Verifying that the 'Locked' header text is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.article_thread_locked_status).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.get_locked_article_status()).to_be_hidden()
 
     with allure.step("Verifying that the 'Thread locked' page message is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.article_thread_locked_message).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.get_text_of_locked_article_thread_locator(
+        )).to_be_hidden()
 
     if user_type != "Forum Moderator":
         with allure.step("Signing in with an admin account"):
@@ -560,16 +572,18 @@ def test_article_unlock_thread_functionality(page: Page, user_type, create_user_
         assert (sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_option_text(
         ) == KBArticlePageMessages.KB_ARTICLE_UNLOCK_THIS_THREAD_OPTION)
 
-    if user_type == 'Simple User':
+    if user_type == 'Simple user':
         with allure.step(f"Signing in with {test_user_two['username']} user account and verifying"
                          f" that the 'Unlock this thread' option is displayed"):
             utilities.start_existing_session(cookies=test_user_two)
-            expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator(
+            )).to_be_hidden()
     if user_type == '':
         with allure.step("Deleting the user session and verifying that the 'Unlock this "
                          "thread' option is not displayed"):
             utilities.delete_cookies()
-            expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator(
+            )).to_be_hidden()
 
     if user_type != 'Forum Moderator':
         with allure.step(f"Signing in with {test_user['username']} user account and clicking on"
@@ -577,33 +591,35 @@ def test_article_unlock_thread_functionality(page: Page, user_type, create_user_
             utilities.start_existing_session(cookies=test_user)
     sumo_pages.kb_article_discussion_page.click_on_lock_this_article_thread_option()
 
-    if user_type == 'Simple User':
+    if user_type == 'Simple user':
         with allure.step(f"Signing in with {test_user_two['username']} user account and verifying"
                          f" that the textarea field is available"):
             utilities.start_existing_session(cookies=test_user_two)
-            expect(sumo_pages.kb_article_discussion_page.thread_post_a_reply_textarea_field
-            ).to_be_visible()
+            expect(sumo_pages.kb_article_discussion_page.get_thread_post_a_reply_textarea_field(
+            )).to_be_visible()
     if user_type == '':
         with allure.step("Deleting user session and verifying that the textarea field is not "
                          "available"):
             utilities.delete_cookies()
-            expect(sumo_pages.kb_article_discussion_page.thread_post_a_reply_textarea_field
-            ).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.get_thread_post_a_reply_textarea_field(
+            )).to_be_hidden()
 
     with allure.step("Verifying that the 'Locked' header text is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.article_thread_locked_status).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.get_locked_article_status()).to_be_hidden()
 
     with allure.step("Verifying that the 'Thread locked' page message is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.article_thread_locked_message).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.get_text_of_locked_article_thread_locator(
+        )).to_be_hidden()
 
 
 # C2260811
 @pytest.mark.articleThreads
-@pytest.mark.parametrize("user_type", ['Forum Moderator', 'Simple User', ''])
+@pytest.mark.parametrize("user_type", ['Forum Moderator', 'Simple user', ''])
 def test_article_thread_sticky(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-    test_user = create_user_factory(groups=["Forum Moderators"], permissions=["review_revision"])
+    test_user = create_user_factory(groups=["Forum Moderators"],
+                                    permissions=["review_revision"])
     test_user_two = create_user_factory()
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
@@ -627,7 +643,8 @@ def test_article_thread_sticky(page: Page, user_type, create_user_factory):
         )
 
     with allure.step("Verifying that the 'Sticky this thread' option is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.sticky_this_thread).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.get_sticky_this_thread_locator()
+               ).to_be_hidden()
 
     with allure.step("Navigating back to the discussions page"):
         utilities.navigate_to_link(thread_info_one['article_discussion_url'])
@@ -645,22 +662,25 @@ def test_article_thread_sticky(page: Page, user_type, create_user_factory):
         assert (sumo_pages.kb_article_discussion_page.get_text_of_sticky_this_thread_option(
         ) == KBArticlePageMessages.KB_ARTICLE_UNSTICKY_OPTION)
 
-    if user_type == 'Simple User':
+    if user_type == 'Simple user':
         with allure.step(f"Signing in with {test_user_two['username']} user account and "
                          f"verifying that the unsticky this thread option is not available"):
             utilities.start_existing_session(cookies=test_user_two)
-            expect(sumo_pages.kb_article_discussion_page.sticky_this_thread).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.get_sticky_this_thread_locator()
+                   ).to_be_hidden()
     if user_type == '':
         with allure.step("Deleting user session and verifying that the unsticky this thread "
                          "option is not available"):
             utilities.delete_cookies()
-            expect(sumo_pages.kb_article_discussion_page.sticky_this_thread).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.get_sticky_this_thread_locator()
+                   ).to_be_hidden()
 
     with allure.step("Verifying that the 'Sticky' status is displayed"):
-        expect(sumo_pages.kb_article_discussion_page.article_thread_sticky_status).to_be_visible()
+        expect(sumo_pages.kb_article_discussion_page.get_sticky_this_thread_status_locator()
+               ).to_be_visible()
 
     with allure.step("Navigating back to the discussions page and verifying that the sticky "
-                     "thread is displayed in top of the list"):
+                     "article is displayed in top of the list"):
         utilities.navigate_to_link(thread_info_one['article_discussion_url'])
         assert (
             sumo_pages.kb_article_discussion_page.
@@ -678,7 +698,7 @@ def test_article_thread_sticky(page: Page, user_type, create_user_factory):
         assert (sumo_pages.kb_article_discussion_page.get_text_of_sticky_this_thread_option(
         ) == KBArticlePageMessages.KB_ARTICLE_STICKY_THIS_THREAD_OPTION)
 
-    if user_type == 'Simple User':
+    if user_type == 'Simple user':
         with allure.step(f"Signing in with {test_user_two['username']} user account"):
             utilities.start_existing_session(cookies=test_user_two)
     if user_type == '':
@@ -686,7 +706,8 @@ def test_article_thread_sticky(page: Page, user_type, create_user_factory):
             utilities.delete_cookies()
 
     with allure.step("Verifying that the 'Sticky' status is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.article_thread_sticky_status).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.get_sticky_this_thread_status_locator()
+               ).to_be_hidden()
 
     with allure.step("Navigating back to the discussions page and verifying that the sticky"
                      " article is not displayed in top of the list"):
@@ -701,7 +722,8 @@ def test_article_thread_sticky(page: Page, user_type, create_user_factory):
 def test_article_thread_content_edit(page: Page, thread_author, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-    test_user = create_user_factory(groups=["Forum Moderators"], permissions=["review_revision"])
+    test_user = create_user_factory(groups=["Forum Moderators"],
+                                    permissions=["review_revision"])
     test_user_two = create_user_factory()
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
@@ -745,7 +767,7 @@ def test_article_thread_content_edit(page: Page, thread_author, create_user_fact
     with allure.step("Deleting user session and verifying that the edit this thread option "
                      "is not displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.kb_article_discussion_page.article_thread_edit_this_thread
+        expect(sumo_pages.kb_article_discussion_page.get_edit_this_thread_locator()
                ).to_be_hidden()
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
diff --git a/playwright_tests/tests/explore_help_articles_tests/articles/test_article_translation.py b/playwright_tests/tests/explore_help_articles_tests/articles/test_article_translation.py
index 8b66e4074a8..dcf8be7657b 100644
--- a/playwright_tests/tests/explore_help_articles_tests/articles/test_article_translation.py
+++ b/playwright_tests/tests/explore_help_articles_tests/articles/test_article_translation.py
@@ -3,6 +3,7 @@
 from playwright.sync_api import Page, expect
 from pytest_check import check
 from slugify import slugify
+
 from kitsune.settings import FALLBACK_LANGUAGES, NON_SUPPORTED_LOCALES, SUMO_LANGUAGES
 from playwright_tests.core.utilities import Utilities
 from playwright_tests.messages.explore_help_articles.kb_article_page_messages import (
@@ -17,7 +18,8 @@
 
 # C2489548, C2490043, C946153
 @pytest.mark.kbArticleTranslation
-def test_not_ready_for_localization_articles_dashboard_status(page: Page, create_user_factory):
+def test_not_ready_for_localization_articles_dashboard_status(page: Page,
+                                                              create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     kb_translation_messages = KbTranslationMessages()
@@ -49,7 +51,7 @@ def test_not_ready_for_localization_articles_dashboard_status(page: Page, create
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations']
         )
-        expect(sumo_pages.most_visited_translations_page.article_title(
+        expect(sumo_pages.most_visited_translations_page.get_a_particular_article_title_locator(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Navigating to the localization unreviewed page and verifying that the "
@@ -57,7 +59,7 @@ def test_not_ready_for_localization_articles_dashboard_status(page: Page, create
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['localization_unreviewed']
         )
-        expect(sumo_pages.localization_unreviewed_page.listed_article(
+        expect(sumo_pages.localization_unreviewed_page.get_listed_article(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Navigating back to the translation page and performing a translation"):
@@ -71,7 +73,7 @@ def test_not_ready_for_localization_articles_dashboard_status(page: Page, create
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations']
         )
-        expect(sumo_pages.most_visited_translations_page.article_title(
+        expect(sumo_pages.most_visited_translations_page.get_a_particular_article_title_locator(
             translation['translation_title'])).to_be_hidden()
 
     with allure.step("Navigating to the localization unreviewed page and verifying that the "
@@ -79,7 +81,7 @@ def test_not_ready_for_localization_articles_dashboard_status(page: Page, create
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['localization_unreviewed']
         )
-        expect(sumo_pages.localization_unreviewed_page.listed_article(
+        expect(sumo_pages.localization_unreviewed_page.get_listed_article(
             translation['translation_title'])).to_be_visible()
 
     with allure.step("Verifying that the correct modified by text is displayed"):
@@ -98,7 +100,7 @@ def test_not_ready_for_localization_articles_dashboard_status(page: Page, create
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations']
         )
-        expect(sumo_pages.localization_unreviewed_page.listed_article(
+        expect(sumo_pages.localization_unreviewed_page.get_listed_article(
             translation['translation_title'])).to_be_hidden()
 
     with allure.step("Navigating to the localization dashboard and verifying that the article is"
@@ -106,7 +108,7 @@ def test_not_ready_for_localization_articles_dashboard_status(page: Page, create
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations']
         )
-        expect(sumo_pages.localization_unreviewed_page.listed_article(
+        expect(sumo_pages.localization_unreviewed_page.get_listed_article(
             translation['translation_title'])).to_be_hidden()
 
     with allure.step("Navigating to the parent article and marking it as ready for l10n"):
@@ -173,7 +175,7 @@ def test_ready_for_localization_articles_dashboard_status(page: Page, create_use
                             "banner is displayed"):
         sumo_pages.most_visited_translations_page.click_on_a_particular_article_status(
             article_details['article_title'])
-        expect(sumo_pages.translate_article_page.translating_an_unready_article_banner
+        expect(sumo_pages.translate_article_page.get_unready_for_translation_banner()
                ).to_be_hidden()
 
     with allure.step("Performing an article translation"):
@@ -264,7 +266,7 @@ def test_revisions_cannot_be_marked_as_ready_for_l10n_if_lacking_permissions(pag
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations']
         )
-        expect(sumo_pages.most_visited_translations_page.article_title(
+        expect(sumo_pages.most_visited_translations_page.get_a_particular_article_title_locator(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Navigating to the localization unreviewed page and verifying that the "
@@ -272,7 +274,7 @@ def test_revisions_cannot_be_marked_as_ready_for_l10n_if_lacking_permissions(pag
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['localization_unreviewed']
         )
-        expect(sumo_pages.localization_unreviewed_page.listed_article(
+        expect(sumo_pages.localization_unreviewed_page.get_listed_article(
             article_details['article_title'])).to_be_hidden()
 
 
@@ -284,9 +286,13 @@ def test_unsupported_locales_fallback(page: Page):
         for key, value in NON_SUPPORTED_LOCALES.items():
             utilities.navigate_to_link(HomepageMessages.STAGE_HOMEPAGE_URL + f"/{key}/")
             if value is None:
-                expect(page).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL_EN_US)
+                expect(
+                    page
+                ).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL_EN_US)
             else:
-                expect(page).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL + f"/{value}/")
+                expect(
+                    page
+                ).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL + f"/{value}/")
 
 
 # C2625000
@@ -310,7 +316,8 @@ def test_supported_languages(page: Page):
                 continue
             else:
                 with page.expect_navigation() as navigation_info:
-                    utilities.navigate_to_link(HomepageMessages.STAGE_HOMEPAGE_URL + f"/{locale}/")
+                    utilities.navigate_to_link(
+                        HomepageMessages.STAGE_HOMEPAGE_URL + f"/{locale}/")
                 response = navigation_info.value
                 assert response.status == 200
                 assert locale in utilities.get_page_url()
@@ -348,7 +355,9 @@ def test_sumo_locale_priority(page: Page, create_user_factory):
 
     with allure.step("Sending a request by modifying the 'Accept-Language' header to a "
                      "different locale"):
-        headers = {'Accept-Language': 'it'}
+        headers = {
+            'Accept-Language': 'it'
+        }
         utilities.set_extra_http_headers(headers)
         utilities.navigate_to_link(HomepageMessages.STAGE_HOMEPAGE_URL)
         expect(page).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL + "/ro/")
@@ -356,7 +365,8 @@ def test_sumo_locale_priority(page: Page, create_user_factory):
     with allure.step("Changing the preferred language back to english and signing out"):
         utilities.navigate_to_link(HomepageMessages.STAGE_HOMEPAGE_URL + '/en-US/')
         sumo_pages.top_navbar.click_on_edit_profile_option()
-        sumo_pages.edit_my_profile_page.select_preferred_language_dropdown_option_by_value("en-US")
+        sumo_pages.edit_my_profile_page.select_preferred_language_dropdown_option_by_value(
+            "en-US")
         sumo_pages.edit_my_profile_page.click_update_my_profile_button()
         utilities.delete_cookies()
 
@@ -368,7 +378,9 @@ def test_sumo_locale_priority(page: Page, create_user_factory):
     with allure.step("Sending the request with the modified 'Accept-Language' to point out "
                      "to an invalid locale and a fallback and verifying that the user is "
                      "redirected to the correct first fallback locale"):
-        headers = {'Accept-Language': 'test, de, it'}
+        headers = {
+            'Accept-Language': 'test, de, it'
+        }
         utilities.set_extra_http_headers(headers)
         utilities.navigate_to_link(HomepageMessages.STAGE_HOMEPAGE_URL)
         expect(page).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL + "/de/")
@@ -528,7 +540,8 @@ def test_article_translation_on_locale_switch(page: Page, create_user_factory):
 
 
 @pytest.mark.kbArticleTranslation
-def test_locale_redirect_from_article_without_en_us_parent(page: Page, create_user_factory):
+def test_locale_redirect_from_article_without_en_us_parent(page: Page,
+                                                           create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers"])
@@ -537,7 +550,7 @@ def test_locale_redirect_from_article_without_en_us_parent(page: Page, create_us
 
     with allure.step("Creating a new kb article directly inside the RO locale"):
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, locale="ro", article_category="ro-translation-category"
+            approve_first_revision=True, locale="ro", article_category="Depanare"
         )
         sumo_pages.kb_article_page.click_on_a_particular_breadcrumb(
             article_details['article_title']
diff --git a/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_article_creation_and_access.py b/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_article_creation_and_access.py
index b1bb8df58e5..fb5e722517f 100644
--- a/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_article_creation_and_access.py
+++ b/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_article_creation_and_access.py
@@ -35,8 +35,8 @@ def test_kb_editing_tools_visibility(page: Page, user_type, create_user_factory)
     if user_type == 'Simple user':
         utilities.start_existing_session(cookies=test_user_two)
         with allure.step("Verifying that only some editing tools options are displayed"):
-            expect(sumo_pages.kb_article_page.editing_tools_article_option).to_be_visible()
-            expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_visible()
+            expect(sumo_pages.kb_article_page.get_article_option_locator()).to_be_visible()
+            expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_visible()
             expect(sumo_pages.kb_article_page.get_edit_article_option_locator()).to_be_visible()
             expect(sumo_pages.kb_article_page.get_edit_article_metadata_locator()).to_be_hidden()
             expect(sumo_pages.kb_article_page.get_translate_article_option_locator()
@@ -48,8 +48,8 @@ def test_kb_editing_tools_visibility(page: Page, user_type, create_user_factory)
     elif user_type == '':
         utilities.delete_cookies()
         with allure.step("Verifying that all the editing tools options are not displayed"):
-            expect(sumo_pages.kb_article_page.editing_tools_article_option).to_be_hidden()
-            expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
+            expect(sumo_pages.kb_article_page.get_article_option_locator()).to_be_hidden()
+            expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_hidden()
             expect(sumo_pages.kb_article_page.get_edit_article_option_locator()).to_be_hidden()
             expect(sumo_pages.kb_article_page.get_edit_article_metadata_locator()).to_be_hidden()
             expect(sumo_pages.kb_article_page.get_translate_article_option_locator()
@@ -60,8 +60,8 @@ def test_kb_editing_tools_visibility(page: Page, user_type, create_user_factory)
             expect(sumo_pages.kb_article_page.get_show_history_option_locator()).to_be_hidden()
     else:
         with (allure.step("Verifying that all the editing tools options are displayed")):
-            expect(sumo_pages.kb_article_page.editing_tools_article_option).to_be_visible()
-            expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_visible()
+            expect(sumo_pages.kb_article_page.get_article_option_locator()).to_be_visible()
+            expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_visible()
             expect(sumo_pages.kb_article_page.get_edit_article_option_locator()).to_be_visible()
             expect(sumo_pages.kb_article_page.get_edit_article_metadata_locator()).to_be_visible()
             expect(sumo_pages.kb_article_page.get_translate_article_option_locator()
@@ -282,7 +282,7 @@ def test_articles_discussions_allowed(page: Page, create_user_factory):
 
     with allure.step("Verifying that the posted thread is successfully displayed"):
         expect(
-            sumo_pages.kb_article_discussion_page.posted_thread(
+            sumo_pages.kb_article_discussion_page.get_posted_thread_locator(
                 thread_info['thread_id']
             )
         ).to_be_visible()
@@ -305,7 +305,7 @@ def test_articles_discussions_allowed(page: Page, create_user_factory):
     with allure.step("Deleting user session and verifying that the discussion editing tools "
                      "option is not available"):
         utilities.delete_cookies()
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_hidden()
 
     with allure.step("Manually navigating to the discuss endpoint and verifying that the "
                      "posted thread is successfully displayed"):
@@ -313,7 +313,7 @@ def test_articles_discussions_allowed(page: Page, create_user_factory):
             article_url + KBArticlePageMessages.KB_ARTICLE_DISCUSSIONS_ENDPOINT
         )
         expect(
-            sumo_pages.kb_article_discussion_page.posted_thread(
+            sumo_pages.kb_article_discussion_page.get_posted_thread_locator(
                 thread_info['thread_id']
             )
         ).to_be_visible()
@@ -343,7 +343,7 @@ def test_articles_discussions_allowed(page: Page, create_user_factory):
             article_url + KBArticlePageMessages.KB_ARTICLE_DISCUSSIONS_ENDPOINT
         )
         expect(
-            sumo_pages.kb_article_discussion_page.posted_thread(
+            sumo_pages.kb_article_discussion_page.get_posted_thread_locator(
                 thread_info['thread_id']
             )
         ).to_be_visible()
@@ -369,7 +369,9 @@ def test_articles_discussions_not_allowed(page: Page, create_user_factory):
                      "option is not displayed"):
         sumo_pages.kb_article_page.click_on_article_option()
         article_url = utilities.get_page_url()
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
+        expect(
+            sumo_pages.kb_article_page.editing_tools_discussion_locator()
+        ).to_be_hidden()
 
     with check, allure.step("Manually navigating to the 'Discuss' endpoint and verifying "
                             "that the 404 is displayed"):
@@ -393,7 +395,7 @@ def test_articles_discussions_not_allowed(page: Page, create_user_factory):
     with allure.step("Navigating back to the article page and verifying that the "
                      "'Discussion' option is not displayed"):
         utilities.navigate_to_link(article_url)
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_hidden()
 
     with check, allure.step("Manually navigating to the 'Discuss' endpoint and verifying "
                             "that the 404 page is returned"):
@@ -410,7 +412,7 @@ def test_articles_discussions_not_allowed(page: Page, create_user_factory):
         utilities.delete_cookies()
 
     with allure.step("Verifying that the 'Discussion' option is not displayed"):
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_hidden()
 
     with check, allure.step("Manually navigating to the 'Discuss' endpoint and verifying "
                             "that the 404 page is displayed"):
@@ -729,7 +731,7 @@ def test_kb_article_keyword_and_summary_update(page: Page, create_user_factory):
     with check, allure.step("Navigating to the 'Edit Article' form and verifying that the "
                             "edit keyword field is not displayed"):
         sumo_pages.kb_article_page.click_on_edit_article_option()
-        expect(sumo_pages.kb_edit_article_page.edit_article_keywords_field).to_be_hidden()
+        expect(sumo_pages.kb_edit_article_page.get_edit_keywords_field_locator()).to_be_hidden()
 
     with allure.step("Navigating back to the article"):
         sumo_pages.kb_article_page.click_on_article_option()
@@ -750,7 +752,9 @@ def test_kb_article_keyword_and_summary_update(page: Page, create_user_factory):
         sumo_pages.submit_kb_article_flow.submit_new_kb_revision(
             keywords=utilities.kb_article_test_data['updated_keywords'],
             search_result_summary=utilities.kb_article_test_data
-            ['updated_search_result_summary'], approve_revision=True, is_admin=True
+            ['updated_search_result_summary'],
+            approve_revision=True,
+            is_admin=True
         )
 
     with allure.step("Clicking on the top navbar sumo nav logo"):
@@ -925,7 +929,9 @@ def test_edit_article_metadata_category(page: Page, create_user_factory):
         )
 
     with allure.step("Selecting a different category"):
-        sumo_pages.edit_article_metadata_flow.edit_article_metadata(category="Templates")
+        sumo_pages.edit_article_metadata_flow.edit_article_metadata(
+            category="Templates"
+        )
 
     with check, allure.step("Verifying that the correct error message is displayed"):
         assert (sumo_pages.kb_article_edit_article_metadata_page.
@@ -942,7 +948,9 @@ def test_edit_article_metadata_category(page: Page, create_user_factory):
             [article_details['article_category']]
         )
         expect(
-            sumo_pages.kb_category_page.article_from_list(article_details['article_title'])
+            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
+                article_details['article_title']
+            )
         ).to_be_hidden()
 
     with check, allure.step("Verifying that the article is displayed inside the new category"):
@@ -950,7 +958,9 @@ def test_edit_article_metadata_category(page: Page, create_user_factory):
             utilities.different_endpoints['kb_categories_links']["Navigation"]
         )
         expect(
-            sumo_pages.kb_category_page.article_from_list(article_details['article_title'])
+            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
+                article_details['article_title']
+            )
         ).to_be_visible()
 
     article_template_title = "Template:" + article_details['article_title']
@@ -967,7 +977,9 @@ def test_edit_article_metadata_category(page: Page, create_user_factory):
             utilities.different_endpoints['kb_categories_links']["Navigation"]
         )
         expect(
-            sumo_pages.kb_category_page.article_from_list(article_template_title)
+            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
+                article_template_title
+            )
         ).to_be_hidden()
 
     with check, allure.step("Verifying that the article is displayed inside the new category"):
@@ -975,7 +987,9 @@ def test_edit_article_metadata_category(page: Page, create_user_factory):
             utilities.different_endpoints['kb_categories_links']["Templates"]
         )
         expect(
-            sumo_pages.kb_category_page.article_from_list(article_template_title)
+            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
+                article_template_title
+            )
         ).to_be_visible()
 
 
@@ -1037,14 +1051,14 @@ def test_edit_metadata_article_discussions(page: Page, create_user_factory):
         )
 
     with check, allure.step("Verifying that the 'Discussion' is visible for admin users"):
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_visible()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_visible()
 
     with allure.step(f"Signing in with {test_user['username']} and verifying that the discussion "
                      "options is visible"):
         utilities.start_existing_session(cookies=test_user)
 
     with check, allure.step("Verifying that the 'Discussion' is visible for non-admin users"):
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_visible()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_visible()
 
     with allure.step(f"Signing in with {test_user_two['username']} and disabling article "
                      f"discussions via edit article metadata form"):
@@ -1052,7 +1066,7 @@ def test_edit_metadata_article_discussions(page: Page, create_user_factory):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(discussions=False)
 
     with check, allure.step("Verifying that 'Discussion' is not displayed for admin users"):
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_hidden()
 
     with check, allure.step("Navigating to the /discuss endpoint and verifying that 404 is "
                             "returned"):
@@ -1067,7 +1081,7 @@ def test_edit_metadata_article_discussions(page: Page, create_user_factory):
                             "non-admin users"):
         utilities.navigate_to_link(article_details['article_url'])
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_hidden()
 
     with check, allure.step("Navigating to the /discuss endpoint and verifying that 404 is "
                             "returned"):
@@ -1085,12 +1099,12 @@ def test_edit_metadata_article_discussions(page: Page, create_user_factory):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(discussions=True)
 
     with check, allure.step("Verifying that the 'Discussion' is visible for admin users"):
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_visible()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_visible()
 
     with check, allure.step(f"Verifying that the 'Discussion' is visible for"
                             f" {test_user['username']}"):
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_visible()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_visible()
 
 
 # C2244014
@@ -1119,7 +1133,7 @@ def test_edit_metadata_article_multiple_users(page: Page, create_user_factory):
     with allure.step("Clicking on the 'Edit Article Metadata' option"):
         sumo_pages.kb_article_page.click_on_edit_article_metadata()
 
-    with check, allure.step("Verifying that the correct warning message is displayed"):
+    with check, allure.step("Verifying that the correct error message is displayed"):
         assert (sumo_pages.kb_edit_article_page.
                 get_edit_article_warning_message() == kb_revision.
                 get_article_warning_message(test_user_two['username']))
@@ -1127,7 +1141,7 @@ def test_edit_metadata_article_multiple_users(page: Page, create_user_factory):
     with allure.step("Clicking on the 'Edit Anyway' option and verifying that the warning "
                      "banner is no longer displayed"):
         sumo_pages.kb_edit_article_page.click_on_edit_anyway_option()
-        expect(sumo_pages.kb_edit_article_page.edit_by_another_user_warning_banner).to_be_hidden()
+        expect(sumo_pages.kb_edit_article_page.get_warning_banner_locator()).to_be_hidden()
 
 
 # C2271119, C2243454
@@ -1263,8 +1277,8 @@ def test_article_creation_and_frequent_topics_cards(page: Page, create_user_fact
                         is_frequent_topic_card_displayed(test_topic_card))
 
     with allure.step("Creating a new kb article under the Test Topic and approving the revision"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            product="Firefox", article_topic="Firefox test topic", approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, product="1", topic="506", approve_revision=True)
 
     with check, allure.step("Verifying that the article topic card and article is successfully "
                             "listed and the 'View all {x} counter' is the correct one"):
@@ -1280,8 +1294,8 @@ def test_article_creation_and_frequent_topics_cards(page: Page, create_user_fact
                 get_frequent_topic_card_view_all_articles_link_text(test_topic_card)))
 
     with allure.step("Creating a new kb article and not approving the revision"):
-        second_article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            product="Firefox", article_topic="Firefox test topic")
+        second_article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, product="1", topic="506")
 
     with check, allure.step("Verifying that the unapproved article is not listed inside the "
                             "topic card list and the 'View all {x} articles' counter has not "
@@ -1349,9 +1363,8 @@ def test_article_update_and_frequent_topics_cards(page: Page, create_user_factor
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article under the Test Topic and approving the revision"):
-        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            product="Thunderbird", article_topic="Thunderbird test topic",
-            approve_first_revision=True)
+        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, product="8", topic="505", approve_revision=True)
 
     with allure.step("Updating the title of the article"):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(title=new_article_name)
@@ -1378,9 +1391,8 @@ def test_obsolete_articles_and_frequent_topics_cards(page: Page, create_user_fac
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article under the Test Topic and approving the revision"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            product="Thunderbird", article_topic="Thunderbird test topic",
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, product="8", topic="505", approve_revision=True)
 
     with allure.step("Marking the article as Obsolete via the 'Edit Article Metadata' page"):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(obsolete=True)
@@ -1422,9 +1434,8 @@ def test_ignored_article_types_from_frequent_topics_cards(page: Page, category,
 
     with allure.step("Creating a new kb article of 'Canned Responses' type, under the Test Topic "
                      "and approving the revision"):
-        article = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            product="Pocket", article_topic="Pocket test topic", approve_first_revision=True,
-            article_category=category, is_template= (category == "60"))
+        article = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, product="19", topic="507", approve_revision=True, category=category)
 
     with check, allure.step("Verifying that the article is not displayed inside the topic card"):
         for link in ["product_support", "product_solutions"]:
@@ -1447,8 +1458,8 @@ def test_article_topic_and_product_change(page: Page, create_user_factory):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article under the Test Topic and approving the revision"):
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            product="Pocket", article_topic="Pocket test topic", approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, product="19", topic="507", approve_revision=True)
 
     with allure.step("Updating the article metadata to add the MDN product and test topic"):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(
@@ -1500,7 +1511,8 @@ def test_article_helpfulness_votes(page: Page, vote_type, create_user_factory):
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Create a new simple article"):
-        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
+        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
 
     with allure.step(f"Sign in with {test_user['username']} user account"):
@@ -1558,7 +1570,8 @@ def test_article_helpfulness_cancel_vote(page: Page, vote_type, create_user_fact
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Create a new simple article"):
-        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
+        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
 
     with allure.step(f"Sign in with {test_user['username']} user account"):
@@ -1616,7 +1629,8 @@ def test_article_unhelpfulness_votes(page: Page, vote_type, create_user_factory)
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Create a new simple article"):
-        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
+        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
 
     with allure.step(f"Sign in with {test_user['username']} user account"):
@@ -1677,7 +1691,8 @@ def test_article_unhelpfulness_cancel_vote(page: Page, vote_type, create_user_fa
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Create a new simple article"):
-        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
+        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
 
     with allure.step(f"Sign in with {test_user['username']} user account"):
@@ -1728,8 +1743,8 @@ def test_article_helpfulness_metadata_count(page: Page, create_user_factory):
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Create a new simple article"):
-        article_info = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            article_topic="Browse", approve_first_revision=True)
+        article_info = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page,topic=374, approve_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
 
     with allure.step("Voting the article as helpful"):
@@ -1780,8 +1795,8 @@ def test_voting_the_same_article_twice_is_not_possible(page: Page, context: Brow
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Create a new simple article"):
-        article_info = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            article_topic="Browse", approve_first_revision=True)
+        article_info = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, topic=374, approve_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
 
     with allure.step("Sign in with a different user"):
@@ -1815,8 +1830,8 @@ def test_adding_and_removing_related_documents(page: Page, create_user_factory):
     with allure.step("Creating 3 test articles"):
         counter = 1
         while counter <= 3:
-            article_info = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-                product="Pocket", article_topic="Pocket test topic", approve_first_revision=True)
+            article_info = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+                page=page, product="19", topic="507", approve_revision=True)
             test_article_titles.append(article_info["article_title"])
             test_articles_url.append(article_info["article_url"])
             counter += 1
@@ -1873,8 +1888,8 @@ def test_same_article_cannot_be_added_as_related_article(page: Page, create_user
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new KB article"):
-        article_info = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            product="Pocket", article_topic="Pocket test topic", approve_first_revision=True)
+        article_info = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, product="19", topic="507", approve_revision=True)
 
     with allure.step("Wait for ~1 minute until the kb article is available in search"):
         utilities.wait_for_given_timeout(90000)
@@ -1891,7 +1906,8 @@ def test_same_article_cannot_be_added_as_related_article(page: Page, create_user
 
 #  C3065910
 @pytest.mark.kbArticleCreationAndAccess
-def test_restricted_visibility_related_document_in_article_page(page: Page, create_user_factory):
+def test_restricted_visibility_related_document_in_article_page(page: Page,
+                                                                create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_articles_url = []
@@ -1906,8 +1922,8 @@ def test_restricted_visibility_related_document_in_article_page(page: Page, crea
     with allure.step("Creating 3 new articles"):
         counter = 1
         while counter <= 3:
-            article_info = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-                product="Pocket", article_topic="Pocket test topic", approve_first_revision=True)
+            article_info = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+                page=page, product="19", topic="507", approve_revision=True)
             test_article_titles.append(article_info["article_title"])
             test_articles_url.append(article_info["article_url"])
             counter += 1
diff --git a/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_restricted_visibility.py b/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_restricted_visibility.py
index 587913d0b37..564128c9036 100644
--- a/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_restricted_visibility.py
+++ b/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_restricted_visibility.py
@@ -1,8 +1,10 @@
 from typing import Any
+
 import allure
 import pytest
 from playwright.sync_api import Page, expect
 from pytest_check import check
+
 from playwright_tests.core.utilities import Utilities
 from playwright_tests.messages.explore_help_articles.kb_article_page_messages import (
     KBArticlePageMessages,
@@ -24,18 +26,21 @@ def test_kb_restrict_visibility(page: Page, is_template, create_user_factory):
     whitelisted_groups = utilities.kb_article_test_data['restricted_visibility_groups']
 
     utilities.start_existing_session(cookies=test_user)
+
     article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-        approve_first_revision=True, single_group=whitelisted_groups[0], is_template=is_template
+        approve_first_revision=True,
+        single_group=whitelisted_groups[0],
+        is_template=is_template
     )
 
+    sumo_pages.kb_article_page.click_on_article_option()
+    article_url = utilities.get_page_url()
     with check, allure.step("Navigating to the article and verifying that 404 is not returned"):
         with page.expect_navigation() as navigation_info:
-            sumo_pages.kb_article_page.click_on_article_option()
+            utilities.navigate_to_link(article_url)
         response = navigation_info.value
         assert response.status != 404
 
-        article_url = utilities.get_page_url()
-
     with check, allure.step("Verifying that the correct restricted banner is displayed"):
         assert (KBArticlePageMessages.KB_ARTICLE_RESTRICTED_BANNER in sumo_pages.kb_article_page
                 .get_restricted_visibility_banner_text())
@@ -49,7 +54,7 @@ def test_kb_restrict_visibility(page: Page, is_template, create_user_factory):
         response = navigation_info.value
         assert response.status == 404
 
-    with allure.step("Signing in with a user which is not part of the whitelisted group"):
+    with check, allure.step("Signing in with a user which is not part of the whitelisted group"):
         utilities.start_existing_session(cookies=test_user_two)
 
     with check, allure.step("Navigating to the article and verifying that 404 is returned"):
@@ -58,11 +63,11 @@ def test_kb_restrict_visibility(page: Page, is_template, create_user_factory):
         response = navigation_info.value
         assert response.status == 404
 
-    with allure.step("Signing in with a user which is part of the whitelisted group"):
+    with check, allure.step("Signing in with a user which is part of the whitelisted group"):
         utilities.start_existing_session(cookies=test_user_three)
 
-    with allure.step("Navigating to the article and verifying that group and verifying that 404 is"
-                     " not returned"):
+    with check, allure.step("Navigating to the article and verifying that 404 is not "
+                            "returned"):
         with page.expect_navigation() as navigation_info:
             utilities.navigate_to_link(article_url)
         response = navigation_info.value
@@ -77,11 +82,9 @@ def test_kb_restrict_visibility(page: Page, is_template, create_user_factory):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(
             single_group=whitelisted_groups[1]
         )
-
     with allure.step("Signing in with a user which is part of the whitelisted groups"):
         utilities.start_existing_session(cookies=test_user_four)
 
-
     with check, allure.step("Navigating to the article and verifying that 404 is not returned"):
         with page.expect_navigation() as navigation_info:
             utilities.navigate_to_link(article_url)
@@ -172,7 +175,8 @@ def test_restricted_visibility_in_search_results(page: Page, create_user_factory
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, single_group=whitelisted_group[0]
+            approve_first_revision=True,
+            single_group=whitelisted_group[0]
         )
 
     with allure.step("Wait for ~1 minute until the kb article is available in search"):
@@ -184,13 +188,16 @@ def test_restricted_visibility_in_search_results(page: Page, create_user_factory
     with check, allure.step("Verifying that the article is not displayed inside the search "
                             "results"):
         sumo_pages.search_page.fill_into_searchbar(article_details['article_title'])
-        expect(sumo_pages.search_page.get_locator_of_a_particular_article(
-            article_details['article_title'])).to_be_hidden()
+        expect(
+            sumo_pages.search_page.get_locator_of_a_particular_article(
+                article_details['article_title'])
+        ).to_be_hidden()
 
     with allure.step("Signing in with an account that is part of that whitelisted group"):
         utilities.start_existing_session(cookies=test_user_three)
 
-    with check, allure.step("Verifying that the article is not inside the search results"):
+    with check, allure.step("Verifying that the article is not inside the search "
+                            "results"):
         sumo_pages.search_page.fill_into_searchbar(article_details['article_title'])
         expect(sumo_pages.search_page.get_locator_of_a_particular_article(
             article_details['article_title'])).to_be_hidden()
@@ -216,7 +223,8 @@ def test_restricted_visibility_in_search_results(page: Page, create_user_factory
 # C2466518
 @pytest.mark.kbRestrictedVisibility
 @pytest.mark.parametrize("is_template", [False, True])
-def test_restricted_visibility_in_recent_revisions(page: Page, is_template, create_user_factory):
+def test_restricted_visibility_in_recent_revisions(page: Page, is_template,
+                                                   create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers", "Staff",
@@ -229,7 +237,8 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template, crea
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, single_group=whitelisted_groups[0],
+            approve_first_revision=True,
+            single_group=whitelisted_groups[0],
             is_template=is_template
         )
 
@@ -237,7 +246,7 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template, crea
                             "article is displayed"):
         sumo_pages.top_navbar.click_on_recent_revisions_option()
         assert utilities.expect_locator_visibility(
-            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
                 article_details['article_title'])
         )
 
@@ -246,7 +255,7 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template, crea
 
     with check, allure.step("Verifying that the article is displayed"):
         assert utilities.expect_locator_visibility(
-            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
                 article_details['article_title'])
         )
 
@@ -254,7 +263,7 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template, crea
         utilities.start_existing_session(cookies=test_user_three)
 
     with allure.step("Verifying that the article is not displayed"):
-        expect(sumo_pages.recent_revisions_page.recent_revision_based_on_article(
+        expect(sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Signing in with an admin account and whitelisting a new group"):
@@ -271,7 +280,7 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template, crea
 
     with allure.step("Verifying that the article is displayed"):
         assert utilities.expect_locator_visibility(
-            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
                 article_details['article_title'])
         )
 
@@ -288,7 +297,7 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template, crea
             utilities.general_test_data['dashboard_links']['recent_revisions']
         )
         assert utilities.expect_locator_visibility(
-            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
+            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
                 article_details['article_title'])
         )
 
@@ -296,7 +305,8 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template, crea
 # C2466524
 @pytest.mark.kbRestrictedVisibility
 @pytest.mark.parametrize("is_template", [False, True])
-def test_kb_restricted_visibility_media_gallery(page: Page, is_template, create_user_factory):
+def test_kb_restricted_visibility_media_gallery(page: Page, is_template,
+                                                create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers", "Staff",
@@ -309,7 +319,8 @@ def test_kb_restricted_visibility_media_gallery(page: Page, is_template, create_
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, single_group=whitelisted_groups[0],
+            approve_first_revision=True,
+            single_group=whitelisted_groups[0],
             article_content_image=utilities.kb_article_test_data['article_image'],
             is_template=is_template
         )
@@ -416,7 +427,8 @@ def test_kb_restricted_visibility_discussion(page: Page, is_template, create_use
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, single_group=whitelisted_groups[0],
+            approve_first_revision=True,
+            single_group=whitelisted_groups[0],
             is_template=is_template
         )
 
@@ -427,26 +439,28 @@ def test_kb_restricted_visibility_discussion(page: Page, is_template, create_use
 
     with check, allure.step("Verifying that the the kb article is displayed for admin users"):
         assert utilities.expect_locator_visibility(
-            sumo_pages.article_discussions_page.article_discussion_title(thread['thread_title'])
+            sumo_pages.article_discussions_page
+            .is_title_for_article_discussion_displayed(thread['thread_title'])
         )
 
     with check, allure.step("Verifying that the kb article is displayed for whitelisted "
                             "group users"):
         utilities.start_existing_session(cookies=test_user_two)
         assert utilities.expect_locator_visibility(
-            sumo_pages.article_discussions_page.article_discussion_title(thread['thread_title'])
+            sumo_pages.article_discussions_page
+            .is_title_for_article_discussion_displayed(thread['thread_title'])
         )
 
     with check, allure.step("Verifying that the kb article is not displayed for signed out users"):
         utilities.delete_cookies()
         expect(sumo_pages.article_discussions_page
-               .article_discussion_title(thread['thread_title'])).to_be_hidden()
+               .is_title_for_article_discussion_displayed(thread['thread_title'])).to_be_hidden()
 
     with allure.step("Verifying that the kb article is displayed for non-whitelisted group "
                      "users"):
         utilities.start_existing_session(cookies=test_user_three)
         expect(sumo_pages.article_discussions_page
-               .article_discussion_title(thread['thread_title'])).to_be_hidden()
+               .is_title_for_article_discussion_displayed(thread['thread_title'])).to_be_hidden()
 
     with allure.step("Signing in with an admin account and whitelisting a new group"):
         utilities.start_existing_session(cookies=test_user)
@@ -463,7 +477,8 @@ def test_kb_restricted_visibility_discussion(page: Page, is_template, create_use
             utilities.general_test_data['discussions_links']['article_discussions']
         )
         assert utilities.expect_locator_visibility(
-            sumo_pages.article_discussions_page.article_discussion_title(thread['thread_title'])
+            sumo_pages.article_discussions_page
+            .is_title_for_article_discussion_displayed(thread['thread_title'])
         )
 
     with allure.step("Removing restrictions"):
@@ -479,7 +494,8 @@ def test_kb_restricted_visibility_discussion(page: Page, is_template, create_use
             utilities.general_test_data['discussions_links']['article_discussions']
         )
         assert utilities.expect_locator_visibility(
-            sumo_pages.article_discussions_page.article_discussion_title(thread['thread_title'])
+            sumo_pages.article_discussions_page
+            .is_title_for_article_discussion_displayed(thread['thread_title'])
         )
 
 
@@ -498,7 +514,8 @@ def test_kb_restricted_visibility_in_topics_page(page: Page, create_user_factory
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, single_group=whitelisted_groups[0]
+            approve_first_revision=True,
+            single_group=whitelisted_groups[0]
         )
 
     sumo_pages.kb_article_page.click_on_article_option()
@@ -558,7 +575,8 @@ def test_kb_restricted_visibility_in_topics_page(page: Page, create_user_factory
 #  C2539825
 @pytest.mark.kbRestrictedVisibility
 @pytest.mark.parametrize("is_template", [False, True])
-def test_kb_restricted_visibility_profile_level(page: Page, is_template, create_user_factory):
+def test_kb_restricted_visibility_profile_level(page: Page, is_template,
+                                                create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers", "Staff",
@@ -571,7 +589,8 @@ def test_kb_restricted_visibility_profile_level(page: Page, is_template, create_
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, single_group=whitelisted_groups[0],
+            approve_first_revision=True,
+            single_group=whitelisted_groups[0],
             is_template=is_template
         )
 
@@ -585,7 +604,8 @@ def test_kb_restricted_visibility_profile_level(page: Page, is_template, create_
     with check, allure.step("Verifying that the article is displayed inside the document "
                             "contribution page for admin users"):
         assert utilities.expect_locator_visibility(
-            sumo_pages.my_documents_page.document_by_name(article_details['article_title'])
+            sumo_pages.my_documents_page.get_a_particular_document_locator(
+                article_details['article_title'])
         )
 
     with check, allure.step("Verifying that the article is displayed inside the op document "
@@ -593,15 +613,16 @@ def test_kb_restricted_visibility_profile_level(page: Page, is_template, create_
         utilities.start_existing_session(cookies=test_user_two)
         utilities.navigate_to_link(op_document_contributions_link)
         assert utilities.expect_locator_visibility(
-            sumo_pages.my_documents_page.document_by_name(article_details['article_title'])
+            sumo_pages.my_documents_page.get_a_particular_document_locator(
+                article_details['article_title'])
         )
 
     with allure.step("Verifying that the article is not displayed inside the op document "
                      "contributions list for a non whitelisted user"):
         utilities.start_existing_session(cookies=test_user_three)
         utilities.navigate_to_link(op_document_contributions_link)
-        expect(sumo_pages.my_documents_page.document_by_name(article_details['article_title'])
-               ).to_be_hidden()
+        expect(sumo_pages.my_documents_page.get_a_particular_document_locator(
+            article_details['article_title'])).to_be_hidden()
 
     with allure.step("Signing in with an admin account and whitelisting a new group"):
         utilities.start_existing_session(cookies=test_user)
@@ -620,7 +641,8 @@ def test_kb_restricted_visibility_profile_level(page: Page, is_template, create_
                      "contributions list for the newly whitelisted users group"):
         utilities.start_existing_session(cookies=test_user_three)
         assert utilities.expect_locator_visibility(
-            sumo_pages.my_documents_page.document_by_name(article_details['article_title'])
+            sumo_pages.my_documents_page.get_a_particular_document_locator(
+                article_details['article_title'])
         )
 
     with allure.step("Removing restrictions"):
@@ -640,14 +662,16 @@ def test_kb_restricted_visibility_profile_level(page: Page, is_template, create_
                      "for signed out users"):
         utilities.delete_cookies()
         assert utilities.expect_locator_visibility(
-            sumo_pages.my_documents_page.document_by_name(article_details['article_title'])
+            sumo_pages.my_documents_page.get_a_particular_document_locator(
+                article_details['article_title'])
         )
 
 
 # C2468303
 @pytest.mark.kbRestrictedVisibility
 @pytest.mark.parametrize("is_template", [False, True])
-def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template, create_user_factory):
+def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template,
+                                                     create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers", "Staff",
@@ -660,8 +684,10 @@ def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template, cr
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, ready_for_localization=True,
-            single_group=whitelisted_group, is_template=is_template
+            approve_first_revision=True,
+            ready_for_localization=True,
+            single_group=whitelisted_group,
+            is_template=is_template
         )
 
     with check, allure.step("Verifying that the article is displayed for admin users inside "
@@ -669,7 +695,8 @@ def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template, cr
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations'])
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_dashboard_page.article_title(article_details['article_title'])
+            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+                article_details['article_title'])
         )
 
     with check, allure.step("Verifying that the article is displayed for users belonging to "
@@ -678,7 +705,8 @@ def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template, cr
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations'])
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_dashboard_page.article_title(article_details['article_title'])
+            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+                article_details['article_title'])
         )
 
     with allure.step("Verifying that the article is not displayed for users belonging to "
@@ -686,7 +714,7 @@ def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template, cr
         utilities.start_existing_session(cookies=test_user_three)
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations'])
-        expect(sumo_pages.kb_dashboard_page.article_title(
+        expect(sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Removing restrictions"):
@@ -702,13 +730,15 @@ def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template, cr
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations'])
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_dashboard_page.article_title(article_details['article_title']))
+            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+                article_details['article_title']))
 
 
 # C2466519
 @pytest.mark.kbRestrictedVisibility
 @pytest.mark.parametrize("is_template", [False, True])
-def test_kb_restricted_visibility_in_dashboards(page: Page, is_template, create_user_factory):
+def test_kb_restricted_visibility_in_dashboards(page: Page, is_template,
+                                                create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers", "Staff",
@@ -720,32 +750,39 @@ def test_kb_restricted_visibility_in_dashboards(page: Page, is_template, create_
     with allure.step("Creating a new kb article with restricted visibility"):
         utilities.start_existing_session(cookies=test_user)
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, ready_for_localization=True,
-            single_group=whitelisted_group, is_template=is_template
+            approve_first_revision=True,
+            ready_for_localization=True,
+            single_group=whitelisted_group,
+            is_template=is_template
         )
 
     with check, allure.step("Verifying that the article is displayed for admin users inside "
                             "the kb-overview dashboard"):
-        utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
+        utilities.navigate_to_link(
+            utilities.general_test_data['dashboard_links']['kb_overview'])
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_dashboard_page.article_title(article_details['article_title'])
+            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+                article_details['article_title'])
         )
 
     with check, allure.step("Verifying that the article is displayed for users belonging to "
                             "the whitelisted group"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         utilities.start_existing_session(cookies=test_user_two)
-        utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
+        utilities.navigate_to_link(
+            utilities.general_test_data['dashboard_links']['kb_overview'])
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_dashboard_page.article_title(article_details['article_title'])
+            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+                article_details['article_title'])
         )
 
     with allure.step("Verifying that the article is not displayed for users belonging to "
                      "non-whitelisted groups"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         utilities.start_existing_session(cookies=test_user_three)
-        utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
-        expect(sumo_pages.kb_dashboard_page.article_title(
+        utilities.navigate_to_link(
+            utilities.general_test_data['dashboard_links']['kb_overview'])
+        expect(sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Removing restrictions"):
@@ -758,9 +795,11 @@ def test_kb_restricted_visibility_in_dashboards(page: Page, is_template, create_
     with allure.step("Signing out and verifying that the article is displayed inside the "
                      "kb-overview dashboard"):
         utilities.delete_cookies()
-        utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
+        utilities.navigate_to_link(
+            utilities.general_test_data['dashboard_links']['kb_overview'])
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_dashboard_page.article_title(article_details['article_title'])
+            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+                article_details['article_title'])
         )
 
 
@@ -781,8 +820,10 @@ def test_kb_restricted_visibility_what_links_here_page(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, ready_for_localization=True,
-            single_group=whitelisted_groups[0], is_template=is_template
+            approve_first_revision=True,
+            ready_for_localization=True,
+            single_group=whitelisted_groups[0],
+            is_template=is_template
         )
 
     with allure.step("Navigating to the test article linked to the document"):
@@ -792,7 +833,7 @@ def test_kb_restricted_visibility_what_links_here_page(page: Page, is_template,
                             "restricted article is displayed for admin accounts"):
         sumo_pages.kb_article_page.click_on_what_links_here_option()
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_what_links_here_page.what_links_here_for_article(
+            sumo_pages.kb_what_links_here_page.get_a_particular_what_links_here_article_locator(
                 article_details['article_title'])
         )
 
@@ -801,7 +842,7 @@ def test_kb_restricted_visibility_what_links_here_page(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user_two)
         assert utilities.expect_locator_visibility(
             sumo_pages.kb_what_links_here_page
-            .what_links_here_for_article(article_details['article_title'])
+            .get_a_particular_what_links_here_article_locator(article_details['article_title'])
         )
 
     with check, allure.step("Verifying that the restricted article is not displayed for "
@@ -809,12 +850,14 @@ def test_kb_restricted_visibility_what_links_here_page(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user_three)
         expect(
             sumo_pages.kb_what_links_here_page
-            .what_links_here_for_article(article_details['article_title'])).to_be_hidden()
+            .get_a_particular_what_links_here_article_locator(article_details['article_title'])
+        ).to_be_hidden()
 
     with (allure.step("Verifying that the article is not displayed for signed out users")):
         utilities.delete_cookies()
         expect(sumo_pages.kb_what_links_here_page.
-               what_links_here_for_article(article_details['article_title'])).to_be_hidden()
+               get_a_particular_what_links_here_article_locator(article_details['article_title'])
+               ).to_be_hidden()
 
     with allure.step("Signing in with an admin account and whitelisting a new group"):
         utilities.start_existing_session(cookies=test_user)
@@ -832,7 +875,7 @@ def test_kb_restricted_visibility_what_links_here_page(page: Page, is_template,
         sumo_pages.kb_article_page.click_on_what_links_here_option()
         assert utilities.expect_locator_visibility(
             sumo_pages.kb_what_links_here_page
-            .what_links_here_for_article(article_details['article_title'])
+            .get_a_particular_what_links_here_article_locator(article_details['article_title'])
         )
 
     with allure.step("Removing restrictions"):
@@ -851,14 +894,15 @@ def test_kb_restricted_visibility_what_links_here_page(page: Page, is_template,
         utilities.delete_cookies()
         assert utilities.expect_locator_visibility(
             sumo_pages.kb_what_links_here_page
-            .what_links_here_for_article(article_details['article_title'])
+            .get_a_particular_what_links_here_article_locator(article_details['article_title'])
         )
 
 
 # C2539824
 @pytest.mark.kbRestrictedVisibility
 @pytest.mark.parametrize("is_template", [False, True])
-def test_kb_restricted_visibility_category_page(page: Page, is_template, create_user_factory):
+def test_kb_restricted_visibility_category_page(page: Page, is_template,
+                                                create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers", "Staff",
@@ -870,8 +914,10 @@ def test_kb_restricted_visibility_category_page(page: Page, is_template, create_
     with allure.step("Creating a new kb article with restricted visibility"):
         utilities.start_existing_session(cookies=test_user)
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, ready_for_localization=True,
-            single_group=whitelisted_groups[0], is_template=is_template
+            approve_first_revision=True,
+            ready_for_localization=True,
+            single_group=whitelisted_groups[0],
+            is_template=is_template
         )
 
     with check, allure.step("Navigating to the article category field and verifying that the "
@@ -881,26 +927,28 @@ def test_kb_restricted_visibility_category_page(page: Page, is_template, create_
         sumo_pages.kb_article_show_history_page.click_on_show_history_category()
 
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_category_page.article_from_list(article_details['article_title'])
+            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
+                article_details['article_title'])
         )
 
     with check, allure.step("Verifying that the restricted kb article is displayed for users "
                             "belonging to a whitelisted group"):
         utilities.start_existing_session(cookies=test_user_two)
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_category_page.article_from_list(article_details['article_title'])
+            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
+                article_details['article_title'])
         )
 
-    with check, allure.step("Verifying that the restricted kb article is not displayed for users "
+    with check, allure.step("Verifying that the restricted kb article is displayed for users "
                             "belonging to a non-whitelisted group"):
         utilities.start_existing_session(cookies=test_user_three)
-        expect(sumo_pages.kb_category_page.article_from_list(
+        expect(sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
             article_details['article_title'])).to_be_hidden()
 
-    with allure.step("Verifying that the restricted kb article is not displayed for signed out "
+    with allure.step("Verifying that the restricted kb article is displayed for signed out "
                      "users"):
         utilities.delete_cookies()
-        expect(sumo_pages.kb_category_page.article_from_list(
+        expect(sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Signing in with an admin account and whitelisting a new group"):
@@ -917,7 +965,8 @@ def test_kb_restricted_visibility_category_page(page: Page, is_template, create_
         sumo_pages.kb_article_page.click_on_show_history_option()
         sumo_pages.kb_article_show_history_page.click_on_show_history_category()
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_category_page.article_from_list(article_details['article_title'])
+            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
+                article_details['article_title'])
         )
 
     with allure.step("Removing restrictions"):
@@ -935,7 +984,8 @@ def test_kb_restricted_visibility_category_page(page: Page, is_template, create_
                      "article is displayed for signed out users"):
         utilities.delete_cookies()
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_category_page.article_from_list(article_details['article_title'])
+            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
+                article_details['article_title'])
         )
 
 
diff --git a/playwright_tests/tests/explore_help_articles_tests/articles/test_product_support_page.py b/playwright_tests/tests/explore_help_articles_tests/articles/test_product_support_page.py
index 4abbdb91af8..c33dfc15ea9 100644
--- a/playwright_tests/tests/explore_help_articles_tests/articles/test_product_support_page.py
+++ b/playwright_tests/tests/explore_help_articles_tests/articles/test_product_support_page.py
@@ -1,8 +1,10 @@
 import random
+
 import allure
 import pytest
 from playwright.sync_api import Page, expect
 from pytest_check import check
+
 from playwright_tests.core.utilities import Utilities
 from playwright_tests.messages.ask_a_question_messages.product_solutions_messages import (
     ProductSolutionsMessages,
diff --git a/playwright_tests/tests/explore_help_articles_tests/explore_by_topic_tests/test_explore_by_topics.py b/playwright_tests/tests/explore_help_articles_tests/explore_by_topic_tests/test_explore_by_topics.py
index 4e44c6a8485..7f77eac6f5c 100644
--- a/playwright_tests/tests/explore_help_articles_tests/explore_by_topic_tests/test_explore_by_topics.py
+++ b/playwright_tests/tests/explore_help_articles_tests/explore_by_topic_tests/test_explore_by_topics.py
@@ -1,3 +1,4 @@
+import time
 import allure
 import pytest
 from playwright.sync_api import Page
@@ -25,6 +26,7 @@ def test_explore_by_topic_product_filter(page: Page):
         topic = topic.strip()
         if topic != "Browse":
             sumo_pages.explore_by_topic_page.click_on_a_topic_filter(topic)
+            utilities.wait_for_dom_to_load()
         with allure.step("Verifying that the correct page header is displayed"):
             assert topic == (sumo_pages.explore_by_topic_page
                              .get_explore_by_topic_page_header().strip())
@@ -38,6 +40,7 @@ def test_explore_by_topic_product_filter(page: Page):
                         product.strip())
                 response = navigation_info.value
                 if response is None:
+                    print("Navigation did not occur. Refreshing the page.")
                     utilities.refresh_page()
                 if not sumo_pages.explore_by_topic_page.get_metadata_of_all_listed_articles():
                     pytest.fail(f"There is no sublist for {product}")
@@ -66,6 +69,7 @@ def test_explore_by_topic_aaq_widget_text(page: Page, create_user_factory):
         for product in sumo_pages.explore_by_topic_page.get_all_filter_by_product_options():
             product = product.strip()
             sumo_pages.explore_by_topic_page.select_a_filter_by_product_option(product)
+            utilities.wait_for_given_timeout(2000)
             with allure.step("Verifying the correct AAQ widget text is displayed for products"):
                 if product == "All Products":
                     assert (sumo_pages.common_web_elements
@@ -106,6 +110,7 @@ def test_explore_by_topic_aaq_widget_redirect(page: Page, create_user_factory):
             product = product.strip()
             current_url = utilities.get_page_url()
             sumo_pages.explore_by_topic_page.select_a_filter_by_product_option(product)
+            utilities.wait_for_given_timeout(2000)
             with page.expect_navigation() as navigation_info:
                 sumo_pages.common_web_elements.click_on_aaq_button()
             response = navigation_info.value
diff --git a/playwright_tests/tests/footer_tests/test_footer.py b/playwright_tests/tests/footer_tests/test_footer.py
index cbada25720e..c44fdd7b81d 100644
--- a/playwright_tests/tests/footer_tests/test_footer.py
+++ b/playwright_tests/tests/footer_tests/test_footer.py
@@ -14,6 +14,8 @@ def test_all_footer_links_are_working(page: Page):
         relative_url = link.get_attribute("href")
 
         if relative_url == "https://twitter.com/firefox":
+            print("Skipping Twitter link because it returned 400 due to custom user agent being"
+                  "used by playwright")
             continue
 
         # Verify if URL is absolute, and construct the full URL if it's not
diff --git a/playwright_tests/tests/homepage_tests/test_homepage.py b/playwright_tests/tests/homepage_tests/test_homepage.py
index 3798713e9ad..ab5060f84a6 100644
--- a/playwright_tests/tests/homepage_tests/test_homepage.py
+++ b/playwright_tests/tests/homepage_tests/test_homepage.py
@@ -20,7 +20,8 @@ def test_join_our_community_card_learn_more_redirects_to_contribute_page(page: P
 
     with allure.step("Verifying that we are redirected to the 'Contribute' page successfully"):
         assert (
-            utilities.get_page_url() == ContributePageMessages.STAGE_CONTRIBUTE_PAGE_URL
+            utilities.get_page_url()
+            == ContributePageMessages.STAGE_CONTRIBUTE_PAGE_URL
         ), "We are not on the Contribute page!"
 
 
@@ -28,8 +29,9 @@ def test_join_our_community_card_learn_more_redirects_to_contribute_page(page: P
 @pytest.mark.homePageTests
 def test_join_our_community_card_has_the_correct_content(page: Page):
     sumo_pages = SumoPages(page)
-    with allure.step( "Verifying that the 'Join Our Community' card has the correct strings"
-                      " applied"):
+    with allure.step(
+        "Verifying that the 'Join Our Community' card has the correct strings applied"
+    ):
         assert (
             sumo_pages.common_web_elements.get_volunteer_learn_more_card_header()
             == HomepageMessages.JOIN_OUR_COMMUNITY_CARD_TITLE
diff --git a/playwright_tests/tests/messaging_system_tests/test_messaging_system.py b/playwright_tests/tests/messaging_system_tests/test_messaging_system.py
index a89c1537459..c04e0fe913d 100644
--- a/playwright_tests/tests/messaging_system_tests/test_messaging_system.py
+++ b/playwright_tests/tests/messaging_system_tests/test_messaging_system.py
@@ -41,6 +41,7 @@ def test_no_messages_here_text_is_displayed_when_no_messages_are_available(page:
 
 
 # T5697913, C2706735
+# This test needs to be updated to fetch the username from a different place
 @pytest.mark.messagingSystem
 def test_private_messages_can_be_sent_via_user_profiles(page: Page, is_firefox,
                                                         create_user_factory):
@@ -83,7 +84,9 @@ def test_private_messages_can_be_sent_via_user_profiles(page: Page, is_firefox,
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
 
     with allure.step("Verifying that the sent message is displayed"):
-        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_visible()
+        expect(
+            sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
+        ).to_be_visible()
 
     with allure.step("Deleting the message from the sent messages page"):
         sumo_pages.messaging_system_flow.delete_message_flow(
@@ -97,7 +100,8 @@ def test_private_messages_can_be_sent_via_user_profiles(page: Page, is_firefox,
                 DELETE_MESSAGE_BANNER_TEXT)
 
     with allure.step("Verifying that messages from user two are not displayed"):
-        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_hidden()
+        expect(sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
+               ).to_be_hidden()
 
     with allure.step("Signing in with the user which received the message"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -106,11 +110,11 @@ def test_private_messages_can_be_sent_via_user_profiles(page: Page, is_firefox,
         sumo_pages.top_navbar.click_on_inbox_option()
 
     with allure.step("Verifying that the inbox contains the previously sent messages"):
-        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_visible()
 
     with allure.step("Fetching the unread messages count and verifying that the counter displays"
                      " the correct data"):
-        unread_messages = len(sumo_pages.inbox_page.all_unread_messages.all())
+        unread_messages = len(sumo_pages.inbox_page.get_all_unread_messages())
         sumo_pages.top_navbar.mouse_over_profile_avatar()
         assert (unread_messages == sumo_pages.top_navbar.
                 get_unread_message_notification_counter_value())
@@ -122,7 +126,8 @@ def test_private_messages_can_be_sent_via_user_profiles(page: Page, is_firefox,
         )
 
     with allure.step("Verifying that the messages are no longer displayed inside the inbox"):
-        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(excerpt=message_body)).to_be_hidden()
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(excerpt=message_body)
+               ).to_be_hidden()
 
     with allure.step("Verifying that the correct banner is displayed"):
         assert sumo_pages.sent_message_page.get_sent_message_deleted_banner_text(
@@ -137,6 +142,10 @@ def test_private_message_can_be_sent_via_new_message_page(page: Page, create_use
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory()
+
+    print(test_user)
+    print(test_user_two)
+
     message_body = "Test " + utilities.generate_random_number(1, 1000)
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
@@ -159,13 +168,27 @@ def test_private_message_can_be_sent_via_new_message_page(page: Page, create_use
     with allure.step("Verifying that the sent message is displayed inside the sent messages "
                      "page"):
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
-        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_visible()
+        expect(sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
+               ).to_be_visible()
+
+    with allure.step("Clearing the sent messages list"):
+        sumo_pages.messaging_system_flow.delete_message_flow(
+            excerpt=message_body, from_sent_list=True,
+            expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL
+        )
 
     with allure.step("Signing in with the receiver account and verifying that the message is "
                      "displayed inside the inbox section"):
         utilities.start_existing_session(cookies=test_user_two)
         sumo_pages.top_navbar.click_on_inbox_option()
-        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)
+               ).to_be_visible()
+
+    with allure.step("Clearing the inbox"):
+        sumo_pages.messaging_system_flow.delete_message_flow(
+            excerpt=message_body, from_inbox_list=True,
+            expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL
+        )
 
 
 # C891412, C891413
@@ -186,7 +209,7 @@ def test_navbar_options_redirect_and_options_and_highlight(page: Page, create_us
                      "option is highlighted"):
         expect(page).to_have_url(InboxPageMessages.INBOX_PAGE_STAGE_URL)
         expect(
-            sumo_pages.mess_system_user_navbar.messaging_system_user_navbar_inbox_option
+            sumo_pages.mess_system_user_navbar.get_inbox_navbar_element()
         ).to_have_css("background-color", InboxPageMessages.NAVBAR_INBOX_SELECTED_BG_COLOR)
 
     with allure.step("Clicking on the sent messages navbar option"):
@@ -194,9 +217,11 @@ def test_navbar_options_redirect_and_options_and_highlight(page: Page, create_us
 
     with check, allure.step("Verifying that we are on the correct page and the 'Sent Messages' "
                             "navbar option is highlighted"):
-        expect(page).to_have_url(SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
         expect(
-            sumo_pages.mess_system_user_navbar.messaging_system_user_navbar_sent_messages_option
+            page
+        ).to_have_url(SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
+        expect(
+            sumo_pages.mess_system_user_navbar.get_sent_messages_navbar_element()
         ).to_have_css("background-color",
                       SentMessagesPageMessages.NAVBAR_SENT_MESSAGES_SELECTED_BG_COLOR)
 
@@ -207,7 +232,7 @@ def test_navbar_options_redirect_and_options_and_highlight(page: Page, create_us
                             " navbar option is successfully highlighted"):
         expect(page).to_have_url(NewMessagePageMessages.NEW_MESSAGE_PAGE_STAGE_URL)
         expect(
-            sumo_pages.mess_system_user_navbar.messaging_system_user_navbar_new_message_option
+            sumo_pages.mess_system_user_navbar.get_new_message_navbar_element()
         ).to_have_css("background-color",
                       NewMessagePageMessages.NAVBAR_NEW_MESSAGE_SELECTED_BG_COLOR)
 
@@ -218,7 +243,7 @@ def test_navbar_options_redirect_and_options_and_highlight(page: Page, create_us
                      "option is highlighted"):
         expect(page).to_have_url(InboxPageMessages.INBOX_PAGE_STAGE_URL)
         expect(
-            sumo_pages.mess_system_user_navbar.messaging_system_user_navbar_inbox_option
+            sumo_pages.mess_system_user_navbar.get_inbox_navbar_element()
         ).to_have_css("background-color", InboxPageMessages.NAVBAR_INBOX_SELECTED_BG_COLOR)
 
 
@@ -254,7 +279,7 @@ def test_new_message_field_validation(page: Page, create_user_factory):
 
     with allure.step("Verifying that the characters remaining color is the expected one"):
         expect(
-            sumo_pages.new_message_page.textarea_remaining_characters_message
+            sumo_pages.new_message_page.get_characters_remaining_text_locator()
         ).to_have_css("color", NewMessagePageMessages.ENOUGH_CHARACTERS_REMAINING_COLOR)
 
     with allure.step("Adding 9990 characters inside the input field"):
@@ -268,7 +293,7 @@ def test_new_message_field_validation(page: Page, create_user_factory):
         ) in NewMessagePageMessages.TEN_CHARACTERS_REMAINING_MESSAGE
 
     with allure.step("Verifying that the characters remaining color is the expected one"):
-        expect(sumo_pages.new_message_page.textarea_remaining_characters_message
+        expect(sumo_pages.new_message_page.get_characters_remaining_text_locator()
                ).to_have_css("color", NewMessagePageMessages.ENOUGH_CHARACTERS_REMAINING_COLOR)
 
     # elif self.browser == "firefox":
@@ -291,7 +316,7 @@ def test_new_message_field_validation(page: Page, create_user_factory):
         ) in NewMessagePageMessages.NINE_CHARACTERS_REMAINING_MESSAGE
 
     with allure.step("Verifying that the characters remaining color is the expected one"):
-        expect(sumo_pages.new_message_page.textarea_remaining_characters_message
+        expect(sumo_pages.new_message_page.get_characters_remaining_text_locator()
                ).to_have_css("color", NewMessagePageMessages.NO_CHARACTERS_REMAINING_COLOR)
 
     # elif self.browser == "firefox":
@@ -311,7 +336,7 @@ def test_new_message_field_validation(page: Page, create_user_factory):
 
     with allure.step("Verifying that the char remaining string is updated accordingly"):
         expect(
-            sumo_pages.new_message_page.textarea_remaining_characters_message
+            sumo_pages.new_message_page.get_characters_remaining_text_locator()
         ).to_have_css("color", NewMessagePageMessages.NO_CHARACTERS_REMAINING_COLOR)
 
     # elif self.browser == "firefox":
@@ -325,7 +350,7 @@ def test_new_message_field_validation(page: Page, create_user_factory):
 
     with allure.step("Verifying that the characters remaining color is the expected one"):
         expect(
-            sumo_pages.new_message_page.textarea_remaining_characters_message
+            sumo_pages.new_message_page.get_characters_remaining_text_locator()
         ).to_have_css("color", NewMessagePageMessages.NO_CHARACTERS_REMAINING_COLOR)
 
     # elif self.browser == "firefox":
@@ -365,22 +390,23 @@ def test_new_message_cancel_button(page: Page, create_user_factory):
                      "redirected back to the inbox page"):
         sumo_pages.new_message_page.click_cancel_button()
         expect(
-            sumo_pages.mess_system_user_navbar.messaging_system_user_navbar_inbox_option
+            sumo_pages.mess_system_user_navbar.get_inbox_navbar_element()
         ).to_have_css("background-color", InboxPageMessages.NAVBAR_INBOX_SELECTED_BG_COLOR)
         expect(page).to_have_url(InboxPageMessages.INBOX_PAGE_STAGE_URL)
 
     with allure.step("Navigating to the 'Sent Messages' page and verifying that the message "
                      "was not sent"):
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
-        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_hidden()
+        expect(sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
+               ).to_be_hidden()
 
-    with allure.step("Signing in with the receiver account"):
+    with allure.step("Signing out and signing in with the receiver account"):
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Navigating to the receiver inbox and verifying that no message was "
                      "received"):
         sumo_pages.top_navbar.click_on_inbox_option()
-        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_hidden()
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_hidden()
 
 
 # C2706741, C2706736, C2706740, C2706739, C2706735
@@ -416,6 +442,11 @@ def test_messaging_system_unread_notification_after_message_deletion(page: Page,
             expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL
         )
 
+    with allure.step("Deleting sent messages"):
+        sumo_pages.sent_message_page.delete_all_sent_messages_via_delete_selected_button(
+            expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL
+        )
+
     with allure.step("Signing in with the recipient"):
         utilities.start_existing_session(cookies=test_user_two)
 
@@ -424,11 +455,11 @@ def test_messaging_system_unread_notification_after_message_deletion(page: Page,
 
     with allure.step("Verifying that the avatar notification and the new message counter is "
                      "correct"):
-        inbox_messages_count = len(sumo_pages.inbox_page.all_unread_messages.all())
+        inbox_messages_count = len(sumo_pages.inbox_page.get_all_unread_messages())
         sumo_pages.top_navbar.mouse_over_profile_avatar()
         assert (sumo_pages.top_navbar
                 .get_unread_message_notification_counter_value() == inbox_messages_count)
-        assert sumo_pages.top_navbar.unread_message_profile_notification.is_visible()
+        assert sumo_pages.top_navbar.is_unread_message_notification_displayed()
 
     with allure.step("Marking the first received message as read"):
         sumo_pages.inbox_page.check_a_particular_message_based_on_excerpt(content_first_message)
@@ -439,11 +470,11 @@ def test_messaging_system_unread_notification_after_message_deletion(page: Page,
 
     with allure.step("Verifying that the new message notification counter resembles the unread "
                      "inbox message count"):
-        inbox_messages_count = len(sumo_pages.inbox_page.all_unread_messages.all())
+        inbox_messages_count = len(sumo_pages.inbox_page.get_all_unread_messages())
         sumo_pages.top_navbar.mouse_over_profile_avatar()
         assert (sumo_pages.top_navbar
                 .get_unread_message_notification_counter_value() == inbox_messages_count)
-        assert sumo_pages.top_navbar.unread_message_profile_notification.is_visible()
+        assert sumo_pages.top_navbar.is_unread_message_notification_displayed()
 
     with allure.step("Deleting the first message"):
         sumo_pages.messaging_system_flow.delete_message_flow(
@@ -453,11 +484,11 @@ def test_messaging_system_unread_notification_after_message_deletion(page: Page,
 
     with allure.step("Verifying that the new message notification counter resembles the unread "
                      "inbox message count"):
-        inbox_messages_count = len(sumo_pages.inbox_page.all_unread_messages.all())
+        inbox_messages_count = len(sumo_pages.inbox_page.get_all_unread_messages())
         sumo_pages.top_navbar.mouse_over_profile_avatar()
         assert (sumo_pages.top_navbar
                 .get_unread_message_notification_counter_value() == inbox_messages_count)
-        assert sumo_pages.top_navbar.unread_message_profile_notification.is_visible()
+        assert sumo_pages.top_navbar.is_unread_message_notification_displayed()
 
     with allure.step("Marking the second received message as read"):
         sumo_pages.inbox_page.check_a_particular_message_based_on_excerpt(content_second_message)
@@ -465,15 +496,15 @@ def test_messaging_system_unread_notification_after_message_deletion(page: Page,
 
     with allure.step("Verifying that the new message notification counter resembles the unread "
                      "inbox message count"):
-        inbox_messages_count = len(sumo_pages.inbox_page.all_unread_messages.all())
+        inbox_messages_count = len(sumo_pages.inbox_page.get_all_unread_messages())
         sumo_pages.top_navbar.mouse_over_profile_avatar()
         if inbox_messages_count == 0:
-            assert sumo_pages.top_navbar.unread_message_count.is_hidden()
-            assert sumo_pages.top_navbar.unread_message_profile_notification.is_hidden()
+            assert not sumo_pages.top_navbar.is_unread_message_notification_counter_visible()
+            assert not sumo_pages.top_navbar.is_unread_message_notification_displayed()
         else:
             assert (sumo_pages.top_navbar
                     .get_unread_message_notification_counter_value() == inbox_messages_count)
-            assert sumo_pages.top_navbar.unread_message_profile_notification.is_visible()
+            assert sumo_pages.top_navbar.is_unread_message_notification_displayed()
 
     with allure.step("Deleting the second received message"):
         sumo_pages.messaging_system_flow.delete_message_flow(
@@ -483,10 +514,10 @@ def test_messaging_system_unread_notification_after_message_deletion(page: Page,
 
     with allure.step("Verifying that the new message notification counter resembles the unread "
                      "inbox message count"):
-        inbox_messages_count = len(sumo_pages.inbox_page.all_unread_messages.all())
+        inbox_messages_count = len(sumo_pages.inbox_page.get_all_unread_messages())
         sumo_pages.top_navbar.mouse_over_profile_avatar()
         if inbox_messages_count == 0:
-            assert sumo_pages.top_navbar.unread_message_count.is_hidden()
+            assert not sumo_pages.top_navbar.is_unread_message_notification_counter_visible()
         else:
             assert (sumo_pages.top_navbar
                     .get_unread_message_notification_counter_value() == inbox_messages_count)
@@ -517,7 +548,7 @@ def test_new_message_preview(page: Page, create_user_factory):
     with allure.step("Clicking on the 'Preview' button and verifying that the preview "
                      "section is successfully displayed"):
         sumo_pages.new_message_page.click_on_preview_button()
-        expect(sumo_pages.new_message_page.preview_section).to_be_visible()
+        expect(sumo_pages.new_message_page.get_preview_section_locator()).to_be_visible()
 
     with allure.step("Verifying that all the preview items are displayed"):
         assert sumo_pages.new_message_page.get_text_of_previewed_data_first_paragraph(
@@ -547,8 +578,11 @@ def test_new_message_preview(page: Page, create_user_factory):
         assert sumo_pages.new_message_page.get_text_of_previewed_data_bulleted_list_items(
         ) == bulleted_list_items
 
-        expect(sumo_pages.new_message_page.preview_external_link).to_be_visible()
-        expect(sumo_pages.new_message_page.preview_internal_link).to_be_visible()
+        expect(sumo_pages.new_message_page.get_preview_external_link_test_data_locator()
+               ).to_be_visible()
+
+        expect(sumo_pages.new_message_page.get_preview_internal_link_test_data_locator()
+               ).to_be_visible()
 
     with allure.step("Clicking on the internal link and verifying that the user is "
                      "redirected to the correct article"):
@@ -566,14 +600,14 @@ def test_new_message_preview(page: Page, create_user_factory):
                      "'Sent Messages page'"):
         sumo_pages.top_navbar.click_on_inbox_option()
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
-        expect(sumo_pages.sent_message_page.sender_username(
+        expect(sumo_pages.sent_message_page.sent_messages_by_username(
             username=test_user_two["username"])).to_be_hidden()
 
     with allure.step("Signing in with the potential message receiver and verifying that no "
                      "message were received"):
         utilities.start_existing_session(cookies=test_user_two)
         sumo_pages.top_navbar.click_on_inbox_option()
-        expect(sumo_pages.inbox_page.sender_username(username=test_user["username"])
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_sender(username=test_user["username"])
                ).to_be_hidden()
 
 
@@ -612,7 +646,9 @@ def test_messages_can_be_selected_and_deleted(page: Page, create_user_factory):
 
     with allure.step("Verifying that the message is still listed inside the sent messages "
                      "section"):
-        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_visible()
+        expect(
+            sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
+        ).to_be_visible()
 
     with allure.step("Sending another message to self twice"):
         for i in range(2):
@@ -630,14 +666,15 @@ def test_messages_can_be_selected_and_deleted(page: Page, create_user_factory):
             expected_locator=sumo_pages.inbox_page.message_action_banner)
         assert sumo_pages.inbox_page.get_action_banner_text(
         ) in InboxPageMessages.NO_MESSAGES_SELECTED_BANNER_TEXT
-        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body).first).to_be_visible()
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body).first
+               ).to_be_visible()
 
     with allure.step("Selecting the messages and deleting it via the delete selected button"):
         sumo_pages.inbox_page.delete_all_inbox_messages_via_delete_selected_button(
             message_body, expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL)
 
     with allure.step("Verifying that the messages are no longer displayed"):
-        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_hidden()
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_hidden()
         assert sumo_pages.inbox_page.get_action_banner_text(
         ) in InboxPageMessages.MULTIPLE_MESSAGES_DELETION_BANNER_TEXT
 
@@ -648,7 +685,8 @@ def test_messages_can_be_selected_and_deleted(page: Page, create_user_factory):
             message_body, expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
 
     with allure.step("Verifying that the messages are no longer displayed"):
-        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_hidden()
+        expect(sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
+               ).to_be_hidden()
 
     with check, allure.step("Verifying that the correct banner is displayed"):
         assert sumo_pages.sent_message_page.get_sent_message_deleted_banner_text(
@@ -659,15 +697,16 @@ def test_messages_can_be_selected_and_deleted(page: Page, create_user_factory):
         sumo_pages.top_navbar.click_on_inbox_option()
 
     with allure.step("Verifying that the messages are displayed inside the inbox section"):
-        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_visible()
 
-    with allure.step("Deleting all messages from the inbox page via the delete selected button'"):
+    with allure.step("Deleting all messages from the inbox page via the delete selected "
+                     "button'"):
         sumo_pages.inbox_page.delete_all_inbox_messages_via_delete_selected_button(
             message_body, expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL)
 
     with allure.step("Verifying that the messages are no longer displayed inside the inbox"
                      " section and the correct banner is displayed"):
-        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_hidden()
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_hidden()
         assert sumo_pages.inbox_page.get_action_banner_text(
         ) in InboxPageMessages.MESSAGE_DELETED_BANNER_TEXT
 
@@ -692,8 +731,8 @@ def test_group_messages_cannot_be_sent_by_non_staff_users(page: Page, create_use
             utilities.user_message_test_data['test_groups'][0]
         )
 
-    with allure.step("Verifying that no groups are returned"):
-        expect(sumo_pages.new_message_page.no_user_search_results_text).to_be_visible(timeout=15000)
+    with allure.step("Verifying that no users are returned"):
+        expect(sumo_pages.new_message_page.get_no_user_message_locator()).to_be_visible(timeout=15000)
 
     with allure.step("Navigating to the groups page"):
         utilities.navigate_to_link(utilities.general_test_data['groups'])
@@ -701,18 +740,18 @@ def test_group_messages_cannot_be_sent_by_non_staff_users(page: Page, create_use
             utilities.user_message_test_data['test_groups'][0])
 
     with allure.step("Verifying that the pm group members button is not displayed"):
-        expect(sumo_pages.user_groups.private_message_group_members_button).to_be_hidden()
+        expect(sumo_pages.user_groups.get_pm_group_members_button()).to_be_hidden()
 
     with allure.step("Deleting the user session and verifying that the pm group members "
                      "button is not displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.user_groups.private_message_group_members_button).to_be_hidden()
+        expect(sumo_pages.user_groups.get_pm_group_members_button()).to_be_hidden()
 
     # The PM group members button was removed for staff members as well.
     with allure.step("Signing in with a staff account and verifying that the pm group "
                      "members button is not displayed"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.user_groups.private_message_group_members_button).to_be_hidden()
+        expect(sumo_pages.user_groups.get_pm_group_members_button()).to_be_hidden()
 
 
 # C2566115, C2566116, C2566119
@@ -752,22 +791,32 @@ def test_staff_users_can_send_group_messages(page: Page, create_user_factory):
                      "was sent"):
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
         expect(
-            sumo_pages.sent_message_page.sent_message_by_group(targeted_test_group, message_body)
+            sumo_pages.sent_message_page.sent_messages_to_group(targeted_test_group, message_body)
         ).to_be_visible()
 
+    with allure.step("Deleting the outbox"):
+        sumo_pages.sent_message_page.delete_all_sent_messages_via_delete_selected_button(
+            message_body, expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
+
     with allure.step("Signing in with all targeted group members, verifying that the message "
-                     "was received."):
+                     "was received and clearing the inbox"):
         for user in group_members:
             utilities.start_existing_session(cookies=user)
+
             sumo_pages.top_navbar.click_on_inbox_option()
-            expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
+            expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)
+                   ).to_be_visible()
+            sumo_pages.inbox_page.delete_all_inbox_messages_via_delete_selected_button(
+                message_body, expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL)
 
     with allure.step("Signing in with users from second test group and verifying that the "
                      "message was not received"):
         for user in second_group:
             utilities.start_existing_session(cookies=user)
+
             sumo_pages.top_navbar.click_on_inbox_option()
-            expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_hidden()
+            expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)
+                   ).to_be_hidden()
 
 
 # C2566117, C2566119
@@ -805,12 +854,20 @@ def test_staff_users_can_send_messages_to_multiple_groups(page: Page, create_use
         sumo_pages.sent_message_page.click_on_sent_message_subject(message_body)
         assert sumo_pages.sent_message_page.get_text_of_all_sent_groups() == targeted_test_group
 
+    with allure.step("Deleting the outbox"):
+        utilities.navigate_back()
+        sumo_pages.sent_message_page.delete_all_sent_messages_via_delete_selected_button(
+            message_body, expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
+
     with allure.step("Signing in with all targeted group members, verifying that the message "
-                     "was received."):
+                     "was received and clearing the inbox"):
         for user in [test_user_two, test_user_three]:
             utilities.start_existing_session(user)
             sumo_pages.top_navbar.click_on_inbox_option()
-            expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
+            expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)
+                   ).to_be_visible()
+            sumo_pages.inbox_page.delete_all_inbox_messages_via_delete_selected_button(
+                message_body, expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL)
 
 
 # C2566118, C2566119, C2566120
@@ -847,17 +904,27 @@ def test_staff_users_can_send_messages_to_both_groups_and_user(page: Page, creat
         assert (test_user_three["username"] in sumo_pages.sent_message_page.
                 get_text_of_all_recipients())
 
+    with allure.step("Deleting the outbox"):
+        utilities.navigate_back()
+        sumo_pages.sent_message_page.delete_all_sent_messages_via_delete_selected_button(
+            message_body, expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
+
     with allure.step("Signing in with all targeted group members, verifying that the message "
                      "was received and clearing the inbox"):
         for user in [test_user_two, test_user_three]:
             utilities.start_existing_session(user)
+
             sumo_pages.top_navbar.click_on_inbox_option()
-            expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
+            expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)
+                   ).to_be_visible()
+            sumo_pages.inbox_page.delete_all_inbox_messages_via_delete_selected_button(
+                message_body, expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL)
 
 
 # C2566116
 @pytest.mark.messagingSystem
-def test_removed_group_users_do_not_receive_group_messages(page: Page, create_user_factory):
+def test_removed_group_users_do_not_receive_group_messages(page: Page,
+                                                           create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Staff"], permissions=["change_groupprofile"])
@@ -865,12 +932,14 @@ def test_removed_group_users_do_not_receive_group_messages(page: Page, create_us
         groups=[utilities.user_message_test_data['test_groups'][0]])
     test_user_three = create_user_factory(
         groups=[utilities.user_message_test_data['test_groups'][0]])
+
     message_body = "Test " + utilities.generate_random_number(1, 1000)
     targeted_test_group = utilities.user_message_test_data['test_groups'][0]
 
     with allure.step("Signing in with a staff account and removing a user from the targeted "
                      "group"):
         utilities.start_existing_session(cookies=test_user)
+
         utilities.navigate_to_link(utilities.general_test_data['groups'])
         sumo_pages.user_groups.click_on_a_particular_group(targeted_test_group)
         sumo_pages.user_group_flow.remove_a_user_from_group(test_user_two["username"])
@@ -884,20 +953,27 @@ def test_removed_group_users_do_not_receive_group_messages(page: Page, create_us
             expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL
         )
 
+    with allure.step("Deleting the outbox"):
+        sumo_pages.sent_message_page.delete_all_sent_messages_via_delete_selected_button(
+            message_body, expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
+
     with allure.step(f"Signing in with {test_user_three['username']} user which is still part of "
                      f"the group and verifying that the message was received"):
         utilities.start_existing_session(cookies=test_user_three)
         sumo_pages.top_navbar.click_on_inbox_option()
-        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_visible()
+        sumo_pages.inbox_page.delete_all_inbox_messages_via_delete_selected_button(
+            message_body, expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL)
 
     with allure.step("Verifying that the removed user has not received the group message"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_hidden()
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_hidden()
 
 
 # C2584835
 @pytest.mark.messagingSystem
-def test_unable_to_send_group_messages_to_profiless_groups(page: Page, create_user_factory):
+def test_unable_to_send_group_messages_to_profiless_groups(page: Page,
+                                                           create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Staff"])
@@ -912,8 +988,8 @@ def test_unable_to_send_group_messages_to_profiless_groups(page: Page, create_us
     with allure.step("Typing in a profiless group name inside the To field"):
         sumo_pages.new_message_page.type_into_to_input_field("kb-contributors")
 
-    with allure.step("Verifying that no groups are returned"):
-        expect(sumo_pages.new_message_page.no_user_search_results_text).to_be_visible(timeout=15000)
+    with allure.step("Verifying that no users are returned"):
+        expect(sumo_pages.new_message_page.get_no_user_message_locator()).to_be_visible(timeout=15000)
 
 
 # C2083482
@@ -965,7 +1041,13 @@ def test_pm_group_member(page: Page, is_firefox, create_user_factory):
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
 
     with allure.step("Verifying that the sent message is displayed"):
-        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_visible()
+        expect(
+            sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
+        ).to_be_visible()
+
+    with allure.step("Deleting the message from the sent messages page"):
+        sumo_pages.messaging_system_flow.delete_message_flow(
+            excerpt=message_body, from_sent_list=True)
 
     with allure.step("Signing in with the user which received the message"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -974,4 +1056,8 @@ def test_pm_group_member(page: Page, is_firefox, create_user_factory):
         sumo_pages.top_navbar.click_on_inbox_option()
 
     with allure.step("Verifying that the inbox contains the previously sent messages"):
-        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
+        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_visible()
+
+    with allure.step("Deleting the messages from the inbox section"):
+        sumo_pages.messaging_system_flow.delete_message_flow(
+            excerpt=message_body, from_inbox_list=True)
diff --git a/playwright_tests/tests/search_tests/test_contributor_forums_seach.py b/playwright_tests/tests/search_tests/test_contributor_forums_seach.py
index c3f79c5e833..7556433534c 100644
--- a/playwright_tests/tests/search_tests/test_contributor_forums_seach.py
+++ b/playwright_tests/tests/search_tests/test_contributor_forums_seach.py
@@ -1,4 +1,5 @@
 import random
+
 import allure
 import pytest
 from playwright.sync_api import Page
@@ -36,7 +37,7 @@ def test_by_thread_title(page: Page, create_user_factory):
 
 # C1350866, C1350867, C1350868
 @pytest.mark.contributorForumSearch
-def test_and_or_not_operators_in_community_hub(page: Page, create_user_factory):
+def test_and_or_not_operators_in_community_forums(page: Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["forum-contributors"])
@@ -217,7 +218,7 @@ def test_searching_in_contributor_forums_return_results_only_to_that_forum(page,
             "Support Forum discussions")
 
     with check, allure.step("Searching this forum for the posted thread and verifying that the "
-                            "thread is not returned"):
+                            "thread is returned"):
         sumo_pages.forum_discussions_page.search_in_community_discussion(thread_title)
         assert (thread_title not in sumo_pages.forum_discussions_page.
                 get_all_thread_titles_from_search_results())
diff --git a/playwright_tests/tests/search_tests/test_main_searchbar.py b/playwright_tests/tests/search_tests/test_main_searchbar.py
index c284b690b81..d3550650890 100644
--- a/playwright_tests/tests/search_tests/test_main_searchbar.py
+++ b/playwright_tests/tests/search_tests/test_main_searchbar.py
@@ -178,8 +178,10 @@ def test_searchbar_functionality_and_search_filters(page: Page, create_user_fact
         utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_info = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
-            topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            topic_name=utilities.
+            aaq_question_test_data["valid_firefox_question"]["topic_value"],
+            body=utilities.
+            aaq_question_test_data["valid_firefox_question"]["question_body"],
             expected_locator=sumo_pages.question_page.questions_header
         )
         question_tile = question_info["aaq_subject"]
@@ -242,6 +244,7 @@ def test_searchbar_functionality_and_search_filters(page: Page, create_user_fact
     with allure.step("Using the searchbar to search for a particular question"):
         sumo_pages.search_page.clear_the_searchbar(is_sidebar=True)
         sumo_pages.search_page.fill_into_searchbar(question_tile, is_sidebar=True)
+        utilities.wait_for_given_timeout(2000)
         result_count = utilities.number_extraction_from_string(
             sumo_pages.search_page.get_search_results_header())
 
@@ -303,15 +306,18 @@ def test_searchbar_functionality_on_article_page(page: Page, create_user_factory
     with allure.step("Submitting a new KB article against the Firefox product and using the "
                      "searchbar to search for a particular kb Article"):
         utilities.start_existing_session(cookies=test_user)
+
         sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
         sumo_pages.kb_article_page.click_on_article_option()
+
         utilities.wait_for_given_timeout(2000)
         sumo_pages.search_page.fill_into_searchbar(test_article_name, is_sidebar=True)
 
     with allure.step("Verifying that the article is successfully returned"):
         assert test_article_name in sumo_pages.search_page.get_all_search_results_article_titles()
 
-    with allure.step("Verifying that the filter by product is applied to the correct product"):
+    with allure.step("Verifying that the filter by product is applied to the correct "
+                     "product"):
         assert sumo_pages.search_page.get_the_highlighted_side_nav_item() == "Firefox"
 
     with allure.step("Using the searchbar to search for a particular question"):
@@ -323,6 +329,7 @@ def test_searchbar_functionality_on_article_page(page: Page, create_user_factory
 
     with allure.step("Verifying that the filter by product is applied to the correct product"):
         assert sumo_pages.search_page.get_the_highlighted_side_nav_item() == "Firefox"
+    sumo_pages.search_page.clear_the_searchbar(is_sidebar=True)
 
 
 # C1329220
@@ -385,6 +392,7 @@ def test_popular_searches_products(page: Page):
                 with allure.step("Navigating back"):
                     utilities.navigate_back()
 
+
 # C1329221
 @pytest.mark.searchTests
 def test_stopwords(page: Page):
@@ -413,13 +421,13 @@ def test_synonyms(page: Page):
     search_terms = ['addon', 'add-on', 'add', 'how to add bookmarks', 'how to add themes',
                     'pop-ups', 'popups', 'pop ups', 'bookmarks bar', 'bookmark bar',
                     'bookmarks toolbar', 'bookmark toolbar']
-
     with allure.step("Adding a search term and validating the search results"):
         for search_term in search_terms:
             sumo_pages.search_page.fill_into_searchbar(search_term)
             for title in sumo_pages.search_page.get_all_search_results_article_titles():
                 content = sumo_pages.search_page.get_all_search_results_article_bolded_content(
                     title)
+
                 assert _verify_search_results(page, search_term, 'english', title, content)
 
 
@@ -462,13 +470,13 @@ def test_brand_synonyms(page: Page):
     sumo_pages = SumoPages(page)
     search_terms = ['mozilla', 'modzilla', 'mozzila', 'mozzilla', 'mozila', 'ios', 'ipad',
                     'iphone', 'ipod']
-
     with allure.step("Adding a search term inside the search bar and validating search results"):
         for search_term in search_terms:
             sumo_pages.search_page.fill_into_searchbar(search_term)
             for title in sumo_pages.search_page.get_all_search_results_article_titles():
                 content = sumo_pages.search_page.get_all_search_results_article_bolded_content(
                     title)
+
                 assert _verify_search_results(page, search_term, 'english', title, content)
 
 
@@ -606,6 +614,20 @@ def test_conjunctions_and_disjunction_operators(page: Page):
                                                                 f"{title} and bolded content: "
                                                                 f"{content}")
 
+# C1358447
+@pytest.mark.searchTests
+def test_search_by_doc_id(page: Page):
+    sumo_pages = SumoPages(page)
+
+    # 67390 is the docId for the DoNotDelete article
+    search_string = "field:doc_id.en-US:67390"
+    document_title = "DoNotDelete"
+
+    with allure.step("Searching by document Id and verifying that the correct document is"
+                     " returned"):
+        sumo_pages.search_page.fill_into_searchbar(search_string)
+        assert document_title in sumo_pages.search_page.get_all_search_results_article_titles()
+
 
 # C1350861, C1349864, C1352398
 @pytest.mark.searchTests
@@ -657,10 +679,12 @@ def test_not_operator(page: Page):
                                                       f"{title} and bolded content: "
                                                       f"{content}")
 
+
 # C1350991, C1352392, C1352394
 @pytest.mark.searchTests
 def test_exact_phrase_searching(page: Page):
     sumo_pages = SumoPages(page)
+    utilities = Utilities(page)
     search_term = '"Firefox desktop"'
     second_search_term = '"Firefox desktop'
     no_results_search_term = '"test test bla blatest test"'
@@ -698,6 +722,7 @@ def test_exact_phrase_searching(page: Page):
 
         with allure.step("Adding an exact search phrase which should return 0 results"):
             sumo_pages.search_page.fill_into_searchbar(no_results_search_term)
+            utilities.wait_for_given_timeout(2000)
 
         with allure.step("Verifying that no results are returned for the given exact search "
                          "phrase"):
@@ -710,6 +735,7 @@ def test_keywords_field_and_content_operator(page: Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(permissions=["review_revision"])
+
     utilities.start_existing_session(cookies=test_user)
 
     search_term_keyword = "field:keywords.en-US:playwright search test"
@@ -941,8 +967,8 @@ def test_obsolete_marked_documents_visibility(page: Page, create_user_factory):
     utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Submitting a new KB article"):
-        test_article = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        test_article = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
         utilities.wait_for_given_timeout(65000)
 
     with allure.step("Verifying that the article is successfully returned"):
@@ -951,7 +977,7 @@ def test_obsolete_marked_documents_visibility(page: Page, create_user_factory):
         assert (test_article["article_title"] in sumo_pages.search_page.
                 get_all_search_results_article_titles())
 
-    with allure.step("Marking the article as obsolete"):
+    with allure.step("Marking the question as obsolete"):
         utilities.navigate_to_link(test_article["article_url"])
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(obsolete=True)
         utilities.wait_for_given_timeout(65000)
@@ -962,7 +988,7 @@ def test_obsolete_marked_documents_visibility(page: Page, create_user_factory):
         assert (test_article["article_title"] not in sumo_pages.search_page.
                 get_all_search_results_article_titles())
 
-    with allure.step("Unmarking the article as obsolete"):
+    with allure.step("Unmarking the question as obsolete"):
         utilities.navigate_to_link(test_article["article_url"])
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(obsolete=False)
         utilities.wait_for_given_timeout(65000)
@@ -1044,8 +1070,8 @@ def test_article_product_metadata_update_and_search_filter_by_product(page: Page
 
 # C2873849
 @pytest.mark.searchTests
-def test_archived_questions_are_returned_in_advanced_search_results_only(page: Page,
-                                                                         create_user_factory):
+def test_archived_questions_are_returned_advanced_search_results_only(page: Page,
+                                                                      create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory()
@@ -1058,7 +1084,8 @@ def test_archived_questions_are_returned_in_advanced_search_results_only(page: P
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]
+            ["simple_body_text"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -1067,8 +1094,8 @@ def test_archived_questions_are_returned_in_advanced_search_results_only(page: P
                      "results"):
         question_reply = (
             utilities.aaq_question_test_data['valid_firefox_question']['question_reply'])
-        sumo_pages.aaq_flow.post_question_reply_flow(repliant_username=test_user['username'],
-                                                     reply=question_reply)
+        sumo_pages.aaq_flow.post_question_reply_flow( repliant_username=test_user['username'],
+                                                      reply=question_reply)
         utilities.start_existing_session(session_file_name=user)
         sumo_pages.question_page.click_on_archive_this_question_option()
 
@@ -1092,8 +1119,8 @@ def test_archived_questions_are_returned_in_advanced_search_results_only(page: P
 
         sumo_pages.search_page.clear_the_searchbar()
         sumo_pages.search_page.fill_into_searchbar(
-            f"field:question_content.en-US:I'm experiencing an accessibility issue "
-        )
+            f"field:question_content.en-US:{question_details['question_body']}")
+        utilities.wait_for_given_timeout(2000)
 
         while sumo_pages.common_web_elements.is_next_pagination_item_visible():
             search_titles = sumo_pages.search_page.get_all_search_results_article_titles()
@@ -1113,6 +1140,7 @@ def test_aaq_question_id_and_is_archived_fields_search(page:Page, create_user_fa
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
+
     utilities.start_existing_session(cookies=test_user)
 
     with check, allure.step("Searching archived questions using the question_is_archived:true and "
@@ -1167,13 +1195,16 @@ def test_aaq_question_is_locked_field_search(page:Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
+
     utilities.start_existing_session(cookies=test_user)
 
-    with check, allure.step("Searching for question_is_locked:false inside the searchbox and "
+    with check, allure.step("Searching for question_is_locked:false inside the searchobx and "
                             "verifying that the returned questions are locked"):
         sumo_pages.search_page.fill_into_searchbar("field:question_is_locked:false")
+        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
+        print(sumo_pages.question_page.get_thread_locked_text())
         if sumo_pages.question_page.is_thread_locked_banner_displayed():
             assert sumo_pages.question_page.get_thread_locked_text() not in (
                 [QuestionPageMessages.LOCKED_AND_ARCHIVED_BANNER,
@@ -1182,10 +1213,11 @@ def test_aaq_question_is_locked_field_search(page:Page, create_user_factory):
         else:
             assert True
 
-    with allure.step("Searching for question_is_locked:true inside the searchbox and verifying"
+    with allure.step("Searching for question_is_locked:true inside the searchobx and verifying"
                      " that the returned questions are not locked"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         sumo_pages.search_page.fill_into_searchbar("field:question_is_locked:true")
+        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         assert sumo_pages.question_page.get_thread_locked_text() in (
@@ -1199,19 +1231,22 @@ def test_aaq_question_has_solution_field_search(page:Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
+
     utilities.start_existing_session(cookies=test_user)
 
-    with check, allure.step("Searching for question_has_solution:false inside the searchbox and "
+    with check, allure.step("Searching for question_has_solution:false inside the searchobx and "
                             "verifying that the returned questions don't have a solution"):
         sumo_pages.search_page.fill_into_searchbar("field:question_has_solution:false")
+        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         assert not sumo_pages.question_page.is_solution_section_displayed()
 
-    with allure.step("Searching for question_has_solution:true inside the searchbox and verifying"
+    with allure.step("Searching for question_has_solution:true inside the searchobx and verifying"
                      " that the returned questions have a solution"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         sumo_pages.search_page.fill_into_searchbar("field:question_has_solution:true")
+        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         assert sumo_pages.question_page.is_solution_section_displayed()
@@ -1223,22 +1258,25 @@ def test_aaq_question_product_id_field_search(page:Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
+
     utilities.start_existing_session(cookies=test_user)
 
-    with check, allure.step("Searching for question_product id 1 inside the searchbox and "
+    with check, allure.step("Searching for question_product id 1 inside the searchobx and "
                             "verifying that the returned questions are filled under the Firefox"
                             "product"):
         sumo_pages.search_page.fill_into_searchbar("field:question_product_id:1")
+        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         sumo_pages.question_page.click_on_question_details_button()
         assert sumo_pages.question_page.get_question_details_product() == "Firefox"
 
-    with allure.step("Searching for question_product id 2 inside the searchbox and verifying"
+    with allure.step("Searching for question_product id 2 inside the searchobx and verifying"
                      " that the returned questions are filled under the Firefox for Android"
                      " product"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         sumo_pages.search_page.fill_into_searchbar("field:question_product_id:2")
+        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         sumo_pages.question_page.click_on_question_details_button()
@@ -1251,21 +1289,24 @@ def test_aaq_question_topic_id_field_search(page:Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
+
     utilities.start_existing_session(cookies=test_user)
 
-    with check, allure.step("Searching for question_topic 383 inside the searchbox and "
+    with check, allure.step("Searching for question_topic 383 inside the searchobx and "
                             "verifying that returned questions are filled against the"
                             " Accessibility topic"):
         sumo_pages.search_page.fill_into_searchbar("field:question_topic_id:383")
+        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         sumo_pages.question_page.click_on_question_details_button()
         assert sumo_pages.question_page.get_question_details_topic() == "Accessibility"
 
-    with allure.step("Searching for question_topic 410 inside the searchbox and verifying"
+    with allure.step("Searching for question_topic 410 inside the searchobx and verifying"
                      " that the returned questions are filled against the Accounts topic"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         sumo_pages.search_page.fill_into_searchbar("field:question_topic_id:410")
+        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         sumo_pages.question_page.click_on_question_details_button()
@@ -1278,20 +1319,23 @@ def test_aaq_question_tag_id_field_search(page:Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
+
     utilities.start_existing_session(cookies=test_user)
 
-    with check, allure.step("Searching for question_tag_id 2272 inside the searchbox and "
+    with check, allure.step("Searching for question_tag_id 2272 inside the searchobx and "
                             "verifying that the returned questions contain the accessibility tag"):
         sumo_pages.search_page.fill_into_searchbar("field:question_tag_ids:2772")
+        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         sumo_pages.question_page.click_on_question_details_button()
         assert "accessibility" in sumo_pages.question_page.get_question_tag_options(True)
 
-    with allure.step("Searching for question_tag_id 2273 inside the searchbox and verifying"
+    with allure.step("Searching for question_tag_id 2273 inside the searchobx and verifying"
                      " that the returned questions contain the firefox tag"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         sumo_pages.search_page.fill_into_searchbar("field:question_tag_ids:2773")
+        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         sumo_pages.question_page.click_on_question_details_button()
@@ -1302,10 +1346,12 @@ def test_aaq_question_tag_id_field_search(page:Page, create_user_factory):
 @pytest.mark.searchTests
 def test_aaq_question_votes_field_search(page:Page):
     sumo_pages = SumoPages(page)
+    utilities = Utilities(page)
 
     with check, allure.step("Searching for question_num_votes:0 and verifying that the search"
                             " results contain the queried number of question votes"):
         sumo_pages.search_page.fill_into_searchbar("field:question_num_votes:0")
+        utilities.wait_for_given_timeout(2000)
         assert all("0" in search_result for search_result in sumo_pages.search_page.
                    get_text_of_question_votes())
 
@@ -1313,6 +1359,7 @@ def test_aaq_question_votes_field_search(page:Page):
                      " that the returned questions contain the queried number of votes"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         sumo_pages.search_page.fill_into_searchbar("field:question_num_votes:3")
+        utilities.wait_for_given_timeout(2000)
         assert all("3" in search_result for search_result in sumo_pages.
                    search_page.get_text_of_question_votes())
 
diff --git a/playwright_tests/tests/top_navbar_section_tests/test_top_navbar.py b/playwright_tests/tests/top_navbar_section_tests/test_top_navbar.py
index 8bc16f17dc5..795cbdc8574 100644
--- a/playwright_tests/tests/top_navbar_section_tests/test_top_navbar.py
+++ b/playwright_tests/tests/top_navbar_section_tests/test_top_navbar.py
@@ -19,7 +19,6 @@
 @pytest.mark.topNavbarTests
 def test_number_of_options_not_signed_in(page: Page):
     sumo_pages = SumoPages(page)
-
     with check, allure.step("Verifying that the SUMO logo is successfully displayed"):
         image = sumo_pages.top_navbar.get_sumo_nav_logo()
         image_link = image.get_attribute("src")
@@ -64,11 +63,10 @@ def test_number_of_options_signed_in(page: Page, create_user_factory):
 def test_explore_by_product_redirects(page: Page):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
-
     with allure.step("Clicking on all options from the 'Explore Help Articles' and verifying the "
                      "redirect"):
-        for index, option in enumerate(
-            sumo_pages.top_navbar.get_all_explore_by_product_options_locators()):
+        for index, option in enumerate(sumo_pages.top_navbar
+                                       .get_all_explore_by_product_options_locators()):
             if index > 0:
                 sumo_pages.top_navbar.hover_over_explore_by_product_top_navbar_option()
             current_option = re.sub(
@@ -95,7 +93,6 @@ def test_explore_by_product_redirects(page: Page):
 @pytest.mark.topNavbarTests
 def test_explore_by_topic_redirects(page: Page):
     sumo_pages = SumoPages(page)
-
     with allure.step("Clicking on all options from the 'Explore by topic' and verifying the "
                      "redirect"):
         for index, option in enumerate(sumo_pages.top_navbar.get_all_explore_by_topic_locators()):
@@ -130,12 +127,13 @@ def test_browse_by_product_community_forum_redirect(page: Page, create_user_fact
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory()
+
     utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Clicking on all options from the 'Browse by product' and verifying the "
                      "redirect"):
-        for index, option in enumerate(
-            sumo_pages.top_navbar.get_all_browse_by_product_options_locators()):
+        for index, option in enumerate(sumo_pages.top_navbar
+                                       .get_all_browse_by_product_options_locators()):
             if index > 0:
                 sumo_pages.top_navbar.hover_over_community_forums_top_navbar_option()
             current_option = re.sub(
@@ -164,12 +162,12 @@ def test_browse_all_forum_threads_by_topic_redirect(page: Page, create_user_fact
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory()
-    utilities.start_existing_session(cookies=test_user)
 
+    utilities.start_existing_session(cookies=test_user)
     with allure.step("Clicking on all options from the 'Browse all forum threads by topic' and "
                      "verifying the redirect"):
-        for index, option in enumerate(
-            sumo_pages.top_navbar.get_all_browse_all_forum_threads_by_topic_locators()):
+        for index, option in enumerate(sumo_pages.top_navbar
+                                       .get_all_browse_all_forum_threads_by_topic_locators()):
             if index > 0:
                 sumo_pages.top_navbar.hover_over_community_forums_top_navbar_option()
             current_option = re.sub(
@@ -194,7 +192,6 @@ def test_browse_all_forum_threads_by_topic_redirect(page: Page, create_user_fact
 def test_ask_a_question_top_navbar_redirect(page: Page):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
-
     with allure.step("Clicking on all options from the 'Ask a Question' and verifying the "
                      "redirect"):
         for index, option in enumerate(sumo_pages.top_navbar.get_all_ask_a_question_locators()):
@@ -228,6 +225,7 @@ def test_contribute_top_navbar_redirects(page: Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["forum-contributors"])
+
     utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Clicking on the 'Contributor discussions' top-navbar option and verifying "
diff --git a/playwright_tests/tests/user_deletion_tests/forums/community_forums/test_user_deletion_in_community_forums.py b/playwright_tests/tests/user_deletion_tests/forums/community_forums/test_user_deletion_in_community_forums.py
index 9642561ef7f..27cf7aee316 100644
--- a/playwright_tests/tests/user_deletion_tests/forums/community_forums/test_user_deletion_in_community_forums.py
+++ b/playwright_tests/tests/user_deletion_tests/forums/community_forums/test_user_deletion_in_community_forums.py
@@ -19,7 +19,9 @@ def test_user_deletion_on_archived_locked_no_replies_and_votes_question(page: Pa
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        utilities.navigate_to_link(
+            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
+        )
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -58,7 +60,9 @@ def test_user_deletion_on_spam_no_replies_and_votes_question(page: Page, questio
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        utilities.navigate_to_link(
+            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
+        )
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -90,7 +94,8 @@ def test_user_deletion_on_spam_no_replies_and_votes_question(page: Page, questio
 # C2979514, C2979647
 @pytest.mark.userDeletion
 @pytest.mark.parametrize("question_type", ["archived", "locked", "archived-locked"])
-def test_user_deletion_on_archived_locked_with_replies_question(page: Page, question_type,
+def test_user_deletion_on_archived_locked_with_replies_question(page: Page,
+                                                                question_type,
                                                                 create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
@@ -99,7 +104,9 @@ def test_user_deletion_on_archived_locked_with_replies_question(page: Page, ques
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        utilities.navigate_to_link(
+            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
+        )
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -136,6 +143,7 @@ def test_user_deletion_on_archived_locked_with_replies_question(page: Page, ques
     with allure.step("Deleting the question"):
         sumo_pages.aaq_flow.deleting_question_flow()
 
+
 # C2979648, C2807894
 @pytest.mark.userDeletion
 @pytest.mark.parametrize("question_type", ["spam", "archived-locked"])
@@ -148,7 +156,9 @@ def test_user_deletion_on_spam_with_replies_question(page: Page, question_type,
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        utilities.navigate_to_link(
+            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
+        )
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -168,6 +178,7 @@ def test_user_deletion_on_spam_with_replies_question(page: Page, question_type,
                 sumo_pages.question_page.click_on_archive_this_question_option()
                 sumo_pages.question_page.click_on_mark_as_spam_option()
 
+
     with allure.step("Signing in with the test user and initiating the user deletion flow"):
         utilities.start_existing_session(cookies=test_user)
         sumo_pages.edit_profile_flow.close_account()
@@ -187,7 +198,9 @@ def test_user_deletion_on_question_with_spam_replies(page: Page, create_user_fac
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        utilities.navigate_to_link(
+            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
+        )
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -216,7 +229,8 @@ def test_user_deletion_on_question_with_spam_replies(page: Page, create_user_fac
 @pytest.mark.smokeTest
 @pytest.mark.userDeletion
 @pytest.mark.parametrize("question_type", ["archived", "non-archived"])
-def test_user_deletion_on_question_with_replies_from_other_user(page: Page, question_type,
+def test_user_deletion_on_question_with_replies_from_other_user(page: Page,
+                                                                question_type,
                                                                 create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
@@ -225,7 +239,9 @@ def test_user_deletion_on_question_with_replies_from_other_user(page: Page, ques
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        utilities.navigate_to_link(
+            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
+        )
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -255,14 +271,15 @@ def test_user_deletion_on_question_with_replies_from_other_user(page: Page, ques
                     general_test_data["system_account_name"])
             assert (sumo_pages.question_page
                     .get_display_name_of_question_reply_author(reply_id) == staff)
-
     with allure.step("Deleting the question"):
         sumo_pages.aaq_flow.deleting_question_flow()
 
+
 # C2807314
 @pytest.mark.userDeletion
 @pytest.mark.parametrize("question_type", ["archived", "non-archived"])
-def test_user_deletion_on_question_with_replies_from_same_user(page: Page, question_type,
+def test_user_deletion_on_question_with_replies_from_same_user(page: Page,
+                                                               question_type,
                                                                create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
@@ -271,7 +288,9 @@ def test_user_deletion_on_question_with_replies_from_same_user(page: Page, quest
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        utilities.navigate_to_link(
+            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
+        )
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -305,6 +324,7 @@ def test_user_deletion_on_question_with_replies_from_same_user(page: Page, quest
     with allure.step("Deleting the question"):
         sumo_pages.aaq_flow.deleting_question_flow()
 
+
 # C2807314
 @pytest.mark.smokeTest
 @pytest.mark.userDeletion
@@ -317,7 +337,9 @@ def test_user_deletion_on_question_with_solution(page: Page, question_type, crea
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        utilities.navigate_to_link(
+            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
+        )
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -355,6 +377,7 @@ def test_user_deletion_on_question_with_solution(page: Page, question_type, crea
     with allure.step("Deleting the question"):
         sumo_pages.aaq_flow.deleting_question_flow()
 
+
 # C2807314
 @pytest.mark.userDeletion
 @pytest.mark.parametrize("question_type", ["archived", "non-archived"])
@@ -366,7 +389,9 @@ def test_user_deletion_on_voted_question(page: Page, question_type, create_user_
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        utilities.navigate_to_link(
+            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
+        )
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -393,12 +418,14 @@ def test_user_deletion_on_voted_question(page: Page, question_type, create_user_
         assert response.status == 404
 
 
+
 # C2807938, C2807940, C2926133, C2807890, C2807892, C2807893
 @pytest.mark.smokeTest
 @pytest.mark.userDeletion
 @pytest.mark.parametrize("answer_type", ["simple", "solution", "voted"])
 @pytest.mark.parametrize("question_type", ["archived", "non-archived"])
-def test_user_deletion_on_question_reply_for_archived_questions(page: Page, answer_type,
+def test_user_deletion_on_question_reply_for_archived_questions(page: Page,
+                                                                answer_type,
                                                                 question_type,
                                                                 create_user_factory):
     utilities = Utilities(page)
@@ -409,7 +436,9 @@ def test_user_deletion_on_question_reply_for_archived_questions(page: Page, answ
     with allure.step("Signing in with the staff user  and posting a question to a freemium "
                      "product"):
         utilities.start_existing_session(session_file_name=staff)
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        utilities.navigate_to_link(
+            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
+        )
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -450,4 +479,3 @@ def test_user_deletion_on_question_reply_for_archived_questions(page: Page, answ
 
     with allure.step("Deleting the question"):
         sumo_pages.aaq_flow.deleting_question_flow()
-
diff --git a/playwright_tests/tests/user_deletion_tests/forums/contributor_forums/test_user_deletion_in_contributor_forums.py b/playwright_tests/tests/user_deletion_tests/forums/contributor_forums/test_user_deletion_in_contributor_forums.py
index 20375b47de9..6f87bef650b 100644
--- a/playwright_tests/tests/user_deletion_tests/forums/contributor_forums/test_user_deletion_in_contributor_forums.py
+++ b/playwright_tests/tests/user_deletion_tests/forums/contributor_forums/test_user_deletion_in_contributor_forums.py
@@ -352,8 +352,8 @@ def test_quoted_first_post_is_moved_to_system_account(page: Page, create_user_fa
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory()
-    staff_user = utilities.username_extraction_from_email(utilities.staff_user)
     thread_title = "Test thread " + utilities.generate_random_number(1, 1000)
+    staff_user = utilities.username_extraction_from_email(utilities.staff_user)
 
     with allure.step("Signing in to SUMO and posting a new contributor forum thread"):
         utilities.start_existing_session(cookies=test_user)
@@ -381,9 +381,9 @@ def test_quoted_first_post_is_moved_to_system_account(page: Page, create_user_fa
         assert (test_user["username"] in sumo_pages.forum_thread_page.
                 get_thread_post_mention_text(thread_reply_id))
 
-        with allure.step("Deleting the thread"):
-            utilities.start_existing_session(session_file_name=staff_user)
-            sumo_pages.contributor_thread_flow.delete_thread()
+    with allure.step("Deleting the thread"):
+        utilities.start_existing_session(session_file_name=staff_user)
+        sumo_pages.contributor_thread_flow.delete_thread()
 
 
 # C2952021
@@ -435,6 +435,6 @@ def test_quoted_replies_are_moved_to_system_account(page: Page, create_user_fact
         assert (test_user_two["username"] in sumo_pages.forum_thread_page.
                 get_thread_post_mention_text(third_thread_reply))
 
-        with allure.step("Deleting the thread"):
-            utilities.start_existing_session(session_file_name=staff_user)
-            sumo_pages.contributor_thread_flow.delete_thread()
+    with allure.step("Deleting the thread"):
+        utilities.start_existing_session(session_file_name=staff_user)
+        sumo_pages.contributor_thread_flow.delete_thread()
diff --git a/playwright_tests/tests/user_deletion_tests/kb/test_user_deletion_and_article_contributions.py b/playwright_tests/tests/user_deletion_tests/kb/test_user_deletion_and_article_contributions.py
index 68f59cc870e..f7dd53d805f 100644
--- a/playwright_tests/tests/user_deletion_tests/kb/test_user_deletion_and_article_contributions.py
+++ b/playwright_tests/tests/user_deletion_tests/kb/test_user_deletion_and_article_contributions.py
@@ -19,8 +19,8 @@ def test_reviewed_revisions_assignment_to_system_account(page: Page, create_user
 
     with allure.step("Signing in with the first test user and creating a new kb article"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
 
     with allure.step("Signing in with the second account and creating a new revision"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -70,6 +70,7 @@ def test_reviewed_revisions_assignment_to_system_account(page: Page, create_user
     with allure.step("Deleting the test article"):
         sumo_pages.kb_article_deletion_flow.delete_kb_article()
 
+
 # C2952003, C2952016
 @pytest.mark.smokeTest
 @pytest.mark.userDeletion
@@ -81,7 +82,7 @@ def test_unreviewed_revisions_are_not_assigned_to_system_account(page: Page, cre
 
     with allure.step("Signing in with the first test user and creating a new kb article"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
         sumo_pages.submit_kb_article_flow.submit_new_kb_revision()
 
     with allure.step("Navigating to the 'Edit profile' and delete the account via the "
@@ -101,11 +102,12 @@ def test_deferred_revisions_are_not_assigned_to_system_account(page:Page, create
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory(groups=["Knowledge Base Reviewers"])
+    staff_user = utilities.username_extraction_from_email(utilities.staff_user)
 
     with allure.step("Creating a new article and approving it's first revision"):
         utilities.start_existing_session(cookies=test_user_two)
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True)
 
     with allure.step("Signing in with a different user and submitting a new article revision "
                      "without approving it"):
@@ -124,6 +126,10 @@ def test_deferred_revisions_are_not_assigned_to_system_account(page:Page, create
         assert not sumo_pages.kb_article_show_history_page.is_revision_displayed(
             second_revision["revision_id"])
 
+    with allure.step("Deleting the article"):
+        utilities.start_existing_session(session_file_name=staff_user)
+        sumo_pages.kb_article_deletion_flow.delete_kb_article()
+
 
 #  C2979501, C2979502
 @pytest.mark.smokeTest
@@ -135,10 +141,10 @@ def test_localization_revisions_are_assigned_to_system_account(page: Page, creat
     staff = utilities.username_extraction_from_email(utilities.staff_user)
 
     with allure.step("Signing in with the KB reviewer and creating a new kb article, approving "
-                     "it's first revision and marking it as ready for localization"):
+                     "it's first revision and markit it as ready for localization"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, ready_for_localization=True)
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
+            page=page, approve_revision=True, ready_for_l10n=True)
 
     with allure.step("Deleting the user"):
         sumo_pages.edit_profile_flow.close_account()
@@ -153,6 +159,7 @@ def test_localization_revisions_are_assigned_to_system_account(page: Page, creat
     with allure.step("Deleting the article"):
         sumo_pages.kb_article_deletion_flow.delete_kb_article()
 
+
 # C2979502
 @pytest.mark.userDeletion
 def test_reviewed_by_assignment_to_system_account(page: Page, create_user_factory):
@@ -160,10 +167,11 @@ def test_reviewed_by_assignment_to_system_account(page: Page, create_user_factor
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory(groups=["Knowledge Base Reviewers"])
+    staff_user = utilities.username_extraction_from_email(utilities.staff_user)
 
     with allure.step("Signing in and creating a new kb article"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
+        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
 
     with allure.step("Signing in with a KB reviewer and approving the revision"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -194,5 +202,6 @@ def test_reviewed_by_assignment_to_system_account(page: Page, create_user_factor
             second_revision["revision_id"])
         assert sumo_pages.kb_article_preview_revision_page.get_reviewed_by_text() == "SumoBot"
 
-    with allure.step("Deleting the article"):
+    with allure.step("Deleting the revision"):
+        utilities.start_existing_session(session_file_name=staff_user)
         sumo_pages.kb_article_deletion_flow.delete_kb_article()
diff --git a/playwright_tests/tests/user_deletion_tests/media_gallery/test_user_deletion_in_media_gallery.py b/playwright_tests/tests/user_deletion_tests/media_gallery/test_user_deletion_in_media_gallery.py
index 582ab5d8c82..f4100fc8ba9 100644
--- a/playwright_tests/tests/user_deletion_tests/media_gallery/test_user_deletion_in_media_gallery.py
+++ b/playwright_tests/tests/user_deletion_tests/media_gallery/test_user_deletion_in_media_gallery.py
@@ -2,6 +2,7 @@
 import pytest
 from playwright.sync_api import Page
 from pytest_check import check
+
 from playwright_tests.core.utilities import Utilities
 from playwright_tests.pages.sumo_pages import SumoPages
 
@@ -30,6 +31,7 @@ def test_media_file_ownership_reassignment_to_system_account(page: Page, create_
         assert sumo_pages.media_gallery.get_image_creator_text() == test_user["username"]
 
     with allure.step("Deleting the test user account"):
+        sumo_pages.top_navbar.click_on_edit_profile_option()
         sumo_pages.edit_profile_flow.close_account()
 
     with check, allure.step("Navigating back to the image preview and verifying that the system "
diff --git a/playwright_tests/tests/user_deletion_tests/messaging_system/test_user_deletion_in_messaging_system.py b/playwright_tests/tests/user_deletion_tests/messaging_system/test_user_deletion_in_messaging_system.py
index 28c83141020..8bd71cc058d 100644
--- a/playwright_tests/tests/user_deletion_tests/messaging_system/test_user_deletion_in_messaging_system.py
+++ b/playwright_tests/tests/user_deletion_tests/messaging_system/test_user_deletion_in_messaging_system.py
@@ -42,7 +42,7 @@ def test_deleted_user_is_displayed_in_both_inbox_and_outbox(page: Page, create_u
         utilities.start_existing_session(cookies=test_user)
         sumo_pages.top_navbar.click_on_inbox_option()
 
-    with check, allure.step("Verifying that sender of the message is the 'deleted user'"):
+    with check, allure.step("Verifying that sender of the message is the 'delete user'"):
         assert (sumo_pages.inbox_page.
                 get_sender_by_excerpt(second_message_body) == deleted_user_username)
 
@@ -60,6 +60,7 @@ def test_deleted_user_is_displayed_in_both_inbox_and_outbox(page: Page, create_u
 
     with check, allure.step("Navigating to the outbox and verifying that the 'delete user' is the "
                             "recipient of the sent message"):
+        utilities.wait_for_dom_to_load()
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
         assert (sumo_pages.sent_message_page.
                 get_deleted_user_recipient_based_on_excerpt(first_message_body
@@ -87,5 +88,5 @@ def test_messages_cannot_be_sent_to_system_user(page: Page, create_user_factory)
                      "user is not returned"):
         sumo_pages.new_message_page.type_into_to_input_field(
             utilities.general_test_data["system_account_name"])
-        expect(sumo_pages.new_message_page.no_user_search_results_text).to_be_visible(
+        expect(sumo_pages.new_message_page.get_no_user_message_locator()).to_be_visible(
             timeout=15000)
diff --git a/playwright_tests/tests/user_page_tests/test_edit_contribution_areas.py b/playwright_tests/tests/user_page_tests/test_edit_contribution_areas.py
index dfa7c92cf07..b3c38ed7d69 100644
--- a/playwright_tests/tests/user_page_tests/test_edit_contribution_areas.py
+++ b/playwright_tests/tests/user_page_tests/test_edit_contribution_areas.py
@@ -48,6 +48,8 @@ def test_all_checkboxes_can_be_selected_and_saved(page: Page, create_user_factor
 
     with check, allure.step("Navigating to the user page and verifying that the user groups is"
                             " successfully displayed"):
+        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(
+            first_user['username']))
         for option in contribution_options:
             assert option in (sumo_pages.my_profile_page.get_my_profile_groups_items_text())
 
@@ -74,5 +76,7 @@ def test_all_checkboxes_can_be_selected_and_saved(page: Page, create_user_factor
 
     with allure.step("Navigating to the my profile page and verifying that the added groups are "
                      "no longer displayed"):
+        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(
+            first_user['username']))
         for option in contribution_options:
             assert option not in (sumo_pages.my_profile_page.get_my_profile_groups_items_text())
diff --git a/playwright_tests/tests/user_page_tests/test_edit_my_profile.py b/playwright_tests/tests/user_page_tests/test_edit_my_profile.py
index 31efcbb6577..2f16bd0fb40 100644
--- a/playwright_tests/tests/user_page_tests/test_edit_my_profile.py
+++ b/playwright_tests/tests/user_page_tests/test_edit_my_profile.py
@@ -26,7 +26,7 @@ def test_username_field_is_automatically_populated(page: Page, create_user_facto
     with allure.step(f"Signing in with {test_user['username']} user account and navigating to the "
                      f"'Edit Profile' page"):
         utilities.start_existing_session(cookies=test_user)
-        sumo_pages.top_navbar.click_on_edit_profile_option()
+    sumo_pages.top_navbar.click_on_edit_profile_option()
 
     with allure.step("Verifying that username field is automatically populated with the correct "
                      "data"):
@@ -48,8 +48,10 @@ def test_edit_profile_field_validation_with_symbols(page: Page, create_user_fact
         utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         article_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
-            topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            topic_name=utilities
+            .aaq_question_test_data["valid_firefox_question"]["topic_value"],
+            body=utilities.
+            aaq_question_test_data["valid_firefox_question"]["question_body"],
         )
 
     usernames = utilities.profile_edit_test_data["valid_user_edit_with_symbols"]
@@ -61,11 +63,12 @@ def test_edit_profile_field_validation_with_symbols(page: Page, create_user_fact
         with allure.step("Clearing the username, display name fields and inserting the new one"):
             sumo_pages.edit_my_profile_page.clear_username_field()
             sumo_pages.edit_my_profile_page.clear_display_name_field()
+
         sumo_pages.edit_my_profile_page.send_text_to_username_field(value)
 
         with allure.step("Clicking on the 'Update My Profile' button"):
             sumo_pages.edit_my_profile_page.click_update_my_profile_button(
-                expected_locator=sumo_pages.my_profile_page.display_name_by_username(value)
+                expected_locator=sumo_pages.my_profile_page.get_expected_header_locator(value)
             )
 
         with check, allure.step("Verify that the newly set username is successfully applied to the"
@@ -173,6 +176,7 @@ def test_cancel_profile_edit(page: Page, create_user_factory):
 @pytest.mark.editUserProfileTests
 def test_manage_firefox_account_redirects_to_firefox_account_settings_page(page: Page,
                                                                            create_user_factory):
+
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -262,7 +266,8 @@ def test_profile_username_field_cannot_be_left_empty(page: Page, create_user_fac
 
 # C1491018, C891531,C1491021
 @pytest.mark.editUserProfileTests
-def test_username_can_contain_uppercase_and_lowercase_letters(page: Page, create_user_factory):
+def test_username_can_contain_uppercase_and_lowercase_letters(page: Page,
+                                                              create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -320,8 +325,8 @@ def test_display_name_replaces_the_username_text(page: Page, create_user_factory
             expected_url=MyProfileMessages.get_my_profile_stage_url(test_user["username"])
         )
 
-    with check, allure.step("Verifying that the top navbar username updates with the display "
-                            "name"):
+    with check, allure.step("Verifying that the top navbar username updates with the display"
+                            " name"):
         assert sumo_pages.top_navbar.get_text_of_logged_in_username() == new_display_name
 
     with check, allure.step(f"Verifying that the 'My profile' display name contains "
@@ -330,6 +335,10 @@ def test_display_name_replaces_the_username_text(page: Page, create_user_factory
                 get_my_profile_display_name_header_text() == f"{new_display_name} ("
                                                              f"{test_user['username']})")
 
+        assert (sumo_pages.my_profile_page.
+                get_my_profile_display_name_header_text() == f"{new_display_name} ("
+                                                             f"{test_user['username']})")
+
     with allure.step("Reverting back and deleting the display name"):
         sumo_pages.top_navbar.click_on_edit_profile_option()
         sumo_pages.edit_my_profile_page.clear_display_name_field()
@@ -425,14 +434,18 @@ def test_email_visibility(page: Page, create_user_factory):
     with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
 
-    with check, allure.step("Verifying that the email address is displayed"):
+    with check, allure.step("Accessing the previous user profile and verifying that the email"
+                            " address is displayed"):
+        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(staff_username))
         assert sumo_pages.my_profile_page.get_text_of_publicly_displayed_username() == staff_email
 
     with allure.step("Signing out"):
         utilities.delete_cookies()
 
-    with allure.step("Verifying that the email address is not displayed to signed out users"):
-        expect(sumo_pages.my_profile_page.displayed_email_address).to_be_hidden()
+    with allure.step("Accessing the previous user profile and verifying that the email "
+                     "address is not displayed to signed out users"):
+        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(staff_username))
+        expect(sumo_pages.my_profile_page.publicly_displayed_email_element()).to_be_hidden()
 
     with allure.step("Accessing the 'Edit My Profile' page and unchecking the make email "
                      "visible checkbox"):
@@ -447,14 +460,16 @@ def test_email_visibility(page: Page, create_user_factory):
             )
 
     with check, allure.step("Verifying that the email is not displayed"):
-        expect(sumo_pages.my_profile_page.displayed_email_address).to_be_hidden()
+        expect(sumo_pages.my_profile_page.publicly_displayed_email_element()).to_be_hidden()
 
     with allure.step("Signing in with a different non-admin user"):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Accessing the previous user profile and verifying that the email "
                      "address is not displayed"):
-        expect(sumo_pages.my_profile_page.displayed_email_address).to_be_hidden()
+        # This also needs an update
+        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(staff_username))
+        expect(sumo_pages.my_profile_page.publicly_displayed_email_element()).to_be_hidden()
 
 
 # T5697918, T5697919, T5697921, T5697920, T5697922, T5697923, T5697924, T5697925
@@ -478,40 +493,11 @@ def test_profile_information(page: Page, create_user_factory):
         "country", "city", "involved_from_month", "involved_from_year"
     ]
 
-    profile_info_getters = {
-        "website": sumo_pages.my_profile_page.get_my_profile_website_text,
-        "twitter": sumo_pages.my_profile_page.get_my_profile_twitter_text,
-        "community_portal": sumo_pages.my_profile_page.get_my_profile_community_portal_text,
-        "people_directory": sumo_pages.my_profile_page.get_my_profile_people_directory_text,
-        "matrix_nickname": sumo_pages.my_profile_page.get_my_profile_matrix_text,
-        "country": sumo_pages.my_profile_page.get_my_profile_location_text,
-        "city": sumo_pages.my_profile_page.get_my_profile_location_text,
-        "involved_from_month": sumo_pages.my_profile_page.get_my_contributed_from_text,
-        "involved_from_year": sumo_pages.my_profile_page.get_my_contributed_from_text,
-    }
-
-    with check, allure.step("Verifying profile info as logged-in user"):
-        utilities.start_existing_session(cookies=test_user_two)
-        displayed_values = {
-            key: getter()
-            for key, getter in profile_info_getters.items()
-        }
-
-        for key in profile_info_keys:
-            assert profile_info[key] in displayed_values[key], \
-                f"Incorrect value for '{key}' when logged in."
-
-    with check, allure.step("Verifying profile info after logout"):
-        utilities.delete_cookies()
-
-        displayed_values = {
-            key: getter()
-            for key, getter in profile_info_getters.items()
-        }
-
-        for key in profile_info_keys:
-            assert profile_info[key] in displayed_values[key], \
-                f"Incorrect value for '{key}' when logged out."
+    for key in profile_info_keys:
+        with allure.step(f"Verifying that the correct {key.replace('_', ' ')} "
+                         f"information is displayed"):
+            assert (_validate_profile_info(page, key, profile_info[key],
+                                           test_user["username"], test_user_two))
 
 
 # T5697906, T5697929
@@ -519,6 +505,7 @@ def test_profile_information(page: Page, create_user_factory):
 @pytest.mark.editUserProfileTests
 def test_edit_user_profile_button_is_not_displayed_for_non_admin_users(page: Page,
                                                                        create_user_factory):
+
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -529,7 +516,7 @@ def test_edit_user_profile_button_is_not_displayed_for_non_admin_users(page: Pag
             test_user["username"]))
 
     with check, allure.step("Verifying that the 'Edit user profile' option is not displayed"):
-        expect(sumo_pages.my_profile_page.edit_user_profile_option).to_be_hidden()
+        expect(sumo_pages.my_profile_page.edit_user_profile_option_element()).to_be_hidden()
 
     with check, allure.step("Navigating to the profile edit link directly and verifying that the"
                             " user is redirected to the auth page"):
@@ -537,7 +524,7 @@ def test_edit_user_profile_button_is_not_displayed_for_non_admin_users(page: Pag
             EditMyProfilePageMessages.get_url_of_other_profile_edit_page(test_user["username"])
         )
         assert sumo_pages.auth_page.is_continue_with_firefox_button_displayed()
-        expect(sumo_pages.edit_my_profile_page.edit_my_profile_edit_input_form).to_be_hidden()
+        expect(sumo_pages.edit_my_profile_page.get_my_profile_edit_form_locator()).to_be_hidden()
 
     with allure.step(f"Signing in with {test_user_two['username']} user account and accessing "
                      f"another user account"):
@@ -547,7 +534,7 @@ def test_edit_user_profile_button_is_not_displayed_for_non_admin_users(page: Pag
             test_user["username"]))
 
     with check, allure.step("Verifying that the 'Edit user profile' option is not displayed"):
-        expect(sumo_pages.my_profile_page.edit_user_profile_option).to_be_hidden()
+        expect(sumo_pages.my_profile_page.edit_user_profile_option_element()).to_be_hidden()
 
     with allure.step("Navigating to the profile edit link directly, verifying that the correct"
                      " message is displayed and that the edit form is not displayed"):
@@ -560,7 +547,7 @@ def test_edit_user_profile_button_is_not_displayed_for_non_admin_users(page: Pag
         assert (sumo_pages.edit_my_profile_page.
                 get_access_denied_subheading_text() == EditMyProfilePageMessages.
                 PROFILE_ACCESS_DENIED_SUBHEADING)
-        expect(sumo_pages.edit_my_profile_page.edit_my_profile_edit_input_form).to_be_hidden()
+        expect(sumo_pages.edit_my_profile_page.get_my_profile_edit_form_locator()).to_be_hidden()
 
 
 # T5697928
@@ -568,6 +555,7 @@ def test_edit_user_profile_button_is_not_displayed_for_non_admin_users(page: Pag
 @pytest.mark.editUserProfileTests
 def test_report_user_is_displayed_and_accessible_for_signed_in_users_only(page: Page,
                                                                           create_user_factory):
+
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -581,28 +569,32 @@ def test_report_user_is_displayed_and_accessible_for_signed_in_users_only(page:
         utilities.navigate_to_link(
             MyProfileMessages.get_my_profile_stage_url(test_user_two["username"])
         )
-        expect(sumo_pages.my_profile_page.report_abuse_profile_option).to_be_visible()
+        expect(sumo_pages.my_profile_page.is_report_user_option_displayed()).to_be_visible()
 
     with check, allure.step("Clicking on the 'Report Abuse' option and verifying that the report "
                             "abuse panel is displayed"):
         sumo_pages.my_profile_page.click_on_report_abuse_option()
-        expect(sumo_pages.my_profile_page.report_abuse_panel).to_be_visible()
+        expect(sumo_pages.my_profile_page.is_report_abuse_panel_displayed()).to_be_visible()
 
     with check, allure.step("Closing the report abuse panel and verifying that the report user "
                             "panel is no longer displayed"):
         sumo_pages.my_profile_page.click_on_report_abuse_close_button()
-        expect(sumo_pages.my_profile_page.report_abuse_panel).to_be_hidden()
+        expect(sumo_pages.my_profile_page.is_report_abuse_panel_displayed()).to_be_hidden()
 
     with allure.step("Signing out and verifying that the 'Report Abuse' option is not "
                      "displayed on user profiles"):
         utilities.delete_cookies()
-        expect(sumo_pages.my_profile_page.report_abuse_profile_option).to_be_hidden()
+        utilities.navigate_to_link(
+            MyProfileMessages.get_my_profile_stage_url(test_user_two["username"])
+        )
+        expect(sumo_pages.my_profile_page.is_report_user_option_displayed()).to_be_hidden()
 
 
 # T5697930
 @pytest.mark.editUserProfileTests
 def test_private_message_button_redirects_signed_out_users_to_fxa_login_flow(page: Page,
                                                                              create_user_factory):
+
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -614,7 +606,9 @@ def test_private_message_button_redirects_signed_out_users_to_fxa_login_flow(pag
     with allure.step("Clicking on the 'Private Message' button and verifying that the non-signed "
                      "in user is redirected to the fxa page"):
         sumo_pages.my_profile_page.click_on_private_message_button()
-        assert sumo_pages.auth_page.is_continue_with_firefox_button_displayed()
+        assert (
+            sumo_pages.auth_page.is_continue_with_firefox_button_displayed()
+        ), "The auth page is not displayed! It should be!"
 
 
 # C916055, C916054
@@ -622,40 +616,52 @@ def test_private_message_button_redirects_signed_out_users_to_fxa_login_flow(pag
 @pytest.mark.editUserProfileTests
 def test_deactivate_this_user_buttons_are_displayed_only_for_admin_users(page: Page,
                                                                          create_user_factory):
+
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory()
-    test_user_with_deactivation_perms = create_user_factory(permissions=["deactivate_users"])
+    test_user_with_deactivation_perms = create_user_factory(
+        permissions=["deactivate_users"])
 
     with allure.step("Navigating ot a user profile while not signed in with a user"):
         utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(
             test_user["username"]))
 
     with check, allure.step("Verifying that the deactivate user buttons are not displayed"):
-        expect(sumo_pages.my_profile_page.deactivate_this_user_button).to_be_hidden()
-        expect(sumo_pages.my_profile_page.deactivate_this_user_and_mark_all_content_as_spam
+        expect(sumo_pages.my_profile_page.is_deactivate_this_user_button_displayed()
+               ).to_be_hidden()
+
+        expect(sumo_pages.my_profile_page.deactivate_user_and_mark_content_as_spam_button()
                ).to_be_hidden()
 
     with allure.step(f"Signing in with {test_user_two['username']} user account"):
+        sumo_pages.top_navbar.click_on_sumo_nav_logo()
         utilities.start_existing_session(cookies=test_user_two)
 
     with check, allure.step("Accessing another user profile and verifying that the deactivate "
                             "buttons are not displayed"):
-        expect(sumo_pages.my_profile_page.deactivate_this_user_button).to_be_hidden()
-        expect(sumo_pages.my_profile_page.deactivate_this_user_and_mark_all_content_as_spam
+        utilities.navigate_to_link(
+            MyProfileMessages.get_my_profile_stage_url(test_user["username"])
+        )
+        expect(sumo_pages.my_profile_page.is_deactivate_this_user_button_displayed()
+               ).to_be_hidden()
+        expect(sumo_pages.my_profile_page.deactivate_user_and_mark_content_as_spam_button()
                ).to_be_hidden()
 
     with allure.step("Signing in with a user that has user deactivation permissions "
                      f"({test_user_with_deactivation_perms['username']})"):
+        sumo_pages.top_navbar.click_on_sumo_nav_logo()
+        utilities.delete_cookies()
         utilities.start_existing_session(cookies=test_user_with_deactivation_perms)
 
     with allure.step("Accessing another user profile and verifying that the deactivate user "
                      "buttons are displayed"):
         utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(
             test_user["username"]))
-        expect(sumo_pages.my_profile_page.deactivate_this_user_button).to_be_visible()
-        expect(sumo_pages.my_profile_page.deactivate_this_user_and_mark_all_content_as_spam
+        expect(sumo_pages.my_profile_page.is_deactivate_this_user_button_displayed()
+               ).to_be_visible()
+        expect(sumo_pages.my_profile_page.deactivate_user_and_mark_content_as_spam_button()
                ).to_be_visible()
 
 
@@ -686,8 +692,10 @@ def normalize_time(timezone: str) -> str:
         utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         article_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
-            topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+            topic_name=utilities
+            .aaq_question_test_data["valid_firefox_question"]["topic_value"],
+            body=utilities.
+            aaq_question_test_data["valid_firefox_question"]["question_body"],
         )
 
     with allure.step("Accessing the 'Edit My Profile' page and changing the timezone to "
@@ -704,6 +712,8 @@ def normalize_time(timezone: str) -> str:
         reply_id = sumo_pages.aaq_flow.post_question_reply_flow(
             repliant_username=test_user["username"], reply="Test test test")
 
+        print("Sumo returned time: ", sumo_pages.question_page.get_time_from_reply(reply_id))
+        print("Actual timezone time: ",normalize_time("Europe/Bucharest"))
         # Verifying that the time difference is less than 1 minute
         time_difference = abs(
             (datetime.datetime.strptime(
@@ -714,7 +724,7 @@ def normalize_time(timezone: str) -> str:
                 normalize_time("Europe/Bucharest").replace("Today at ", ""),
                 "%I:%M %p")).total_seconds() / 60
         )
-
+        print("Time difference: ", time_difference)
         assert time_difference <= 1, (f"Time difference is more than 1 minute: {time_difference} "
                                       f"minutes")
 
@@ -731,6 +741,8 @@ def normalize_time(timezone: str) -> str:
         utilities.navigate_to_link(article_details["question_page_url"])
         reply_id = sumo_pages.aaq_flow.post_question_reply_flow(
             repliant_username=test_user["username"], reply="Test test test")
+        print("Sumo returned time: ", sumo_pages.question_page.get_time_from_reply(reply_id))
+        print("Actual timezone time: ", normalize_time("US/Central"))
 
         # Verifying that the time difference is less than 1 minute
         time_difference = abs(
@@ -782,5 +794,42 @@ def test_close_account_and_delete_profile_information(page:Page, create_user_fac
     with allure.step("Deleting the user via the 'Close account and delete all profile information'"
                      "modal"):
         sumo_pages.edit_profile_flow.close_account()
-        assert utilities.get_page_url() == utilities.profile_edit_test_data["close_account_page"]
-        assert sumo_pages.top_navbar.signin_signup_button.is_visible()
+        assert utilities.get_page_url() ==  utilities.profile_edit_test_data["close_account_page"]
+        assert sumo_pages.top_navbar.is_sign_in_up_button_displayed()
+
+
+def _validate_profile_info(page: Page, target: str, profile_info: str, username: str,
+                           second_user_session_cookies: dict) -> bool:
+    utilities = Utilities(page)
+    sumo_pages = SumoPages(page)
+
+    profile_info_getters = {
+        "website": sumo_pages.my_profile_page.get_my_profile_website_text,
+        "twitter": sumo_pages.my_profile_page.get_my_profile_twitter_text,
+        "community_portal": sumo_pages.my_profile_page.get_my_profile_community_portal_text,
+        "people_directory": sumo_pages.my_profile_page.get_my_profile_people_directory_text,
+        "matrix_nickname": sumo_pages.my_profile_page.get_my_profile_matrix_text,
+        "country": sumo_pages.my_profile_page.get_my_profile_location_text,
+        "city": sumo_pages.my_profile_page.get_my_profile_location_text,
+        "involved_from_month": sumo_pages.my_profile_page.get_my_contributed_from_text,
+        "involved_from_year": sumo_pages.my_profile_page.get_my_contributed_from_text,
+    }
+
+    with allure.step("Signing in with a different non-admin user"):
+        utilities.start_existing_session(cookies=second_user_session_cookies)
+
+    with allure.step("Verifying that the correct information is displayed for the first user"):
+        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(username))
+        print(profile_info_getters.get(target, lambda: None)())
+        print(profile_info)
+        if profile_info not in profile_info_getters.get(target, lambda: None)():
+            return False
+
+    with allure.step("Signing out and verifying the information again"):
+        utilities.delete_cookies()
+        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(username))
+        if profile_info not in profile_info_getters.get(target, lambda: None)():
+            return False
+
+    utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(username))
+    return True
diff --git a/playwright_tests/tests/user_page_tests/test_my_profile_page.py b/playwright_tests/tests/user_page_tests/test_my_profile_page.py
index a36f602cc95..0dc79b412fd 100644
--- a/playwright_tests/tests/user_page_tests/test_my_profile_page.py
+++ b/playwright_tests/tests/user_page_tests/test_my_profile_page.py
@@ -60,12 +60,13 @@ def test_my_profile_sign_out_button_functionality(page: Page, create_user_factor
         expect(page).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL_EN_US)
 
     with allure.step("Verify that the 'Sign in/Up' button from the page header is displayed"):
-        expect(sumo_pages.top_navbar.signin_signup_button).to_be_visible()
+        expect(sumo_pages.top_navbar.sign_in_up_button_displayed_element()).to_be_visible()
 
 
 # C2108828, C891410
 @pytest.mark.userProfile
-def test_provided_solutions_number_is_successfully_displayed(page: Page, create_user_factory):
+def test_provided_solutions_number_is_successfully_displayed(page: Page,
+                                                             create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -82,40 +83,54 @@ def test_provided_solutions_number_is_successfully_displayed(page: Page, create_
                 subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
                 topic_name=utilities.
                 aaq_question_test_data["valid_firefox_question"]["topic_value"],
-                body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+                body=utilities.
+                aaq_question_test_data["valid_firefox_question"]["question_body"],
                 expected_locator=sumo_pages.question_page.questions_header
             )
         )
 
-    with allure.step("Posting a reply to the question"):
-        utilities.start_existing_session(cookies=second_user)
-        answer_id = sumo_pages.aaq_flow.post_question_reply_flow(
-            repliant_username=second_user["username"],
-            reply=utilities.question_test_data["question_reply_solution"]
+    with allure.step("Navigating to the user profile page and extracting the original number "
+                     "of posted question solutions"):
+        sumo_pages.top_navbar.click_on_view_profile_option()
+        if sumo_pages.my_profile_page.is_solutions_displayed():
+            original_number_of_solutions = utilities.number_extraction_from_string(
+                sumo_pages.my_profile_page.get_my_profile_solutions_text()
+            )
+        else:
+            original_number_of_solutions = 0
+
+    with allure.step("Navigating to the previously posted question and posting a reply to it"):
+        utilities.navigate_to_link(question_info["question_page_url"])
+        question_test_data = utilities.question_test_data
+        sumo_pages.question_page.add_text_to_post_a_reply_textarea(
+            question_test_data["question_reply_solution"]
+        )
+        answer_id = sumo_pages.question_page.click_on_post_reply_button(
+            repliant_username=test_user["username"]
         )
 
     with allure.step("Marking the reply as the question solution"):
-        utilities.start_existing_session(cookies=test_user)
         sumo_pages.question_page.click_on_solves_the_problem_button(target_reply_id=answer_id)
 
     with check, allure.step("Accessing the 'My profile' page of the account which provided the"
                             " solution and verifying that the original number of solutions has "
                             "incremented"):
-        utilities.start_existing_session(cookies=second_user)
         sumo_pages.top_navbar.click_on_view_profile_option()
+        utilities.number_extraction_from_string(
+            sumo_pages.my_profile_page.get_my_profile_solutions_text()
+        )
+        assert (utilities.number_extraction_from_string(
+            sumo_pages.my_profile_page.get_my_profile_solutions_text()
+        ) == original_number_of_solutions + 1)
 
-        assert sumo_pages.my_profile_page.get_my_profile_solutions_text() == "1 solution"
-
-    with allure.step("Signing in with the OP and undoing the solution"):
-        utilities.start_existing_session(cookies=test_user)
+    with allure.step(f"Signing in with a user that has the 'Can delete question' perm "
+                     f"({second_user['username']}), Deleting the posted question and verifying "
+                     f"that we are redirected to the product support forum page after deletion"):
         utilities.navigate_to_link(question_info["question_page_url"])
-        sumo_pages.question_page.click_on_undo_button()
-
-    with allure.step("Signing in back with the user that has provided the solution and verifying "
-                     "that the solution counter is not displayed"):
         utilities.start_existing_session(cookies=second_user)
-        sumo_pages.top_navbar.click_on_view_profile_option()
-        assert not sumo_pages.my_profile_page.is_solutions_displayed()
+        sumo_pages.question_page.click_delete_this_question_question_tools_option()
+        sumo_pages.question_page.click_delete_this_question_button()
+        expect(sumo_pages.product_support_page.product_product_title_element()).to_be_visible()
 
 
 # C1318760
@@ -135,8 +150,8 @@ def test_number_of_answers_and_questions_for_contributor_thread_contributions(pa
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
-        )
+            thread_title=thread_title,
+            thread_body=utilities.discussion_thread_data['thread_body'])
 
     with allure.step("Creating a new thread reply"):
         sumo_pages.contributor_thread_flow.post_thread_reply(
@@ -151,7 +166,8 @@ def test_number_of_answers_and_questions_for_contributor_thread_contributions(pa
 
 # C890832,  C2094281, C891410, C2245210, C2245211, C2245212, C2245209
 @pytest.mark.userProfile
-def test_number_of_my_profile_answers_is_successfully_displayed(page: Page, create_user_factory):
+def test_number_of_my_profile_answers_is_successfully_displayed(page: Page,
+                                                                create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -168,21 +184,28 @@ def test_number_of_my_profile_answers_is_successfully_displayed(page: Page, crea
                 subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
                 topic_name=utilities.
                 aaq_question_test_data["valid_firefox_question"]["topic_value"],
-                body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+                body=utilities.
+                aaq_question_test_data["valid_firefox_question"]["question_body"],
                 expected_locator=sumo_pages.question_page.questions_header
             )
         )
 
     with allure.step("Posting a reply for the question"):
-        reply_text = utilities.question_test_data["non_solution_reply"]
-        answer_id = sumo_pages.aaq_flow.post_question_reply_flow(
-            repliant_username=test_user["username"], reply=reply_text
+        question_test_data = utilities.question_test_data
+        reply_text = question_test_data["non_solution_reply"]
+        sumo_pages.question_page.add_text_to_post_a_reply_textarea(reply_text)
+        answer_id = sumo_pages.question_page.click_on_post_reply_button(
+            repliant_username=test_user["username"]
         )
 
     with check, allure.step("Accessing the 'My profile' page and verifying that the number of"
                             " answers has incremented successfully"):
         sumo_pages.question_page.click_on_the_reply_author(answer_id)
-        assert sumo_pages.my_profile_page.get_my_profile_answers_text() == "1 answer"
+        utilities.number_extraction_from_string(
+            sumo_pages.my_profile_page.get_my_profile_answers_text()
+        )
+        assert (utilities.number_extraction_from_string(
+            sumo_pages.my_profile_page.get_my_profile_answers_text()) == 1)
 
     with check, allure.step("Clicking on the my profile answers and verifying that the posted"
                             " answer is successfully displayed inside the list"):
@@ -193,18 +216,23 @@ def test_number_of_my_profile_answers_is_successfully_displayed(page: Page, crea
 
     with allure.step("Updating the question title and question reply"):
         sumo_pages.my_answers_page.click_on_specific_answer(answer_id)
+        sumo_pages.question_page.click_on_edit_this_question_question_tools_option()
         updated_title_text = ("Updated Question Title " + utilities.
                               generate_random_number(1,1000))
         updated_reply_text = "Updated reply"
-        sumo_pages.aaq_flow.editing_question_flow(subject=updated_title_text, submit_edit=True)
-        sumo_pages.aaq_flow.editing_reply_flow(
-            answer_id=answer_id, reply_body=updated_reply_text, submit_reply=True
+        sumo_pages.aaq_flow.editing_question_flow(
+            subject=updated_title_text,
+            submit_edit=True
         )
+        sumo_pages.question_page.click_on_reply_more_options_button(answer_id)
+        sumo_pages.question_page.click_on_edit_this_post_for_a_certain_reply(answer_id)
+        sumo_pages.aaq_flow.editing_reply_flow(reply_body=updated_reply_text, submit_reply=True)
 
     with check, allure.step("Navigating back to the answers page from the profile section and"
                             " verifying that the updates are reflected"):
         sumo_pages.question_page.click_on_the_reply_author(answer_id)
-        assert sumo_pages.my_profile_page.get_my_profile_answers_text() == "1 answer"
+        assert (utilities.number_extraction_from_string(
+            sumo_pages.my_profile_page.get_my_profile_answers_text()) == 1)
 
         sumo_pages.my_profile_page.click_my_profile_answers_link()
         assert (updated_reply_text == sumo_pages.my_answers_page.get_my_answer_text(
@@ -215,14 +243,16 @@ def test_number_of_my_profile_answers_is_successfully_displayed(page: Page, crea
     with allure.step("Navigating back to the posted question and posting a reply to it"):
         sumo_pages.my_answers_page.click_on_specific_answer(answer_id)
         reply_text = "A new reply"
-        second_answer_id = sumo_pages.aaq_flow.post_question_reply_flow(
-            repliant_username=test_user["username"], reply=reply_text
+        sumo_pages.question_page.add_text_to_post_a_reply_textarea(reply_text)
+        second_answer_id = sumo_pages.question_page.click_on_post_reply_button(
+            repliant_username=test_user["username"]
         )
 
     with check, allure.step("Navigating back to the answers page from the profile section and"
                             " verifying that the updates are reflected"):
         sumo_pages.question_page.click_on_the_reply_author(second_answer_id)
-        assert sumo_pages.my_profile_page.get_my_profile_answers_text() == "2 answers"
+        assert (utilities.number_extraction_from_string(
+            sumo_pages.my_profile_page.get_my_profile_answers_text()) == 2)
         sumo_pages.my_profile_page.click_my_profile_answers_link()
         assert (reply_text == sumo_pages.my_answers_page.get_my_answer_text(
             answer_id=second_answer_id))
@@ -232,7 +262,8 @@ def test_number_of_my_profile_answers_is_successfully_displayed(page: Page, crea
 
 #  C2094285, C2094284, C891309, C891410, C2245213
 @pytest.mark.userProfile
-def test_number_of_posted_articles_is_successfully_displayed(page: Page, create_user_factory):
+def test_number_of_posted_articles_is_successfully_displayed(page: Page,
+                                                             create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -246,7 +277,8 @@ def test_number_of_posted_articles_is_successfully_displayed(page: Page, create_
     with check, allure.step("Accessing the profile page and verifying that the number of posted"
                             " documents has incremented"):
         sumo_pages.top_navbar.click_on_view_profile_option()
-        assert sumo_pages.my_profile_page.get_my_profile_documents_text() == "1 document"
+        assert (utilities.number_extraction_from_string(
+            sumo_pages.my_profile_page.get_my_profile_documents_text()) == 1)
 
     with check, allure.step("Clicking on my posted documents link and verifying that the posted"
                             " document is listed"):
@@ -263,7 +295,8 @@ def test_number_of_posted_articles_is_successfully_displayed(page: Page, create_
     with check, allure.step("Accessing the profile page and verifying that the number of posted"
                             " documents is the same"):
         sumo_pages.top_navbar.click_on_view_profile_option()
-        assert sumo_pages.my_profile_page.get_my_profile_documents_text() == "1 document"
+        assert (utilities.number_extraction_from_string(
+            sumo_pages.my_profile_page.get_my_profile_documents_text()) == 1)
 
     with allure.step("Clicking on my posted documents link and verifying that the new document"
                      " title is listed"):
@@ -275,6 +308,7 @@ def test_number_of_posted_articles_is_successfully_displayed(page: Page, create_
 @pytest.mark.userProfile
 def test_accounts_with_symbols_are_getting_a_corresponding_valid_username(page: Page,
                                                                           create_user_factory):
+
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(username="tes@tU.se-r4")
diff --git a/playwright_tests/tests/user_page_tests/test_my_questions.py b/playwright_tests/tests/user_page_tests/test_my_questions.py
index 93a21d39b80..3e757d6bb63 100644
--- a/playwright_tests/tests/user_page_tests/test_my_questions.py
+++ b/playwright_tests/tests/user_page_tests/test_my_questions.py
@@ -16,11 +16,13 @@ def test_number_of_questions_is_incremented_when_posting_a_question(page: Page,
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
 
-    with allure.step(f"Signing in with {test_user['username']} user account"):
+    with allure.step(f"Signing in with {test_user['username']} a user account"):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Navigating to the AAQ form and posting a new AAQ question"):
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        utilities.navigate_to_link(
+            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
+        )
 
         sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
@@ -40,6 +42,7 @@ def test_number_of_questions_is_incremented_when_posting_a_question(page: Page,
 @pytest.mark.userQuestions
 def test_my_contributions_questions_reflects_my_questions_page_numbers(page: Page,
                                                                        create_user_factory):
+
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -55,8 +58,8 @@ def test_my_contributions_questions_reflects_my_questions_page_numbers(page: Pag
             )
             sumo_pages.aaq_flow.submit_an_aaq_question(
                 subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
-                topic_name=utilities.
-                aaq_question_test_data["valid_firefox_question"]["topic_value"],
+                topic_name=utilities.aaq_question_test_data[
+                    "valid_firefox_question"]["topic_value"],
                 body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
                 expected_locator=sumo_pages.question_page.questions_header
             )
@@ -80,6 +83,7 @@ def test_my_contributions_questions_reflects_my_questions_page_numbers(page: Pag
 @pytest.mark.userQuestions
 def test_correct_messages_is_displayed_if_user_has_no_posted_questions(page: Page,
                                                                        create_user_factory):
+
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(permissions=["delete_question"])
@@ -96,7 +100,8 @@ def test_correct_messages_is_displayed_if_user_has_no_posted_questions(page: Pag
                 NO_POSTED_QUESTIONS_MESSAGE)
 
     with check, allure.step("Verifying that the question list is not displayed"):
-        expect(sumo_pages.my_questions_page.questions_list).to_be_hidden()
+        expect(sumo_pages.my_questions_page.get_list_of_profile_questions_locators()
+               ).to_be_hidden()
 
     with allure.step("Navigating to the Firefox AAQ form and posting a new AAQ question for "
                      "the Firefox product"):
@@ -106,8 +111,10 @@ def test_correct_messages_is_displayed_if_user_has_no_posted_questions(page: Pag
                 subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
                 topic_name=utilities
                 .aaq_question_test_data["valid_firefox_question"]["topic_value"],
-                body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+                body=utilities.
+                aaq_question_test_data["valid_firefox_question"]["question_body"],
                 expected_locator=sumo_pages.question_page.questions_header
+
             )
         )
 
@@ -115,7 +122,8 @@ def test_correct_messages_is_displayed_if_user_has_no_posted_questions(page: Pag
                             " message is no longer displayed"):
         sumo_pages.top_navbar.click_on_view_profile_option()
         sumo_pages.user_navbar.click_on_my_questions_option()
-        expect(sumo_pages.my_questions_page.questions_no_question_message).to_be_hidden()
+        expect(sumo_pages.my_questions_page.get_list_of_profile_no_question_message_locator()
+               ).to_be_hidden()
 
     with allure.step("Deleting the question"):
         utilities.navigate_to_link(question_info["question_page_url"])
@@ -134,6 +142,7 @@ def test_correct_messages_is_displayed_if_user_has_no_posted_questions(page: Pag
 @pytest.mark.userQuestions
 def test_question_page_reflects_posted_questions_and_redirects_to_question(page: Page,
                                                                            create_user_factory):
+
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -143,22 +152,13 @@ def test_question_page_reflects_posted_questions_and_redirects_to_question(page:
 
     with allure.step("Navigating to the Firefox AAQ form and posting a new AAQ question"):
         utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
-        first_question = (
-            sumo_pages.aaq_flow.submit_an_aaq_question(
-                subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
-                topic_name=utilities.
-                aaq_question_test_data["valid_firefox_question"]["topic_value"],
-                body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
-                expected_locator=sumo_pages.question_page.questions_header
-            )
-        )
-        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
-        second_question = (
+        question_info = (
             sumo_pages.aaq_flow.submit_an_aaq_question(
                 subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
                 topic_name=utilities.
                 aaq_question_test_data["valid_firefox_question"]["topic_value"],
-                body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+                body=utilities.
+                aaq_question_test_data["valid_firefox_question"]["question_body"],
                 expected_locator=sumo_pages.question_page.questions_header
             )
         )
@@ -166,19 +166,10 @@ def test_question_page_reflects_posted_questions_and_redirects_to_question(page:
     with check, allure.step("Navigating to my questions profile page and verifying that the first "
                             "element from the My Questions page is the recently posted question"):
         sumo_pages.top_navbar.click_on_my_questions_profile_option()
-        assert (sumo_pages.my_questions_page.get_text_of_listed_question_by_index(1).
-                strip() == second_question["aaq_subject"].strip())
-        assert (sumo_pages.my_questions_page.get_text_of_listed_question_by_index(2).
-                strip() == first_question["aaq_subject"].strip())
+        assert (sumo_pages.my_questions_page.get_text_of_first_listed_question().
+                strip() == question_info["aaq_subject"].strip())
 
     with allure.step("Clicking on the first list item and verifying that the user is "
                      "redirected to the correct question"):
         sumo_pages.my_questions_page.click_on_a_question_by_index(1)
-        expect(page).to_have_url(second_question["question_page_url"])
-
-    with allure.step("Navigating back, clicking on the second listed item and verifying that the "
-                     "user is redirected to the correct question"):
-        utilities.navigate_back()
-        sumo_pages.my_questions_page.click_on_a_question_by_index(2)
-        expect(page).to_have_url(first_question["question_page_url"])
-
+        expect(page).to_have_url(question_info["question_page_url"])

From 16189509b48d35c366989e7087f007d3615d21c0 Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Wed, 17 Dec 2025 15:54:31 +0100
Subject: [PATCH 07/13] Reapply "Merge branch 'main' into improve-aaq-3"

This reverts commit fc40affc3a1c893e0ee31aee1aa30969e7a6dd71.
---
 .../0009_alter_announcement_options.py        |  17 +
 kitsune/customercare/forms.py                 |  78 +++--
 .../0003_alter_supportticket_status.py        |  18 ++
 kitsune/customercare/models.py                |   9 +-
 kitsune/customercare/tests/test_forms.py      | 139 ++++++--
 kitsune/customercare/zendesk.py               |   3 +-
 kitsune/products/admin.py                     | 110 +++++++
 .../commands/sync_product_versions.py         |  30 +-
 kitsune/products/managers.py                  |  11 +-
 ...desktopic_productsupportconfig_and_more.py |  72 +++++
 .../0029_populate_zendesk_configs.py          | 117 +++++++
 kitsune/products/models.py                    | 169 +++++++++-
 kitsune/products/tests/__init__.py            |  44 ++-
 .../tests/test_sync_product_versions.py       |  69 +++-
 kitsune/questions/admin.py                    |   1 +
 .../questions/email/new_answer_to_asker.html  |   2 +-
 .../jinja2/questions/includes/aaq_macros.html |  38 ++-
 kitsune/sumo/templatetags/jinja_helpers.py    |   7 +-
 .../jinja2/wiki/confirm_revision_delete.html  |   2 +-
 .../jinja2/wiki/includes/document_macros.html |   2 +-
 kitsune/wiki/services.py                      |  13 +-
 kitsune/wiki/tests/test_services.py           |   2 +-
 kitsune/wiki/tests/test_templates.py          |   2 +-
 playwright_tests/core/basepage.py             |   6 +-
 playwright_tests/core/utilities.py            |  17 +-
 .../aaq_flows/aaq_flow.py                     |  99 +++++-
 .../article_flows/add_kb_article_flow.py      | 122 ++-----
 .../AAQ_messages/aaq_form_page_messages.py    |   4 +-
 .../kb_translation_messages.py                |   2 +-
 .../ask_a_question/aaq_pages/aaq_form_page.py |  60 ++--
 .../contact_support_page.py                   |  13 +-
 .../posted_question_pages/questions_page.py   | 209 +++---------
 .../product_solutions_page.py                 |  35 +--
 .../product_topics_page.py                    |  11 +-
 playwright_tests/pages/auth_page.py           |   2 +-
 .../common_elements/common_web_elements.py    |  29 +-
 .../forums_pages/all_community_forums_page.py |   9 +-
 .../forums_pages/product_support_forum.py     |  25 +-
 .../contribute_pages/contribute_page.py       |  23 +-
 .../contributor_discussions_page.py           |  19 +-
 .../delete_thread_post_page.py                |   8 +-
 .../edit_thread_post_page.py                  |   8 +-
 .../edit_thread_title_page.py                 |   8 +-
 .../forum_discussions_page.py                 |  12 +-
 .../forum_thread_page.py                      |  25 +-
 .../new_thread_page.py                        |   4 +-
 .../ways_to_contribute_pages.py               |  17 +-
 .../article_discussions_page.py               |   6 +-
 .../community_hub_page.py                     |   7 +-
 .../kb_dashboard_page.py                      |  11 +-
 .../l10n_most_visited_translations.py         |   8 +-
 .../l10n_unreviewed.py                        |   8 +-
 .../moderate_forum_content.py                 |  19 +-
 .../recent_revisions_page.py                  |  43 ++-
 .../pages/contribute/groups_page.py           |  41 +--
 .../articles/kb_article_discussion_page.py    |  60 +---
 .../articles/kb_article_page.py               |  25 +-
 .../kb_article_review_revision_page.py        |  11 +-
 .../articles/kb_article_show_history_page.py  |  15 +-
 .../articles/kb_category_page.py              |   8 +-
 .../articles/kb_edit_article_meta.py          |   5 +-
 .../articles/kb_edit_article_page.py          |  21 +-
 .../articles/kb_revision_preview_page.py      |  56 +---
 .../articles/kb_translate_article_page.py     |  21 +-
 .../articles/kb_what_links_here_page.py       |   5 +-
 .../articles/products_page.py                 |  14 +-
 .../articles/submit_kb_article_page.py        |  32 +-
 .../explore_by_topic_page.py                  |  30 +-
 .../product_support_page.py                   |  15 +-
 playwright_tests/pages/footer.py              |   7 +-
 playwright_tests/pages/homepage.py            |  11 +-
 .../messaging_system_pages/inbox_page.py      |  26 --
 .../mess_system_user_navbar.py                |  21 +-
 .../messaging_system_pages/new_message.py     |  22 +-
 .../messaging_system_pages/sent_messages.py   |  33 +-
 playwright_tests/pages/search/search_page.py  |  27 +-
 playwright_tests/pages/top_navbar.py          |  69 ++--
 .../user_pages/my_profile_answers_page.py     |   4 +-
 .../user_pages/my_profile_documents_page.py   |  11 +-
 .../pages/user_pages/my_profile_edit.py       |  19 +-
 ...my_profile_edit_contribution_areas_page.py |  11 +-
 .../my_profile_edit_settings_page.py          |  11 +-
 .../my_profile_my_questions_page.py           |  22 +-
 .../pages/user_pages/my_profile_page.py       |  51 +--
 .../user_pages/my_profile_user_navbar.py      |   5 +-
 playwright_tests/test_data/aaq_question.json  |   7 +-
 .../test_data/add_kb_article.json             |  12 +-
 .../aaq_tests/test_aaq_form_page.py           | 113 +++----
 .../aaq_tests/test_anti_spam_measures.py      |  19 +-
 .../aaq_tests/test_posted_questions.py        | 297 ++++++++----------
 .../test_community_forums_by_product.py       |  23 +-
 .../test_popular_topics_page.py               |   1 +
 playwright_tests/tests/conftest.py            |  24 +-
 .../test_contributor_discussions_page.py      |  19 +-
 .../test_contributor_discussions_threads.py   |  68 ++--
 .../dashboards_tests/test_kb_dashboard.py     | 161 ++++------
 .../test_recent_revisions_dashboard.py        | 125 +++-----
 .../tests/contribute_tests/test_groups.py     |  18 +-
 .../articles/test_article_show_history.py     |  72 ++---
 .../articles/test_article_threads.py          | 154 ++++-----
 .../articles/test_article_translation.py      |  49 ++-
 .../test_kb_article_creation_and_access.py    | 132 ++++----
 .../articles/test_kb_restricted_visibility.py | 202 +++++-------
 .../articles/test_product_support_page.py     |   2 -
 .../test_explore_by_topics.py                 |   5 -
 .../tests/footer_tests/test_footer.py         |   2 -
 .../tests/homepage_tests/test_homepage.py     |   8 +-
 .../test_messaging_system.py                  | 216 ++++---------
 .../test_contributor_forums_seach.py          |   5 +-
 .../tests/search_tests/test_main_searchbar.py |  99 ++----
 .../test_top_navbar.py                        |  20 +-
 .../test_user_deletion_in_community_forums.py |  60 +---
 ...est_user_deletion_in_contributor_forums.py |  14 +-
 ...user_deletion_and_article_contributions.py |  29 +-
 .../test_user_deletion_in_media_gallery.py    |   2 -
 .../test_user_deletion_in_messaging_system.py |   5 +-
 .../test_edit_contribution_areas.py           |   4 -
 .../user_page_tests/test_edit_my_profile.py   | 183 ++++-------
 .../user_page_tests/test_my_profile_page.py   | 110 +++----
 .../user_page_tests/test_my_questions.py      |  53 ++--
 120 files changed, 2314 insertions(+), 2532 deletions(-)
 create mode 100644 kitsune/announcements/migrations/0009_alter_announcement_options.py
 create mode 100644 kitsune/customercare/migrations/0003_alter_supportticket_status.py
 create mode 100644 kitsune/products/migrations/0028_zendeskconfig_zendesktopic_productsupportconfig_and_more.py
 create mode 100644 kitsune/products/migrations/0029_populate_zendesk_configs.py

diff --git a/kitsune/announcements/migrations/0009_alter_announcement_options.py b/kitsune/announcements/migrations/0009_alter_announcement_options.py
new file mode 100644
index 00000000000..31f1e9b5058
--- /dev/null
+++ b/kitsune/announcements/migrations/0009_alter_announcement_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.25 on 2025-12-03 03:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcements', '0008_announcement_product'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='announcement',
+            options={'ordering': ['-created']},
+        ),
+    ]
diff --git a/kitsune/customercare/forms.py b/kitsune/customercare/forms.py
index 3b6c80af6e6..27328df1205 100644
--- a/kitsune/customercare/forms.py
+++ b/kitsune/customercare/forms.py
@@ -6,11 +6,9 @@
 from django.core.validators import validate_email
 from django.utils.translation import gettext_lazy as _lazy
 
-from kitsune.customercare import ZENDESK_CATEGORIES, ZENDESK_CATEGORIES_LOGINLESS
 from kitsune.customercare.models import SupportTicket
 from kitsune.products import PRODUCT_SLUG_ALIASES
-
-PRODUCTS_WITH_OS = ["mozilla-vpn"]
+from kitsune.products.models import ProductSupportConfig, ZendeskTopic
 
 OS_CHOICES = [
     (None, _lazy("Select platform")),
@@ -51,23 +49,37 @@ def __init__(self, *args, product, user=None, **kwargs):
         self.product = product
         self.user = user
 
-        if product.slug in settings.LOGIN_EXCEPTIONS and (not user or not user.is_authenticated):
+        is_loginless = product.slug in settings.LOGIN_EXCEPTIONS and (
+            not user or not user.is_authenticated
+        )
+
+        if is_loginless:
             self.fields["email"].widget = forms.EmailInput()
-            categories_dict = ZENDESK_CATEGORIES_LOGINLESS
         else:
             self.fields["email"].initial = user.email
-            categories_dict = ZENDESK_CATEGORIES
 
-        self.product_categories = categories_dict.get(product.slug, [])
+        try:
+            support_config = ProductSupportConfig.objects.get(product=product, is_active=True)
+        except ProductSupportConfig.DoesNotExist:
+            support_config = None
+
+        if support_config and support_config.zendesk_config:
+            zendesk_config = support_config.zendesk_config
 
-        category_choices = [(None, _lazy("Select a reason for contacting"))]
-        for category in self.product_categories:
-            category_choices.append((category["slug"], category["topic"]))
+            topics = zendesk_config.topics.filter(loginless_only=is_loginless).order_by(
+                "display_order"
+            )
+
+            category_choices = [(None, _lazy("Select a reason for contacting"))]
+            for topic in topics:
+                category_choices.append((topic.slug, topic.topic))
+
+            self.fields["category"].choices = category_choices
+
+            if not zendesk_config.enable_os_field:
+                self.fields["os"].widget = forms.HiddenInput()
 
-        self.fields["category"].choices = category_choices
         self.label_suffix = ""
-        if product.slug not in PRODUCTS_WITH_OS:
-            self.fields["os"].widget = forms.HiddenInput()
 
     def clean_email(self):
         email = self.cleaned_data.get("email")
@@ -96,22 +108,31 @@ def send(self, user, product):
         """Create a SupportTicket record and trigger async classification."""
         selected_category_slug = self.cleaned_data.get("category")
         zendesk_tags = []
+
         if selected_category_slug:
-            selected_category_data = None
-            for category in self.product_categories:
-                if category["slug"] == selected_category_slug:
-                    selected_category_data = category
-                    break
-
-            if selected_category_data:
-                tag_data = selected_category_data["tags"]
-
-                for tag_value in tag_data.values():
-                    if tag_value:
-                        if isinstance(tag_value, list):
-                            zendesk_tags.extend(tag_value)
-                        else:
-                            zendesk_tags.append(tag_value)
+            try:
+                support_config = ProductSupportConfig.objects.get(product=product, is_active=True)
+            except ProductSupportConfig.DoesNotExist:
+                support_config = None
+
+            if support_config and support_config.zendesk_config:
+                try:
+                    topic = ZendeskTopic.objects.get(
+                        zendesk_config=support_config.zendesk_config,
+                        slug=selected_category_slug,
+                    )
+                except ZendeskTopic.DoesNotExist:
+                    topic = None
+
+                if topic:
+                    tag_data = topic.tags_dict
+
+                    for tag_value in tag_data.values():
+                        if tag_value:
+                            if isinstance(tag_value, list):
+                                zendesk_tags.extend(tag_value)
+                            else:
+                                zendesk_tags.append(tag_value)
 
         if settings.STAGE:
             zendesk_tags.append("stage")
@@ -129,7 +150,6 @@ def send(self, user, product):
             status=SupportTicket.STATUS_PENDING,
         )
 
-        # Trigger async classification task
         from kitsune.customercare.tasks import zendesk_submission_classifier
 
         zendesk_submission_classifier.delay(submission.id)
diff --git a/kitsune/customercare/migrations/0003_alter_supportticket_status.py b/kitsune/customercare/migrations/0003_alter_supportticket_status.py
new file mode 100644
index 00000000000..465aec1b0f0
--- /dev/null
+++ b/kitsune/customercare/migrations/0003_alter_supportticket_status.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.25 on 2025-12-03 03:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('customercare', '0002_supportticket_topic'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='supportticket',
+            name='status',
+            field=models.CharField(choices=[('pending', 'Ticket Pending Classification'), ('sent', 'Ticket Sent'), ('flagged', 'Ticket under Review'), ('rejected', 'Ticket Rejected')], db_index=True, default='pending', max_length=20),
+        ),
+    ]
diff --git a/kitsune/customercare/models.py b/kitsune/customercare/models.py
index d022a94187e..9fe8f456a9b 100644
--- a/kitsune/customercare/models.py
+++ b/kitsune/customercare/models.py
@@ -1,6 +1,5 @@
 from django.contrib.auth.models import User
 from django.db import models
-from django.utils.translation import gettext_lazy as _lazy
 
 from kitsune.products.models import Product, Topic
 from kitsune.sumo.models import ModelBase
@@ -15,10 +14,10 @@ class SupportTicket(ModelBase):
     STATUS_REJECTED = "rejected"
 
     STATUS_CHOICES = (
-        (STATUS_PENDING, _lazy("Pending")),
-        (STATUS_SENT, _lazy("Sent")),
-        (STATUS_FLAGGED, _lazy("Flagged for Review")),
-        (STATUS_REJECTED, _lazy("Rejected")),
+        (STATUS_PENDING, "Ticket Pending Classification"),
+        (STATUS_SENT, "Ticket Sent"),
+        (STATUS_FLAGGED, "Ticket under Review"),
+        (STATUS_REJECTED, "Ticket Rejected"),
     )
 
     subject = models.CharField(max_length=255)
diff --git a/kitsune/customercare/tests/test_forms.py b/kitsune/customercare/tests/test_forms.py
index 86e7defb2a1..630acf400da 100644
--- a/kitsune/customercare/tests/test_forms.py
+++ b/kitsune/customercare/tests/test_forms.py
@@ -2,10 +2,14 @@
 
 from django.contrib.auth.models import AnonymousUser
 
-from kitsune.customercare import ZENDESK_CATEGORIES, ZENDESK_CATEGORIES_LOGINLESS
 from kitsune.customercare.forms import ZendeskForm
 from kitsune.customercare.models import SupportTicket
-from kitsune.products.tests import ProductFactory
+from kitsune.products.tests import (
+    ProductFactory,
+    ProductSupportConfigFactory,
+    ZendeskConfigFactory,
+    ZendeskTopicFactory,
+)
 from kitsune.sumo.tests import TestCase
 from kitsune.users.tests import UserFactory
 
@@ -22,16 +26,115 @@ def setUp(self):
         )
         self.user = UserFactory(email="test@example.com")
 
+        # Create ZendeskConfig for VPN
+        self.vpn_zendesk = ZendeskConfigFactory(name="Mozilla VPN Support")
+        ZendeskTopicFactory(
+            zendesk_config=self.vpn_zendesk,
+            slug="vpn-connection-issues",
+            topic="I can't connect to Mozilla VPN",
+            display_order=0,
+            legacy_tag="technical",
+            tier_tags=[
+                "t1-performance-and-connectivity",
+                "t2-connectivity",
+                "t3-connection-failure",
+            ],
+            automation_tag="ssa-connection-issues-automation",
+            segmentation_tag="",
+            loginless_only=False,
+        )
+        ZendeskTopicFactory(
+            zendesk_config=self.vpn_zendesk,
+            slug="vpn-server-selection",
+            topic="I can't choose a VPN location",
+            display_order=1,
+            legacy_tag="technical",
+            tier_tags=[
+                "t1-performance-and-connectivity",
+                "t2-connectivity",
+                "t3-cant-select-server",
+            ],
+            loginless_only=False,
+        )
+        ZendeskTopicFactory(
+            zendesk_config=self.vpn_zendesk,
+            slug="payments",
+            topic="I need help with a billing or subscription question",
+            display_order=2,
+            legacy_tag="payments",
+            tier_tags=["t1-billing-and-subscriptions"],
+            automation_tag="",
+            segmentation_tag="",
+            loginless_only=False,
+        )
+        ProductSupportConfigFactory(
+            product=self.vpn_product, zendesk_config=self.vpn_zendesk, forum_config=None
+        )
+
+        # Create ZendeskConfig for Relay
+        self.relay_zendesk = ZendeskConfigFactory(name="Firefox Relay Support")
+        ZendeskTopicFactory(
+            zendesk_config=self.relay_zendesk,
+            slug="relay-email-forwarding",
+            topic="I'm not receiving emails to my Relay mask",
+            display_order=0,
+            legacy_tag="technical",
+            tier_tags=["t1-privacy-and-security", "t2-masking", "t3-email-masking"],
+            segmentation_tag="seg-relay-no-fwd-deliver",
+            loginless_only=False,
+        )
+        ZendeskTopicFactory(
+            zendesk_config=self.relay_zendesk,
+            slug="relay-domain-change",
+            topic="I want to change my Relay email domain",
+            display_order=1,
+            legacy_tag="technical",
+            tier_tags=["t1-privacy-and-security", "t2-masking", "t3-email-masking"],
+            segmentation_tag="seg-relay-chg-domain",
+            loginless_only=False,
+        )
+        ProductSupportConfigFactory(
+            product=self.relay_product, zendesk_config=self.relay_zendesk, forum_config=None
+        )
+
+        # Create ZendeskConfig for Mozilla Account with loginless topics
+        self.accounts_zendesk = ZendeskConfigFactory(name="Mozilla Account Support")
+        ZendeskTopicFactory(
+            zendesk_config=self.accounts_zendesk,
+            slug="fxa-2fa-lockout",
+            topic="My security code isn't working or is lost",
+            display_order=0,
+            legacy_tag="accounts",
+            tier_tags=[
+                "t1-passwords-and-sign-in",
+                "t2-two-factor-authentication",
+                "t3-two-factor-lockout",
+            ],
+            automation_tag="ssa-2fa-automation",
+            loginless_only=True,
+        )
+        ZendeskTopicFactory(
+            zendesk_config=self.accounts_zendesk,
+            slug="fxa-reset-password",
+            topic="I forgot my password",
+            display_order=1,
+            legacy_tag="accounts",
+            tier_tags=["t1-passwords-and-sign-in", "t2-reset-passwords"],
+            automation_tag="ssa-emailverify-automation",
+            loginless_only=True,
+        )
+        ProductSupportConfigFactory(
+            product=self.accounts_product, zendesk_config=self.accounts_zendesk, forum_config=None
+        )
+
     def test_authenticated_form_gets_correct_categories(self):
         """Test that authenticated users get product-specific categories."""
         form = ZendeskForm(product=self.vpn_product, user=self.user)
 
-        expected_categories = ZENDESK_CATEGORIES["mozilla-vpn"]
-        self.assertEqual(form.product_categories, expected_categories)
-
         category_topics = [choice[1] for choice in form.fields["category"].choices if choice[0]]
         self.assertIn("I can't connect to Mozilla VPN", category_topics)
         self.assertIn("I can't choose a VPN location", category_topics)
+        self.assertEqual(len(category_topics), 3)  # 3 topics for VPN
 
     def test_different_products_get_different_categories(self):
         """Test that different products get different categories."""
@@ -52,12 +155,10 @@ def test_loginless_form_gets_loginless_categories(self):
         anonymous_user = AnonymousUser()
         form = ZendeskForm(product=self.accounts_product, user=anonymous_user)
 
-        expected_categories = ZENDESK_CATEGORIES_LOGINLESS["mozilla-account"]
-        self.assertEqual(form.product_categories, expected_categories)
-
         category_topics = [choice[1] for choice in form.fields["category"].choices if choice[0]]
         self.assertIn("I forgot my password", category_topics)
         self.assertIn("My security code isn't working or is lost", category_topics)
+        self.assertEqual(len(category_topics), 2)  # 2 loginless topics for Mozilla Account
 
     def test_form_stores_product_and_user(self):
         """Test that form stores product and user for later use."""
@@ -187,7 +288,7 @@ def test_send_with_no_category_selected(self, mock_task):
         mock_task.assert_called_once_with(submission.id)
 
     def test_product_without_categories_gets_empty_choices(self):
-        """Test that products not in our categories dict get empty choices."""
+        """Test that products without ProductSupportConfig get no choices."""
         unknown_product = ProductFactory(
             title="Unknown Product", slug="unknown-product", codename="unknown"
         )
@@ -195,26 +296,20 @@ def test_product_without_categories_gets_empty_choices(self):
         form = ZendeskForm(product=unknown_product, user=self.user)
 
         category_choices = form.fields["category"].choices
-        self.assertEqual(len(category_choices), 1)
-        self.assertEqual(category_choices[0][1], "Select a reason for contacting")
+        # Without ProductSupportConfig, no categories are populated
+        self.assertEqual(len(category_choices), 0)
 
     def test_base_categories_are_properly_expanded(self):
-        """Test that DRY base categories are properly expanded."""
+        """Test that topics are properly loaded from database."""
         form = ZendeskForm(product=self.vpn_product, user=self.user)
 
-        payments_category = None
-        for category in form.product_categories:
-            if category["slug"] == "payments":
-                payments_category = category
-                break
+        category_choices = form.fields["category"].choices
+        category_dict = {slug: topic for slug, topic in category_choices if slug}
 
-        self.assertIsNotNone(payments_category)
+        self.assertIn("payments", category_dict)
         self.assertEqual(
-            payments_category["topic"], "I need help with a billing or subscription question"
+            category_dict["payments"], "I need help with a billing or subscription question"
         )
-        self.assertEqual(payments_category["tags"]["tiers"], ["t1-billing-and-subscriptions"])
-        self.assertIsNone(payments_category["tags"]["automation"])
-        self.assertIsNone(payments_category["tags"]["segmentation"])
 
     @patch("django.conf.settings.LOGIN_EXCEPTIONS", ["mozilla-account"])
     @patch("kitsune.customercare.tasks.zendesk_submission_classifier.delay")
diff --git a/kitsune/customercare/zendesk.py b/kitsune/customercare/zendesk.py
index a3c83055879..210929255bf 100644
--- a/kitsune/customercare/zendesk.py
+++ b/kitsune/customercare/zendesk.py
@@ -1,11 +1,10 @@
 from django.conf import settings
-from django.utils.translation import gettext_lazy as _lazy
 from zenpy import Zenpy
 from zenpy.lib.api_objects import Identity as ZendeskIdentity
 from zenpy.lib.api_objects import Ticket
 from zenpy.lib.api_objects import User as ZendeskUser
 
-NO_RESPONSE = _lazy("No response provided.")
+NO_RESPONSE = "No response provided."
 LOGINLESS_TAG = "loginless_ticket"
 
 
diff --git a/kitsune/products/admin.py b/kitsune/products/admin.py
index c88254f66bf..8ef5ea7b9da 100644
--- a/kitsune/products/admin.py
+++ b/kitsune/products/admin.py
@@ -8,10 +8,13 @@
 from kitsune.products.models import (
     Platform,
     Product,
+    ProductSupportConfig,
     ProductTopic,
     Topic,
     TopicSlugHistory,
     Version,
+    ZendeskConfig,
+    ZendeskTopic,
 )
 
 
@@ -75,6 +78,7 @@ class ProductAdmin(admin.ModelAdmin):
     readonly_fields = ("id",)
     prepopulated_fields = {"slug": ("title",)}
     list_filter = (ArchivedFilter,)
+    search_fields = ("title", "slug")
     form = MetadataForm
     autocomplete_fields = ("pinned_article_config",)
 
@@ -169,3 +173,109 @@ class TopicSlugHistoryAdmin(admin.ModelAdmin):
 admin.site.register(Topic, TopicAdmin)
 admin.site.register(Version, VersionAdmin)
 admin.site.register(TopicSlugHistory, TopicSlugHistoryAdmin)
+
+
+class ZendeskTopicInline(admin.StackedInline):
+    model = ZendeskTopic
+    extra = 1
+    classes = ("collapse",)
+    fields = (
+        "slug",
+        "topic",
+        "display_order",
+        "legacy_tag",
+        "tier_tags",
+        "automation_tag",
+        "segmentation_tag",
+        "loginless_only",
+    )
+
+
+class ZendeskTopicAdmin(admin.ModelAdmin):
+    list_display = ("topic", "zendesk_config", "slug", "display_order", "loginless_only")
+    list_display_links = ("topic", "slug")
+    list_editable = ("display_order",)
+    list_filter = ("zendesk_config", "loginless_only")
+    search_fields = ("topic", "slug", "zendesk_config__name")
+    prepopulated_fields = {"slug": ("topic",)}
+
+
+class ZendeskConfigAdmin(admin.ModelAdmin):
+    list_display = ("name", "ticket_form_id", "enable_os_field")
+    list_display_links = ("name",)
+    list_editable = ("enable_os_field",)
+    search_fields = ("name",)
+    inlines = [ZendeskTopicInline]
+
+
+class ProductSupportConfigAdmin(admin.ModelAdmin):
+    list_display = (
+        "product",
+        "is_active",
+        "enable_forum_support",
+        "enable_zendesk_support",
+        "is_hybrid",
+        "default_support_type",
+    )
+    list_display_links = ("product",)
+    list_editable = ("is_active",)
+    list_filter = ("is_active", "default_support_type")
+    search_fields = ("product__title", "product__slug")
+    filter_horizontal = ("hybrid_support_groups",)
+    autocomplete_fields = ("product", "forum_config", "zendesk_config")
+    readonly_fields = ("is_hybrid", "enable_forum_support", "enable_zendesk_support")
+
+    fieldsets = (
+        (
+            "Basic Information",
+            {
+                "fields": ("product", "is_active"),
+            },
+        ),
+        (
+            "Support Channels",
+            {
+                "fields": (
+                    "forum_config",
+                    "zendesk_config",
+                    "enable_forum_support",
+                    "enable_zendesk_support",
+                    "is_hybrid",
+                ),
+                "description": "Configure which support channels are available for this product. "
+                "At least one must be selected.",
+            },
+        ),
+        (
+            "Routing Configuration",
+            {
+                "fields": ("default_support_type", "group_default_support_type"),
+                "description": "Set default support type for all users and optionally for hybrid group members.",
+            },
+        ),
+        (
+            "Hybrid Support (Forums + Zendesk)",
+            {
+                "fields": ("hybrid_support_groups",),
+                "description": "Users in these groups can choose between forums and Zendesk when both are enabled. "
+                "Leave empty to allow all users to choose.",
+            },
+        ),
+    )
+
+    @admin.display(boolean=True, description="Forum Enabled")
+    def enable_forum_support(self, obj):
+        return obj.enable_forum_support
+
+    @admin.display(boolean=True, description="Zendesk Enabled")
+    def enable_zendesk_support(self, obj):
+        return obj.enable_zendesk_support
+
+    @admin.display(boolean=True, description="Hybrid (Both)")
+    def is_hybrid(self, obj):
+        return obj.is_hybrid
+
+
+admin.site.register(ZendeskTopic, ZendeskTopicAdmin)
+admin.site.register(ZendeskConfig, ZendeskConfigAdmin)
+admin.site.register(ProductSupportConfig, ProductSupportConfigAdmin)
diff --git a/kitsune/products/management/commands/sync_product_versions.py b/kitsune/products/management/commands/sync_product_versions.py
index 97aa804824e..7c13c1d5f60 100644
--- a/kitsune/products/management/commands/sync_product_versions.py
+++ b/kitsune/products/management/commands/sync_product_versions.py
@@ -63,6 +63,8 @@ def _get_product_configs(self):
                 "slug_prefix": "fx",
                 "version_data": product_details.firefox_versions,
                 "version_key": "LATEST_FIREFOX_VERSION",
+                "beta_version_key": "LATEST_FIREFOX_RELEASED_DEVEL_VERSION",
+                "alpha_version_key": "FIREFOX_NIGHTLY",
                 "history_data": product_details.firefox_history_major_releases,
                 "esr_keys": [],
                 "esr_only": False,
@@ -82,6 +84,8 @@ def _get_product_configs(self):
                 "slug_prefix": "m",
                 "version_data": product_details.mobile_versions,
                 "version_key": "version",
+                "beta_version_key": "beta_version",
+                "alpha_version_key": "nightly_version",
                 "history_data": product_details.firefox_history_major_releases,
                 "esr_keys": [],
                 "esr_only": False,
@@ -91,6 +95,8 @@ def _get_product_configs(self):
                 "slug_prefix": "ios",
                 "version_data": product_details.firefox_versions,
                 "version_key": "LATEST_FIREFOX_VERSION",
+                "beta_version_key": "LATEST_FIREFOX_RELEASED_DEVEL_VERSION",
+                "alpha_version_key": "FIREFOX_NIGHTLY",
                 "history_data": product_details.firefox_history_major_releases,
                 "esr_keys": [],
                 "esr_only": False,
@@ -100,6 +106,8 @@ def _get_product_configs(self):
                 "slug_prefix": "tb",
                 "version_data": product_details.thunderbird_versions,
                 "version_key": "LATEST_THUNDERBIRD_VERSION",
+                "beta_version_key": "LATEST_THUNDERBIRD_DEVEL_VERSION",
+                "alpha_version_key": "LATEST_THUNDERBIRD_NIGHTLY_VERSION",
                 "history_data": product_details.thunderbird_history_major_releases,
                 "esr_keys": ["THUNDERBIRD_ESR"],
                 "esr_only": False,
@@ -117,7 +125,7 @@ def _sync_product(self, product: Product, config: dict, dry_run: bool, verbosity
             return
 
         if verbosity >= 1:
-            self.stdout.write(f"\nSyncing {product.title} (latest: {latest_version})...")
+            self.stdout.write(f"\nSyncing {product.title} (latest release: {latest_version})...")
 
         esr_only = config.get("esr_only", False)
 
@@ -129,11 +137,22 @@ def _sync_product(self, product: Product, config: dict, dry_run: bool, verbosity
             if not esr_only:
                 history_data = config["history_data"]
                 available_versions = self._get_available_versions(history_data, latest_major)
+
+                beta_version = config["version_data"].get(config["beta_version_key"])
+                beta_major = self._parse_major_version(beta_version) if beta_version else None
+                if beta_major:
+                    available_versions.append(beta_major)
+
+                alpha_version = config["version_data"].get(config["alpha_version_key"])
+                alpha_major = self._parse_major_version(alpha_version) if alpha_version else None
+                if alpha_major:
+                    available_versions.append(alpha_major)
+
                 self._create_or_update_versions(
                     product, config, available_versions, dry_run, verbosity
                 )
             self._handle_esr_versions(product, config, dry_run, verbosity)
-            self._update_visibility(product, dry_run, verbosity)
+            self._update_visibility(product, latest_major, dry_run, verbosity)
 
     def _get_available_versions(self, history_data: dict, latest_major: int) -> list:
         """Get list of available major version numbers from history."""
@@ -269,18 +288,19 @@ def _handle_esr_versions(self, product: Product, config: dict, dry_run: bool, ve
                     if verbosity >= 1:
                         self.stdout.write(f"  Created ESR {slug}")
 
-    def _update_visibility(self, product: Product, dry_run: bool, verbosity: int):
+    def _update_visibility(self, product: Product, latest_major: int, dry_run: bool, verbosity: int):
         """Update visibility and default flags for all versions of a product."""
         all_versions = list(Version.objects.filter(product=product).order_by("-max_version"))
         if not all_versions:
             return
 
         esr_versions = [v for v in all_versions if v.slug.endswith("-esr")]
-        regular_versions = [v for v in all_versions if not v.slug.endswith("-esr")]
+        regular_versions = [v for v in all_versions if not v.slug.endswith("-esr") and v.min_version <= latest_major]
+        prerelease_versions = [v for v in all_versions if not v.slug.endswith("-esr") and v.min_version > latest_major]
         top_10 = regular_versions[:10]
 
         for version in all_versions:
-            should_be_visible = version in top_10 or version in esr_versions
+            should_be_visible = version in top_10 or version in esr_versions or version in prerelease_versions
             should_be_default = bool(regular_versions) and version == regular_versions[0]
 
             if version.visible != should_be_visible or version.default != should_be_default:
diff --git a/kitsune/products/managers.py b/kitsune/products/managers.py
index 264023d6621..0c033cc6e76 100644
--- a/kitsune/products/managers.py
+++ b/kitsune/products/managers.py
@@ -11,7 +11,6 @@ def get_queryset(self):
 
 class ProductManager(NonArchivedManager):
     def with_question_forums(self, language_code: str = ""):
-
         q_kwargs: dict[str, Any] = {
             "aaq_configs__is_active": True,
         }
@@ -20,3 +19,13 @@ def with_question_forums(self, language_code: str = ""):
             q_kwargs["aaq_configs__enabled_locales__locale"] = language_code
 
         return self.filter(**q_kwargs).filter(codename="").distinct()
+
+
+class ProductSupportConfigManager(Manager):
+    def locales_list(self):
+        """Returns list of locales that have active forum support configurations."""
+        return (
+            self.filter(forum_config__enabled_locales__locale__isnull=False)
+            .values_list("forum_config__enabled_locales__locale", flat=True)
+            .distinct()
+        )
diff --git a/kitsune/products/migrations/0028_zendeskconfig_zendesktopic_productsupportconfig_and_more.py b/kitsune/products/migrations/0028_zendeskconfig_zendesktopic_productsupportconfig_and_more.py
new file mode 100644
index 00000000000..06613ff972f
--- /dev/null
+++ b/kitsune/products/migrations/0028_zendeskconfig_zendesktopic_productsupportconfig_and_more.py
@@ -0,0 +1,72 @@
+# Generated by Django 4.2.25 on 2025-12-15 07:27
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('questions', '0022_remove_aaqconfig_pinned_articles_and_more'),
+        ('products', '0027_product_pinned_article_config'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ZendeskConfig',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text='Descriptive name for this Zendesk configuration', max_length=255)),
+                ('ticket_form_id', models.CharField(blank=True, help_text='Zendesk ticket form ID to use for this product (leave blank to use global default)', max_length=50)),
+                ('enable_os_field', models.BooleanField(default=False, help_text='Show operating system selector in the support form')),
+            ],
+            options={
+                'verbose_name': 'Zendesk configuration',
+                'ordering': ['name'],
+            },
+        ),
+        migrations.CreateModel(
+            name='ZendeskTopic',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('slug', models.SlugField(help_text='Unique identifier for this topic', max_length=100)),
+                ('topic', models.CharField(help_text='User-facing topic text shown in the dropdown', max_length=255)),
+                ('display_order', models.IntegerField(default=0, help_text='Order in which topics appear (lower numbers first)')),
+                ('legacy_tag', models.CharField(blank=True, help_text='Legacy Zendesk tag', max_length=100)),
+                ('tier_tags', models.JSONField(default=list, help_text="List of tier tags (e.g., ['t1-billing-and-subscriptions'])")),
+                ('automation_tag', models.CharField(blank=True, help_text='Automation tag for Zendesk workflows', max_length=100, null=True)),
+                ('segmentation_tag', models.CharField(blank=True, help_text='Segmentation tag for analytics', max_length=100, null=True)),
+                ('loginless_only', models.BooleanField(default=False, help_text='Only show this topic for loginless (unauthenticated) support flows')),
+                ('zendesk_config', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topics', to='products.zendeskconfig')),
+            ],
+            options={
+                'verbose_name': 'Zendesk topic',
+                'ordering': ['display_order', 'slug'],
+            },
+        ),
+        migrations.CreateModel(
+            name='ProductSupportConfig',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('is_active', models.BooleanField(default=False, help_text='Only one configuration can be active per product')),
+                ('default_support_type', models.CharField(choices=[('forum', 'Community Forums'), ('zendesk', 'Zendesk Support')], default='forum', help_text='Default support channel for users (used when only one channel or no group access)', max_length=20)),
+                ('group_default_support_type', models.CharField(blank=True, choices=[('forum', 'Community Forums'), ('zendesk', 'Zendesk Support')], help_text='Default support type for users in hybrid groups (if not set, uses default_support_type)', max_length=20, null=True)),
+                ('forum_config', models.ForeignKey(blank=True, help_text='Select forum configuration to enable community support', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='support_configs', to='questions.aaqconfig')),
+                ('hybrid_support_groups', models.ManyToManyField(blank=True, help_text='Groups that can choose between forums and Zendesk when both are enabled', related_name='hybrid_support_configs', to='auth.group')),
+                ('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='support_configs', to='products.product')),
+                ('zendesk_config', models.ForeignKey(blank=True, help_text='Select Zendesk configuration to enable Zendesk support', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='support_configs', to='products.zendeskconfig')),
+            ],
+            options={
+                'verbose_name': 'Product support configuration',
+            },
+        ),
+        migrations.AddConstraint(
+            model_name='zendesktopic',
+            constraint=models.UniqueConstraint(fields=('zendesk_config', 'slug'), name='unique_zendesk_topic_per_config'),
+        ),
+        migrations.AddConstraint(
+            model_name='productsupportconfig',
+            constraint=models.UniqueConstraint(fields=('product', 'is_active'), name='unique_active_support_config'),
+        ),
+    ]
diff --git a/kitsune/products/migrations/0029_populate_zendesk_configs.py b/kitsune/products/migrations/0029_populate_zendesk_configs.py
new file mode 100644
index 00000000000..0fc037f826e
--- /dev/null
+++ b/kitsune/products/migrations/0029_populate_zendesk_configs.py
@@ -0,0 +1,117 @@
+# Generated by Django 4.2.25 on 2025-12-16 02:49
+
+from django.conf import settings
+from django.db import migrations
+
+
+def populate_zendesk_configs(apps, schema_editor):
+    """
+    Populate ZendeskConfig, ZendeskTopic, and ProductSupportConfig from hardcoded data.
+
+    Reads ZENDESK_CATEGORIES dict and creates database records for products that exist
+    in this environment. Creates ProductSupportConfig for all products with either
+    AAQConfig or ZendeskConfig.
+    """
+    from kitsune.customercare import ZENDESK_CATEGORIES, ZENDESK_CATEGORIES_LOGINLESS
+
+    Product = apps.get_model("products", "Product")
+    ZendeskConfig = apps.get_model("products", "ZendeskConfig")
+    ZendeskTopic = apps.get_model("products", "ZendeskTopic")
+    ProductSupportConfig = apps.get_model("products", "ProductSupportConfig")
+    AAQConfig = apps.get_model("questions", "AAQConfig")
+
+    zendesk_configs_by_slug = {}
+    products_with_os_field = ["mozilla-vpn"]
+
+    for product_slug, categories in ZENDESK_CATEGORIES.items():
+        try:
+            product = Product.objects.get(slug=product_slug)
+        except Product.DoesNotExist:
+            continue
+
+        zendesk_config = ZendeskConfig.objects.create(
+            name=f"{product.title} Support",
+            ticket_form_id=str(settings.ZENDESK_TICKET_FORM_ID),
+            enable_os_field=product_slug in products_with_os_field,
+        )
+        zendesk_configs_by_slug[product_slug] = zendesk_config
+
+        display_order = 0
+        for category in categories:
+            tags = category.get("tags", {})
+            ZendeskTopic.objects.create(
+                zendesk_config=zendesk_config,
+                slug=category["slug"],
+                topic=category["topic"],
+                display_order=display_order,
+                legacy_tag=tags.get("legacy", ""),
+                tier_tags=tags.get("tiers", []),
+                automation_tag=tags.get("automation") or "",
+                segmentation_tag=tags.get("segmentation") or "",
+                loginless_only=False,
+            )
+            display_order += 1
+
+        if product_slug in ZENDESK_CATEGORIES_LOGINLESS:
+            for category in ZENDESK_CATEGORIES_LOGINLESS[product_slug]:
+                tags = category.get("tags", {})
+                ZendeskTopic.objects.create(
+                    zendesk_config=zendesk_config,
+                    slug=category["slug"],
+                    topic=category["topic"],
+                    display_order=display_order,
+                    legacy_tag=tags.get("legacy", ""),
+                    tier_tags=tags.get("tiers", []),
+                    automation_tag=tags.get("automation") or "",
+                    segmentation_tag=tags.get("segmentation") or "",
+                    loginless_only=True,
+                )
+                display_order += 1
+
+    for product in Product.objects.all():
+        zendesk_config = zendesk_configs_by_slug.get(product.slug)
+
+        config_data = None
+
+        if zendesk_config:
+            config_data = {
+                "product": product,
+                "forum_config": None,
+                "zendesk_config": zendesk_config,
+                "default_support_type": "zendesk",
+            }
+        else:
+            aaq_config = AAQConfig.objects.filter(product=product).first()
+            if aaq_config:
+                config_data = {
+                    "product": product,
+                    "forum_config": aaq_config,
+                    "zendesk_config": None,
+                    "default_support_type": "forum",
+                }
+
+        if config_data:
+            ProductSupportConfig.objects.create(
+                is_active=True, group_default_support_type=None, **config_data
+            )
+
+
+def reverse_migration(apps, schema_editor):
+    """Reverse the data migration by deleting all created records."""
+    ProductSupportConfig = apps.get_model("products", "ProductSupportConfig")
+    ZendeskConfig = apps.get_model("products", "ZendeskConfig")
+    ZendeskTopic = apps.get_model("products", "ZendeskTopic")
+
+    ProductSupportConfig.objects.all().delete()
+    ZendeskTopic.objects.all().delete()
+    ZendeskConfig.objects.all().delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("products", "0028_zendeskconfig_zendesktopic_productsupportconfig_and_more"),
+    ]
+
+    operations = [
+        migrations.RunPython(populate_zendesk_configs, reverse_migration),
+    ]
diff --git a/kitsune/products/models.py b/kitsune/products/models.py
index d2e2f3cf0df..8e04e2c50a2 100644
--- a/kitsune/products/models.py
+++ b/kitsune/products/models.py
@@ -1,8 +1,13 @@
 from django.conf import settings
+from django.contrib.auth.models import Group
 from django.core.cache import cache
 from django.db import models
 
-from kitsune.products.managers import NonArchivedManager, ProductManager
+from kitsune.products.managers import (
+    NonArchivedManager,
+    ProductManager,
+    ProductSupportConfigManager,
+)
 from kitsune.sumo.fields import ImagePlusField
 from kitsune.sumo.models import ModelBase
 from kitsune.sumo.urlresolvers import reverse
@@ -255,3 +260,165 @@ class Platform(ModelBase):
 
     def __str__(self):
         return "{}".format(self.name)
+
+
+class ProductSupportConfig(ModelBase):
+    """Configuration for product support routing (forums and/or Zendesk).
+
+    This model acts as a routing layer that determines which support channel(s)
+    are available for a product and handles group-based access control for hybrid support.
+    """
+
+    SUPPORT_TYPE_FORUM = "forum"
+    SUPPORT_TYPE_ZENDESK = "zendesk"
+    SUPPORT_TYPE_CHOICES = [
+        (SUPPORT_TYPE_FORUM, "Community Forums"),
+        (SUPPORT_TYPE_ZENDESK, "Zendesk Support"),
+    ]
+
+    product = models.ForeignKey(Product, on_delete=models.CASCADE, related_name="support_configs")
+    forum_config = models.ForeignKey(
+        "questions.AAQConfig",
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name="support_configs",
+        help_text="Select forum configuration to enable community support",
+    )
+    zendesk_config = models.ForeignKey(
+        "ZendeskConfig",
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name="support_configs",
+        help_text="Select Zendesk configuration to enable Zendesk support",
+    )
+    is_active = models.BooleanField(
+        default=False, help_text="Only one configuration can be active per product"
+    )
+    default_support_type = models.CharField(
+        max_length=20,
+        choices=SUPPORT_TYPE_CHOICES,
+        default=SUPPORT_TYPE_FORUM,
+        help_text="Default support channel for users (used when only one channel or no group access)",
+    )
+    hybrid_support_groups = models.ManyToManyField(
+        Group,
+        blank=True,
+        related_name="hybrid_support_configs",
+        help_text="Groups that can choose between forums and Zendesk when both are enabled",
+    )
+    group_default_support_type = models.CharField(
+        max_length=20,
+        choices=SUPPORT_TYPE_CHOICES,
+        null=True,
+        blank=True,
+        help_text="Default support type for users in hybrid groups (if not set, uses default_support_type)",
+    )
+
+    objects = ProductSupportConfigManager()
+
+    class Meta:
+        verbose_name = "Product support configuration"
+        constraints = [
+            models.UniqueConstraint(
+                fields=["product", "is_active"], name="unique_active_support_config"
+            )
+        ]
+
+    def __str__(self):
+        return f"{self.product} Support Configuration"
+
+    @property
+    def is_hybrid(self):
+        """Returns True if both forum and Zendesk support are enabled."""
+        return bool(self.forum_config) and bool(self.zendesk_config)
+
+    @property
+    def enable_forum_support(self):
+        """Returns True if forum support is enabled (forum_config is set)."""
+        return bool(self.forum_config)
+
+    @property
+    def enable_zendesk_support(self):
+        """Returns True if Zendesk support is enabled (zendesk_config is set)."""
+        return bool(self.zendesk_config)
+
+
+class ZendeskConfig(ModelBase):
+    """Configuration for Zendesk support integration.
+
+    Stores per-product Zendesk settings like form IDs and field preferences.
+    Global Zendesk API credentials remain in Django settings.
+    """
+
+    name = models.CharField(
+        max_length=255, help_text="Descriptive name for this Zendesk configuration"
+    )
+    ticket_form_id = models.CharField(
+        max_length=50,
+        blank=True,
+        help_text="Zendesk ticket form ID to use for this product (leave blank to use global default)",
+    )
+    enable_os_field = models.BooleanField(
+        default=False, help_text="Show operating system selector in the support form"
+    )
+
+    class Meta:
+        verbose_name = "Zendesk configuration"
+        ordering = ["name"]
+
+    def __str__(self):
+        return self.name
+
+
+class ZendeskTopic(ModelBase):
+    """Zendesk support topic/category for the support form dropdown."""
+
+    zendesk_config = models.ForeignKey(
+        ZendeskConfig, on_delete=models.CASCADE, related_name="topics"
+    )
+    slug = models.SlugField(max_length=100, help_text="Unique identifier for this topic")
+    topic = models.CharField(
+        max_length=255, help_text="User-facing topic text shown in the dropdown"
+    )
+    display_order = models.IntegerField(
+        default=0, help_text="Order in which topics appear (lower numbers first)"
+    )
+    legacy_tag = models.CharField(max_length=100, blank=True, help_text="Legacy Zendesk tag")
+    tier_tags = models.JSONField(
+        default=list,
+        help_text="List of tier tags (e.g., ['t1-billing-and-subscriptions'])",
+    )
+    automation_tag = models.CharField(
+        max_length=100, blank=True, null=True, help_text="Automation tag for Zendesk workflows"
+    )
+    segmentation_tag = models.CharField(
+        max_length=100, blank=True, null=True, help_text="Segmentation tag for analytics"
+    )
+    loginless_only = models.BooleanField(
+        default=False,
+        help_text="Only show this topic for loginless (unauthenticated) support flows",
+    )
+
+    class Meta:
+        verbose_name = "Zendesk topic"
+        ordering = ["display_order", "slug"]
+        constraints = [
+            models.UniqueConstraint(
+                fields=["zendesk_config", "slug"], name="unique_zendesk_topic_per_config"
+            )
+        ]
+
+    def __str__(self):
+        return f"{self.zendesk_config.name}: {self.topic}"
+
+    @property
+    def tags_dict(self):
+        """Returns tags in the format expected by ZendeskForm."""
+        return {
+            "legacy": self.legacy_tag,
+            "tiers": self.tier_tags,
+            "automation": self.automation_tag,
+            "segmentation": self.segmentation_tag,
+        }
diff --git a/kitsune/products/tests/__init__.py b/kitsune/products/tests/__init__.py
index c9cf859132d..91256a7244d 100644
--- a/kitsune/products/tests/__init__.py
+++ b/kitsune/products/tests/__init__.py
@@ -3,7 +3,15 @@
 import factory.fuzzy
 from django.template.defaultfilters import slugify
 
-from kitsune.products.models import Platform, Product, Topic, Version
+from kitsune.products.models import (
+    Platform,
+    Product,
+    ProductSupportConfig,
+    Topic,
+    Version,
+    ZendeskConfig,
+    ZendeskTopic,
+)
 from kitsune.sumo.tests import FuzzyUnicode
 
 
@@ -68,3 +76,37 @@ class Meta:
     slug = factory.LazyAttribute(lambda o: slugify(o.name))
     visible = True
     display_order = factory.fuzzy.FuzzyInteger(10)
+
+
+class ZendeskConfigFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = ZendeskConfig
+
+    name = FuzzyUnicode()
+    ticket_form_id = "360000417171"
+    enable_os_field = False
+
+
+class ZendeskTopicFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = ZendeskTopic
+
+    zendesk_config = factory.SubFactory(ZendeskConfigFactory)
+    slug = FuzzyUnicode()
+    topic = FuzzyUnicode()
+    display_order = factory.fuzzy.FuzzyInteger(10)
+    legacy_tag = ""
+    tier_tags: list[str] = []
+    automation_tag = ""
+    segmentation_tag = ""
+    loginless_only = False
+
+
+class ProductSupportConfigFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = ProductSupportConfig
+
+    product = factory.SubFactory(ProductFactory)
+    is_active = True
+    default_support_type = ProductSupportConfig.SUPPORT_TYPE_ZENDESK
+    group_default_support_type = None
diff --git a/kitsune/products/tests/test_sync_product_versions.py b/kitsune/products/tests/test_sync_product_versions.py
index 3f7c7c5b5c3..18633f88d0d 100644
--- a/kitsune/products/tests/test_sync_product_versions.py
+++ b/kitsune/products/tests/test_sync_product_versions.py
@@ -26,6 +26,8 @@ def _mock_product_details(self):
         # Firefox versions data
         mock_pd.firefox_versions = {
             "LATEST_FIREFOX_VERSION": "143.0.4",
+            "LATEST_FIREFOX_RELEASED_DEVEL_VERSION": "144.0b7",
+            "FIREFOX_NIGHTLY": "145.0a2",
             "FIREFOX_ESR": "140.3.1esr",
             "FIREFOX_ESR115": "115.20.0esr",
         }
@@ -41,11 +43,15 @@ def _mock_product_details(self):
         # Mobile versions data
         mock_pd.mobile_versions = {
             "version": "143.0",
+            "beta_version": "144.0b2",
+            "nightly_version": "145.0a3",
         }
 
         # Thunderbird versions data
         mock_pd.thunderbird_versions = {
             "LATEST_THUNDERBIRD_VERSION": "128.5.0",
+            "LATEST_THUNDERBIRD_DEVEL_VERSION": "129.0b2",
+            "LATEST_THUNDERBIRD_NIGHTLY_VERSION": "130.0a1",
             "THUNDERBIRD_ESR": "128.5.0esr",
         }
 
@@ -77,12 +83,27 @@ def test_sync_firefox_versions(self, mock_product_details):
         self.assertEqual(v140.min_version, 140.0)
         self.assertEqual(v140.max_version, 141.0)
 
+        # Check latest Release version
         v143 = Version.objects.get(product=self.firefox, slug="fx143")
         self.assertEqual(v143.name, "Version 143")
         self.assertEqual(v143.min_version, 143.0)
         self.assertEqual(v143.max_version, 144.0)
         self.assertTrue(v143.default)
 
+        # Check latest Beta version
+        v144 = Version.objects.get(product=self.firefox, slug="fx144")
+        self.assertEqual(v144.name, "Version 144")
+        self.assertEqual(v144.min_version, 144.0)
+        self.assertEqual(v144.max_version, 145.0)
+        self.assertFalse(v144.default)
+
+        # Check latest Nightly version
+        v145 = Version.objects.get(product=self.firefox, slug="fx145")
+        self.assertEqual(v145.name, "Version 145")
+        self.assertEqual(v145.min_version, 145.0)
+        self.assertEqual(v145.max_version, 146.0)
+        self.assertFalse(v145.default)
+
         # ESR versions should NOT be created under Firefox product
         esr_versions = Version.objects.filter(product=self.firefox, slug__endswith="-esr")
         self.assertEqual(esr_versions.count(), 0)
@@ -131,11 +152,21 @@ def test_sync_mobile_versions(self, mock_product_details):
         versions = Version.objects.filter(product=self.mobile)
         self.assertGreater(versions.count(), 0)
 
-        # Check latest version
+        # Check latest Release version
         v143 = Version.objects.get(product=self.mobile, slug="m143")
         self.assertEqual(v143.name, "Version 143")
         self.assertTrue(v143.default)
 
+        # Check latest Beta version
+        v144 = Version.objects.get(product=self.mobile, slug="m144")
+        self.assertEqual(v144.name, "Version 144")
+        self.assertFalse(v144.default)
+
+        # Check latest Nightly version
+        v145 = Version.objects.get(product=self.mobile, slug="m145")
+        self.assertEqual(v145.name, "Version 145")
+        self.assertFalse(v145.default)
+
     @mock.patch("kitsune.products.management.commands.sync_product_versions.product_details")
     def test_sync_ios_versions(self, mock_product_details):
         """Test syncing Firefox for iOS versions."""
@@ -148,11 +179,21 @@ def test_sync_ios_versions(self, mock_product_details):
         versions = Version.objects.filter(product=self.ios)
         self.assertGreater(versions.count(), 0)
 
-        # Check latest version
+        # Check latest Release version
         v143 = Version.objects.get(product=self.ios, slug="ios143")
         self.assertEqual(v143.name, "Version 143")
         self.assertTrue(v143.default)
 
+        # Check latest Beta version
+        v144 = Version.objects.get(product=self.ios, slug="ios144")
+        self.assertEqual(v144.name, "Version 144")
+        self.assertFalse(v144.default)
+
+        # Check latest Nightly version
+        v145 = Version.objects.get(product=self.ios, slug="ios145")
+        self.assertEqual(v145.name, "Version 145")
+        self.assertFalse(v145.default)
+
     @mock.patch("kitsune.products.management.commands.sync_product_versions.product_details")
     def test_sync_thunderbird_versions(self, mock_product_details):
         """Test syncing Thunderbird versions."""
@@ -165,11 +206,21 @@ def test_sync_thunderbird_versions(self, mock_product_details):
         versions = Version.objects.filter(product=self.thunderbird)
         self.assertGreater(versions.count(), 0)
 
-        # Check latest version
+        # Check latest Release version
         v128 = Version.objects.get(product=self.thunderbird, slug="tb128")
         self.assertEqual(v128.name, "Version 128")
         self.assertTrue(v128.default)
 
+        # Check latest Beta version
+        v129 = Version.objects.get(product=self.thunderbird, slug="tb129")
+        self.assertEqual(v129.name, "Version 129")
+        self.assertFalse(v129.default)
+
+        # Check latest Daily version
+        v130 = Version.objects.get(product=self.thunderbird, slug="tb130")
+        self.assertEqual(v130.name, "Version 130")
+        self.assertFalse(v130.default)
+
         # Check ESR
         esr128 = Version.objects.get(product=self.thunderbird, slug="tb128-esr")
         self.assertEqual(esr128.name, "Version 128 ESR")
@@ -177,7 +228,7 @@ def test_sync_thunderbird_versions(self, mock_product_details):
 
     @mock.patch("kitsune.products.management.commands.sync_product_versions.product_details")
     def test_visibility_rules(self, mock_product_details):
-        """Test that only top 10 versions + ESR are visible."""
+        """Test that only top 10 versions + ESR + beta/alpha are visible."""
         mock_product_details.configure_mock(**self._mock_product_details().__dict__)
 
         out = StringIO()
@@ -185,11 +236,19 @@ def test_visibility_rules(self, mock_product_details):
 
         visible_regular = Version.objects.filter(product=self.firefox, visible=True).exclude(
             slug__endswith="-esr"
+        ).exclude(
+            min_version__gt=143
         )
 
-        # Should have top 10 visible (or fewer if less than 10 exist)
+        # Should have top 10 release visible (or fewer if less than 10 exist)
         self.assertLessEqual(visible_regular.count(), 10)
 
+        # Beta/Nightly should always be visible
+        beta = Version.objects.get(product=self.firefox, slug="fx144")
+        self.assertTrue(beta.visible)
+        nightly = Version.objects.get(product=self.firefox, slug="fx145")
+        self.assertTrue(nightly.visible)
+
         # ESR versions should always be visible
         esr_versions = Version.objects.filter(product=self.firefox, slug__endswith="-esr")
         for esr in esr_versions:
diff --git a/kitsune/questions/admin.py b/kitsune/questions/admin.py
index 318f36c1a1a..65c22aa1b61 100644
--- a/kitsune/questions/admin.py
+++ b/kitsune/questions/admin.py
@@ -53,6 +53,7 @@ class AAQConfigAdmin(admin.ModelAdmin):
     list_display = ("title", "product", "is_active", "pinned_article_config")
     list_editable = ("is_active",)
     inlines = [QuestionLocaleAdmin]
+    search_fields = ("title", "product__title", "product__slug")
     fields = (
         "title",
         "product",
diff --git a/kitsune/questions/jinja2/questions/email/new_answer_to_asker.html b/kitsune/questions/jinja2/questions/email/new_answer_to_asker.html
index cc22b3a2e5e..51ba1797cc2 100644
--- a/kitsune/questions/jinja2/questions/email/new_answer_to_asker.html
+++ b/kitsune/questions/jinja2/questions/email/new_answer_to_asker.html
@@ -34,7 +34,7 @@ <h1><a href="https://{{ host }}{{ question_url }}">{{ question_title }}</a></h1>
   </div>
   <p>
     <a class="button" href="https://{{ host }}{{ solution_url }}">{{ _('This solves my problem') }}</a>
-    <a href="https://{{ host }}{{ answer_url }}">{{ _('View the reply') }}</a>
+    <a href="https://{{ host }}{{ answer_url }}">{{ _('View & reply') }}</a>
   </p>
   <div class="gi-box">
     <a href="https://{{ host }}/questions?filter=unsolved">{{ _('Browse for unsolved questions and help a Firefox user') }}</a>
diff --git a/kitsune/questions/jinja2/questions/includes/aaq_macros.html b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
index b106f6fbfc6..e6f2c58d7aa 100644
--- a/kitsune/questions/jinja2/questions/includes/aaq_macros.html
+++ b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
@@ -190,19 +190,31 @@ <h2 class="sumo-page-subheading">{{ _('Topics') }}</h2>
 
 {% macro troubleshooting_instructions(field) %}
   <div>
-    <div id="troubleshooting-button" class="sumo-button-wrap">
-      <button class="sumo-button" id="share-data" type="button" aria-describedby="{{ field.help_id }}">
-        {{ _('Share Data') }}
-      </button>
-    </div>
-    <div id="troubleshooting-manual" class="hide-until-expanded" class="field-help-text">
-      {% trans %}
-        We can't automatically get your browser's troubleshooting data, please
-        <a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox">try these manual steps</a>.
-      {% endtrans %}
-    </div>
-    <div id="troubleshooting-field" class="hide-until-expanded field full-width">
-      {{ field }}
+    <div id="api-section">
+      <div id="troubleshooting-button" class="sumo-button-wrap">
+        <button class="sumo-button" id="share-data" type="button">
+          {{ _('Share Data') }}
+        </button>
+      </div>
+      <p id="troubleshooting-manual" class="hide-until-expanded">
+        {# L10n: Deprecated #}
+        {% set deprecated_share_data_fallback %}
+          {% trans %}
+            We can't automatically get your browser's troubleshooting data, please
+            <a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox">try these manual steps</a>.
+          {% endtrans %}
+        {% endset %}
+        {# L10n: Try these manual steps refers to https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox #}
+        {% trans a_open='<a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox" target="_blank">'|safe, a_close='</a>'|safe %}
+          We can't automatically get your browser's troubleshooting data, please {{ a_open }}try these manual steps{{ a_close }}.
+        {% endtrans %}
+      </p>
+      <div id="troubleshooting-field" class="hide-until-expanded field full-width">
+        {{ field }}
+      </div>
+      <p>
+        {{ _('This information gives details about the internal workings of your browser that will help in answering your question.') }}
+      </p>
     </div>
   </div>
 {% endmacro %}
diff --git a/kitsune/sumo/templatetags/jinja_helpers.py b/kitsune/sumo/templatetags/jinja_helpers.py
index 3f579227561..f7a39b99b73 100644
--- a/kitsune/sumo/templatetags/jinja_helpers.py
+++ b/kitsune/sumo/templatetags/jinja_helpers.py
@@ -11,7 +11,6 @@
 from babel.dates import format_date, format_datetime, format_time
 from babel.numbers import format_decimal
 from django.conf import settings
-from django.contrib.humanize.templatetags.humanize import naturaltime
 from django.db.models.fields.files import FieldFile
 from django.http import QueryDict
 from django.template.loader import render_to_string
@@ -241,7 +240,7 @@ def _contextual_locale(context):
 
 @jinja2.pass_context
 @library.global_function
-def datetimeformat(context, value, format="shortdatetime", use_naturaltime=False):
+def datetimeformat(context, value, format="shortdatetime", use_timesince=False):
     """
     Returns a formatted date/time using Babel's locale settings. Uses the
     timezone from settings.py, if the user has not been authenticated.
@@ -276,8 +275,8 @@ def datetimeformat(context, value, format="shortdatetime", use_naturaltime=False
     convert_value = new_value.astimezone(convert_tzinfo)
     locale = _babel_locale(_contextual_locale(context))
 
-    if use_naturaltime and (django_now().astimezone(convert_tzinfo) - convert_value).days < 30:
-        return naturaltime(convert_value)
+    if use_timesince and (django_now().astimezone(convert_tzinfo) - convert_value).days < 30:
+        return timesince(convert_value)
 
     if format == "shortdatetime" or format == "shortdate":
         # Check if the date is today
diff --git a/kitsune/wiki/jinja2/wiki/confirm_revision_delete.html b/kitsune/wiki/jinja2/wiki/confirm_revision_delete.html
index 858e9d3c773..bea674f0d76 100644
--- a/kitsune/wiki/jinja2/wiki/confirm_revision_delete.html
+++ b/kitsune/wiki/jinja2/wiki/confirm_revision_delete.html
@@ -9,7 +9,7 @@
   <div class="grid_9">
     <article id="delete-revision">
       {% if only_revision %}
-        <h1 class="title">{{ _('Unable to delete only revision of the document') }}</h1>
+        <h1 class="title">{{ _('Unable to delete the only revision of the document') }}</h1>
         <p>{{ _('To delete the document, please notify an admin.') }}</p>
         <div class="submit">
           <a href="{{ url('wiki.document_revisions', document.slug) }}">{{ _('Go back to document history') }}</a>
diff --git a/kitsune/wiki/jinja2/wiki/includes/document_macros.html b/kitsune/wiki/jinja2/wiki/includes/document_macros.html
index 73c6d0b3645..3d9ee08e519 100644
--- a/kitsune/wiki/jinja2/wiki/includes/document_macros.html
+++ b/kitsune/wiki/jinja2/wiki/includes/document_macros.html
@@ -24,7 +24,7 @@ <h1 class="sumo-page-heading">{{ document.title }}</h1>
        <img class="pencil" src="{{ webpack_static('sumo/img/pencil.svg') }}" />
        <strong>{% if is_first_revision %}{{ _("Created") }}{% else %}{{ _("Last updated") }}{% endif %}:</strong>
         <span class="time">
-          {{ datetimeformat(created_date, format="shortdate", use_naturaltime=True) }}
+          {{ datetimeformat(created_date, format="shortdate", use_timesince=True) }}
         </span>
       </span>
     {% endif %}
diff --git a/kitsune/wiki/services.py b/kitsune/wiki/services.py
index d02cad77898..456f3268460 100644
--- a/kitsune/wiki/services.py
+++ b/kitsune/wiki/services.py
@@ -439,18 +439,23 @@ def publish_pending_translations(self, log: logging.Logger | None = None) -> Non
         if not (settings.HYBRID_REVIEW_GRACE_PERIOD and settings.HYBRID_ENABLED_LOCALES):
             return
 
-        grace_period = f"{settings.HYBRID_REVIEW_GRACE_PERIOD} hour(s)"
-        pending_revisions = self.query_builder.get_pending_translations()
+        grace_period = settings.HYBRID_REVIEW_GRACE_PERIOD
+        if grace_period <= 72:
+            grace_period_string = f"{grace_period} hour{'s' if grace_period > 1 else ''}"
+        else:
+            grace_period = grace_period // 24
+            grace_period_string = f"{grace_period} day{'s' if grace_period > 1 else ''}"
 
+        pending_revisions = self.query_builder.get_pending_translations()
         for revision in pending_revisions:
             rev = self.content_manager.publish_revision(
                 revision,
                 comment=(
-                    f"Automatically approved because it was not reviewed within {grace_period}."
+                    f"Automatically approved because it was not reviewed within {grace_period_string}."
                 ),
             )
             if log:
                 log.info(
                     f"Automatically approved {rev.get_absolute_url()} because it was not"
-                    f" reviewed within {grace_period}."
+                    f" reviewed within {grace_period_string}."
                 )
diff --git a/kitsune/wiki/tests/test_services.py b/kitsune/wiki/tests/test_services.py
index 80b5ebc6a29..7bc8c9a1705 100644
--- a/kitsune/wiki/tests/test_services.py
+++ b/kitsune/wiki/tests/test_services.py
@@ -16,7 +16,7 @@
 from kitsune.wiki.strategies import TranslationMethod, TranslationStrategyFactory
 from kitsune.wiki.tests import ApprovedRevisionFactory, DocumentFactory, RevisionFactory
 
-APPROVED_MSG = "Automatically approved because it was not reviewed within 72 hour(s)."
+APPROVED_MSG = "Automatically approved because it was not reviewed within 72 hours."
 REJECTED_MSG = "No longer relevant."
 
 
diff --git a/kitsune/wiki/tests/test_templates.py b/kitsune/wiki/tests/test_templates.py
index a6744538ffe..6075f327c8d 100644
--- a/kitsune/wiki/tests/test_templates.py
+++ b/kitsune/wiki/tests/test_templates.py
@@ -2813,7 +2813,7 @@ def test_delete_only_revision(self):
         response = get(self.client, "wiki.delete_revision", args=[doc.slug, rev.id])
         self.assertEqual(200, response.status_code)
         self.assertEqual(
-            "Unable to delete only revision of the document",
+            "Unable to delete the only revision of the document",
             pq(response.content)("h1.title").text(),
         )
 
diff --git a/playwright_tests/core/basepage.py b/playwright_tests/core/basepage.py
index e4268629232..61b04958052 100644
--- a/playwright_tests/core/basepage.py
+++ b/playwright_tests/core/basepage.py
@@ -209,7 +209,6 @@ def _fill(self, locator: Locator, text: str, with_force=False):
         """
         This helper function fills a given text inside a given element locator.
         """
-        self.wait_for_dom_to_load()
         locator.fill(text, force=with_force)
 
     def _type(self, locator: Locator, text: str, delay: int):
@@ -230,15 +229,16 @@ def _clear_field(self, locator: Locator):
         """
         This helper function clears the given element locator input field.
         """
-        self.wait_for_dom_to_load()
         locator.clear()
 
-    def _select_option_by_label(self, locator: Locator, label_name: str):
+    def _select_option_by_label(self, locator: Locator, label_name: str, expected_locator=None):
         """
         This helper function selects an element from a given select box based on label.
         """
         self.wait_for_dom_to_load()
         locator.select_option(label=label_name)
+        if expected_locator:
+            self._wait_for_locator(expected_locator)
 
     def _select_option_by_value(self, locator: Locator, value: str):
         """
diff --git a/playwright_tests/core/utilities.py b/playwright_tests/core/utilities.py
index b02b8b97bc4..3eccfa18348 100644
--- a/playwright_tests/core/utilities.py
+++ b/playwright_tests/core/utilities.py
@@ -322,7 +322,7 @@ def delete_cookies(self, tried_once=False, retries=3):
 
         # In order to avoid test flakiness we are trying to delete the cookies again if the sign-in
         # sign-up button is not visible after page refresh.
-        if not top_navbar.is_sign_in_up_button_displayed and not tried_once:
+        if top_navbar.signin_signup_button.is_hidden() and not tried_once:
             self.delete_cookies(tried_once=True)
 
     def start_existing_session(self, cookies: dict = None, session_file_name: str = None,
@@ -345,12 +345,12 @@ def start_existing_session(self, cookies: dict = None, session_file_name: str =
                 cookies_data = json.load(file)
             self.page.context.add_cookies(cookies=cookies_data['cookies'])
             self.refresh_page()
-            if top_navbar.is_sign_in_up_button_displayed() and not tried_once:
+            if top_navbar.signin_signup_button.is_visible() and not tried_once:
                 self.start_existing_session(session_file_name=session_file_name, tried_once=True)
         elif cookies is not None:
             self.page.context.add_cookies(cookies=cookies['cookies'])
             self.refresh_page()
-            if top_navbar.is_sign_in_up_button_displayed() and not tried_once:
+            if top_navbar.signin_signup_button.is_visible() and not tried_once:
                 self.start_existing_session(cookies=cookies, tried_once=True)
 
 
@@ -673,6 +673,17 @@ def expect_locator_visibility(self, locator: Locator) -> bool:
         else:
             return False
 
+    def strip_wiki_syntax(self, text: str) -> str:
+        # Handle wiki links.
+        text = re.sub(r"\[\[(?:[^\|\]]*\|)?([^\]]+)\]\]", r"\1", text)
+        # Handle external links.
+        text = re.sub(r"\[(https?://[^\s]+)\s+([^\]]+)\]", r"\2", text)
+        # Handle bold wiki.
+        text = re.sub(r"'''(.*?)'''", r"\1", text)
+        # Handle italic wiki.
+        text = re.sub(r"''(.*?)''", r"\1", text)
+        return " ".join(text.split())  # collapse whitespace
+
 
 def retry_on_502(func):
     """Decorator that retries the wrapped function if a 502 error is encountered."""
diff --git a/playwright_tests/flows/ask_a_question_flows/aaq_flows/aaq_flow.py b/playwright_tests/flows/ask_a_question_flows/aaq_flows/aaq_flow.py
index 111af41ff10..8ca34862d9b 100644
--- a/playwright_tests/flows/ask_a_question_flows/aaq_flows/aaq_flow.py
+++ b/playwright_tests/flows/ask_a_question_flows/aaq_flows/aaq_flow.py
@@ -15,13 +15,23 @@ def __init__(self, page: Page):
         self.top_navbar = TopNavbar(page)
         self.auth_page = AuthPage(page)
 
-
-    # Submitting an aaq question for a product flow.
-    # Mozilla VPN has an extra optional dropdown menu for choosing an operating system.
     @retry_on_502
     def submit_an_aaq_question(self, subject: str, body: str, topic_name='', attach_image=False,
                                is_premium=False, email="", is_loginless=False,
                                expected_locator=None, form_url=None):
+        """
+        Flow for submitting an AAQ question.
+        Args:
+            subject (str): The question subject.
+            body (str): The question body.
+            topic_name (str): The question topic.
+            attach_image (bool): If we should attach an image to the question or not.
+            is_premium (bool): If the form is for a premium product.
+            email: The email to be submitted for the premium product form.
+            is_loginless (bool): If the form is loginless.
+            expected_locator: Acts as a wait until the question is successfully submitted.
+            form_url: The URL of the targeted form.
+        """
         question_subject = ''
         if form_url and self.utilities.get_page_url() != form_url:
             self.utilities.navigate_to_link(form_url)
@@ -45,10 +55,16 @@ def submit_an_aaq_question(self, subject: str, body: str, topic_name='', attach_
             return {"aaq_subject": question_subject, "question_page_url": current_page_url,
                     "question_body": body, "question_id": question_id}
 
-    # Populating the aaq form fields for freemium products with given values without submitting the
-    # form.
     def add__valid_data_to_all_aaq_fields_without_submitting(self, subject: str, topic_value: str,
                                                              body_text: str, attach_image=False):
+        """
+        Flow for adding valid data to all freemium products AAQ fields without submitting the form.
+        Args:
+            subject (str): The subject of the question.
+            topic_value (str): The value of the chosen topic.
+            body_text (str): The body of the question.
+            attach_image (bool): If an image should be attached to the question or not.
+        """
         aaq_subject = subject + self.utilities.generate_random_number(min_value=0, max_value=5000)
         # Adding text to subject field.
         self.aaq_form_page.add_text_to_aaq_form_subject_field(aaq_subject)
@@ -63,7 +79,7 @@ def add__valid_data_to_all_aaq_fields_without_submitting(self, subject: str, top
 
         if attach_image:
             # Uploading an image to the aaq question form.
-            self.aaq_form_page.get_upload_image_button_locator().set_input_files(
+            self.aaq_form_page.add_image_browse_button.set_input_files(
                 self.utilities.aaq_question_test_data["valid_firefox_question"]["image_path"]
             )
 
@@ -73,37 +89,53 @@ def add__valid_data_to_all_aaq_fields_without_submitting(self, subject: str, top
         # Returning the entered question subject for further usage.
         return aaq_subject
 
-    # Flow for adding valid data to premium products forms without submitting the ticket.
-    # We are currently choosing one random topic & os for each product ticket submission.
-    # Note: Some premium products forms (example: Mozilla VPN) has an extra "os" dropdown.
     def add_valid_data_to_all_premium_products_aaq_fields(self, subject: str, body: str,
                                                           is_loginless: bool, email: str):
+        """
+        Flow for adding valid data to all premium products AAQ fields without submitting the form.
+        Args:
+            subject (str): The question subject.
+            body (str): The question body.
+            is_loginless (bool): If the form is loginless or not.
+            email (str): The email to be added to the form.
+        """
         if is_loginless:
-            if self.top_navbar.is_sign_in_up_button_displayed():
+            if self.top_navbar.signin_signup_button.is_visible():
                 self.top_navbar.click_on_signin_signup_button()
                 self.auth_page.click_on_cant_sign_in_to_my_mozilla_account_link()
             self.aaq_form_page.fill_contact_email_field(email)
-
+        # We are currently choosing one random topic & os for each product ticket submission.
         self.aaq_form_page.select_random_topic_by_value()
-
+        # Note: Some premium products forms (example: Mozilla VPN) has an extra "os" dropdown.
         if self.aaq_form_page.is_os_dropdown_menu_visible():
             self.aaq_form_page.select_random_os_by_value()
         self.aaq_form_page.add_text_to_premium_aaq_form_subject_field(subject)
         self.aaq_form_page.add_text_to_premium_aaq_textarea_body_field(body)
 
-    # Adding an image to the aaq form.
     def adding_an_image_to_aaq_form(self):
-        self.aaq_form_page.get_upload_image_button_locator().set_input_files(
+        """Flow for adding an image inside the AAQ form."""
+        self.aaq_form_page.add_image_browse_button.set_input_files(
             self.utilities.aaq_question_test_data["valid_firefox_question"]["image_path"]
         )
 
     @retry_on_502
     def deleting_question_flow(self):
+        """Flow for deleting a question."""
         self.question_page.click_delete_this_question_question_tools_option()
         self.question_page.click_delete_this_question_button()
 
     @retry_on_502
     def editing_question_flow(self, subject='', body='', troubleshoot='', submit_edit=True):
+        """
+        Flow for updating a particular AAQ question.
+        Args:
+            subject: The new AAQ question title.
+            body: The new AAQ body content.
+            troubleshoot: The new content of the Troubleshoot Information info/section.
+            submit_edit: If the edits should be submitted or not.
+        """
+        self.question_page.click_on_edit_this_question_question_tools_option()
+
         if subject:
             self.aaq_form_page.clear_subject_input_field()
             self.aaq_form_page.add_text_to_aaq_form_subject_field(subject)
@@ -119,7 +151,17 @@ def editing_question_flow(self, subject='', body='', troubleshoot='', submit_edi
             self.aaq_form_page.click_aaq_edit_submit_button()
 
     @retry_on_502
-    def editing_reply_flow(self, reply_body: str, submit_reply=True):
+    def editing_reply_flow(self, answer_id: str, reply_body: str, submit_reply=True):
+        """
+        Flow for updating a particular AAQ question reply.
+        Args:
+            answer_id (str): The ID of the targeted AAQ question reply.
+            reply_body (str): The new reply body content.
+            submit_reply: If the edits should be submitted or not.
+        """
+        self.question_page.click_on_reply_more_options_button(answer_id)
+        self.question_page.click_on_edit_this_post_for_a_certain_reply(answer_id)
+
         self.aaq_form_page.clear_the_question_body_textarea_field()
         self.aaq_form_page.add_text_to_aaq_textarea_field(reply_body)
 
@@ -128,6 +170,12 @@ def editing_reply_flow(self, reply_body: str, submit_reply=True):
 
     @retry_on_502
     def delete_question_reply(self, answer_id: str, delete_reply: bool):
+        """
+        Flow of deleting a question reply.
+        Args:
+            answer_id (str): The ID of the reply that needs to be deleted.
+            delete_reply (bool): If we should delete or cancel the deletion.
+        """
         self.question_page.click_on_reply_more_options_button(answer_id)
         self.question_page.click_on_delete_this_post_for_a_certain_reply(answer_id)
 
@@ -137,6 +185,16 @@ def delete_question_reply(self, answer_id: str, delete_reply: bool):
     @retry_on_502
     def post_question_reply_flow(self, repliant_username: str, reply='', submit_reply=True,
                                  quoted_reply=False, reply_for_id='') -> str:
+        """
+        Flow for posting a question reply.
+        Args:
+            repliant_username (str): The username of the repliant. Acts as a wait until the reply
+            is successfully posted.
+            reply: The content of the reply.
+            submit_reply: If we should submit the question or not.
+            quoted_reply: If we should quote a reply or not.
+            reply_for_id: If we should quote a reply we need the id of the targeted reply.
+        """
 
         if quoted_reply:
             self.question_page.click_on_reply_more_options_button(reply_for_id)
@@ -151,6 +209,12 @@ def post_question_reply_flow(self, repliant_username: str, reply='', submit_repl
             return self.question_page.click_on_post_reply_button(repliant_username)
 
     def report_question_abuse(self, answer_id: str, text=''):
+        """
+        Flow for reporting question as abusive.
+        Args:
+            answer_id (str): The ID of the question.
+            text: Text to be added inside the report.
+        """
         self.question_page.click_on_reply_more_options_button(answer_id)
         self.question_page.click_on_report_abuse_for_a_certain_reply(answer_id)
 
@@ -161,5 +225,10 @@ def report_question_abuse(self, answer_id: str, text=''):
         self.question_page.click_abuse_modal_close_button()
 
     def spam_marking_a_reply(self, reply_id: str):
+        """
+        Flow for marking a reply as spam.
+        Args:
+            reply_id (str): The ID of the reply.
+        """
         self.question_page.click_on_reply_more_options_button(reply_id)
         self.question_page.click_on_mark_as_spam_for_a_certain_reply(reply_id)
diff --git a/playwright_tests/flows/explore_articles_flows/article_flows/add_kb_article_flow.py b/playwright_tests/flows/explore_articles_flows/article_flows/add_kb_article_flow.py
index 3d2802d75e5..bccd6ac3bff 100644
--- a/playwright_tests/flows/explore_articles_flows/article_flows/add_kb_article_flow.py
+++ b/playwright_tests/flows/explore_articles_flows/article_flows/add_kb_article_flow.py
@@ -1,6 +1,7 @@
+import random
+import string
 from typing import Any
 from playwright.sync_api import Page
-from slugify import slugify
 from playwright_tests.core.utilities import Utilities, retry_on_502
 from playwright_tests.flows.explore_articles_flows.article_flows.add_kb_media_flow import (
     AddKbMediaFlow,
@@ -40,7 +41,8 @@ def __init__(self, page: Page):
     def submit_simple_kb_article(self, article_title=None, article_slug=None,
                                  article_category=None, article_keyword=None,
                                  allow_discussion=True, allow_translations=True,
-                                 selected_product=True, selected_topics=True, search_summary=None,
+                                 selected_product=True, selected_topics=True, article_topic=None,
+                                 product=None, search_summary=None,
                                  article_content=None, article_content_image=False,
                                  submit_article=True, is_template=False, expiry_date=None,
                                  restricted_to_groups: list[str] = None, single_group="",
@@ -57,8 +59,9 @@ def submit_simple_kb_article(self, article_title=None, article_slug=None,
 
         kb_article_title = (article_title if article_title is not None else
                             kb_article_test_data[
-                                "kb_template_title" if is_template else "kb_article_title"] + self.
-                            utilities.generate_random_number(0, 5000))
+                                "kb_template_title" if is_template else "kb_article_title"
+                            ]+ ''.join(random.choice(string.ascii_lowercase + string.digits
+                                                     ) for _ in range(10)))
 
         if kb_article_title != "":
             self.submit_kb_article_page.add_text_to_article_form_title_field(
@@ -71,9 +74,13 @@ def submit_simple_kb_article(self, article_title=None, article_slug=None,
             self.submit_kb_article_page.add_text_to_article_slug_field(kb_article_slug)
 
         if article_category is None:
-            article_category = kb_article_test_data[
-                "kb_template_category" if is_template else "category_options"
-            ]
+            article_category = (kb_article_test_data["category_options"]
+            ["60" if is_template else "10"])
+        else:
+            try:
+                article_category = kb_article_test_data["category_options"][f"{article_category}"]
+            except KeyError as e:
+                article_category = article_category
         self.submit_kb_article_page.select_category_option_by_text(article_category)
 
         if article_slug == "":
@@ -82,23 +89,28 @@ def submit_simple_kb_article(self, article_title=None, article_slug=None,
         if not allow_translations:
             self.submit_kb_article_page.check_allow_translations_checkbox()
 
-        product = kb_article_test_data["relevant_to_product"]
+        if not product:
+            product = kb_article_test_data["relevant_to_product"]
         if selected_product is True:
             self.submit_kb_article_page.click_on_a_particular_product(product)
 
-        article_topic = [
-            kb_article_test_data["selected_parent_topic"],
-            kb_article_test_data["selected_child_topic"]
-        ]
-
-        # Adding Article topic
-        if selected_topics is True:
+        if not article_topic:
+            article_topic = [
+                kb_article_test_data["selected_parent_topic"],
+                kb_article_test_data["selected_child_topic"]
+            ]
+            # Adding Article topic
+            if selected_topics is True:
+                self.submit_kb_article_page.click_on_a_particular_parent_topic_checkbox(
+                    article_topic[0]
+                )
+                self.submit_kb_article_page.click_on_a_particular_child_topic_checkbox(
+                    article_topic[0],
+                    article_topic[1],
+                )
+        else:
             self.submit_kb_article_page.click_on_a_particular_parent_topic_checkbox(
-                article_topic[0]
-            )
-            self.submit_kb_article_page.click_on_a_particular_child_topic_checkbox(
-                article_topic[0],
-                article_topic[1],
+                article_topic
             )
 
         # Interacting with Allow Discussion checkbox
@@ -172,7 +184,8 @@ def submit_simple_kb_article(self, article_title=None, article_slug=None,
                 "keyword": keyword,
                 "search_results_summary": summary,
                 "expiry_date": kb_article_test_data["expiry_date"],
-                "article_url": article_url,
+                "article_url": article_url.removesuffix("/history"),
+                "article_show_history_url":article_url,
                 "first_revision_id": first_revision_id
                 }
 
@@ -258,73 +271,6 @@ def submit_new_kb_revision(self, keywords=None, search_result_summary=None, cont
                 "changes_description": self.utilities.kb_article_test_data['changes_description']
                 }
 
-    def kb_article_creation_via_api(self, page: Page, approve_revision=False, is_template=False,
-                                    product=None, topic=None, category=None, ready_for_l10n=False,
-                                    significance_type='') -> dict[str, Any]:
-        """
-        Create a new KB article via API.
-        :param page: Page object.
-        :param approve_revision: Approve the first revision of the article.
-        :param ready_for_l10n: Mark the revision as ready for localization.
-        :param significance_type: Add the significance type of the revision.
-        :param is_template: Create a KB template.
-        :param product: Product ID.
-        :param topic: Topic ID.
-        :param category: Category ID.
-        """
-        kb_article_test_data = self.utilities.kb_article_test_data
-        self.utilities.navigate_to_link(KBArticlePageMessages.CREATE_NEW_KB_ARTICLE_STAGE_URL)
-
-        category = category or ("60" if is_template else "10")
-        kb_title = (
-            kb_article_test_data[
-                "kb_template_title" if category == "60" else "kb_article_title"] + self.utilities.
-            generate_random_number(0, 5000))
-
-        topic = topic if topic is not None else "383"
-        product = product if product is not None else "1"
-        slug = slugify(kb_title)
-
-        form_data = {
-            "csrfmiddlewaretoken": self.utilities.get_csrfmiddlewaretoken(),
-            "title": kb_title,
-            "slug": slug,
-            "category": category,
-            "is_localizable": "on",
-            "products": product,
-            "topics": topic,
-            "allow_discussion": "on",
-            "keywords": kb_article_test_data["keywords"],
-            "summary": kb_article_test_data["search_result_summary"],
-            "content": kb_article_test_data["article_content"],
-            "expires": "",
-            "based_on": "",
-            "comment": kb_article_test_data["changes_description"]
-        }
-
-        response = self.utilities.post_api_request(
-            page, KBArticlePageMessages.CREATE_NEW_KB_ARTICLE_STAGE_URL, data=form_data
-        )
-
-        print(response)
-        self.utilities.navigate_to_link(response.url)
-
-        first_revision_id = self.kb_article_show_history_page.get_last_revision_id()
-        if approve_revision:
-            self.approve_kb_revision(revision_id=first_revision_id, ready_for_l10n=ready_for_l10n)
-
-
-        return {"article_title": kb_title,
-                "article_content": kb_article_test_data["article_content"],
-                "article_slug": slug,
-                "keyword": kb_article_test_data["keywords"],
-                "search_results_summary": kb_article_test_data["search_result_summary"],
-                "article_url": response.url.removesuffix("/history"),
-                "article_show_history_url": self.utilities.get_page_url(),
-                "first_revision_id": first_revision_id,
-                "article_review_description": kb_article_test_data["changes_description"]
-                }
-
     def defer_revision(self, revision_id: str):
         self.kb_article_show_history_page.click_on_review_revision(revision_id)
         self.kb_article_review_revision_page.click_on_defer_revision_button()
diff --git a/playwright_tests/messages/ask_a_question_messages/AAQ_messages/aaq_form_page_messages.py b/playwright_tests/messages/ask_a_question_messages/AAQ_messages/aaq_form_page_messages.py
index 29515c69824..8bac92fe907 100644
--- a/playwright_tests/messages/ask_a_question_messages/AAQ_messages/aaq_form_page_messages.py
+++ b/playwright_tests/messages/ask_a_question_messages/AAQ_messages/aaq_form_page_messages.py
@@ -11,5 +11,5 @@ class AAQFormMessages:
     LOGINLESS_RATELIMIT_REACHED_MESSAGE = "You've exceeded the number of submissions for today."
 
     def get_premium_ticket_submission_success_message(self, user_email: str) -> str:
-        return (f"Done! Thank you for reaching out Mozilla Support. We've sent a confirmation "
-                f"email to {user_email}")
+        return (f"Thank you for reaching out to Mozilla Support. We're reviewing your submission "
+                f"and will send a confirmation email to {user_email} shortly.")
diff --git a/playwright_tests/messages/explore_help_articles/kb_translation_messages.py b/playwright_tests/messages/explore_help_articles/kb_translation_messages.py
index e83d74ee674..d5de764ee59 100644
--- a/playwright_tests/messages/explore_help_articles/kb_translation_messages.py
+++ b/playwright_tests/messages/explore_help_articles/kb_translation_messages.py
@@ -2,7 +2,7 @@ class KbTranslationMessages:
     LOCALIZATION_DASHBOARD_NEEDS_REVIEW_STATUS = "Necesită revizuire"
     LOCALIZATION_DASHBOARD_NEEDS_TRANSLATION_STATUS = "Necesită traducere"
     LOCALIZATION_DASHBOARD_NEEDS_ACTUALIZATION_STATUS = "Necesită actualizare"
-    LOCALIZATION_DASHBOARD_TRANSLATED_STATUS = "Updated"
+    LOCALIZATION_DASHBOARD_TRANSLATED_STATUS = "La zi"
 
     def _get_kb_article_translation_ro_page(self, article_slug: str) -> str:
         return f"https://support.allizom.org/ro/kb/{article_slug}/translate"
diff --git a/playwright_tests/pages/ask_a_question/aaq_pages/aaq_form_page.py b/playwright_tests/pages/ask_a_question/aaq_pages/aaq_form_page.py
index 8dd768a66a1..debda5dfb9b 100644
--- a/playwright_tests/pages/ask_a_question/aaq_pages/aaq_form_page.py
+++ b/playwright_tests/pages/ask_a_question/aaq_pages/aaq_form_page.py
@@ -1,5 +1,4 @@
 from playwright.sync_api import ElementHandle, Locator, Page
-
 from playwright_tests.core.basepage import BasePage
 
 
@@ -10,27 +9,27 @@ def __init__(self, page: Page):
         self.__uploaded_image_title = ""
         self.premium_ticket_message = page.locator("ul[class='user-messages'] p")
 
-        # Breadcrumb locators.
+        """"Locators belonging to the breadcrumbs section."""
         self.in_progress_item_label = page.locator(
             "li[class='progress--item is-current'] span[class='progress--label']")
         self.milestone_by_name = lambda milestone_name: page.locator(
             f'//span[@class="progress--label" and text()="{milestone_name}"]/../..')
 
-        # AAQ form page content locators.
+        """Locators belonging to the AAQ form page."""
         self.aaq_page_logo = page.locator("img[class='page-heading--logo']")
         self.aaq_page_product_heading = page.locator("//div[@id='main-content']/article/h3")
         self.aaq_page_intro_text = page.locator("form#question-form p[class='sumo-page-intro']")
         self.aaq_page_info_card = page.locator("div[class*='info card']")
 
-        # AAQ Subject locators.
+        """Locators belonging to the AAQ subject form field."""
         self.aaq_subject_input_field = page.locator("input#id_title")
         self.premium_aaq_subject_input_field = page.locator("input#id_subject")
         self.aaq_subject_input_field_error_message = page.locator("input#id_title + ul li")
 
-        # Loginless form locators.
+        """Locators belonging to the loginless form."""
         self.loginless_contact_email_input_field = page.locator("input#id_email")
 
-        # Product topic dropdown locators.
+        """"Locators belonging to the product topi dropdown."""
         self.product_topic_options = page.locator("select#id_category option")
         self.product_topic_options_without_default_none = page.locator(
             "select#id_category option:not([value=''])")
@@ -39,27 +38,27 @@ def __init__(self, page: Page):
             "select#id_category ~ ul[class='errorlist'] li"
         )
 
-        # Product os dropdown locators (Available for Mozilla VPN product only).
+        """Locators belonging to the product os dropdown (Specific to Mozilla VPN)"""
         self.product_os_select_dropdown_options = page.locator("select#id_os option")
         self.product_os_select_dropdown = page.locator("select#id_os")
 
-        # How can we help textarea field locators.
+        """Locators belonging to the how can we help textarea field."""
         self.how_can_we_help_textarea = page.locator("textarea#id_content")
         self.tell_us_more_premium_product_textarea = page.locator("textarea#id_description")
         self.how_can_we_help_textarea_error_field = page.locator(
             "//textarea[@id='id_content']/../following-sibling::ul/li")
 
-        # Add Image locators.
+        """Locators belonging to the 'Add Image' section."""
         self.add_image_browse_button = page.locator("//span[text()='Browse...']/..")
         self.uploaded_test_image_preview = page.locator("img[title='{__uploaded_image_title}']")
         self.uploaded_test_image_delete_button = page.locator(
             "form[class='upload-input'] input[class='delete']")
         self.uploaded_image = page.locator("a[class='image'] img")
 
-        # Email me when someone answers the thread checkbox locators.
+        """Locators belonging to the Email me when someone answers the thread checkbox."""
         self.email_me_checkbox = page.locator("input#id_notifications")
 
-        # Form buttons locators.
+        """"Locators belonging to the form buttons."""
         self.form_submit_button = page.get_by_role("button").filter(has_text="Submit")
         self.save_edit_question_button = page.get_by_role(
             "button", name="Save Question", exact=True)
@@ -67,7 +66,7 @@ def __init__(self, page: Page):
             "button", name="Update answer", exact=True)
         self.form_cancel_option = page.get_by_role("link").filter(has_text="Cancel")
 
-        # Share Data locators.
+        """Locators belonging to the Share Data section."""
         self.share_data_button = page.locator("button#share-data")
         self.troubleshooting_information_textarea = page.locator("textarea#id_troubleshooting")
         self.try_these_manual_steps_link = page.locator("p#troubleshooting-manual a")
@@ -75,7 +74,7 @@ def __init__(self, page: Page):
         self.product_version_input = page.locator("input#id_ff_version")
         self.product_os = page.locator("input#id_os")
 
-        # Helpful Tip section locators.
+        """Locators belonging to the Helpful tip section."""
         self.helpful_tip_section = page.locator(
             "aside[class='sumo-l-two-col--sidebar'] div[class='large-only']")
 
@@ -85,14 +84,14 @@ def fill_contact_email_field(self, text: str):
     def get_premium_card_submission_message(self) -> str:
         return self._get_text_of_element(self.premium_ticket_message)
 
-    # Breadcrumb actions.
+    """Actions against the breadcrumb locators."""
     def get_in_progress_item_label(self) -> str:
         return self._get_text_of_element(self.in_progress_item_label)
 
     def click_on_a_particular_completed_milestone(self, milestone_name: str):
         self._click(self.milestone_by_name(milestone_name))
 
-    # Question subject actions.
+    """Actions against the question subject locators."""
     def get_value_of_subject_input_field(self) -> str:
         return self._get_element_input_value(self.aaq_subject_input_field)
 
@@ -111,7 +110,7 @@ def add_text_to_premium_aaq_form_subject_field(self, text: str):
     def add_text_to_premium_aaq_textarea_body_field(self, text: str):
         self._fill(self.tell_us_more_premium_product_textarea, text)
 
-    # Question body actions.
+    """Actions against the question body locators."""
     def get_value_of_question_body_textarea_field(self) -> str:
         return self._get_element_input_value(self.how_can_we_help_textarea)
 
@@ -124,7 +123,7 @@ def get_aaq_form_body_error(self) -> str:
     def add_text_to_aaq_textarea_field(self, text: str):
         self._fill(self.how_can_we_help_textarea, text)
 
-    # Question image actions.
+    """Actions against the question image section locators."""
     def image_preview_element(self) -> ElementHandle:
         return self._get_element_handle(self.uploaded_test_image_preview)
 
@@ -138,13 +137,7 @@ def uploaded_image_locator(self) -> Locator:
     def uploaded_images_handles(self) -> list[ElementHandle]:
         return self._get_element_handles(self.uploaded_image)
 
-    def get_upload_image_button_locator(self) -> Locator:
-        return self.add_image_browse_button
-
-    # Page content actions.
-    def get_product_image_locator(self) -> Locator:
-        return self.aaq_page_logo
-
+    """Actions against the general page content locators."""
     def get_aaq_form_page_heading(self) -> str:
         return self._get_text_of_element(self.aaq_page_product_heading)
 
@@ -154,15 +147,12 @@ def get_aaq_form_page_intro_text(self) -> str:
     def get_aaq_form_info_card_text(self) -> str:
         return self._get_text_of_element(self.aaq_page_info_card)
 
-    def get_helpful_tip_locator(self) -> Locator:
-        return self.helpful_tip_section
-
-    # Question topic actions.
+    """Actions against the question topic locators."""
     def get_aaq_form_topic_select_error(self) -> str:
         return self._get_text_of_element(self.product_topic_select_dropdown_error_message)
 
-    # Returns all the non-default selectable topic options.
     def get_aaq_form_topic_options(self) -> list[str]:
+        # Returns all the non-default selectable topic options.
         return self._get_text_of_elements(self.product_topic_options_without_default_none)
 
     def select_aaq_form_topic_value(self, value: str):
@@ -177,7 +167,7 @@ def add_text_to_os_field(self, text: str):
     def select_aaq_form_os_value(self, value: str):
         self._select_option_by_value(self.product_os_select_dropdown_options, value)
 
-    # Troubleshooting information actions.
+    """Actions against the Troubleshooting information section locators."""
     def add_text_to_troubleshooting_information_textarea(self, text: str):
         self._fill(self.troubleshooting_information_textarea, text)
 
@@ -198,13 +188,13 @@ def click_on_share_data_button(self):
     def click_on_show_details_option(self):
         self._click(self.show_details_option)
 
-    # Instead of clicking on the 'Try these manual steps' button we are going to perform the
-    # assertion by checking that the element has the correct href value. Navigating to prod can
-    # yield a 429 error which we want to avoid.
     def get_try_these_manual_steps_link(self) -> str:
+        # Instead of clicking on the 'Try these manual steps' button we are going to perform the
+        # assertion by checking that the element has the correct href value. Navigating to prod can
+        # yield a 429 error which we want to avoid.
         return self._get_element_attribute_value(self.try_these_manual_steps_link, "href")
 
-    # Email me when someone answers the thread section actions.
+    """Actions against the email me when someone answers the thread section locators."""
     def click_on_email_me_when_someone_answers_the_thread_checkbox(self):
         self._click(self.email_me_checkbox)
 
@@ -215,7 +205,7 @@ def click_aaq_form_submit_button(self, expected_locator=None, with_force=False):
         self._click(self.form_submit_button, expected_locator=expected_locator,
                     with_force=with_force)
 
-    # Edit question form actions.
+    """Actions against the edit question form page locators."""
     def click_aaq_edit_submit_button(self):
         self._click(self.save_edit_question_button)
 
diff --git a/playwright_tests/pages/ask_a_question/contact_support_pages/contact_support_page.py b/playwright_tests/pages/ask_a_question/contact_support_pages/contact_support_page.py
index 6270d1ed1e0..05efa49333f 100644
--- a/playwright_tests/pages/ask_a_question/contact_support_pages/contact_support_page.py
+++ b/playwright_tests/pages/ask_a_question/contact_support_pages/contact_support_page.py
@@ -1,5 +1,4 @@
 from playwright.sync_api import Page
-
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,17 +6,17 @@ class ContactSupportPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Breadcrumb locators.
+        """"Locators belonging to the breadcrumbs section."""
         self.current_milestone = page.locator(
             "li[class='progress--item is-current'] span[class='progress--label']")
 
-        # Page content locators.
+        """General page content locators."""
         self.page_main_heading = page.locator("h1[class='sumo-page-heading']")
         self.page_subheading = page.locator("h2[class='sumo-page-subheading']")
         self.browse_all_product_forums_button = page.get_by_role("link").filter(
             has_text="Browse All Product Forums")
 
-        # Product Card Titles locators.
+        """Locators belonging to the product cards."""
         self.product_cards_titles = page.locator("div#product-picker h3[class='card--title']")
         self.product_card_subtitle = lambda card_name: page.locator(
             f"//a[normalize-space(text()) = '{card_name}']/..//following-sibling::p"
@@ -25,11 +24,11 @@ def __init__(self, page: Page):
         self.product_card_by_name = lambda card_name: page.locator(
             "h3[class='card--title']").get_by_role("link", name=card_name, exact=True)
 
-    # Breadcrumb related actions.
+    """"Actions against the breadcrumb locators."""
     def get_text_of_current_milestone(self) -> str:
         return self._get_text_of_element(self.current_milestone)
 
-    # Page actions.
+    """"Actions against the general page locators."""
     def get_contact_support_main_heading(self) -> str:
         return self._get_text_of_element(self.page_main_heading)
 
@@ -39,7 +38,7 @@ def get_contact_support_subheading_text(self) -> str:
     def click_on_browse_all_product_forums_button(self):
         self._click(self.browse_all_product_forums_button)
 
-    # Product card actions.
+    """Actions against the product cards."""
     def get_all_product_card_titles(self) -> list[str]:
         return self._get_text_of_elements(self.product_cards_titles)
 
diff --git a/playwright_tests/pages/ask_a_question/posted_question_pages/questions_page.py b/playwright_tests/pages/ask_a_question/posted_question_pages/questions_page.py
index b6c513583b9..9244dfbdd5b 100644
--- a/playwright_tests/pages/ask_a_question/posted_question_pages/questions_page.py
+++ b/playwright_tests/pages/ask_a_question/posted_question_pages/questions_page.py
@@ -1,15 +1,17 @@
-from playwright.sync_api import ElementHandle, Locator, Page
-
+from playwright.sync_api import ElementHandle, Page
 from playwright_tests.core.basepage import BasePage
 
 
 class QuestionPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-        # Breadcrumb locators.
+
+        """Locators belonging to the page breadcrumbs."""
         self.question_breadcrumb = lambda question_title: page.locator(
             "ol#breadcrumbs").get_by_role("listitem", name=question_title, exact=True)
-        # "Posted successfully" green banner locators.
+        self.aaq_page_breadcrumbs = page.locator("ol#breadcrumbs li a")
+
+        """Locators belonging to the 'Posted successfully' green banner."""
         self.posted_questions_success_banner_message = page.locator(
             "ul[class='user-messages'] li p")
         self.posted_questions_success_banner_my_questions_link = page.locator(
@@ -26,7 +28,7 @@ def __init__(self, page: Page):
         self.problem_solved_banner_text = page.locator(
             "li[class='mzp-c-notification-bar mzp-t-success'] p")
 
-        # Problem solved locators.
+        """Locators belonging to the problem solved section."""
         self.problem_solved_reply_text = page.locator("div[class='reply'] p")
         self.problem_solved_reply_section = page.locator("div[class='solution card elevation-00']")
         self.problem_solved_reply_section_header = page.locator("h4[class='is-solution']")
@@ -37,7 +39,7 @@ def __init__(self, page: Page):
         self.reply_solution_header = lambda reply_id: page.locator(
             f"div#{reply_id} h3[class='is-solution']")
 
-        # Question locators.
+        """Genera question locators."""
         self.question_author = page.locator("div[class='question'] span[class='display-name']")
         self.questions_header = page.locator(
             "h2[class='sumo-callout-heading summary no-product-heading']")
@@ -45,14 +47,11 @@ def __init__(self, page: Page):
         self.modified_question_section = page.locator("p[class='edited text-body-sm']")
         self.question = lambda question_id: page.locator(f"div#{question_id}")
 
-        # Progress bar locators.
+        """Locators belonging to the progress bar section."""
         self.complete_progress_items_label = page.locator(
             "li[class='progress--item is-complete'] span[class='progress--label']")
 
-        # Breadcrumbs locators.
-        self.aaq_page_breadcrumbs = page.locator("ol#breadcrumbs li a")
-
-        # Question details locators.
+        """Locators belonging to the question details section."""
         self.question_details_button = page.locator("button[aria-controls='question-details']")
         self.question_details_product = page.locator("//div[@id='question-details']//span"
                                                      "[text()='Product:']/following-sibling::span")
@@ -67,11 +66,11 @@ def __init__(self, page: Page):
             "div[class='about-support'] p").get_by_text(text, exact=True)
         self.question_section = page.locator("article div[class='question']")
 
-        # Searchbar locators.
+        """Locators belonging to the searchbar section."""
         self.search_support_searchbar = page.locator("form#support-search-sidebar input")
         self.search_support_search_button = page.locator("form#support-search-sidebar button")
 
-        # Question Tools locators.
+        """Locators belonging to the Question Tools section."""
         self.edit_this_question_option = page.locator("ul#related-content li[class='edit'] a")
         self.stop_email_updates_option = page.locator("ul#related-content li[class='email'] a")
         self.subscribe_to_feed_option = page.locator("ul#related-content li[class='rss'] a")
@@ -81,7 +80,7 @@ def __init__(self, page: Page):
         self.system_details_options = page.locator("div#system-details ul[class='system'] li")
         self.mark_as_spam_option = page.locator("ul#related-content form[class='spam-form cf'] a")
 
-        # Tags section locators.
+        """Locators belonging to the tags section."""
         self.question_tags_options_for_non_moderators = page.locator("li[class='tag'] a")
         self.question_tags_options_for_moderators = page.locator("div[class='ts-control'] div")
         self.add_a_tag_input_field = page.locator("input[id*='tag-select']")
@@ -94,7 +93,7 @@ def __init__(self, page: Page):
             "//a[@class='tag-name' and normalize-space(text())='test']/following-sibling::"
             "a[@class='remove']")
 
-        # Post a reply section locators.
+        """Locators belonging to the post a reply section."""
         self.post_a_reply_section_heading = page.locator("h3[class='sumo-card-heading']")
         self.post_a_reply_textarea = page.locator("textarea#id_content")
         self.post_a_reply_textarea_bold_button = page.locator("button[title='Bold']")
@@ -129,7 +128,7 @@ def __init__(self, page: Page):
         self.username_of_posted_quote_owner = lambda reply_id: page.locator(
             f"div#{reply_id} div[class='content'] em p")
         self.posted_reply_said_link = lambda reply_id: page.locator(
-            f"div#{reply_id} div[class='content'] a")
+            f"//div[@id='{reply_id}']//div[@class='content']//a[text()='said']")
         self.blockquote_reply = lambda reply_id: page.locator(
             f"div#{reply_id} div[class='content'] blockquote")
         self.modified_by_text = lambda reply_id: page.locator(
@@ -160,7 +159,7 @@ def __init__(self, page: Page):
             f"div#{reply_id} button[name='not-helpful'] strong[class='helpful-count']")
         self.response_time = lambda reply_id: page.locator(f"div#{reply_id} time time")
 
-        # Common Responses locators.
+        """Locators belonging to the Common Responses section."""
         self.common_responses_option = page.locator("a[title='Common responses']")
         self.common_responses_search_field = page.locator("input#filter-responses-field")
         self.common_responses_modal_close_button = page.locator("div#media-modal a")
@@ -179,32 +178,34 @@ def __init__(self, page: Page):
         self.response_option = lambda option: page.locator(
             "ul[class='sidebar-nav'] li").get_by_text(option, exact=True)
 
-        # I have this problem too locators.
+        """Locators belonging to the 'I have this problem too' section.'"""
         self.i_have_this_problem_too_button = page.locator("div[class='me-too'] button")
         self.i_have_this_problem_too_counter = page.locator(
             "span[class='forum--meta-val have-problem']")
+        self.i_have_this_problem_too_no_thanks_button = page.locator(
+            "//section[@id='vote-thanks']//a[text()='No Thanks']")
 
-        # Needs more information from the user locators.
+        """Locators belonging to the 'Needs more information from' section."""
         self.needs_more_information_from_the_user_checkbox = page.locator("input#id_needs_info")
         self.more_information_panel_header = page.locator(
             "section#more-system-details").get_by_role("heading").filter(
             has_text="More Information")
 
-        # Attached image locators.
+        """Locators belonging to the attached image section."""
         self.attached_image = page.locator("a[class='image'] img")
         self.add_image_button = page.locator("div[class='field add-attachment']")
 
-        # Preview Reply button locators.
+        """Locators belonging to the preview reply button section."""
         self.preview_reply_button = page.locator("input#preview")
 
-        # Post Reply button locators.
+        """Locators belonging to the post reply button."""
         self.post_reply_button = page.get_by_role("button", name="Post Reply", exact=True)
 
-        # Delete question locators.
+        """Locators belonging to the delete question section."""
         self.delete_question_delete_button = page.locator("input[value='Delete']")
         self.delete_question_cancel_button = page.get_by_role("link").filter(has_text="Cancel")
 
-        # Report abuse section.
+        """Locators belonging to the report abuse section."""
         self.report_abuse_submit_button = page.locator(
             "div[class='mzp-c-modal-inner'] button[type='submit']")
         self.report_abuse_textarea = page.locator("div[class='mzp-c-modal-inner'] textarea")
@@ -215,7 +216,7 @@ def __init__(self, page: Page):
         self.report_answer_as_abuse = lambda answer_id: page.locator(
             f"div#{answer_id}").get_by_role("link", name="Report Abuse", exact=True)
 
-        # Signed out card locators.
+        """Locators belonging to the signed out card."""
         self.log_in_to_your_account_signed_out_card_option = page.locator(
             "div[class='question-tools ask-a-question card is-shaded'] p").get_by_role(
             "link", name="log in to your account", exact=True)
@@ -229,14 +230,14 @@ def __init__(self, page: Page):
             "div[class='question-tools ask-a-question card is-shaded']").get_by_role(
             "button", name="I have this problem, too", exact=True)
 
-    # Spam marked banner actions.
+    """Actions against the spam marked banner locators."""
     def get_text_of_spam_marked_banner(self) -> str:
         return self._get_text_of_element(self.reply_flagged_as_spam_banner)
 
     def is_spam_marked_banner_displayed(self) -> bool:
         return self._is_element_visible(self.reply_flagged_as_spam_banner)
 
-    # Report abuse actions.
+    """Actions against the report abuse section locators."""
     def click_abuse_modal_close_button(self):
         self._click(self.report_abuse_modal_close_button)
 
@@ -249,65 +250,47 @@ def add_text_to_report_abuse_textarea(self, text: str):
     def click_on_report_abuse_submit_button(self):
         self._click(self.report_abuse_submit_button)
 
-    # Breadcrumbs actions.
-    def get_current_breadcrumb_locator(self, question_title: str) -> Locator:
-        return self.question_breadcrumb(question_title)
-
+    """Actions against the breadcrumbs locators."""
     def click_on_breadcrumb(self, breadcrumb_xpath: str):
         self._click(breadcrumb_xpath)
 
-    # Get email updates actions.
-    def get_email_updates_option(self) -> Locator:
-        return self.stop_email_updates_option
-
-    # Problem solved actions.
+    """Actions against the Problem solved section locators."""
     def get_problem_solved_section_header_text(self) -> str:
         return self._get_text_of_element(self.problem_solved_reply_section_header)
 
     def click_on_undo_button(self):
         self._click(self.undo_solves_problem)
 
-    def get_undo_button_locator(self) -> Locator:
-        return self.undo_solves_problem
-
     def click_read_this_answer_in_context_link(self):
         self._click(self.problem_solved_reply_reply_link)
 
     def get_chosen_solution_text(self) -> str:
         return self._get_text_of_element(self.problem_solved_reply_text)
 
-    def get_chosen_solution_section_locator(self) -> Locator:
-        return self.problem_solved_reply_section
-
     def is_solution_section_displayed(self) -> bool:
         return self._is_element_visible(self.problem_solved_reply_section)
 
     def get_solved_problem_banner_text(self) -> str:
         return self._get_text_of_element(self.problem_solved_banner_text)
 
-    def get_solved_the_problem_button_locator(self, target_reply_id: str) -> Locator:
-        return self.reply_solves_the_problem(target_reply_id)
-
     def get_chosen_solution_reply_message(self, reply_id: str) -> str:
         return self._get_text_of_element(self.reply_solution_header(reply_id))
 
-    def get_chosen_solution_reply_message_locator(self, reply_id: str) -> Locator:
-        return self.reply_solution_header(reply_id)
-
-    # I have this problem too actions.
-    def get_i_have_this_problem_too_locator(self) -> Locator:
-        return self.i_have_this_problem_too_button
-
+    """Actions against the I have this problem too locators."""
     def click_i_have_this_problem_too_button(self):
-        self._click(self.i_have_this_problem_too_button)
+        self._click(self.i_have_this_problem_too_button,
+                    expected_locator=self.i_have_this_problem_too_no_thanks_button)
 
     def get_i_have_this_problem_too_counter(self) -> int:
         return int(self._get_text_of_element(self.i_have_this_problem_too_counter))
 
+    def click_on_i_have_this_problem_no_thanks_button(self):
+        self._click(self.i_have_this_problem_too_no_thanks_button)
+
     def get_last_reply_by_text(self) -> str:
         return self._get_text_of_element(self.last_reply_by)
 
-    # Page content actions.
+    """Actions against the general page locators."""
     def get_question_header(self) -> str:
         return self._get_text_of_element(self.questions_header)
 
@@ -323,15 +306,9 @@ def get_question_author_name(self) -> str:
     def get_question_id(self) -> str:
         return self._get_element_attribute_value(self.question_section, 'id')
 
-    def get_modified_question_locator(self) -> Locator:
-        return self.modified_question_section
-
     def get_modified_by_text(self) -> str:
         return self._get_text_of_element(self.modified_question_section)
 
-    def get_add_image_section_locator(self) -> Locator:
-        return self.add_image_button
-
     def click_on_my_questions_banner_option(self):
         self._click(self.posted_questions_success_banner_my_questions_link)
 
@@ -351,52 +328,27 @@ def get_text_content_of_reply(self, reply_id: str) -> str:
     def get_display_name_of_question_reply_author(self, reply_id: str) -> str:
         return self._get_text_of_element(self.reply_author_display_name(reply_id))
 
-    def get_displayed_user_title_of_question_reply_locator(self, reply_id: str) -> Locator:
-        return self.reply_user_title(reply_id)
-
     def get_displayed_user_title_of_question_reply(self, reply_id: str) -> str:
         return self._get_text_of_element(self.reply_user_title(reply_id))
 
-    # Question tag actions.
+    """Actions against the question tag section locators."""
     def get_question_tag_options(self, is_moderator: bool) -> list[str]:
         return [tag.replace("\n×", "") for tag in self._get_text_of_elements(
             self.question_tags_options_for_moderators if is_moderator else self
             .question_tags_options_for_non_moderators)]
 
-    def get_remove_tag_button_locator(self, tag_name: str) -> Locator:
-        return self.delete_tag(tag_name)
-
     def add_text_to_add_a_tag_input_field(self, text: str):
         self._fill(self.add_a_tag_input_field, text)
         self._wait_for_given_timeout(2000)
         self._press_a_key(self.add_a_tag_input_field, "Enter")
 
-    def get_add_a_tag_input_field(self) -> Locator:
-        return self.add_a_tag_input_field
-
     def click_on_a_certain_tag(self, tag_name: str, expected_locator):
         self._click(self.tag_by_name(tag_name), expected_locator=expected_locator)
 
-    def get_a_certain_tag(self, tag_name: str) -> Locator:
-        return self.tag(tag_name)
-
     def click_on_tag_remove_button(self, tag_name: str):
         self._click(self.delete_tag(tag_name))
 
-    # Attached image actions.
-    def get_attached_image(self) -> Locator:
-        return self.attached_image
-
-    # Question more information actions.
-    def get_more_information_with_text_locator(self, text: str) -> Locator:
-        return self.more_information_with_text(text)
-
-    def get_question_details_button_locator(self) -> Locator:
-        return self.question_details_button
-
-    def get_more_information_locator(self) -> Locator:
-        return self.more_information_panel_header
-
+    """Actions against the more information section locators."""
     def get_user_agent_information(self) -> str:
         self._wait_for_locator(self.more_system_details_modal)
         return self._get_text_of_element(self.user_agent_information)
@@ -419,70 +371,43 @@ def click_on_more_system_details_option(self):
     def click_on_the_additional_system_panel_close(self):
         self._click(self.close_additional_system_details_button)
 
-    def get_reply_section_locator(self, answer_id: str) -> Locator:
-        return self.reply_section(answer_id)
-
     def click_on_reply_more_options_button(self, answer_id: str):
         self._click(self.more_options_for_answer(answer_id))
 
     def click_on_report_abuse_for_a_certain_reply(self, answer_id: str):
         self._click(self.report_answer_as_abuse(answer_id))
 
-    def get_click_on_report_abuse_reply_locator(self, answer_id: str) -> Locator:
-        return self.report_answer_as_abuse(answer_id)
-
     def click_on_quote_for_a_certain_reply(self, answer_id: str):
         self._click(self.quote_reply(answer_id))
 
-    def get_quote_reply_locator(self, answer_id: str) -> Locator:
-        return self.quote_reply(answer_id)
-
     def click_on_mark_as_spam_for_a_certain_reply(self, answer_id: str):
         self._click(self.mark_reply_as_spam(answer_id))
 
-    def get_mark_as_spam_reply_locator(self, answer_id: str) -> Locator:
-        return self.mark_reply_as_spam(answer_id)
-
-    def get_marked_as_spam_locator(self, answer_id: str) -> Locator:
-        return self.marked_as_spam(answer_id)
-
     def get_marked_as_spam_text(self, answer_id: str) -> str:
         return self._get_text_of_element(self.marked_as_spam(answer_id))
 
     def click_on_edit_this_post_for_a_certain_reply(self, answer_id: str):
         self._click(self.edit_this_post_for_answer(answer_id))
 
-    def get_edit_this_post_reply_locator(self, answer_id: str) -> Locator:
-        return self.edit_this_post_for_answer(answer_id)
-
     def click_on_delete_this_post_for_a_certain_reply(self, answer_id: str):
         self._click(self.delete_this_post_for_answer(answer_id))
 
-    def get_delete_this_post_reply_locator(self, answer_id: str) -> Locator:
-        return self.delete_this_post_for_answer(answer_id)
-
     def click_on_cancel_delete_button(self):
         self._click(self.delete_question_cancel_button)
 
-    # Post a reply actions.
+    """Actions against the post a reply section locators."""
     def add_text_to_post_a_reply_textarea(self, text: str):
         self._fill(self.post_a_reply_textarea, text)
 
     def type_inside_the_post_a_reply_textarea(self, text: str):
         self._type(self.post_a_reply_textarea, text, 100)
 
-    def get_post_a_reply_textarea_locator(self) -> Locator:
-        return self.post_a_reply_textarea
-
     def get_post_a_reply_textarea_text(self) -> str:
         return self._get_text_of_element(self.post_a_reply_textarea)
 
     def get_post_a_reply_textarea_value(self) -> str:
         return self._get_element_input_value(self.post_a_reply_textarea)
 
-    def get_posted_reply_locator(self, question_id: str) -> Locator:
-        return self.question(question_id)
-
     def get_posted_reply_text(self, reply_id: str) -> str:
         return self._get_text_of_element(self.posted_reply_text(reply_id))
 
@@ -498,46 +423,19 @@ def get_blockquote_reply_text(self, reply_id: str) -> str:
     def get_posted_reply_modified_by_text(self, reply_id: str) -> str:
         return self._get_text_of_element(self.modified_by_text(reply_id))
 
-    def get_posted_reply_modified_by_locator(self, reply_id: str) -> Locator:
-        return self.modified_by_text(reply_id)
-
     def click_on_post_reply_button(self, repliant_username) -> str:
         self._click(self.post_reply_button,
                     expected_locator=self.repliant_username(repliant_username))
         return self._get_element_attribute_value(self.answer_by_username(repliant_username), "id")
 
-    # Question Tools actions.
-    def get_edit_this_question_option_locator(self) -> Locator:
-        return self.edit_this_question_option
-
-    def get_delete_this_question_locator(self) -> Locator:
-        return self.delete_this_question_option
-
-    def get_lock_this_question_locator(self) -> Locator:
-        return self.lock_this_question_option
-
-    # Stands for archived banner as well
+    """Actions against the question tools section locators."""
     def get_thread_locked_text(self) -> str:
+        # Stands for archived banner as well
         return self._get_text_of_element(self.lock_this_thread_banner)
 
-    def get_thread_locked_locator(self) -> Locator:
-        return self.lock_this_thread_banner
-
     def is_thread_locked_banner_displayed(self) -> bool:
         return self._is_element_visible(self.lock_this_thread_banner)
 
-    def get_archive_this_question_locator(self) -> Locator:
-        return self.archive_this_question_option
-
-    def get_needs_more_information_checkbox_locator(self) -> Locator:
-        return self.needs_more_information_from_the_user_checkbox
-
-    def get_mark_as_spam_locator(self) -> Locator:
-        return self.mark_as_spam_option
-
-    def get_marked_as_spam_banner_locator(self) -> Locator:
-        return self.marked_as_spam_banner
-
     def get_marked_as_spam_banner_text(self) -> str:
         return self._get_text_of_element(self.marked_as_spam_banner)
 
@@ -571,10 +469,7 @@ def is_reply_displayed(self, reply_id: str) -> bool:
     def is_reply_with_content_displayed(self, reply_content: str) -> bool:
         return self._is_element_visible(self.reply_by_content(reply_content))
 
-    # Votes reply section
-    def get_reply_votes_section_locator(self, reply_id: str) -> Locator:
-        return self.reply_vote_section(reply_id)
-
+    """Actions against the reply votes section locators."""
     def get_reply_vote_heading(self, reply_id: str) -> str:
         return self._get_text_of_element(self.reply_vote_heading(reply_id))
 
@@ -584,11 +479,6 @@ def click_reply_vote_thumbs_up_button(self, reply_id: str):
     def get_thumbs_up_vote_message(self, reply_id: str) -> str:
         return self._get_text_of_element(self.reply_vote_thumbs_up_message(reply_id))
 
-    def get_thumbs_up_button_locator(self, reply_id: str) -> Locator:
-        return self.reply_vote_thumbs_up(reply_id)
-
-    def get_thumbs_down_button_locator(self, reply_id: str) -> Locator:
-        return self.reply_vote_thumbs_down(reply_id)
 
     def click_reply_vote_thumbs_down_button(self, reply_id):
         self._click(self.reply_vote_thumbs_down(reply_id))
@@ -599,7 +489,7 @@ def get_helpful_count(self, reply_id) -> str:
     def get_not_helpful_count(self, reply_id) -> str:
         return self._get_text_of_element(self.unhelpful_count(reply_id))
 
-    # Signed out card actions.
+    """Actions against the signed out card locators."""
     def click_on_log_in_to_your_account_signed_out_card_link(self):
         self._click(self.log_in_to_your_account_signed_out_card_option)
 
@@ -609,17 +499,10 @@ def click_on_start_a_new_question_signed_out_card_link(self):
     def click_on_ask_a_question_signed_out_card_option(self):
         self._click(self.ask_a_question_signed_out_card_option)
 
-    def ask_a_question_signed_out_card_option_locator(self) -> Locator:
-        return self.ask_a_question_signed_out_card_option
-
     def click_on_i_have_this_problem_too_signed_out_card_option(self):
         self._click(self.i_have_this_problem_too_signed_out_card_option)
 
-    def get_i_have_this_problem_too_signed_out_card_locator(self) -> Locator:
-        return self.i_have_this_problem_too_signed_out_card_option
-
-    # Common responses actions.
-
+    """Actions against the common responses section locators."""
     def click_on_common_responses_option(self):
         self._click(self.common_responses_option)
 
@@ -641,8 +524,8 @@ def click_on_a_particular_category_option(self, option: str):
     def click_on_a_particular_response_option(self, option: str):
         self._click(self.response_option(option))
 
-    # Removing both newline characters and link syntax format.
     def get_text_of_response_editor_textarea_field(self) -> str:
+        # Removing both newline characters and link syntax format.
         return (self._get_element_input_value(self.common_responses_textarea_field)
                 .replace("\n", "")
                 .replace("[", "")
diff --git a/playwright_tests/pages/ask_a_question/product_solutions_pages/product_solutions_page.py b/playwright_tests/pages/ask_a_question/product_solutions_pages/product_solutions_page.py
index a864fba180f..99dd21e025f 100644
--- a/playwright_tests/pages/ask_a_question/product_solutions_pages/product_solutions_page.py
+++ b/playwright_tests/pages/ask_a_question/product_solutions_pages/product_solutions_page.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import ElementHandle, Locator, Page
-
+from playwright.sync_api import ElementHandle, Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,24 +6,24 @@ class ProductSolutionsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Page breadcrumb locators.
+        """Locators belonging to the page breadcrumbs."""
         self.complete_progress_item = page.locator("li[class='progress--item is-complete'] a")
         self.complete_progress_item_label = page.locator(
             "li[class='progress--item is-complete'] span.progress--label")
         self.current_progress_item_label = page.locator(
             "li[class='progress--item is-current'] span.progress--label")
 
-        # Page content locators.
+        """General page content locators."""
         self.product_title_heading = page.locator("span.product-title-text")
         self.page_heading_intro_text = page.locator("p.page-heading--intro-text")
 
-        # Find help locators.
+        """Locators belonging to the Find Help section."""
         self.product_solutions_find_help_searchbar = page.locator(
             "form#question-search-masthead input")
         self.product_solutions_find_help_search_button = page.locator(
             "form#question-search-masthead button")
 
-        # Featured articles locators.
+        """Locators belonging to the featured articles section."""
         self.featured_article_section_title = page.get_by_role("heading").filter(
             has_text="Featured Articles")
         self.featured_articles_cards = page.locator(
@@ -33,7 +32,7 @@ def __init__(self, page: Page):
             f'//h2[contains(text(),"Featured Articles")]/../..//a[normalize-space(text())='
             f'"{card_name}"]')
 
-        # Popular topics locators.
+        """Locators belonging to the popular topics section."""
         self.popular_topics_section_title = page.get_by_role("heading").filter(
             has_text="Popular Topics")
         self.popular_topics_cards = page.locator(
@@ -42,18 +41,18 @@ def __init__(self, page: Page):
             f"//h2[contains(text(),'Popular Topics')]/../..//a[normalize-space(text()) = "
             f"'{card_name}']")
 
-        # Support scam banner locators.
+        """Locators belonging to the support scam banner."""
         self.support_scams_banner = page.locator("div#id_scam_alert")
         self.support_scam_banner_learn_more_button = page.locator("div#id_scam_alert a")
 
-    # Breadcrumb actions.
+    """Actions against the page breadcrumbs locators."""
     def click_on_the_completed_milestone(self):
         self._click(self.complete_progress_item)
 
     def get_current_milestone_text(self) -> str:
         return self._get_text_of_element(self.current_progress_item_label)
 
-    # Featured article actions.
+    """Actions against the featured article section locators."""
     def click_on_a_featured_article_card(self, card_name: str):
         self._click(self.featured_article_card(card_name))
 
@@ -63,7 +62,7 @@ def get_all_featured_articles_titles(self) -> list[str]:
     def is_featured_article_section_displayed(self) -> bool:
         return self._is_element_visible(self.featured_article_section_title)
 
-    # Popular topic actions.
+    """Actions against the popular topic section locators."""
     def click_on_a_popular_topic_card(self, card_name: str):
         self._click(self.popular_topic_card(card_name))
 
@@ -73,21 +72,17 @@ def get_popular_topics(self) -> list[str]:
     def is_popular_topics_section_displayed(self) -> bool:
         return self._is_element_visible(self.popular_topics_section_title)
 
-    # Product solutions actions.
+    """Actions against the product solutions section locators."""
     def get_product_solutions_heading(self) -> str:
         return self._get_text_of_element(self.product_title_heading)
 
     def is_product_solutions_page_header_displayed(self) -> ElementHandle:
         return self._get_element_handle(self.product_title_heading)
 
-    # Support scam banner actions
-
-    # Instead of clicking on the 'Learn More' button we are going to perform the assertion
-    # by checking that the element has the correct href value. Navigating to prod can yield
-    # a 429 error which we want to avoid.
+    """Actions against the scam banner locators."""
     def get_scam_alert_banner_link(self) -> str:
+        # Instead of clicking on the 'Learn More' button we are going to perform the assertion
+        # by checking that the element has the correct href value. Navigating to prod can yield
+        # a 429 error which we want to avoid.
         return self._get_element_attribute_value(self.support_scam_banner_learn_more_button,
                                                  "href")
-
-    def get_scam_banner_locator(self) -> Locator:
-        return self.support_scams_banner
diff --git a/playwright_tests/pages/ask_a_question/product_topics_pages/product_topics_page.py b/playwright_tests/pages/ask_a_question/product_topics_pages/product_topics_page.py
index eff5bc3167c..74b18eb9e79 100644
--- a/playwright_tests/pages/ask_a_question/product_topics_pages/product_topics_page.py
+++ b/playwright_tests/pages/ask_a_question/product_topics_pages/product_topics_page.py
@@ -1,5 +1,4 @@
 from playwright.sync_api import Page
-
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,7 +6,7 @@ class ProductTopicPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Product topic page content locators.
+        """Locators belonging to the product topic page."""
         self.page_title = page.locator("h1[class='topic-title sumo-page-heading']")
         self.page_subheading = page.locator("div[class='sumo-article-header--text'] p")
         self.all_articles = page.locator("section[class='topic-list'] article h2 a")
@@ -15,18 +14,18 @@ def __init__(self, page: Page):
             "h2[class='sumo-card-heading']").get_by_role(
             "link", name=article_title, exact=True)
 
-        # Product topic page navbar locators.
+        """Locators belonging to the product topic page navbar."""
         self.navbar_links = page.locator("//ul[@class='sidebar-nav--list']/li/a")
         self.selected_nav_link = page.locator("a[class*='selected']")
         self.navbar_option = lambda option_name: page.locator(
             "ul[class='sidebar-nav--list'] li").get_by_role("link").filter(has_text=option_name)
 
-        # Product topic page article metadata locators.
+        """Locators belonging to the product topic page article metadata."""
         self.article_helpfulness_count = lambda article_name: page.locator(
             f"//a[normalize-space(text())='{article_name}']/../../div[@id='document_metadata']//"
             f"span[@class='helpful-count']")
 
-    # Page content actions.
+    """Actions against the general product topic page locators."""
     def get_all_listed_article_titles(self) -> list[str]:
         """Returns a list of all the article titles displayed on the page."""
         return self._get_text_of_elements(self.all_articles)
@@ -42,7 +41,7 @@ def get_a_particular_article_locator(self, article_title: str):
     def click_on_a_particular_article(self, article_title: str):
         self._click(self.article_link(article_title))
 
-    # Navbar actions.
+    """Actions against the navbar locators."""
     def get_selected_navbar_option(self) -> str:
         """Returns the text of the selected navbar option."""
         return self._get_text_of_element(self.selected_nav_link)
diff --git a/playwright_tests/pages/auth_page.py b/playwright_tests/pages/auth_page.py
index 4d08ead335e..0a2c8586972 100644
--- a/playwright_tests/pages/auth_page.py
+++ b/playwright_tests/pages/auth_page.py
@@ -7,7 +7,7 @@ class AuthPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Auth page content
+        """Locators belonging to the general content of the auth page."""
         self.auth_page_section = page.locator("section.sumo-auth--wrap")
         self.fxa_sign_in_page_header = page.locator("h1.fxa-signin-password-header")
         self.auth_page_main_header = page.locator("h1.sumo-page-heading")
diff --git a/playwright_tests/pages/common_elements/common_web_elements.py b/playwright_tests/pages/common_elements/common_web_elements.py
index 68a0cbcdca3..2a9389584e7 100644
--- a/playwright_tests/pages/common_elements/common_web_elements.py
+++ b/playwright_tests/pages/common_elements/common_web_elements.py
@@ -1,8 +1,6 @@
 import random
 from typing import Literal
-
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -10,16 +8,16 @@ class CommonWebElements(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Avoid spam banner locators.
+        """Locators belonging to the spam banner."""
         self.scam_banner = page.locator("div#id_scam_alert")
         self.scam_banner_text = page.locator("div#id_scam_alert p[class='heading']")
         self.learn_more_button = page.locator("div#id_scam_alert").get_by_role("link")
 
-        # Still need help widget locators.
+        """Locators belonging to the Still need help widget."""
         self.aaq_button = page.locator("div[class*='aaq-widget']").get_by_role("link")
         self.still_need_help_subheading = page.locator("div.aaq-widget p")
 
-        # Learn more card locators.
+        """Locators belonging to the Learn more card."""
         self.volunteer_learn_more_card_heading = page.locator(
             "//div[@class='card--details']//a[text()='Learn More']//../../../h3")
         self.volunteer_learn_more_card_text = page.locator(
@@ -28,6 +26,9 @@ def __init__(self, page: Page):
             "div[class='card--details']").get_by_role("link", name="Learn More")
 
         # Frequent Topics locators applicable to product & product solutions pages.
+        """Locators belonging to the Frequent Topics applicable to product & product solutions
+         pages.
+         """
         self.frequent_topics_section_title = page.get_by_role(
             "heading", name="Topics", exact=True)
         self.frequent_topics_section_subtitle = page.get_by_role(
@@ -48,7 +49,7 @@ def __init__(self, page: Page):
             f"//div[@class='card--topic']/div[@class='topic-header']/h3[@class='card--title']/a"
             f"[normalize-space(text())='{card_title}']/../../following-sibling::a")
 
-        # Pagination page locators
+        """Locators belonging to the pagination elements."""
         self.pagination_item = lambda pagination_item: page.locator(
             "ol[class='pagination']").get_by_role("link").filter(has_text=pagination_item)
         self.selected_pagination_item = page.locator(
@@ -58,12 +59,12 @@ def __init__(self, page: Page):
         self.next_pagination_item= page.locator(
             "//ol[@class='pagination']//span[text()='Next']/..")
 
-    # Actions against the Avoid Spam Banner
+    """Actions against the Avoid Spam banner locators."""
     def get_scam_banner_text(self) -> str:
         """Returns the scam banner text."""
         return self._get_text_of_element(self.scam_banner_text)
 
-    # Actions against the Still Need Help Widget
+    """Actions against the Still Need Help widget locators."""
     def click_on_aaq_button(self):
         """Click on the 'Still Need Help?' button."""
         self._click(self.aaq_button)
@@ -75,13 +76,7 @@ def get_aaq_widget_text(self) -> str:
     def get_aaq_widget_button_name(self) -> str:
         return self._get_text_of_element(self.aaq_button)
 
-    def get_still_need_help_locator(self) -> Locator:
-        return self.still_need_help_subheading
-
-    # Actions against the Learn More card
-    def get_learn_more_button_locator(self) -> Locator:
-        return self.learn_more_button
-
+    """Actions against the learn more section locators."""
     def click_on_volunteer_learn_more_link(self):
         self._click(self.volunteer_learn_more_link)
 
@@ -97,7 +92,7 @@ def get_volunteer_learn_more_card_header(self) -> str:
         """
         return self._get_text_of_element(self.volunteer_learn_more_card_heading)
 
-    # Actions against the Frequent Topics Section.
+    """Actions against the Frequent Topics Section locators."""
     def is_frequent_topics_section_displayed(self) -> bool:
         """Check if the frequent topics section is displayed on the page."""
         return self._is_element_visible(self.frequent_topics_section_title)
diff --git a/playwright_tests/pages/community_forums/forums_pages/all_community_forums_page.py b/playwright_tests/pages/community_forums/forums_pages/all_community_forums_page.py
index 2fd823d69c0..d70c525f553 100644
--- a/playwright_tests/pages/community_forums/forums_pages/all_community_forums_page.py
+++ b/playwright_tests/pages/community_forums/forums_pages/all_community_forums_page.py
@@ -1,5 +1,4 @@
 from playwright.sync_api import Page
-
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,11 +6,11 @@ class SupportForumsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Locators belonging to the page heading section.
+        """Locators belonging to the page heading section."""
         self.page_main_heading = page.locator("h1[class='sumo-page-heading']")
         self.page_intro = page.locator("p[class='sumo-page-intro']")
 
-        # Locators belonging to the product community forums cards.
+        """Locators belonging to the product community forum cards."""
         self.product_card_titles = page.locator("h3[class='card--title']")
         self.product_card = lambda card_name: page.locator(
             f"//a[normalize-space(.)='{card_name}']")
@@ -20,7 +19,7 @@ def __init__(self, page: Page):
         self.all_products_support_forum_button = page.get_by_role("link").filter(
             has_text="All Products Community Forums")
 
-    # Page heading actions.
+    """Actions against the page heading locators."""
     def get_page_heading_text(self) -> str:
         """Get the text of the page title."""
         return self._get_text_of_element(self.page_main_heading)
@@ -29,7 +28,7 @@ def get_page_intro_text(self) -> str:
         """Get the text of the page subtitle."""
         return self._get_text_of_element(self.page_intro)
 
-    # Product cards actions.
+    """Actions against the product cards section."""
     def click_on_a_particular_product_card(self, card_name: str):
         """
         Click on a particular product community forum card.
diff --git a/playwright_tests/pages/community_forums/forums_pages/product_support_forum.py b/playwright_tests/pages/community_forums/forums_pages/product_support_forum.py
index c57d6969ae4..26240fb1775 100644
--- a/playwright_tests/pages/community_forums/forums_pages/product_support_forum.py
+++ b/playwright_tests/pages/community_forums/forums_pages/product_support_forum.py
@@ -1,7 +1,5 @@
 import re
-
-from playwright.sync_api import Page, Locator
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -9,12 +7,12 @@ class ProductSupportForum(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # General page locators.
+        """General page locators."""
         self.ask_the_community_button = page.get_by_role("link").filter(
             has_text="Ask the Community")
         self.community_forum_header = page.locator("//span[@class='product-title-text']")
 
-        # Locators related to the displayed questions.
+        """Locators belonging to the displayed questions."""
         self.showing_questions_tagged_tag = page.locator("div#tagged a[class='tag']")
         self.all_question_list_tags = page.locator("li[class='tag']")
         self.show_all_questions_option = page.locator("a[class='show-all']")
@@ -36,8 +34,7 @@ def __init__(self, page: Page):
         self.question_locked_indicator = lambda question_id: page.locator(
             f"//article[@id='{question_id}']//li[@class='thread-locked']")
 
-
-        # Locators belonging to the filter options.
+        """Locators belonging to the filter options sections."""
         self.selected_tab_filter = page.locator(
             "//ul[@class='tabs--list subtopics']/li[@class='tabs--item']/a[@class='selected']")
         self.tab_filter_by_name = lambda filter_name: page.locator(
@@ -48,7 +45,7 @@ def __init__(self, page: Page):
             "select#products-topics-dropdown").get_by_role("option", selected=True)
 
 
-    # General product community forum actions.
+    """Actions against the general product community forum page locators."""
     def get_text_of_product_community_forum_header(self) -> str:
         """Get the text of the product community forum header."""
         return self._get_text_of_element(self.community_forum_header)
@@ -57,7 +54,7 @@ def click_on_the_ask_the_community_button(self):
         """Click on the 'Ask the Community' button."""
         self._click(self.ask_the_community_button)
 
-    # Actions against the filter tab section.
+    """Actions against the filter tab section locators."""
     def get_text_of_selected_tab_filter(self) -> str:
         """Get the text of the currently selected tab filter."""
         return self._get_text_of_element(self.selected_tab_filter)
@@ -78,13 +75,13 @@ def is_tab_filter_displayed(self, filter_name: str) -> bool:
         """
         return self._is_element_visible(self.tab_filter_by_name(filter_name))
 
-    # Actions against the filter section.
+    """Actions against the filter section locators."""
     def get_selected_topic_option(self) -> str:
         """Get the selected topic filter option."""
         option = super()._get_text_of_element(self.topic_dropdown_selected_option)
         return re.sub(r'\s+', ' ', option).strip()
 
-    # Actions against the filter by tag section.
+    """Actions against the filter by tag section locators."""
     def get_text_of_selected_tag_filter_option(self) -> str:
         """Get the text of the applied tag filter option."""
         return super()._get_text_of_element(self.showing_questions_tagged_tag)
@@ -93,7 +90,7 @@ def click_on_the_show_all_questions_option(self):
         """Click on the 'Show all questions' option displayed when filtering by tags."""
         super()._click(self.show_all_questions_option)
 
-    # Actions against the displayed questions.
+    """Actions against the displayed questions locators."""
     def get_all_question_list_tags(self, question_id: str) -> list[str]:
         """
         Get the tags associated with a particular question.
@@ -138,10 +135,6 @@ def get_ids_of_all_listed_questions(self) -> list[str]:
             """
             return []
 
-    def get_list_of_is_spam_locators(self) -> list[Locator]:
-        """Get the list of spam locators"""
-        return self.is_spam_locator.all()
-
     def is_spam_flag_for_question(self, question_id: str) -> bool:
         """
         Return if the is-spam flag is set for a certain question or not.
diff --git a/playwright_tests/pages/contribute/contribute_pages/contribute_page.py b/playwright_tests/pages/contribute/contribute_pages/contribute_page.py
index f6198958862..aaaf7ffc662 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contribute_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contribute_page.py
@@ -1,5 +1,4 @@
 from playwright.sync_api import ElementHandle, Page
-
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,11 +6,11 @@ class ContributePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Breadcrumbs
+        """Locators belonging to the breadcrumbs section."""
         self.breadcrumbs = page.locator("ol#breadcrumbs li")
         self.breadcrumb_homepage = page.locator("ol#breadcrumbs li").first
 
-        # Page Hero
+        """Locators belonging to the page hero section."""
         self.page_hero_main_header = page.locator("div[class*='hero'] div h1")
         self.page_hero_main_header_subtext = page.locator(
             "//div[contains(@class, 'hero')]/div/h1/following-sibling::p[1]")
@@ -19,29 +18,29 @@ def __init__(self, page: Page):
         self.page_hero_need_help_subtext = page.locator(
             "//div[contains(@class,'hero')]/div/h1/following-sibling::p[2]")
 
-        # Ways to contribute_messages
+        """Locators belonging to the Ways to contribute messages section."""
         self.way_to_contribute_header = page.locator("//nav/preceding-sibling::h2")
         self.way_to_contribute_cards = page.locator(
             "//h2[contains(text(),'Pick a way to contribute_messages')]/following-sibling::"
             "nav/ul/a")
         self.way_to_contribute_card_titles = page.locator("nav ul a li span")
 
-        # About us
+        """Locators belonging to the about us section."""
         self.about_us_header = page.get_by_role("heading").filter(has_text="About us")
         self.about_us_subtext = page.locator(
             "//h2[contains(text(),'About us')]/following-sibling::p")
 
-        # All page images
+        """Locators belonging to the page images."""
         self.all_page_images = page.locator("div#svelte img")
 
-    # Breadcrumbs
+    """Actions against the breadcrumbs locators."""
     def _get_breadcrumbs_text(self) -> list[str]:
         return super()._get_text_of_elements(self.breadcrumbs)
 
     def _click_on_home_breadcrumb(self):
         super()._click(self.breadcrumb_homepage)
 
-    # Page Hero
+    """Actions against the page hero locators."""
     def _get_page_hero_main_header_text(self) -> str:
         return super()._get_text_of_element(self.page_hero_main_header)
 
@@ -54,25 +53,25 @@ def _get_page_hero_need_help_header_text(self) -> str:
     def _get_page_hero_need_help_subtext(self) -> str:
         return super()._get_text_of_element(self.page_hero_need_help_subtext)
 
-    # Page images
+    """"Actions against the page images locators."""
     def _get_all_page_links(self) -> list[ElementHandle]:
         return super()._get_element_handles(self.all_page_images)
 
-    # Way to contribute_messages
+    """Actions against the ways to contribute messages section locators."""
     def _get_way_to_contribute_header_text(self) -> str:
         return super()._get_text_of_element(self.way_to_contribute_header)
 
     def _get_way_to_contribute_cards(self) -> list[str]:
         return super()._get_text_of_elements(self.way_to_contribute_card_titles)
 
-    # About us
+    """Actions against the about us section locators."""
     def _get_about_us_header_text(self) -> str:
         return super()._get_text_of_element(self.about_us_header)
 
     def _get_about_us_subtext(self) -> str:
         return super()._get_text_of_element(self.about_us_subtext)
 
-    # Contribute cards
+    """Actions against the contribute cards locators."""
     def _get_list_of_contribute_cards(self) -> list[ElementHandle]:
         return super()._get_element_handles(self.way_to_contribute_cards)
 
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/contributor_discussions_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/contributor_discussions_page.py
index 4f417ec027d..fc84d2f1d2a 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/contributor_discussions_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/contributor_discussions_page.py
@@ -1,19 +1,17 @@
 from playwright.sync_api import Page
-
 from playwright_tests.core.basepage import BasePage
 
-"""
-    This class contains the locators and actions for the general "Contributor Discussions" page.
-"""
+"""This class contains the locators and actions for the general "Contributor Discussions" page."""
 
 
 class ContributorDiscussionPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-        # Contributor Discussions breadcrumb locators.
+
+        """Locators belonging to the page breadcrumbs."""
         self.contributor_discussions_page_breadcrumbs = page.locator('ol#breadcrumbs li')
 
-        # Contributor Discussions side navbar locators.
+        """Locators belonging to the contributor discussions side-navbar."""
         self.contributor_discussions_side_navbar_header = page.locator(
             "#for-contributors-sidebar ul li.sidebar-subheading")
         self.contributor_discussions_side_navbar_items = page.locator(
@@ -22,7 +20,7 @@ def __init__(self, page: Page):
             "#for-contributors-sidebar ul li:not(.sidebar-subheading)").get_by_role(
             "link", name=item_name, exact=True)
 
-        # Contributor Discussions forums list locators.
+        """Locators belonging to the contributor discussions forums list."""
         self.contributor_discussions_page_title = page.locator("div#forums h1")
         self.contributor_discussions_forum_names = page.locator("h5[class='sumo-card-heading']")
         self.contributor_discussions_forum_name = lambda forum: page.locator(
@@ -37,7 +35,7 @@ def __init__(self, page: Page):
             f"//h5[@class='sumo-card-heading']/a[text()='{forum}']/../../"
             f"following-sibling::td[@class='last-post']/a").nth(1)
 
-    # Actions against the Contributor Discussions breadcrumb locators.
+    """Actions against the Contributor Discussions breadcrumb locators."""
     def get_contributor_discussions_breadcrumbs(self) -> list[str]:
         """
         Get the text of all the breadcrumbs on the Contributor Discussions page.
@@ -52,7 +50,7 @@ def click_on_first_breadcrumb(self):
         """
         self._click(self.contributor_discussions_page_breadcrumbs.first)
 
-    # Actions against the Contributor Discussions forums list locators.
+    """Actions against the Contributor Discussions forums list locators."""
     def get_contributor_discussions_page_title(self) -> str:
         """
         Get the title of the Contributor Discussions page.
@@ -136,7 +134,8 @@ def click_on_last_post_by(self, forum: str):
         """
         self._click(self.contributor_discussions_forum_last_post_by(forum))
 
-    # Actions against the Contributor Discussions side navbar locators.
+
+    """Actions against the Contributor Discussions side-navbar locators."""
     def get_contributor_discussions_side_navbar_header(self) -> str:
         """
         Get the header text of the Contributor Discussions side navbar.
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/delete_thread_post_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/delete_thread_post_page.py
index a1bde09eccc..163825ce77d 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/delete_thread_post_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/delete_thread_post_page.py
@@ -2,16 +2,18 @@
 
 
 class DeleteThreadPostPage(BasePage):
-    """
-        This class contains the locators and actions for the Delete Thread Post page.
-    """
+    """ This class contains the locators and actions for the Delete Thread Post page."""
 
     def __init__(self, page):
         super().__init__(page)
+
+        """Locators belonging to the delete thread post page."""
         self.delete_page_header = page.locator("article#confirm-delete h1")
         self.delete_button = page.locator("//input[@type='submit']")
         self.cancel_option = page.get_by_role("link", name="Cancel")
 
+
+    """Actions against the delete thread post page."""
     def click_on_delete_button(self):
         """
             Click on the 'Delete' button.
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_post_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_post_page.py
index b6cc70aa13a..c24ad47e18a 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_post_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_post_page.py
@@ -2,17 +2,19 @@
 
 
 class EditThreadPostPage(BasePage):
-    """
-        This class contains the locators and actions for the Edit Thread Post page.
-    """
+    """ This class contains the locators and actions for the Edit Thread Post page."""
     def __init__(self, page):
         super().__init__(page)
+
+        """Locators belonging to the edit thread post page."""
         self.edit_post_header = page.locator("div#edit-post h1")
         self.edit_post_textarea = page.locator("textarea#id_content")
         self.edit_post_cancel_button = page.get_by_role("link", name="Cancel")
         self.edit_post_update_post_button = page.get_by_role("button", name="Update post")
         self.edit_post_preview_button = page.get_by_role("button", name="Preview")
 
+
+    """Actions against the edit thread post page locators."""
     def add_text_inside_the_edit_post_textarea(self, text: str):
         """
             Add text inside the edit post textarea.
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_title_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_title_page.py
index 83e76223851..d4778214a10 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_title_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/edit_thread_title_page.py
@@ -2,19 +2,17 @@
 
 
 class EditThreadTitle(BasePage):
-    """
-        This class contains the locators and actions for the Edit Thread Title page.
-    """
+    """This class contains the locators and actions for the Edit Thread Title page."""
 
     def __init__(self, page):
         super().__init__(page)
 
-        # Locators related to the breadcrumbs section.
+        """Locators belonging to the page breadcrumbs section."""
         self.edit_thread_title_breadcrumbs = page.locator("ol#breadcrumbs li a")
         self.edit_thread_title_breadcrumb = lambda breadcrumb : page.locator(
             "ol#breadcrumbs li").get_by_role("link", name=breadcrumb)
 
-        # Locators related to the edit thread title page.
+        """Locators belonging to the edit thread title page."""
         self.edit_thread_title_page_title = page.locator("div#edit-thread h1")
         self.edit_thread_title_input_field = page.locator("input#id_title")
         self.edit_thread_title_update_thread_button = page.get_by_role(
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_discussions_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_discussions_page.py
index e08ee7b411c..c811ff59125 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_discussions_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_discussions_page.py
@@ -1,25 +1,21 @@
 import re
-
 from playwright.sync_api import Page, ElementHandle
-
 from playwright_tests.core.basepage import BasePage
 
-"""
-    This class contains the locators and actions for the {x} discussions page.
-"""
+"""This class contains the locators and actions for the {x} discussions page."""
 
 
 class ForumDiscussionsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Locators related to the forum discussions page.
+        """Locators belonging to the forum discussions page."""
         self.forum_page_title = page.locator("article#threads h1")
         self.forum_side_nav_selected_option = page.locator(
             "nav#for-contributors-sidebar a.selected")
         self.post_a_new_thread_button = page.locator("a#new-thread")
 
-        # Locators related to the search section.
+        """Locators belonging to the search section."""
         self.search_this_forum_search_field = page.locator("form#find-thread input#search-q")
         self.search_this_forum_search_button = page.locator("form#find-thread input.search-button")
         self.search_results_headers = page.locator(
@@ -27,7 +23,7 @@ def __init__(self, page: Page):
         self.search_results_body = page.locator(
             "//div[@id='search-results']//div[@class='topic-article--text']/p")
 
-        # Locators related to the threads table.
+        """Locators belonging to the threads table section."""
         self.thread_title = lambda thread_name : page.locator(
             "tbody.threads td.title").get_by_role("link", name=thread_name, exact=True)
         self.thread_type = lambda thread_name, type_image: page.locator(
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_thread_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_thread_page.py
index 559003121ea..d1912a8785f 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_thread_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/forum_thread_page.py
@@ -1,26 +1,22 @@
 import re
 from datetime import datetime
-
 from playwright_tests.core.basepage import BasePage
 from playwright_tests.core.utilities import Utilities
 
-"""
-    This class contains the locators and actions for the {x} discussions thread page.
-"""
-
+"""This class contains the locators and actions for the {x} discussions thread page."""
 
 class ForumThreadPage(BasePage):
     def __init__(self, page):
         super().__init__(page)
         self.utilities = Utilities(page)
 
-        # Locators related to the page breadcrumb.
+        """Locators belonging to the page breadcrumbs."""
         self.breadcrumb_options = page.locator("ol#breadcrumbs li")
         self.breadcrumb_links = page.locator("ol#breadcrumbs li a")
         self.breadcrumb_link = lambda breadcrumb_name: page.locator(
             "ol#breadcrumbs li").get_by_role("link", name=breadcrumb_name)
 
-        # Locators related to the Contributor Discussions side navbar.
+        """Locators belonging to the Contributor Discussions side-navbar section."""
         self.contributor_discussions_side_navbar_header = page.locator(
             "#for-contributors-sidebar ul li.sidebar-subheading")
         self.contributor_discussions_side_navbar_items = page.locator(
@@ -29,7 +25,7 @@ def __init__(self, page):
             "#for-contributors-sidebar ul li:not(.sidebar-subheading)").get_by_role(
             "link", name=item_name, exact=True)
 
-        # Locators related to the thread-actions section.
+        """Locators belonging to the thread-actions section."""
         self.edit_thread_title_option = page.get_by_role("link", name="Edit Thread Title")
         self.delete_this_thread_option = page.get_by_role("link", name="Delete this thread")
         self.lock_this_thread_option = page.locator("//a[text()='Lock this thread']")
@@ -38,14 +34,14 @@ def __init__(self, page):
         self.sticky_this_thread_option = page.locator("//a[text()='Sticky this thread']")
         self.unsticky_this_thread_option = page.locator("//a[text()='Unsticky this thread']")
 
-        # Delete thread page.
+        """Locators belonging to the delete thread page."""
         self.delete_button = page.locator("input[value='Delete']")
 
-        # Locators related to the move thread section.
+        """Locators belonging to the move thread section."""
         self.move_thread_dropdown = page.locator("select[name='forum']")
         self.move_thread_button = page.locator("input[value='Move Thread']")
 
-        # Thread locators
+        """General thread page locators."""
         self.forum_title = page.locator("p#forum-title")
         self.thread_title = page.locator("h1.sumo-page-heading")
         self.thread_posted_thread_title = page.locator("h1#sumo-page-heading")
@@ -68,7 +64,7 @@ def __init__(self, page):
         self.quoted_thread_post_quote = lambda post_id: page.locator(
             f"li#post-{post_id} div.content blockquote")
 
-        # Thread post more options locators
+        """Locators belonging to the more options section from the thread post."""
         self.post_3_dotted_menu = lambda post_id: page.locator(f"li#post-{post_id}").get_by_role(
             "button", name="more options")
         self.post_3_dotted_menu_expanded = lambda post_id: page.locator(
@@ -92,11 +88,13 @@ def __init__(self, page):
             f"li#post-{post_id} li.mzp-c-menu-list-item").get_by_role(
             "link", name="Link to this post")
 
-        # Post a reply locators
+        """Locators belonging to the post a reply section."""
         self.post_reply_textarea = page.locator("textarea#id_content")
         self.preview_reply_button = page.locator("button#preview")
         self.post_reply_button = page.get_by_role("button", name="Post Reply")
 
+
+    """Actions against the page breadcrumbs locators."""
     def get_breadcrumb_options(self) -> list[str]:
         """
             Get the breadcrumb options.
@@ -121,6 +119,7 @@ def get_all_breadcrumb_link_names(self) -> list[str]:
         """
         return self._get_text_of_elements(self.breadcrumb_links)
 
+    """Actions against the general thread page locators."""
     def get_thread_meta_information(self) -> list[str]:
         return self._get_text_of_elements(self.thread_meta)
 
diff --git a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/new_thread_page.py b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/new_thread_page.py
index dec39577340..a7643e4fe56 100644
--- a/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/new_thread_page.py
+++ b/playwright_tests/pages/contribute/contribute_pages/contributor_discussions/new_thread_page.py
@@ -5,13 +5,15 @@ class NewThreadPage(BasePage):
     def __init__(self, page):
         super().__init__(page)
 
-        # Locators related to the create a new thread page
+        """Locators belonging to the create a new thread page."""
         self.title_input_field = page.locator("input#id_title")
         self.content_textarea_field = page.locator("textarea#id_content")
         self.cancel_button = page.get_by_role("link", name="Cancel")
         self.preview_button = page.locator("button#preview")
         self.post_thread_button = page.get_by_role("button").filter(has_text="Post Thread")
 
+
+    """Actions against the create a new thread page locators."""
     def fill_title_input_field(self, title: str):
         self._fill(self.title_input_field, title)
 
diff --git a/playwright_tests/pages/contribute/contribute_pages/ways_to_contribute_pages.py b/playwright_tests/pages/contribute/contribute_pages/ways_to_contribute_pages.py
index 942d25885b4..fcf71e886ce 100644
--- a/playwright_tests/pages/contribute/contribute_pages/ways_to_contribute_pages.py
+++ b/playwright_tests/pages/contribute/contribute_pages/ways_to_contribute_pages.py
@@ -1,5 +1,4 @@
 from playwright.sync_api import ElementHandle, Page
-
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,17 +6,17 @@ class WaysToContributePages(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Breadcrumbs
+        """Locators belonging to the page breadcrumbs section."""
         self.interactable_breadcrumbs = page.locator("ol#breadcrumbs li a")
         self.all_breadcrumbs = page.locator("ol#breadcrumbs li")
 
-        # Page Content
+        """Locators belonging to the page content."""
         self.hero_main_header = page.locator("div[class*='hero'] div h1")
         self.hero_second_header = page.locator("div[class*='hero'] div h2")
         self.hero_text = page.locator("div[class*='hero'] div p")
         self.all_page_images = page.locator("div#svelte img")
 
-        # How to contribute_messages section
+        """Locators belonging to the How to contribute messages section."""
         self.how_to_contribute_header = page.locator("section[class='mzp-l-content'] > h2")
         self.all_how_to_contribute_option_links = page.locator("section.mzp-l-content div ol li a")
         self.start_answering_how_to_contribute_option_text = page.locator(
@@ -25,14 +24,14 @@ def __init__(self, page: Page):
         self.first_fact_text = page.locator("//div[contains(@class,'fact')]/span[1]")
         self.second_fact_text = page.locator("//div[contains(@class,'fact')]/span[2]")
 
-        # Other ways to contribute_messages section
+        """Locators belonging to the other ways to contribute messages section."""
         self.other_ways_to_contribute_header = page.locator("//div[@id='svelte']/section[2]/h2")
         self.other_ways_to_contribute_card_titles = page.locator(
             "//div[@id='svelte']/section[2]//nav//span")
         self.other_ways_to_contribute_card_list = page.locator("//div[@id='svelte']/section[2]//"
                                                                "ul/a")
 
-    # Breadcrumbs
+    """Actions against the breadcrumbs locators."""
     def get_text_of_all_breadcrumbs(self) -> list[str]:
         return self._get_text_of_elements(self.all_breadcrumbs)
 
@@ -42,7 +41,7 @@ def get_interactable_breadcrumbs(self) -> list[ElementHandle]:
     def click_on_breadcrumb(self, element: ElementHandle):
         element.click()
 
-    # Page content
+    """Actions against the page content locators."""
     def get_hero_main_header_text(self) -> str:
         return self._get_text_of_element(self.hero_main_header)
 
@@ -55,7 +54,7 @@ def get_hero_text(self) -> str:
     def get_all_page_image_links(self) -> list[ElementHandle]:
         return self._get_element_handles(self.all_page_images)
 
-    # How to contribute_messages section
+    """Actions against the How to contribute messages section locators."""
     def get_how_to_contribute_header_text(self) -> str:
         return self._get_text_of_element(self.how_to_contribute_header)
 
@@ -71,7 +70,7 @@ def get_first_fact_text(self) -> str:
     def get_second_fact_text(self) -> str:
         return self._get_text_of_element(self.second_fact_text)
 
-    # Other ways to contribute_messages section
+    """Actions against the Other ways to contribute messages section locators."""
     def get_other_ways_to_contribute_header(self) -> str:
         return self._get_text_of_element(self.other_ways_to_contribute_header)
 
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/article_discussions_page.py b/playwright_tests/pages/contribute/contributor_tools_pages/article_discussions_page.py
index a7232d50e9b..a97f4066889 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/article_discussions_page.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/article_discussions_page.py
@@ -1,5 +1,4 @@
 from playwright.sync_api import Locator, Page
-
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,8 +6,7 @@ class ArticleDiscussionsPage(BasePage):
 
     def __init__(self, page: Page):
         super().__init__(page)
+
+        """Locators belonging to the Article Discussions page."""
         self.article_discussion_title = lambda article_title: page.locator(
             "td[class='title']").get_by_role("link", name=article_title, exact=True)
-
-    def is_title_for_article_discussion_displayed(self, article_title: str) -> Locator:
-        return self.article_discussion_title(article_title)
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/community_hub_page.py b/playwright_tests/pages/contribute/contributor_tools_pages/community_hub_page.py
index a64a3b76da7..d3ee0578d6b 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/community_hub_page.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/community_hub_page.py
@@ -6,15 +6,15 @@ class CommunityHubPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Locators belonging to the Community Hub searchbar.
+        """Locators belonging to the Community Hub searchbar section."""
         self.find_contributor_searchbar = page.locator(
             "//form[@id='find-contributor']//input[@id='search']")
 
-        # Locators belonging to search result cards
+        """Locators belonging to the search results cards."""
         self.user_titles_from_returned_cards = page.locator(
             "section[class='card elevation-01 results-user'] h2[class='card--title']")
 
-
+    """Actions against the Community Hub searchbar locators."""
     def search_for_contributor(self, search_string: str):
         """
         Search for a contributor
@@ -29,6 +29,7 @@ def clear_search(self):
         """Clear the searchbar."""
         self._clear_field(self.find_contributor_searchbar)
 
+    """Actions against the search results cards locators."""
     def get_all_users_from_user_cards(self) -> list[str]:
         """Returns all user titles from user cards."""
         return self._get_text_of_elements(self.user_titles_from_returned_cards)
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/kb_dashboard_page.py b/playwright_tests/pages/contribute/contributor_tools_pages/kb_dashboard_page.py
index 974d4e5859c..bea26cfec06 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/kb_dashboard_page.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/kb_dashboard_page.py
@@ -1,5 +1,4 @@
 from playwright.sync_api import Locator, Page
-
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,7 +6,7 @@ class KBDashboard(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Top-level filter locators
+        """Locators related to the top-level filter section."""
         self.products_filter_button = page.locator(
             "article#localize div[class='mzp-c-menu-list featured-dropdown is-details'] button")
         self.products_filter_complete_overview = page.locator("div#product-selector select")
@@ -34,10 +33,7 @@ def __init__(self, page: Page):
             f"//td/a[text()='{article_name}']/../following-sibling::td/a[contains(text(),"
             f"'Show translations')]")
 
-    # KB Dashboard actions
-    def get_a_particular_article_title_locator(self, article_name: str) -> Locator:
-        return self.article_title(article_name)
-
+    """Actions against the kb dashboard locators."""
     def click_on_article_title(self, article_name: str):
         self._click(self.article_title(article_name))
 
@@ -62,9 +58,6 @@ def is_stale_status_empty(self, article_name: str) -> bool:
     def get_existing_expiry_date(self, article_name: str) -> str:
         return self._get_text_of_element(self.expiry_date(article_name))
 
-    def get_expiry_date_locator(self, article_name: str) -> Locator:
-        return self.expiry_date(article_name)
-
     def click_on_show_translations_option(self, article_name: str):
         self._click(self.show_translations_option(article_name))
 
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/l10n_most_visited_translations.py b/playwright_tests/pages/contribute/contributor_tools_pages/l10n_most_visited_translations.py
index b4e051b1529..1690dd7c182 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/l10n_most_visited_translations.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/l10n_most_visited_translations.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,6 +6,8 @@ class MostVisitedTranslations(BasePage):
 
     def __init__(self, page: Page):
         super().__init__(page)
+
+        """Locators belonging to the most visited translations page."""
         self.article_title = lambda article_name: page.locator("td").get_by_role(
             "link", name=article_name, exact=True)
         self.updated_localization_status = lambda article_name: page.locator(
@@ -14,9 +15,8 @@ def __init__(self, page: Page):
         self.translation_status = lambda article_name: page.locator(
             f"//td/a[text()='{article_name}']/../following-sibling::td[@class='status']/a")
 
-    def get_a_particular_article_title_locator(self, article_name: str) -> Locator:
-        return self.article_title(article_name)
 
+    """Actions against the most visited translations page locators."""
     def get_updated_localization_status(self, article_name: str) -> str:
         return self._get_text_of_element(self.updated_localization_status(article_name))
 
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/l10n_unreviewed.py b/playwright_tests/pages/contribute/contributor_tools_pages/l10n_unreviewed.py
index 56fbec04fef..a2027da521c 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/l10n_unreviewed.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/l10n_unreviewed.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,15 +6,16 @@ class UnreviewedLocalizationPage(BasePage):
 
     def __init__(self, page: Page):
         super().__init__(page)
+
+        """Locators belonging to the unreviewed localization page."""
         self.listed_article = lambda title: page.locator("td[class='doc-title']").get_by_role(
             "link", name=title, exact=True)
         self.modified_by_text = lambda title: page.locator(
             "td[class='doc-title']").get_by_role("link", name=title, exact=True).locator(
             "+ div[class='users']")
 
-    def get_listed_article(self, title: str) -> Locator:
-        return self.listed_article(title)
 
+    """Actions against the unreviewed localization page locators."""
     def click_on_a_listed_article(self, title: str):
         self._click(self.listed_article(title))
 
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/moderate_forum_content.py b/playwright_tests/pages/contribute/contributor_tools_pages/moderate_forum_content.py
index d8e9c71bf65..4380aa06615 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/moderate_forum_content.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/moderate_forum_content.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,10 +6,10 @@ class ModerateForumContent(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # View all deactivated users button
+        """Locators belonging to the View All deactivated users page."""
         self.view_all_deactivated_users_button = page.locator("div[class='sumo-button-wrap'] a")
 
-        # Flagged questions
+        """Locators belonging to the flagged questions page."""
         self.flagged_question = lambda question_info: page.locator("p").get_by_text(
             question_info, exact=True)
         self.flagged_reason = lambda question_title: page.locator(
@@ -38,9 +37,8 @@ def __init__(self, page: Page):
         self.update_status_button = lambda question_info: page.locator(
             f"//p[normalize-space(text())='{question_info}']/ancestor::div"
             f"[@class='flagged-item-content']//following-sibling::form/input[@value='Update']")
-
-    def get_flagged_question_locator(self, question_info) -> Locator:
-        return self.flagged_question(question_info)
+        self.paginator_section = page.locator("//ol[@class='pagination cf']")
+        self.last_paginator_option = page.locator("//ol[@class='pagination cf']/li/a").last
 
     def get_flag_reason(self, question_title: str) -> str:
         return self._get_text_of_element(self.flagged_reason(question_title))
@@ -77,3 +75,10 @@ def click_on_the_update_button(self, question_info: str):
 
     def click_view_all_deactivated_users_button(self):
         self._click(self.view_all_deactivated_users_button)
+
+    def is_paginator_visible(self) -> bool:
+        self.wait_for_dom_to_load()
+        return self._is_element_visible(self.paginator_section)
+
+    def click_on_last_pagination_element(self):
+        self._click(self.last_paginator_option)
diff --git a/playwright_tests/pages/contribute/contributor_tools_pages/recent_revisions_page.py b/playwright_tests/pages/contribute/contributor_tools_pages/recent_revisions_page.py
index 515df41925b..cdf932768ee 100644
--- a/playwright_tests/pages/contribute/contributor_tools_pages/recent_revisions_page.py
+++ b/playwright_tests/pages/contribute/contributor_tools_pages/recent_revisions_page.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,7 +6,7 @@ class RecentRevisions(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Right-side menu locators
+        """Locators related to the right-side menu."""
         self.kb_dashboard_option = page.get_by_role("link", name="KB Dashboard", exact=True)
         self.locale_metrics_option = page.get_by_role("link", name="Locale Metrics", exact=True)
         self.kb_team_option = page.get_by_role("link").filter(has_text="KB Team")
@@ -15,7 +14,8 @@ def __init__(self, page: Page):
             "li#editing-tools-sidebar li[class='selected'] a")
         self.aggregated_metrics = page.get_by_role("link", name="Aggregated Metrics", exact=True)
 
-        # Recent Revisions table locators.
+        """Locators related to the Recent Revisions table."""
+        self.revisions_table = page.locator("//div[@id='revisions-fragment']")
         self.locale_select_field = page.locator("select#id_locale")
         self.locale_tag = page.locator("span[class='locale']")
         self.all_editors = page.locator("div[class='creator'] a")
@@ -50,11 +50,13 @@ def __init__(self, page: Page):
             f"//div[@id='revisions-fragment']//div[@class='title']/a[text()='{article_title}']/../"
             f"../div[@class='creator']/a[contains(text(),'{username}')]/../../"
             f"div[@class='comment wider']")
+        self.loading_icon = page.locator(
+            "//article[@id='revision-list']/form/img[@class='loading']")
 
-        # Revision diff locators.
+        """Locators related to the revision diff section."""
         self.revision_diff_section = page.locator("div[class='revision-diff']")
 
-    # Right-side menu actions.
+    """Actions against the right-side menu locators."""
     def click_on_kb_dashboard_option(self):
         self._click(self.kb_dashboard_option)
 
@@ -70,7 +72,7 @@ def get_text_of_selected_menu_option(self) -> str:
     def click_on_aggregated_metrics_option(self):
         self._click(self.aggregated_metrics)
 
-    # Recent Revisions table actions.
+    """Actions against the recent revisions table locators."""
     def get_all_revision_dates(self) -> list[str]:
         return self._get_text_of_elements(self.all_dates)
 
@@ -82,26 +84,29 @@ def get_list_of_all_editors(self) -> list[str]:
 
     def select_locale_option(self, locale_value: str):
         self._select_option_by_value(self.locale_select_field, locale_value)
+        self._wait_for_locator(self.loading_icon, timeout=3000)
+        self._wait_for_locator_to_be_hidden(self.loading_icon, timeout=5000)
 
     def fill_in_users_field(self, username: str):
         self._fill(self.users_input_field, username)
         self._press_a_key(self.users_input_field, "Enter")
+        self._wait_for_locator(self.loading_icon, timeout=3000)
+        self._wait_for_locator_to_be_hidden(self.loading_icon, timeout=5000)
 
     def clearing_the_user_field(self):
         self._clear_field(self.users_input_field)
+        self._wait_for_locator(self.loading_icon, timeout=3000)
+        self._wait_for_locator_to_be_hidden(self.loading_icon, timeout=5000)
 
     def add_start_date(self, start_date: str):
         self._type(self.start_date_input_field, start_date, 0)
+        self._wait_for_locator(self.loading_icon, timeout=3000)
+        self._wait_for_locator_to_be_hidden(self.loading_icon, timeout=5000)
 
     def add_end_date(self, end_date: str):
         self._type(self.end_date_input_field, end_date, 0)
-
-    def get_recent_revision_based_on_article(self, title: str) -> Locator:
-        return self.recent_revision_based_on_article(title)
-
-    def get_recent_revision_based_on_article_title_and_user(self, title: str,
-                                                            username: str) -> Locator:
-        return self.recent_revisions_based_on_article_and_user(title, username)
+        self._wait_for_locator(self.loading_icon, timeout=3000)
+        self._wait_for_locator_to_be_hidden(self.loading_icon, timeout=5000)
 
     def click_on_article_title(self, article_title: str, creator: str):
         self._click(self.article_title(creator, article_title))
@@ -112,9 +117,6 @@ def click_article_creator_link(self, article_title: str, creator: str):
     def click_on_show_diff_for_article(self, article_title: str, creator: str):
         self._click(self.show_diff(article_title, creator))
 
-    def get_show_diff_article_locator(self, article_title: str, creator: str) -> Locator:
-        return self.show_diff(article_title, creator)
-
     def click_on_hide_diff_for_article(self, article_title: str, creator: str):
         self._click(self.close_diff(article_title, creator))
 
@@ -124,10 +126,3 @@ def click_on_revision_date_for_article(self, article_title: str, username: str):
     def get_revision_comment(self, article_title: str, username: str) -> str:
         return self._get_element_inner_text_from_page(
             self.revision_comment(article_title, username))
-
-    def get_revision_and_username_locator(self, article_title: str, username: str) -> Locator:
-        return self.recent_revisions_based_on_article_and_user(article_title, username)
-
-    # Diff section actions
-    def get_diff_section_locator(self) -> Locator:
-        return self.revision_diff_section
diff --git a/playwright_tests/pages/contribute/groups_page.py b/playwright_tests/pages/contribute/groups_page.py
index 926ef957404..a23270a1f3c 100644
--- a/playwright_tests/pages/contribute/groups_page.py
+++ b/playwright_tests/pages/contribute/groups_page.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,11 +6,9 @@ class GroupsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # General Groups Page Locators
+        """General locators belonging to the groups page."""
         self.add_group_profile_button = page.get_by_role(
             "link", name="Add group profile", exact=True)
-
-        # Group Page Locators
         self.group_avatar_image = page.locator("section#avatar-area img")
         self.change_uploaded_group_image_option = page.locator(
             "section#avatar-area p").get_by_role("link", name="Change", exact=True)
@@ -50,7 +47,7 @@ def __init__(self, page: Page):
         self.listed_group_leader = lambda username: page.locator(
             "div#group-leaders").get_by_role("link", name=username, exact=True)
 
-        # Change Avatar Page Locators
+        """Locators belonging to the change avatar page."""
         self.upload_avatar_page_header = page.locator("article#change-avatar h1")
         self.upload_avatar_image_preview = page.locator(
             "//input[@id='id_avatar']/preceding-sibling::img")
@@ -58,7 +55,7 @@ def __init__(self, page: Page):
         self.upload_avatar_button = page.locator("input[type='submit']")
         self.upload_avatar_cancel_option = page.get_by_role("link", name="Cancel", exact=True)
 
-        # Delete Avatar Page Locators
+        """Locators belonging to the delete avatar page."""
         self.delete_uploaded_avatar_page_header = page.locator("article#avatar-delete h1")
         self.delete_uploaded_avatar_image_preview = page.locator("div#avatar-preview img")
         self.delete_uploaded_avatar_page_info = page.locator("form p")
@@ -66,7 +63,7 @@ def __init__(self, page: Page):
         self.delete_uploaded_avatar_cancel_button = page.get_by_role(
             "link", name="Cancel", exact=True)
 
-        # Remove User Page Locators
+        """Locators belonging to the remove user page."""
         self.remove_leader_page_header = page.locator("article#remove-leader h1")
         self.remove_user_page_header = page.locator("article#remove-member h1")
         self.remove_leader_button = page.locator("input[value='Remove leader']")
@@ -81,7 +78,7 @@ def __init__(self, page: Page):
             f"group']"
         )
 
-    # Actions against the all groups page.
+    """Actions against the all groups listing page locators."""
     def is_add_group_profile_button_visible(self) -> bool:
         """Check if the add group profile button is visible"""
         return self._is_element_visible(self.add_group_profile_button)
@@ -94,7 +91,7 @@ def click_on_a_particular_group(self, group_name):
         """
         self._click(self.group_by_name(group_name))
 
-    # Actions against the group page.
+    """Actions against a specific group page locators."""
     def get_all_leaders_name(self) -> list[str]:
         """Get the names of all the leaders in the group"""
         return self._get_text_of_elements(self.group_leader_list)
@@ -103,10 +100,6 @@ def get_all_members_name(self) -> list[str]:
         """Get the names of all the members in the group"""
         return self._get_text_of_elements(self.group_members_list)
 
-    def get_group_avatar_locator(self) -> Locator:
-        """Get the locator of the group avatar image"""
-        return self.group_avatar_image
-
     def is_change_avatar_button_visible(self) -> bool:
         """Check if the change avatar button is visible"""
         return self._is_element_visible(self.change_avatar_button)
@@ -182,15 +175,11 @@ def click_on_pm_for_a_particular_user(self, username: str):
         """
         self._click(self.pm_a_group_user(username))
 
-    # Add Group member
+    """Actions against the add group member locators."""
     def get_group_update_notification(self) -> str:
         """Get the text of the user added successfully message"""
         return self._get_text_of_element(self.user_notification)
 
-    def get_pm_group_members_button(self) -> Locator:
-        """Get the locator of the PM group members button"""
-        return self.private_message_group_members_button
-
     def click_on_change_uploaded_avatar_button(self):
         """Click on the change uploaded avatar button"""
         self._click(self.change_uploaded_group_image_option,
@@ -208,11 +197,7 @@ def click_on_edit_group_members(self):
         """Click on the edit group members option"""
         self._click(self.edit_group_members_option)
 
-    # Actions against the change avatar page.
-    def get_change_avatar_image_preview_locator(self) -> Locator:
-        """Get the locator of the change avatar image preview"""
-        return self.upload_avatar_image_preview
-
+    """Actions against the change avatar page locators."""
     def get_upload_avatar_page_header(self) -> str:
         """Get the text of the upload avatar page header"""
         return self._get_text_of_element(self.upload_avatar_page_header)
@@ -225,11 +210,7 @@ def click_on_upload_avatar_cancel_button(self):
         """Click on the upload avatar cancel button"""
         self._click(self.upload_avatar_cancel_option)
 
-    # Actions against the delete avatar page.
-    def get_delete_avatar_image_preview_locator(self) -> Locator:
-        """Get the locator of the delete avatar image preview"""
-        return self.delete_uploaded_avatar_image_preview
-
+    """Actions against the delete avatar page locators."""
     def click_on_cancel_delete_avatar_button(self):
         """Click on the cancel delete avatar button"""
         self._click(self.delete_uploaded_avatar_cancel_button)
@@ -250,7 +231,7 @@ def click_on_delete_avatar_button(self):
         """Click on the delete avatar button"""
         self._click(self.delete_uploaded_avatar_button)
 
-    # Actions against the removal or user addition
+    """Actions against the removal or user addition related locators."""
     def click_on_remove_a_user_from_group_button(self, username: str, from_leaders=False):
         """Click on the remove a user from group button
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_article_discussion_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_article_discussion_page.py
index e58d43a14c8..c04020564fc 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_article_discussion_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_article_discussion_page.py
@@ -1,7 +1,5 @@
 import re
-
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -9,25 +7,25 @@ class KBArticleDiscussionPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Filters locators
+        """Locators belonging to the filters section."""
         self.article_thread_author_filter = page.locator("th[class*='author'] a")
         self.article_thread_replies_filter = page.locator("th[class*='replies'] a")
 
-        # Post a new thread locator.
+        """Locators belonging to the post a new thread section."""
         self.post_a_new_thread_option = page.locator("a#new-thread")
 
-        # New Thread related locators.
+        """Locators belonging to the new thread section."""
         self.new_thread_title_input_field = page.locator("input#id_title")
         self.new_thread_body_input_field = page.locator("textarea#id_content")
         self.new_thread_submit_button = page.get_by_role("button", name="Post Thread", exact=True)
         self.new_thread_cancel_button = page.get_by_role("link", name="Cancel", exact=True)
 
-        # Thread Editing tools
+        """Locators belonging to the thread editing tools section."""
         self.delete_thread = page.get_by_role("link", name="Delete this thread", exact=True)
         self.lock_this_thread = page.locator("a[data-form='thread-lock-form']")
         self.sticky_this_thread = page.locator("a[data-form='thread-sticky-form']")
 
-        # Thread content locators.
+        """Locators belonging to the thread content section."""
         self.article_thread_edit_this_thread = page.get_by_role(
             "link", name="Edit this thread", exact=True)
         self.article_thread_sticky_status = page.locator(
@@ -43,7 +41,7 @@ def __init__(self, page: Page):
         self.thread_body_content = page.locator("div[class='content'] p")
         self.thread_body_content_title = page.locator("h1[class='sumo-page-heading']")
 
-        # Thread replies locators.
+        """Locators belonging to the thread replies section."""
         self.delete_thread_reply_confirmation_page_button = page.locator("input[value='Delete']")
         self.thread_post_a_reply_textarea_field = page.locator("textarea#id_content")
         self.article_thread_locked_message = page.locator("p#thread-locked")
@@ -60,7 +58,7 @@ def __init__(self, page: Page):
             f"li#{thread_id} div[class='mzp-c-menu-list is-details']").get_by_role(
             "link", name="Delete this post", exact=True)
 
-        # Article discussions content locators.
+        """Locators belonging to the article discussions content section."""
         self.all_article_threads_titles = page.locator("td[class='title'] a")
         self.all_article_threads_authors = page.locator("td[class='author'] a")
         self.all_article_thread_replies = page.locator("td[class='replies']")
@@ -68,17 +66,14 @@ def __init__(self, page: Page):
             f"//tr[@class='threads']/td[@class='title']//a[contains(@href, '{thread_id}')]/../"
             f"following-sibling::td[@class='replies']")
 
-        # Edit thread page
+        """Locators belonging to the edit thread page."""
         self.edit_article_thread_title_field = page.locator("input#id_title")
         self.edit_article_thread_cancel_button = page.get_by_role(
             "link", name="Cancel", exact=True)
         self.edit_article_thread_update_thread_button = page.get_by_role(
             "button", name="Update thread", exact=True)
 
-    # Edit thread page actions
-    def get_edit_this_thread_locator(self) -> Locator:
-        return self.article_thread_edit_this_thread
-
+    """Actions against the edit thread page locators."""
     def click_on_edit_this_thread_option(self):
         self._click(self.article_thread_edit_this_thread)
 
@@ -92,14 +87,14 @@ def click_on_edit_article_thread_cancel_button(self):
     def click_on_edit_article_thread_update_button(self):
         self._click(self.edit_article_thread_update_thread_button)
 
-    # Filter actions.
+    """Actions against the filter sections."""
     def click_on_article_thread_author_replies_filter(self):
         self._click(self.article_thread_author_filter)
 
     def click_on_article_thread_replies_filter(self):
         self._click(self.article_thread_replies_filter)
 
-    # Post a new thread button action.
+    """Actions against the post a new thread section."""
     def click_on_post_a_new_thread_option(self):
         self._click(self.post_a_new_thread_option)
 
@@ -109,7 +104,7 @@ def click_on_thread_post_reply_button(self):
     def get_thread_reply_id(self, url: str) -> str:
         return re.search(r'post-(\d+)', url).group(0)
 
-    # Actions related to posting a new thread.
+    """Actions against the posting a new thread section."""
     def add_text_to_new_thread_title_field(self, text: str):
         self._fill(self.new_thread_title_input_field, text)
 
@@ -128,46 +123,26 @@ def click_on_cancel_new_thread_button(self):
     def click_on_submit_new_thread_button(self):
         self._click(self.new_thread_submit_button)
 
-    def get_posted_thread_locator(self, thread_id: str) -> Locator:
-        return self.posted_thread(thread_id)
-
-    def get_thread_by_title_locator(self, thread_title: str) -> Locator:
-        return self.thread_by_title(thread_title)
-
     def click_on_a_particular_thread(self, thread_id: str):
         self._click(self.posted_thread(thread_id))
 
+    """Actions against the thread content locators."""
     # Actions related to thread content
     def get_thread_title_text(self) -> str:
         return self._get_text_of_element(self.thread_body_content_title)
 
-    def get_locked_article_status(self) -> Locator:
-        return self.article_thread_locked_status
-
     def get_lock_this_article_thread_option_text(self) -> str:
         return self._get_text_of_element(self.lock_this_thread)
 
-    def get_lock_this_article_thread_locator(self) -> Locator:
-        return self.lock_this_thread
-
     def click_on_lock_this_article_thread_option(self):
         self._click(self.lock_this_thread)
 
-    def get_sticky_this_thread_locator(self) -> Locator:
-        return self.sticky_this_thread
-
     def get_text_of_sticky_this_thread_option(self) -> str:
         return self._get_text_of_element(self.sticky_this_thread)
 
-    def get_sticky_this_thread_status_locator(self) -> Locator:
-        return self.article_thread_sticky_status
-
     def click_on_sticky_this_thread_option(self):
         self._click(self.sticky_this_thread)
 
-    def get_thread_post_a_reply_textarea_field(self) -> Locator:
-        return self.thread_post_a_reply_textarea_field
-
     def fill_the_thread_post_a_reply_textarea(self, text: str):
         self._fill(self.thread_post_a_reply_textarea_field, text)
 
@@ -177,7 +152,7 @@ def get_thread_page_counter_replies_text(self) -> str:
     def get_thread_page_replied_by_text(self) -> str:
         return self._get_text_of_element(self.thread_page_last_reply_by_text)
 
-    # Article discussions page content actions
+    """Actions against the article discussions page content locators."""
     def get_article_discussions_thread_counter(self, thread_id: str) -> str:
         return self._get_text_of_element(self.discussions_thread_counter(thread_id))
 
@@ -193,10 +168,7 @@ def get_all_article_threads_replies(self) -> list[str]:
     def get_text_of_locked_article_thread_text(self) -> str:
         return self._get_text_of_element(self.article_thread_locked_message)
 
-    def get_text_of_locked_article_thread_locator(self) -> Locator:
-        return self.article_thread_locked_message
-
-    # Actions related to thread replies.
+    """Actions against the thread replies section."""
     def click_on_dotted_menu_for_a_certain_reply(self, thread_id: str):
         self._click(self.dotted_menu_for_thread(thread_id))
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_article_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_article_page.py
index e7291b1fd9c..ed1338080ce 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_article_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_article_page.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,7 +6,7 @@ class KBArticlePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # General page locators.
+        """General locators belonging to the KB article page."""
         self.article_breadcrumb = lambda breadcrumb_name: page.locator(
             "ol#breadcrumbs").get_by_role("link", name=f"{breadcrumb_name}")
         self.kb_article_heading = page.locator("h1.sumo-page-heading")
@@ -23,11 +22,11 @@ def __init__(self, page: Page):
             "div[class='document--contributors-list text-body-xs']").get_by_role(
             "link", name=f'{username}', exact=True)
 
-        # Article metadata locators.
+        """Locators belonging to the article metadata."""
         self.kb_article_helpfulness_count = page.locator(
             "div#document_metadata span[class='helpful-count']")
 
-        # Editing Tools options locators.
+        """Locators belonging to the editing tools options section."""
         self.editing_tools_article_option = page.get_by_role("link", name="Article",
                                                              exact=True)
         self.editing_tools_edit_article_option = page.get_by_role("link", name="Edit Article",
@@ -45,7 +44,7 @@ def __init__(self, page: Page):
         self.editing_tools_show_history_option = page.get_by_role("link", name="Show History",
                                                                   exact=True)
 
-        # Helpfulness widget section locators.
+        """Locators belonging to the helpfulness widget section."""
         self.helpfulness_widget = page.locator("form[class='document-vote--form helpful']")
         self.helpful_button = page.locator("button[class='btn helpful-button']")
         self.unhelpful_button = page.locator("button[class='btn not-helpful-button']")
@@ -57,7 +56,7 @@ def __init__(self, page: Page):
             "//div[@class='sumo-button-wrap align-full']/button[normalize-space(text())='Submit']")
         self.survey_message = page.locator("div[class='survey-message']")
 
-        # Related Articles section locators.
+        """Locators belonging to the related articles section."""
         self.related_articles_section = page.locator("section#related-documents")
         self.related_article_cards = page.locator("section#related-documents h3.card--title a")
         self.related_article = lambda article_title: page.locator(
@@ -65,7 +64,7 @@ def __init__(self, page: Page):
             f'text())="{article_title}"]'
         )
 
-    # KB Article page content actions.
+    """Actions against the kb article page content locators."""
     def click_on_a_particular_breadcrumb(self, breadcrumb_name: str):
         self._click(self.article_breadcrumb(breadcrumb_name))
 
@@ -105,7 +104,7 @@ def get_what_links_here_locator(self):
     def is_article_content_image_displayed(self, image_title: str):
         return self._is_element_visible(self.kb_article_content_image(image_title))
 
-    # KB Article editing tools section actions.
+    """Actions against the kb article editing tools section locators."""
     def click_on_show_history_option(self):
         self._click(self.editing_tools_show_history_option)
 
@@ -136,19 +135,13 @@ def get_show_translations_option_locator(self):
     def click_on_article_option(self):
         self._click(self.editing_tools_article_option)
 
-    def get_article_option_locator(self) -> Locator:
-        return self.editing_tools_article_option
-
-    def editing_tools_discussion_locator(self) -> Locator:
-        return self.editing_tools_discussion_option
-
     def click_on_editing_tools_discussion_option(self):
         self._click(self.editing_tools_discussion_option)
 
     def get_url(self) -> str:
         return self._get_current_page_url()
 
-    # Helpfulness widget actions.
+    """Actions against the helpfulness widget locators."""
     def is_helpfulness_widget_displayed(self) -> bool:
         return self._is_element_visible(self.helpfulness_widget)
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_article_review_revision_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_article_review_revision_page.py
index 491315ffebb..4709f5d3e98 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_article_review_revision_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_article_review_revision_page.py
@@ -1,5 +1,4 @@
 from playwright.sync_api import Page
-
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,6 +6,7 @@ class KBArticleReviewRevisionPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
+        """"General Review revision page locators."""
         self.revision_header = page.locator("h1[class='sumo-page-heading']")
         self.reviewing_revision_text = page.locator(
             "//article[@id='review-revision']//a[text()='Back to History']/..")
@@ -36,11 +36,11 @@ def __init__(self, page: Page):
         self.defer_revision_button = page.locator("button#btn-reject")
         self.approve_revision_button = page.locator("button#btn-approve")
 
-        # Defer revision modal
+        """Locators belonging to the defer revision modal."""
         self.defer_button = page.locator("form#reject-modal button")
         self.cancel_defer = page.locator("form#reject-modal a")
 
-        # Approve revision modal
+        """Locators belonging to the approve revision modal."""
         self.accept_revision_modal_header = page.locator("div[class='kbox-title']")
 
         # Need to add locators for approving own edit revision warning.
@@ -51,11 +51,12 @@ def __init__(self, page: Page):
         self.modal_accept_button = page.locator("form#approve-modal div button")
         self.modal_cancel_button = page.locator("form#approve-modal div a")
 
-        # Revision significance
+        """Locators belonging to the revision significance section."""
         self.minor_significance = page.locator("input#id_significance_0")
         self.normal_significance = page.locator("input#id_significance_1")
         self.major_significance = page.locator("input#id_significance_2")
 
+    """Actions against the general review revision page locators."""
     def get_revision_header(self) -> str:
         return self._get_text_of_element(self.revision_header)
 
@@ -115,7 +116,7 @@ def click_on_cancel_defer_button(self):
     def click_on_approve_revision_button(self):
         self._click(self.approve_revision_button)
 
-    # Modal actions
+    """Actions against the review revision modal locators."""
     def get_accept_revision_modal_header(self) -> str:
         return self._get_text_of_element(self.accept_revision_modal_header)
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_article_show_history_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_article_show_history_page.py
index 9eca03a6dbc..15684e86c5a 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_article_show_history_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_article_show_history_page.py
@@ -7,7 +7,7 @@ class KBArticleShowHistoryPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Show History page locators.
+        """Locators belonging to the show history section."""
         self.show_history_page_header = page.locator("h1[class='title sumo-page-subheading']")
         self.show_history_category_link = page.locator(
             "//dt[text()='Category:']/following-sibling::dd/a")
@@ -42,7 +42,7 @@ def __init__(self, page: Page):
         self.revision_significance = lambda revision_id: page.locator(
             f"tr#{revision_id} td[class='significance']")
 
-        # Document contributors locators
+        """Locators belonging to the document contributors section."""
         self.show_history_page_banner = page.locator(
             "li[class='mzp-c-notification-bar mzp-t-success'] p")
         self.all_contributors_list_items = page.locator("ul[class='avatar-wrap'] li")
@@ -62,7 +62,7 @@ def __init__(self, page: Page):
         self.delete_contributor = lambda username: page.locator(
             f"//span[text()='{username}']/../..//a[@class='remove-button']")
 
-        # Show History delete document section locators.
+        """Locators belonging to the delete document locators."""
         self.delete_this_document_button = page.locator("div#delete-doc a")
         self.delete_this_document_confirmation_delete_button = page.locator(
             "div[class='submit'] input")
@@ -76,7 +76,7 @@ def __init__(self, page: Page):
         self.unable_to_delete_revision_page_go_back_to_document_history = page.locator(
             "div[class='submit'] a")
 
-    # Page actions.
+    """Actions against the Show History page locators."""
     def get_show_history_page_banner(self) -> str:
         return self._get_text_of_element(self.show_history_page_banner)
 
@@ -108,7 +108,7 @@ def click_on_submit_l10n_readiness_button(self, revision_id: str):
         self._click(self.ready_for_l10_modal_submit_button,
                     expected_locator=self.revision_ready_for_l10n_status(revision_id))
 
-    # Delete document actions.
+    """Actions against the delete document section locators."""
     def click_on_delete_this_document_button(self):
         self._click(self.delete_this_document_button)
 
@@ -128,7 +128,7 @@ def get_last_revision_id(self) -> str:
             revisions[0], "id"
         )
 
-    # For unreviewed revisions but user session doesn't permit review.
+    """# For unreviewed revisions but user session doesn't permit review."""
     def click_on_a_revision_date(self, revision_id):
         self._click(self.revision_date(revision_id))
 
@@ -150,6 +150,7 @@ def is_revision_current(self, revision_id: str) -> bool:
         return self._is_element_visible(self.revision_current_status(revision_id))
 
     # For unreviewed revisions but user session permits review.
+    """# For unreviewed revisions but user session permits review."""
     def get_status_of_reviewable_revision(self, revision_id):
         return self._get_text_of_element(self.reviewable_revision(revision_id))
 
@@ -168,7 +169,7 @@ def get_unable_to_delete_revision_subheader(self) -> str:
     def click_go_back_to_document_history_option(self):
         self._click(self.unable_to_delete_revision_page_go_back_to_document_history)
 
-    # Article contribution actions.
+    """Actions against the article contribution section locators."""
     def click_on_edit_contributors_option(self):
         self._click(self.edit_contributors_option)
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_category_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_category_page.py
index 07550dcef35..9584dd0f3ea 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_category_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_category_page.py
@@ -1,13 +1,11 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
 class KBCategoryPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
+
+        """Locators belonging to the KB Category page."""
         self.article_from_list = lambda article_name: page.locator(
             "ul[class='documents'] li").get_by_role("link", name=article_name, exact=True)
-
-    def get_a_particular_article_locator_from_list(self, article_name: str) -> Locator:
-        return self.article_from_list(article_name)
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_meta.py b/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_meta.py
index c689d16b295..e8e3308a090 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_meta.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_meta.py
@@ -1,5 +1,4 @@
 from playwright.sync_api import Page
-
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,7 +6,7 @@ class KBArticleEditMetadata(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Edit article metadata page locators.
+        """Locators belonging to the edit article metadata page."""
         self.edit_article_metadata_error = page.locator("ul[class='errorlist']")
         self.edit_article_metadata_page_header = page.locator("h1[class='sumo-page-heading']")
         self.restrict_visibility_input_field = page.locator(
@@ -45,7 +44,7 @@ def __init__(self, page: Page):
         self.relevant_product_checkbox = lambda product_name: page.locator(
             f"//section[@id='relevant-products']//label[normalize-space(text())='{product_name}']")
 
-    # Edit article metadata page actions.
+    """Actions against the edit article metadata page locators."""
     def get_error_message(self) -> str:
         return self._get_text_of_element(self.edit_article_metadata_error)
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_page.py
index 74d0ee34501..1e9969dde6f 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_edit_article_page.py
@@ -1,19 +1,18 @@
 from playwright.sync_api import Page
-
-from playwright_tests.core.basepage import BasePage, Locator
+from playwright_tests.core.basepage import BasePage
 
 
 class EditKBArticlePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # KB Article edit page locators.
+        """Locators belonging to the kb article edit page."""
         self.edit_article_page_header = page.locator("h1")
         self.edit_by_another_user_warning_banner = page.locator("div#locked-warning")
         self.edit_by_another_user_warning_message = page.locator("div#locked-warning p")
         self.edit_by_another_user_edit_anyway_option = page.locator("a#unlock-button")
 
-        # KB Article edit page field locators.
+        """Locators belonging to the kb article edit page field section."""
         self.edit_article_keywords_field = page.locator("input#id_keywords")
         self.edit_article_search_result_summary_field = page.locator("textarea#id_summary")
         self.edit_article_content_textarea_field = page.locator("textarea#id_content")
@@ -24,18 +23,16 @@ def __init__(self, page: Page):
             "article#edit-document").get_by_role(
             "button", name="Submit for Review", exact=True)
 
-        # Submit your changes locators.
+        """Locators belonging to the submit your changes section."""
         self.edit_article_submit_changes_panel_comment_field = page.locator("input#id_comment")
         self.edit_article_submit_changes_panel_submit_button = page.locator(
             "button#submit-document-form")
 
+    """Actions against the edit kb article page locators."""
     # Edit kb article page actions.
     def get_edit_article_page_header(self) -> str:
         return self._get_text_of_element(self.edit_article_page_header)
 
-    def get_warning_banner_locator(self) -> Locator:
-        return self.edit_by_another_user_warning_banner
-
     def get_edit_article_warning_message(self) -> str:
         paragraphs = self._get_text_of_elements(self.edit_by_another_user_warning_message)
         return ' '.join(paragraphs)
@@ -46,7 +43,7 @@ def click_on_edit_anyway_option(self):
     def is_edit_anyway_option_visible(self) -> bool:
         return self._is_element_visible(self.edit_by_another_user_edit_anyway_option)
 
-    # Edit kb article page field actions.
+    """Actions against the kb article page field locators."""
     def get_edit_article_keywords_field_value(self) -> str:
         return self._get_element_input_value(self.edit_article_keywords_field)
 
@@ -54,9 +51,6 @@ def fill_edit_article_keywords_field(self, text: str):
         self._clear_field(self.edit_article_keywords_field)
         self._fill(self.edit_article_keywords_field, text)
 
-    def get_edit_keywords_field_locator(self) -> Locator:
-        return self.edit_article_keywords_field
-
     def get_edit_article_search_result_summary_text(self) -> str:
         return self._get_text_of_element(self.edit_article_search_result_summary_field)
 
@@ -79,11 +73,10 @@ def get_edit_article_expiry_date_value(self) -> str:
     def fill_edit_article_expiry_date(self, text: str):
         self._type(self.edit_article_expiry_date_field, text, 0)
 
-    # Edit kb button actions.
+    """Actions against the submit your changes section locators."""
     def click_submit_for_review_button(self):
         self._click_on_first_item(self.edit_article_submit_for_review_button)
 
-    # Submit you changes panel actions.
     def fill_edit_article_changes_panel_comment(self, text: str):
         self._fill(self.edit_article_submit_changes_panel_comment_field, text)
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_revision_preview_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_revision_preview_page.py
index fe2dfa8a614..6e04dced654 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_revision_preview_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_revision_preview_page.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,10 +6,10 @@ class KBArticleRevisionsPreviewPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Preview Revision page locators.
+        """Locators belonging to the 'Preview Revision' page."""
         self.preview_revision_page_header = page.locator("h1[class='sumo-page-heading']")
 
-        # Revision Information locators.
+        """Locators belonging to the revision information section."""
         self.revision_information_foldout_section = page.locator(
             "//summary[text()='Revision Information']")
         self.revision_information_content = page.locator("div[class='revision-info']")
@@ -37,26 +36,23 @@ def __init__(self, page: Page):
         self.edit_article_based_on_revision_link = page.get_by_role(
             "link", name="Edit article based on this revision", exact=True)
 
-        # Revision Source locators.
+        """Locators belonging to the revision source section."""
         self.revision_source_foldout_section = page.locator("//summary[text()='Revision Source']")
         self.revision_source_textarea = page.locator("div#doc-source textarea")
 
-        # Revision Content locators.
+        """Locators belonging to the revision content section."""
         self.revision_content_foldout_section = page.locator(
             "//summary[text()='Revision Content']")
         self.revision_content_html_section = page.locator("div#doc-content")
 
-    # Preview Revision page actions.
+    """Actions against the 'Preview Revision' page locators."""
     def get_preview_revision_header(self) -> str:
         return self._get_text_of_element(self.preview_revision_page_header)
 
-    # Revision Information actions.
+    """Actions against the revision information section locators."""
     def click_on_revision_information_foldout_section(self):
         self._click(self.revision_information_foldout_section)
 
-    def get_revision_information_content_locator(self) -> Locator:
-        return self.revision_information_content
-
     def get_preview_revision_id_text(self) -> str:
         return self._get_text_of_element(self.revision_id)
 
@@ -75,62 +71,36 @@ def get_preview_revision_comment_text(self) -> str:
     def get_preview_revision_reviewed_text(self) -> str:
         return self._get_text_of_element(self.reviewed)
 
-    # This locator is available inside the page only when a review was performed.
-    def get_preview_revision_reviewed_date_locator(self) -> Locator:
-        return self.reviewed_time
-
-    # This locator is available inside the page only when a review was performed.
-    # The text returned is the username extracted from the e-mail address.
+    """
+    This locator is available inside the page only when a review was performed.
+    The text returned is the username extracted from the e-mail address.
+    """
     def get_reviewed_by_text(self) -> str:
         return self._get_text_of_element(self.reviewed_by)
 
-    def get_reviewed_by_locator(self) -> Locator:
-        return self.reviewed_by
-
     def get_is_approved_text(self) -> str:
         return self._get_text_of_element(self.is_approved)
 
-    def get_is_approved_text_locator(self) -> Locator:
-        return self.is_approved
-
     def get_is_current_revision_text(self) -> str:
         return self._get_text_of_element(self.is_current_revision)
 
-    def is_current_revision_locator(self) -> Locator:
-        return self.is_current_revision
-
     def get_preview_revision_ready_for_localization_text(self) -> str:
         return self._get_text_of_element(self.ready_for_localization)
 
-    # Is displayed only if the revision was marked as ready for localization
-    def ready_for_localization_date(self) -> Locator:
-        return self.readied_for_localization_date
-
     def readied_for_localization_by_text(self) -> str:
         return self._get_text_of_element(self.readied_for_localization_by)
 
-    def readied_for_localization_by_locator(self) -> Locator:
-        return self.readied_for_localization_by
-
-    def get_edit_article_based_on_this_revision_link_locator(self) -> Locator:
-        return self.edit_article_based_on_revision_link
-
     def click_on_edit_article_based_on_this_revision_link(self):
         self._click(self.edit_article_based_on_revision_link)
 
-    # Revision Source actions.
+    """Actions against the revision source section locators."""
     def click_on_revision_source_foldout_section(self):
         self._click(self.revision_source_foldout_section)
 
     def get_preview_revision_source_textarea_content(self) -> str:
         return self._get_element_input_value(self.revision_source_textarea)
 
-    def get_preview_revision_source_textarea_locator(self) -> Locator:
-        return self.revision_source_textarea
-
-    # Revision Content actions.
+    """Actions against the revision content section locators."""
     def click_on_revision_content_foldout_section(self):
         self._click(self.revision_content_foldout_section)
 
-    def get_revision_content_html_locator(self) -> Locator:
-        return self.revision_content_html_section
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_translate_article_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_translate_article_page.py
index 1f88e6efaee..2dab6ef3dbd 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_translate_article_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_translate_article_page.py
@@ -1,21 +1,32 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
 class TranslateArticlePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
+
+        """General page locators."""
         self.translating_an_unready_article_banner = page.locator("ul[class='user-messages'] li")
         self.article_translation_page_title = page.locator("h1[class='sumo-page-heading']")
+
+        """Locators belonging to the title and slug sections."""
         self.translation_title_field = page.locator("input#id_title")
         self.translation_slug_field = page.locator("input#id_slug")
+
+        """Locators belonging to the allow comments section."""
         self.allow_article_comments_label = page.locator("label[for='id_allow_discussion']")
+
+        """Locators belonging to the keywords and search summary sections."""
         self.translation_keyword_field = page.locator("input#id_keywords")
         self.translation_summary_field = page.locator("textarea#id_summary")
+
+        """Locators belonging to the translation content sections."""
         self.translation_english_readonly_field = page.locator("div#content-or-diff textarea")
         self.translation_text = page.locator("textarea#id_content")
         self.change_body_view = page.locator("div#editor_wrapper + a")
+
+        """Locators belonging to the action buttons section."""
         self.send_translation_for_approval_button = page.locator(
             "button[class*='btn-submit']").first
         self.save_translation_as_draft_button = page.locator("button[class*='btn-draft']").first
@@ -32,9 +43,6 @@ def click_on_locale_from_list(self, locale: str):
     def get_text_of_article_unready_for_translation_banner(self) -> str:
         return self._get_text_of_element(self.translating_an_unready_article_banner)
 
-    def get_unready_for_translation_banner(self) -> Locator:
-        return self.translating_an_unready_article_banner
-
     def get_translate_page_title(self) -> str:
         return self._get_text_of_element(self.article_translation_page_title)
 
@@ -72,6 +80,3 @@ def click_on_description_submit_button(self):
 
     def click_on_save_translation_as_draft_button(self):
         self.save_translation_as_draft_button.first.click()
-
-    def get_draft_success_message_locator(self) -> Locator:
-        return self.draft_saved_successfully_message
diff --git a/playwright_tests/pages/explore_help_articles/articles/kb_what_links_here_page.py b/playwright_tests/pages/explore_help_articles/articles/kb_what_links_here_page.py
index 60b5fdbe5d4..e4c7467f97a 100644
--- a/playwright_tests/pages/explore_help_articles/articles/kb_what_links_here_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/kb_what_links_here_page.py
@@ -6,9 +6,8 @@
 class WhatLinksHerePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
+
+        """Locators belonging to the 'What links here' page."""
         self.what_links_here_list = self.page.locator("article[id] li a")
         self.what_links_here_for_article = lambda article_name: self.page.locator(
             "article[id] li").get_by_role("link").filter(has_text=article_name)
-
-    def get_a_particular_what_links_here_article_locator(self, article_name: str) -> Locator:
-        return self.what_links_here_for_article(article_name)
diff --git a/playwright_tests/pages/explore_help_articles/articles/products_page.py b/playwright_tests/pages/explore_help_articles/articles/products_page.py
index a2109cc162c..87b6fb65928 100644
--- a/playwright_tests/pages/explore_help_articles/articles/products_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/products_page.py
@@ -1,18 +1,18 @@
 from playwright.sync_api import Page
-
 from playwright_tests.core.basepage import BasePage
 
 
 class ProductsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-        # Page breadcrumb locators.
+
+        """Locators belonging to the page breadcrumbs."""
         self.first_breadcrumb = page.locator("ol#breadcrumbs li a")
 
-        # Page content locators.
+        """General page locators."""
         self.page_header = page.locator("h1.sumo-page-heading-xl")
 
-        # Product cards locators.
+        """Locators belonging to the product cards."""
         self.all_product_card_titles = page.locator("h3.card--title")
         self.card_subheading = lambda card_title: page.locator(
             f"//a[normalize-space(text())='{card_title}']/../following-sibling::p[@class='card--"
@@ -20,15 +20,15 @@ def __init__(self, page: Page):
         self.card = lambda card_title: page.locator(
             "div.card--details").get_by_role("link", name=card_title, exact=True)
 
-    # Page breadcrumbs actions.
+    """Actions against the page breadcrumb locators."""
     def click_on_first_breadcrumb(self):
         self._click(self.first_breadcrumb)
 
-    # Page content actions.
+    """Actions against the general page content locators."""
     def get_page_header(self) -> str:
         return self._get_text_of_element(self.page_header)
 
-    # Product card actions.
+    """Actions against the product cards locators."""
     def get_subheading_of_card(self, card_title: str) -> str:
         return self._get_text_of_element(self.card_subheading(card_title))
 
diff --git a/playwright_tests/pages/explore_help_articles/articles/submit_kb_article_page.py b/playwright_tests/pages/explore_help_articles/articles/submit_kb_article_page.py
index 20e3af6398e..c98dc35a444 100644
--- a/playwright_tests/pages/explore_help_articles/articles/submit_kb_article_page.py
+++ b/playwright_tests/pages/explore_help_articles/articles/submit_kb_article_page.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -8,7 +7,7 @@ def __init__(self, page: Page):
         super().__init__(page)
         self.kb_article_for_contributors_sidebar = page.locator("nav#for-contributors-sidebar")
 
-        # New KB article form locators.
+        """Locators belonging to the new kb article form."""
         self.kb_article_restrict_visibility_field = page.locator(
             "input#id_restrict_to_groups-ts-control")
         self.kb_article_restrict_visibility_delete_all_groups = page.locator(
@@ -24,7 +23,7 @@ def __init__(self, page: Page):
         self.kb_article_keyword_input = page.locator("input#id_keywords")
         self.kb_article_search_result_summary_textarea = page.locator("textarea#id_summary")
 
-        # New KB article content locators.
+        """Locators belonging to the new kb article content form locators."""
         self.kb_article_content_textarea = page.locator("textarea#id_content")
         self.kb_article_insert_media = page.locator("button[class*='btn-media']")
         self.kb_article_insert_media_modal_images = page.locator("div#media-modal img")
@@ -63,27 +62,17 @@ def __init__(self, page: Page):
             f"//section[@id='relevant-topics']//label[normalize-space(text())='{parent_topic}']/"
             f"../../..//label[normalize-space(text())='{child_topic_checkbox}']")
 
-    # Page error actions.
+    """Actions against the page error locators."""
     def get_all_kb_errors(self) -> list[str]:
         return self._get_text_of_elements(self.all_kb_errors)
 
-    def get_kb_title_error_locator(self) -> Locator:
-        return self.kb_title_error
-
     def get_kb_title_error_text(self) -> str:
         return self._get_text_of_element(self.kb_title_error)
 
-    def get_kb_slug_error(self) -> Locator:
-        return self.kb_slug_error
-
     def get_kb_slug_error_text(self) -> str:
         return self._get_text_of_element(self.kb_slug_error)
 
-    # For Contributors side navbar actions.
-    def for_contributors_section(self) -> Locator:
-        return self.kb_article_for_contributors_sidebar
-
-    # New KB form actions.
+    """Actions against the new KB form locators."""
     def add_and_select_restrict_visibility_group(self, group_name: str):
         self._fill(self.kb_article_restrict_visibility_field, group_name)
         self._click(self.restrict_visibility_to_group(group_name))
@@ -141,12 +130,6 @@ def click_on_submit_for_review_button(self):
     def click_on_changes_submit_button(self):
         self._click(self.kb_submit_changes_button)
 
-    def is_showfor_panel_displayed(self) -> Locator:
-        return self.kb_article_showfor_panel
-
-    def is_preview_content_section_displayed(self) -> Locator:
-        return self.kb_article_preview_content
-
     def get_text_of_label_for_relevant_to_checkbox(self, option_to_click) -> str:
         return self._get_text_of_element(self.relevant_to_product_checkbox(option_to_click))
 
@@ -156,9 +139,8 @@ def click_on_a_particular_product(self, product_name: str):
     def click_on_a_particular_parent_topic_checkbox(self, parent_topic_name: str):
         self._click(self.parent_topic_checkbox(parent_topic_name))
 
-    def click_on_a_particular_child_topic_checkbox(
-        self, parent_topic: str, child_topic_checkbox: str
-    ):
+    def click_on_a_particular_child_topic_checkbox(self, parent_topic: str,
+                                                   child_topic_checkbox: str):
         self._click(self.child_topic_checkbox(parent_topic, child_topic_checkbox))
 
     def click_on_insert_media_textarea_option(self):
diff --git a/playwright_tests/pages/explore_help_articles/explore_by_topic_page.py b/playwright_tests/pages/explore_help_articles/explore_by_topic_page.py
index 4a4750e65ac..d6399b63cb2 100644
--- a/playwright_tests/pages/explore_help_articles/explore_by_topic_page.py
+++ b/playwright_tests/pages/explore_help_articles/explore_by_topic_page.py
@@ -1,7 +1,5 @@
 import re
-
 from playwright.sync_api import Page
-
 from playwright_tests.core.basepage import BasePage
 
 """
@@ -12,13 +10,18 @@
 class ExploreByTopicPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-        # Locators belonging to the header section.
+
+        """Locators belonging to the page breadcrumb section."""
+        self.product_breadcrumb = lambda product: page.locator(
+            f"//ol[@id='breadcrumbs']/li/a[text()='{product}']")
+
+        """Locators belonging to the page header section."""
         self.explore_by_topic_page_header = page.locator("div.documents-product-title h1")
 
-        # Locators belonging to the listed KB articles.
+        """Locators belonging to the listed KB articles."""
         self.article_metadata_info = page.locator("div#document_metadata span.tooltip")
 
-        # Locators belonging to the page side-navbar section.
+        """Locators belonging to the page side-navbar section."""
         self.filter_by_product_dropdown = page.locator("select#products-topics-dropdown")
         self.filter_by_product_dropdown_selected_option = page.locator(
             "select#products-topics-dropdown option[selected]")
@@ -29,16 +32,12 @@ def __init__(self, page: Page):
         self.topic_filter = lambda option: page.locator(
             "ul.sidebar-nav--list li").get_by_role("link", name=option, exact=True)
 
-    """
-        Actions against the page header section.
-    """
+    """Actions against the page header section."""
     def get_explore_by_topic_page_header(self) -> str:
         """Get the text of the page header."""
         return self._get_text_of_element(self.explore_by_topic_page_header)
 
-    """
-       Actions against the listed KB articles.
-    """
+    """Actions against the listed KB articles."""
     def get_metadata_of_all_listed_articles(self) -> list[list[str]]:
         """Get the metadata of all listed articles."""
         elements = [
@@ -48,9 +47,7 @@ def get_metadata_of_all_listed_articles(self) -> list[list[str]]:
         ]
         return elements
 
-    """
-        Actions against the page side-navbar section.
-    """
+    """Actions against the page side-navbar section."""
     def get_selected_topic_side_navbar_option(self) -> str:
         """Get the text of the selected topic in the side-navbar."""
         return self._get_text_of_element(self.all_topics_selected_option)
@@ -65,7 +62,7 @@ def click_on_a_topic_filter(self, option: str):
         Args:
             option (str): The topic filter to click on.
         """
-        self._click(self.topic_filter(option))
+        self._click(self.topic_filter(option), expected_locator=self.explore_by_topic_page_header)
 
     def get_current_product_filter_dropdown_option(self) -> str:
         """Get the text of the selected option in the product filter dropdown."""
@@ -82,4 +79,5 @@ def select_a_filter_by_product_option(self, option: str):
         Args:
             option (str): The option to select in the dropdown
         """
-        self._select_option_by_label(self.filter_by_product_dropdown, option)
+        self._select_option_by_label(self.filter_by_product_dropdown, option,
+                                     expected_locator=self.product_breadcrumb(option))
diff --git a/playwright_tests/pages/explore_help_articles/product_support_page.py b/playwright_tests/pages/explore_help_articles/product_support_page.py
index 3520e769224..3a26efafc36 100644
--- a/playwright_tests/pages/explore_help_articles/product_support_page.py
+++ b/playwright_tests/pages/explore_help_articles/product_support_page.py
@@ -1,4 +1,4 @@
-from playwright.sync_api import Locator, Page
+from playwright.sync_api import Page
 
 from playwright_tests.core.basepage import BasePage
 
@@ -6,13 +6,14 @@
 class ProductSupportPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-        # Product support breadcrumb locators.
+
+        """Locators belonging to the product support breadcrumbs."""
         self.home_breadcrumb = page.locator("ol#breadcrumbs li").get_by_role("link")
 
-        # Page content locators.
+        """General page content locators."""
         self.product_title = page.locator("span.product-title-text")
 
-        # Feature article locators.
+        """Locators belonging to the featured articles cards."""
         self.featured_article_section_title = page.get_by_role("heading").filter(
             has_text="Featured Articles")
         self.featured_articles_cards = page.locator(
@@ -21,7 +22,7 @@ def __init__(self, page: Page):
             f'//h2[contains(text(),"Featured Articles")]/..//a[normalize-space(text())'
             f'="{card_title}"]')
 
-        # Still need help widget locators.
+        """Locators belonging to the 'Still Need Help' widget."""
         self.still_need_help_widget = page.locator(
             "section[class='support-callouts mzp-l-content sumo-page-section--inner']")
         self.still_need_help_widget_title = page.locator(
@@ -42,10 +43,6 @@ def get_product_support_title_text(self) -> str:
         """Get the product title text on the product support page."""
         return self._get_text_of_element(self.product_title)
 
-    def product_product_title_element(self) -> Locator:
-        """Get the product title element locator on the product support page."""
-        return self.product_title
-
     def get_featured_articles_header_text(self) -> str:
         """Get the featured articles section title text."""
         return self._get_text_of_element(self.featured_article_section_title)
diff --git a/playwright_tests/pages/footer.py b/playwright_tests/pages/footer.py
index 2513d99dc3f..aede7fd4d31 100644
--- a/playwright_tests/pages/footer.py
+++ b/playwright_tests/pages/footer.py
@@ -1,6 +1,5 @@
 from playwright.sync_api import ElementHandle, Page
 from playwright.sync_api import TimeoutError as PlaywrightTimeoutError
-
 from playwright_tests.core.basepage import BasePage
 
 
@@ -8,13 +7,13 @@ class FooterSection(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Footer section locators.
+        """Locators belonging to the footer section locators."""
         self.all_footer_links = page.locator("footer a")
         self.language_selector = page.locator("select#mzp-c-language-switcher-select")
         self.language_selector_options = page.locator(
             "select#mzp-c-language-switcher-select option").all()
 
-    # Footer section actions.
+    """Actions against the footer section."""
     def get_all_footer_links(self) -> list[ElementHandle]:
         """Returns all footer links."""
         return self._get_element_handles(self.all_footer_links)
@@ -25,7 +24,6 @@ def get_all_footer_locales(self) -> list[str]:
 
     def switch_to_a_locale(self, locale: str, max_retries=3) -> None:
         """Switches to a locale with a retry mechanism."""
-        print("Trying to switch the locale")
         attempts = 0
         while attempts < max_retries:
             self._select_option_by_value(self.language_selector, locale)
@@ -33,7 +31,6 @@ def switch_to_a_locale(self, locale: str, max_retries=3) -> None:
                 self.page.wait_for_url("**/" + locale + "/**", timeout=4000)
                 return
             except PlaywrightTimeoutError:
-                print("Switching to locale failed, retrying...")
                 self.page.reload()
                 if locale in self.page.url:
                     return
diff --git a/playwright_tests/pages/homepage.py b/playwright_tests/pages/homepage.py
index a7ad78ba6ba..bd88fefcc10 100644
--- a/playwright_tests/pages/homepage.py
+++ b/playwright_tests/pages/homepage.py
@@ -1,23 +1,24 @@
 from playwright.sync_api import Page
-
 from playwright_tests.core.basepage import BasePage
 
 
 class Homepage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-        # Product list section locators.
+
+        """Locators belonging to the product list section."""
         self.product_list = page.locator("div.card--product")
         self.product_card_titles = page.locator("div.card--product h3.card--title"
                                                 ).get_by_role("link")
         self.product_card = lambda card_title: page.get_by_role(
             "link", name=f'{card_title}', exact=True)
 
-        # Featured articles section locators.
+        """Locators belonging to the featured articles section."""
         self.featured_articles_list = page.locator("div.card--article")
         self.featured_articles_card_titles = page.locator("div.card--article").get_by_role("link")
 
-    # Product Cards
+
+    """Actions against the product cards."""
     def get_text_of_product_card_titles(self) -> list[str]:
         """Get text of all product card titles"""
         return self._get_text_of_elements(self.product_card_titles)
@@ -30,7 +31,7 @@ def click_on_product_card_by_title(self, card_title: str):
         """Click on a product card by its title"""
         self._click(self.product_card(card_title))
 
-    # Featured articles
+    """Actions against the featured articles cards."""
     def get_number_of_featured_articles(self) -> int:
         """Get the number of featured articles"""
         return self._get_elements_count(self.featured_articles_list)
diff --git a/playwright_tests/pages/messaging_system_pages/inbox_page.py b/playwright_tests/pages/messaging_system_pages/inbox_page.py
index 945796b57cf..a22b21cce54 100644
--- a/playwright_tests/pages/messaging_system_pages/inbox_page.py
+++ b/playwright_tests/pages/messaging_system_pages/inbox_page.py
@@ -1,5 +1,4 @@
 from playwright.sync_api import ElementHandle, Locator, Page
-
 from playwright_tests.core.basepage import BasePage
 
 
@@ -84,10 +83,6 @@ def click_on_scam_alert_close_button(self):
         """Click on the close button of the scam alert banner."""
         self._click(self.scam_alert_close_button)
 
-    def get_scam_banner_message_locator(self) -> Locator:
-        """Get the locator of the inbox message scam banner."""
-        return self.scam_alert_banner_text
-
     """Actions against the general Inbox page locators."""
     def get_text_of_main_header(self) -> str:
         """Get the text of the main header of the inbox page."""
@@ -235,22 +230,6 @@ def click_on_cancel_button_inside_the_confirmation_page(self):
         """
         self._press_a_key(self.delete_confirmation_page_cancel_button, 'Enter')
 
-    def get_inbox_message_locator_based_on_sender(self, username: str) -> Locator:
-        """
-            Get the locator of the inbox message based on the sender's username.
-            Args:
-                username (str): The username of the message sender.
-        """
-        return self.sender_username(username)
-
-    def get_inbox_message_locator_based_on_excerpt(self, excerpt: str) -> Locator:
-        """
-            Get the locator of the inbox message based on the excerpt.
-            Args:
-                excerpt (str): The excerpt of the message.
-        """
-        return self.inbox_message_by_excerpt(excerpt)
-
 
     def get_inbox_message_element_handles_based_on_excerpt(self,
                                                            excerpt: str) -> list[ElementHandle]:
@@ -278,11 +257,6 @@ def check_a_particular_message_based_on_excerpt(self, excerpt=''):
         inbox_checkbox = self.get_message_select_checkbox_element(excerpt)
         self._checkbox_interaction(inbox_checkbox[0], True)
 
-    def get_all_unread_messages(self) -> list[Locator]:
-        """Get all the unread messages."""
-        return self.all_unread_messages.all()
-
-
     """Actions against the read inbox message page."""
     def get_the_deleted_user_message_sender_text(self) -> str:
         """Returns the name of the message sender (which should be the deleted user)"""
diff --git a/playwright_tests/pages/messaging_system_pages/mess_system_user_navbar.py b/playwright_tests/pages/messaging_system_pages/mess_system_user_navbar.py
index 0d038bedc3b..ca41096539a 100644
--- a/playwright_tests/pages/messaging_system_pages/mess_system_user_navbar.py
+++ b/playwright_tests/pages/messaging_system_pages/mess_system_user_navbar.py
@@ -1,12 +1,12 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
 class MessagingSystemUserNavbar(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
-        # Messaging system navbar locators.
+
+        """Locators belonging to the messaging system navbar."""
         self.messaging_system_user_navbar_inbox_option = page.locator(
             "ul#pm-nav").get_by_role("link").filter(has_text="Inbox")
         self.messaging_system_user_navbar_sent_messages_option = page.locator(
@@ -14,7 +14,7 @@ def __init__(self, page: Page):
         self.messaging_system_user_navbar_new_message_option = page.locator(
             "ul#pm-nav").get_by_role("link").filter(has_text="New Message")
 
-    # Messaging system navbar actions.
+    """Actions against the messaging system navbar locators."""
     def click_on_messaging_system_navbar_inbox(self):
         """Click on the inbox option in the messaging system navbar."""
         self._click(self.messaging_system_user_navbar_inbox_option)
@@ -26,16 +26,3 @@ def click_on_messaging_system_nav_sent_messages(self):
     def click_on_messaging_system_nav_new_message(self):
         """Click on the new message option in the messaging system navbar."""
         self._click(self.messaging_system_user_navbar_new_message_option)
-
-    # Need to add logic for fetching the background color of selected navbar elements
-    def get_inbox_navbar_element(self) -> Locator:
-        """Get the locator for the inbox option in the messaging system navbar."""
-        return self.messaging_system_user_navbar_inbox_option
-
-    def get_sent_messages_navbar_element(self) -> Locator:
-        """Get the locator for the sent messages option in the messaging system navbar."""
-        return self.messaging_system_user_navbar_sent_messages_option
-
-    def get_new_message_navbar_element(self) -> Locator:
-        """Get the locator for the new message option in the messaging system navbar."""
-        return self.messaging_system_user_navbar_new_message_option
diff --git a/playwright_tests/pages/messaging_system_pages/new_message.py b/playwright_tests/pages/messaging_system_pages/new_message.py
index d5822012e8b..a212aa3dda9 100644
--- a/playwright_tests/pages/messaging_system_pages/new_message.py
+++ b/playwright_tests/pages/messaging_system_pages/new_message.py
@@ -1,4 +1,4 @@
-from playwright.sync_api import Locator, Page
+from playwright.sync_api import Page
 
 from playwright_tests.core.basepage import BasePage
 
@@ -55,10 +55,6 @@ def get_to_user_text(self) -> str:
         """Get the text of the targeted user from the 'To' field."""
         return self._get_text_of_element(self.added_to_user_text)
 
-    def get_no_user_message_locator(self) -> Locator:
-        """Get the locator of the no user message from the 'To' search field."""
-        return self.no_user_search_results_text
-
     def get_text_of_search_result_bolded_character(self) -> str:
         """Get the text of the search result bolded character."""
         return self._get_text_of_element(self.user_search_results_bolded_characters)
@@ -92,10 +88,6 @@ def get_characters_remaining_text(self) -> str:
         """Get the text of the characters remaining message from the New Message textarea."""
         return self._get_text_of_element(self.textarea_remaining_characters_message)
 
-    def get_characters_remaining_text_locator(self) -> Locator:
-        """Get the locator of the characters remaining message from the New Message textarea."""
-        return self.textarea_remaining_characters_message
-
     def click_cancel_button(self):
         """Click on the 'Cancel' button from the New Messages page."""
         self._click(self.cancel_button)
@@ -162,18 +154,6 @@ def click_on_preview_internal_link(self):
         """Click on the internal link from the New Message preview section."""
         self._click(self.preview_internal_link)
 
-    def get_preview_section_locator(self) -> Locator:
-        """Get the locator of the message preview section."""
-        return self.preview_section
-
     def is_message_preview_time_displayed(self) -> bool:
         """Check if the message preview time is displayed."""
         return self._is_element_visible(self.preview_time)
-
-    def get_preview_internal_link_test_data_locator(self) -> Locator:
-        """Get the locator of the internal link displayed inside the New Message page preview."""
-        return self.preview_internal_link
-
-    def get_preview_external_link_test_data_locator(self) -> Locator:
-        """Get the locator of the external link displayed inside the New Message page preview"""
-        return self.preview_external_link
diff --git a/playwright_tests/pages/messaging_system_pages/sent_messages.py b/playwright_tests/pages/messaging_system_pages/sent_messages.py
index 1b9a8cfb1c1..6387cc50654 100644
--- a/playwright_tests/pages/messaging_system_pages/sent_messages.py
+++ b/playwright_tests/pages/messaging_system_pages/sent_messages.py
@@ -1,4 +1,4 @@
-from playwright.sync_api import ElementHandle, Locator, Page
+from playwright.sync_api import ElementHandle, Page
 
 from playwright_tests.core.basepage import BasePage
 
@@ -7,8 +7,6 @@ class SentMessagePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Sent messages page locators.
-
         """Locators belonging to the breadcrumbs section."""
         self.all_breadcrumbs = page.locator("ol#breadcrumbs li")
 
@@ -162,22 +160,6 @@ def click_on_delete_page_cancel_button(self):
         """Click on the cancel button on the delete message page."""
         self._click(self.delete_confirmation_cancel_button)
 
-    def sent_messages_by_username(self, username: str) -> Locator:
-        """Get the locator of the sent messages by the username of the recipient.
-
-        Args:
-            username (str): The username of the recipient.
-        """
-        return self.sender_username(username)
-
-    def sent_messages_by_excerpt_locator(self, excerpt: str) -> Locator:
-        """Get the locator of the sent messages by the excerpt of the message.
-
-        Args:
-            excerpt (str): The excerpt of the message.
-        """
-        return self.sent_message_by_subject(excerpt)
-
     def sent_messages_by_excerpt_element_handles(self, excerpt: str) -> list[ElementHandle]:
         """Get the element handle list of the sent messages by the excerpt of the message.
 
@@ -187,19 +169,6 @@ def sent_messages_by_excerpt_element_handles(self, excerpt: str) -> list[Element
         return list(self._get_element_handles(
             self.sent_message_by_subject(excerpt)))
 
-    def sent_messages_to_group(self, group: str, excerpt: str) -> Locator:
-        """Get the locator of the sent message by the group name of the recipient and the excerpt
-
-        Args:
-            group (str): The name of the group.
-            excerpt (str): The excerpt of the message.
-        """
-        return self.sent_message_by_group(group, excerpt)
-
-    def sent_message_banner(self) -> Locator:
-        """Get the locator of the sent message banner."""
-        return self.banner_text
-
     def are_sent_messages_displayed(self) -> bool:
         """Check if the sent messages are displayed."""
         return self._is_element_visible(self.sent_messages_section)
diff --git a/playwright_tests/pages/search/search_page.py b/playwright_tests/pages/search/search_page.py
index 5ce68c8f4de..e12153f46a9 100644
--- a/playwright_tests/pages/search/search_page.py
+++ b/playwright_tests/pages/search/search_page.py
@@ -7,7 +7,7 @@ class SearchPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Locators belonging to the searchbar.
+        """Locators belonging to the searchbar."""
         self.searchbar_homepage = page.locator("form#support-search-masthead input#search-q")
         self.searchbar_aaq = page.locator("form#question-search-masthead input#search-q")
         self.searchbar_sidebar = page.locator("form#support-search-sidebar input#search-q")
@@ -19,7 +19,7 @@ def __init__(self, page: Page):
             "p[class='popular-searches']").get_by_role("link", name=option, exact=True)
         self.search_results_section = page.locator("main#search-results-list")
 
-        # Locators belonging to the search results filter
+        """Locators belonging to the search results filter."""
         self.selected_filter_locator = page.locator(
             "//ul[@id='doctype-filter']/li[@class='tabs--item']/a[@class='selected']/span")
         self.view_all_filter = page.locator(
@@ -31,7 +31,7 @@ def __init__(self, page: Page):
             "//ul[@id='doctype-filter']/li[@class='tabs--item']/a/span[text()='Community "
             "Discussion Only']")
 
-        # Locators belonging to the search results
+        """Locators belonging to the search results."""
         self.search_results_titles = page.locator(
             "section[class='topic-list content-box'] a[class='title']")
         self.search_results_articles_summary = page.locator("div[class='topic-article--text'] p")
@@ -48,7 +48,7 @@ def __init__(self, page: Page):
             "//ul[@class='topic-article--meta-list thread-meta']/li[contains(text(),"
             "'people have this problem')]")
 
-        # Locators belonging to the side navbar
+        """Locators belonging to the side navbar."""
         self.search_results_side_nav_header = page.locator("h3[class='sidebar-subheading']")
         self.search_results_side_nav_selected_item = page.locator(
             "ul#product-filter li[class='selected'] a")
@@ -56,16 +56,14 @@ def __init__(self, page: Page):
         self.search_results_side_nav_element = lambda product_name: page.locator(
             "ul#product-filter").get_by_role("link", name=product_name, exact=True)
 
-        # General page locators
+        """General page locators."""
         self.page_header = page.locator("h1[class='sumo-page-heading-xl']")
 
 
     def _wait_for_visibility_of_search_results_section(self):
         self._wait_for_locator(self.search_results_section)
 
-    """
-        Actions against the search results
-    """
+    """Actions against the search results."""
     def click_on_a_particular_popular_search(self, popular_search_option: str):
         """Click on a particular popular search option
 
@@ -164,9 +162,7 @@ def is_search_content_section_displayed(self) -> bool:
         """Check if the search content section is displayed"""
         return self._is_element_visible(self.search_results_content)
 
-    """
-        Actions against the search bar
-    """
+    """Actions against the search bar."""
 
     def get_text_of_searchbar_field(self) -> str:
         """Get the text of the search bar field"""
@@ -188,6 +184,7 @@ def fill_into_searchbar(self, text: str, is_aaq=False, is_sidebar=False):
         else:
             self.clear_the_searchbar()
             self._fill(self.searchbar_homepage, text)
+        self._wait_for_visibility_of_search_results_section()
 
     def clear_the_searchbar(self, is_aaq=False, is_sidebar=False):
         """Clear the search bar
@@ -219,9 +216,7 @@ def click_on_a_popular_search(self, popular_search_name: str):
         """
         self._click(self.popular_search(popular_search_name))
 
-    """
-        Actions against the side navbar
-    """
+    """Actions against the side navbar."""
     def get_the_highlighted_side_nav_item(self) -> str:
         """Get the highlighted side nav item"""
         return self._get_text_of_element(self.search_results_side_nav_selected_item)
@@ -234,9 +229,7 @@ def click_on_a_particular_side_nav_item(self, product_name: str):
         """
         self._click(self.search_results_side_nav_element(product_name))
 
-    """
-        General page actions
-    """
+    """General page actions."""
     def get_search_results_header(self) -> str:
         """Get the search results header"""
         self._wait_for_visibility_of_search_results_section()
diff --git a/playwright_tests/pages/top_navbar.py b/playwright_tests/pages/top_navbar.py
index f5f856d91d9..0ac72ac0fb8 100644
--- a/playwright_tests/pages/top_navbar.py
+++ b/playwright_tests/pages/top_navbar.py
@@ -1,18 +1,20 @@
 from playwright.sync_api import ElementHandle, Locator, Page
-
 from playwright_tests.core.basepage import BasePage
+from playwright_tests.pages.contribute.contributor_tools_pages.recent_revisions_page import \
+    RecentRevisions
 
 
 class TopNavbar(BasePage):
     def __init__(self, page: Page):
+        self.recent_revisions = RecentRevisions(page)
         super().__init__(page)
 
-        # General page locators
+        """General page locators."""
         self.menu_titles = page.locator("div#main-navigation a.mzp-c-menu-title")
         self.sumo_nav_logo = page.locator(
             "div.sumo-nav--logo").get_by_role("link").get_by_role("img")
 
-        # Locators belonging to the 'Explore Help Articles' top-navbar section.
+        """Locators belonging to the 'Explore Help Articles' top-navbar section."""
         self.explore_by_topic_top_navbar_header = page.locator(
             "h4.mzp-c-menu-item-title").filter(has_text="Explore by topic")
         self.explore_by_product_top_navbar_header = page.locator(
@@ -27,7 +29,7 @@ def __init__(self, page: Page):
         self.explore_by_topic_top_navbar_options = page.locator(
             "//h4[text()='Explore by topic']/../following-sibling::ul/li/a")
 
-        # Locators belonging to the 'Ask a Question' top-navbar section.
+        """Locators belonging to the 'Ask a Question' top-navbar section."""
         self.ask_a_question_top_navbar = page.locator(
             "li[class='mzp-c-menu-category mzp-has-drop-down mzp-js-expandable']").filter(
             has_text="Ask a Question")
@@ -41,7 +43,7 @@ def __init__(self, page: Page):
         self.browse_all_products_option = page.locator(
             "div#main-navigation").get_by_role("link", name="View all", exact=True)
 
-        # Locators belonging to the 'Community Forums' top-navbar section.
+        """Locators belonging to the 'Community Forums' top-navbar section."""
         self.browse_by_product_top_navbar_header = page.locator(
             "h4.mzp-c-menu-item-title").filter(has_text="Browse by product")
         self.browse_all_forum_threads_by_topic_top_navbar_header = page.locator(
@@ -55,7 +57,7 @@ def __init__(self, page: Page):
         self.firefox_desktop_option = page.locator("//a[text()='Firefox desktop']")
         self.view_all_forums = page.locator("//a[normalize-space(text())='View all forums']")
 
-        # Locators belonging to the 'Contribute' top-navbar section.
+        """Locators belonging to the 'Contribute' top-navbar section."""
         self.contribute_option = page.get_by_role("link").filter(has_text="Contribute")
         self.contributor_discussions_top_navbar_header = page.locator(
             "h4.mzp-c-menu-item-title").filter(has_text="Contributor discussions")
@@ -83,7 +85,7 @@ def __init__(self, page: Page):
             "ul[class='mzp-c-menu-item-list sumo-nav--sublist']").get_by_role("link").filter(
             has_text="Community hub")
 
-        # Locators belonging to the 'Sign In/Up' top-navbar section.
+        """Locators belonging to the 'Sign in/up' top-navbar section."""
         self.signin_signup_button = page.locator("div#profile-navigation").get_by_role(
             "link").filter(has_text="Sign In/Up")
         self.signed_in_username = page.locator("span.sumo-nav--username")
@@ -102,9 +104,7 @@ def __init__(self, page: Page):
             "div#profile-navigation div.avatar-container-message-alert")
         self.unread_message_count = page.locator("span.message-count-alert")
 
-    """
-        Actions against the top-navbar logo.
-    """
+    """Actions against the top-navbar logo."""
     def get_sumo_nav_logo(self) -> ElementHandle:
         """Get sumo nav logo element handle"""
         return self._get_element_handle(self.sumo_nav_logo)
@@ -113,9 +113,7 @@ def click_on_sumo_nav_logo(self):
         """Click on the sumo nav logo"""
         self._click(self.sumo_nav_logo)
 
-    """
-        Actions against the 'Explore Help Articles' top-navbar section.
-    """
+    """Actions against the 'Explore Help Articles' top-navbar section."""
     def hover_over_explore_by_product_top_navbar_option(self):
         """Hover over the 'Explore by product' top-navbar option"""
         self._hover_over_element(self.explore_help_articles_top_navbar_option)
@@ -135,9 +133,8 @@ def click_on_explore_our_help_articles_view_all_option(self):
         """Click on the 'View all products' option"""
         self.hover_over_explore_by_product_top_navbar_option()
         self._click(self.explore_our_help_articles_view_all_option)
-    """
-        Actions against the 'Community Forums' top-navbar section.
-    """
+
+    """Actions against the 'Community Forums' top-navbar section."""
     def hover_over_community_forums_top_navbar_option(self):
         """Hover over the 'Community Forums' top-navbar option"""
         self._hover_over_element(self.community_forums_top_navbar_option)
@@ -163,10 +160,7 @@ def click_on_view_all_forums_option(self):
         self.hover_over_community_forums_top_navbar_option()
         self._click(self.view_all_forums)
 
-
-    """
-        Actions against the 'Ask a Question' top-navbar section.
-    """
+    """Actions against the 'Ask a Question' top-navbar section."""
     def hover_over_ask_a_question_top_navbar(self):
         """Hover over the 'Ask a Question' top-navbar option"""
         self._hover_over_element(self.ask_a_question_top_navbar)
@@ -182,9 +176,7 @@ def click_on_browse_all_products_option(self):
         self.hover_over_ask_a_question_top_navbar()
         self._click(self.browse_all_products_option)
 
-    """
-        Actions against the 'Contribute' top-navbar section.
-    """
+    """Actions against the 'Contribute' top-navbar section."""
     def hover_over_contribute_top_navbar(self):
         """Hover over the 'Contribute' top-navbar option"""
         self._hover_over_element(self.contribute_option)
@@ -209,7 +201,7 @@ def click_on_article_discussions_option(self):
         self.hover_over_contribute_top_navbar()
         self._click(self.article_discussions_option)
 
-    # Contributor tools
+    """Actions against the Contributor Tools."""
     def click_on_moderate_forum_content_option(self):
         """Click on the 'Moderate forum content' option"""
         self.hover_over_contribute_top_navbar()
@@ -219,6 +211,7 @@ def click_on_recent_revisions_option(self):
         """Click on the 'Recent revisions' option"""
         self.hover_over_contribute_top_navbar()
         self._click(self.recent_revisions_option)
+        self._wait_for_locator(self.recent_revisions.revisions_table, 5000)
 
     def click_on_dashboards_option(self):
         """Click on the 'Knowledge base dashboards' option"""
@@ -240,9 +233,7 @@ def click_on_community_hub_option(self):
         self.hover_over_contribute_top_navbar()
         self._click(self.community_hub_option)
 
-    """
-        Actions against the sign-in/sign-up top-navbar section.
-    """
+    """Actions against the sign-in/sign-up top-navbar section."""
     def click_on_signin_signup_button(self):
         """Click on the 'Sign In/Up' button"""
         self._click(self.signin_signup_button)
@@ -257,17 +248,7 @@ def click_on_sign_out_button(self):
         self.mouse_over_profile_avatar()
         self._click(self.sign_out_button)
 
-    def sign_in_up_button_displayed_element(self) -> Locator:
-        """Get the 'Sign In/Up' button displayed element locator"""
-        return self.signin_signup_button
-
-    def is_sign_in_up_button_displayed(self) -> bool:
-        """Check if the 'Sign In/Up' button is displayed"""
-        return self._is_element_visible(self.signin_signup_button)
-
-    """
-        Actions against the user profile top-navbar section.
-    """
+    """Actions against the user profile top-navbar section."""
     def click_on_view_profile_option(self):
         """Click on the 'View Profile' option"""
         self.mouse_over_profile_avatar()
@@ -312,21 +293,11 @@ def get_text_of_logged_in_username(self) -> str:
         """Get the text of the logged in username"""
         return self._get_text_of_element(self.signed_in_username)
 
-    def is_unread_message_notification_displayed(self) -> bool:
-        """Check if the unread message notification is displayed"""
-        return self._is_element_visible(self.unread_message_profile_notification)
-
     def get_unread_message_notification_counter_value(self) -> int:
         """Get the unread message notification counter value"""
         return int(self._get_text_of_element(self.unread_message_count))
 
-    def is_unread_message_notification_counter_visible(self) -> bool:
-        """Check if the unread message notification counter is visible"""
-        return self._is_element_visible(self.unread_message_count)
-
-    """
-        General actions against the top-navbar section.
-    """
+    """General actions against the top-navbar section."""
     def get_available_menu_titles(self) -> list[str]:
         """Get the available menu titles"""
         return self._get_text_of_elements(self.menu_titles)
diff --git a/playwright_tests/pages/user_pages/my_profile_answers_page.py b/playwright_tests/pages/user_pages/my_profile_answers_page.py
index c8fe594862a..bf130016edb 100644
--- a/playwright_tests/pages/user_pages/my_profile_answers_page.py
+++ b/playwright_tests/pages/user_pages/my_profile_answers_page.py
@@ -7,14 +7,14 @@ class MyProfileAnswersPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # My Profile Answers locators.
+        """Locators belonging to the Answers page."""
         self.my_answers_page_header = page.locator("h2[class='sumo-page-subheading']")
         self.my_answers_question_subject_links = page.locator("article#profile li a")
         self.answer_by_id = lambda id: page.locator(f"article#profile a[href*='{id}']")
         self.answer_text = lambda id: page.locator(
             f"//article[@id='profile']//a[contains(@href, '{id}')]/following-sibling::blockquote")
 
-    # My Profile Answers actions.
+    """Actions against the profile answers page locators."""
     def get_page_header(self) -> str:
         """Get the header of the My Profile Answers page."""
         return self._get_text_of_element(self.my_answers_page_header)
diff --git a/playwright_tests/pages/user_pages/my_profile_documents_page.py b/playwright_tests/pages/user_pages/my_profile_documents_page.py
index 3ac067ed06f..6d7c4a4bf98 100644
--- a/playwright_tests/pages/user_pages/my_profile_documents_page.py
+++ b/playwright_tests/pages/user_pages/my_profile_documents_page.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,12 +6,12 @@ class MyProfileDocumentsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # My profile documents locators.
+        """Locators belonging to the my profile documents page."""
         self.documents_link_list = page.locator("main a")
         self.document_by_name = lambda document_name: page.locator("main").get_by_role(
             "link").filter(has_text=document_name)
 
-    # My profile documents actions.
+    """Actions against the my profile documents page locators."""
     def click_on_a_particular_document(self, document_name: str):
         """Click on a particular document"""
         self._click(self.document_by_name(document_name))
@@ -20,7 +19,3 @@ def click_on_a_particular_document(self, document_name: str):
     def get_text_of_document_links(self) -> list[str]:
         """Get text of all document links"""
         return self._get_text_of_elements(self.documents_link_list)
-
-    def get_a_particular_document_locator(self, document_name: str) -> Locator:
-        """Get a particular document locator"""
-        return self.document_by_name(document_name)
diff --git a/playwright_tests/pages/user_pages/my_profile_edit.py b/playwright_tests/pages/user_pages/my_profile_edit.py
index 71fa9a01bd5..118c2c028de 100644
--- a/playwright_tests/pages/user_pages/my_profile_edit.py
+++ b/playwright_tests/pages/user_pages/my_profile_edit.py
@@ -1,5 +1,5 @@
-from playwright.sync_api import Locator, Page
-
+import re
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,15 +7,15 @@ class MyProfileEdit(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Access denied section
+        """Locators belonging to the Access Denied section."""
         self.access_denied_main_header = page.locator("article#error-page h1")
         self.access_denied_subheading_message = page.locator("div[class='center-on-mobile'] p")
 
-        # Navbar section
+        """Locators belonging to the navbar section."""
         self.my_profile_user_navbar_options = page.locator("ul#user-nav li a")
         self.my_profile_user_navbar_selected_element = page.locator("a[class='selected']")
 
-        # Edit profile page
+        """Locators belonging to the edit profile page."""
         self.edit_my_profile_edit_input_form = page.locator("article#edit-profile form")
         self.edit_my_profile_main_header = page.locator("h1[class='sumo-page-heading']")
         self.manage_firefox_account_button = page.get_by_role("link").filter(
@@ -45,7 +45,7 @@ def __init__(self, page: Page):
         self.update_my_profile_button = page.get_by_role("button").filter(
             has_text="Update My Profile")
 
-        # Locators belonging to the close account modal.
+        """Locators belonging to the close account modal."""
         self.close_account_and_delete_all_profile_information_link = page.locator(
             "p.delete-account-link a")
         self.close_account_username_modal = page.locator("input#delete-profile-confirmation-input")
@@ -285,8 +285,7 @@ def clear_confirmation_code_from_close_account_modal(self):
 
     def click_close_account_button(self):
         """Click the close account button in the close account modal"""
-        self._click(self.close_account_delete_button,
-                    expected_url="https://support.allizom.org/en-US/users/close_account",
+        self._click(self.close_account_delete_button, expected_url=re.compile(r"close_account$"),
                     retries=2)
 
     def is_delete_your_account_button_disabled(self) -> bool:
@@ -308,7 +307,3 @@ def click_make_email_visible_checkbox(self, check: bool):
     def is_make_email_visible_checkbox_selected(self) -> bool:
         """Return True if the make email visible checkbox is selected"""
         return self._is_checkbox_checked(self.make_email_visible_to_logged_in_users_checkbox)
-
-    def get_my_profile_edit_form_locator(self) -> Locator:
-        """Return the locator of the edit profile form"""
-        return self.edit_my_profile_edit_input_form
diff --git a/playwright_tests/pages/user_pages/my_profile_edit_contribution_areas_page.py b/playwright_tests/pages/user_pages/my_profile_edit_contribution_areas_page.py
index 1e16ba2d8e0..7a43c7add8b 100644
--- a/playwright_tests/pages/user_pages/my_profile_edit_contribution_areas_page.py
+++ b/playwright_tests/pages/user_pages/my_profile_edit_contribution_areas_page.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,7 +6,7 @@ class MyProfileEditContributionAreasPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # My profile contribution areas page locators.
+        """Locators belonging to the my profile contribution areas page."""
         self.edit_contribution_areas_page_header = page.locator("h3[class='sumo-page-heading']")
         self.edit_contribution_areas_checkboxes = page.locator("input[type='checkbox']")
         self.edit_contribution_areas_kb_contributors = page.locator(
@@ -27,7 +26,7 @@ def __init__(self, page: Page):
         self.edit_contribution_areas_preferences_saved_banner_close_button = page.locator(
             "ul[class='user-messages'] li button")
 
-    # My profile contribution areas page actions.
+    """Actions against the my profile contribution areas page locators."""
     def edit_con_areas_pref_banner_txt(self) -> str:
         """Get the display pref banner text"""
         return self._get_text_of_element(
@@ -66,10 +65,6 @@ def click_on_edit_cont_pref_banner_close_button(self):
         """Click on the close button of the edit contribution areas preferences saved banner"""
         self._click(self.edit_contribution_areas_preferences_saved_banner_close_button)
 
-    def is_edit_cont_pref_banner_displayed(self) -> Locator:
-        """Check if the edit contribution areas preferences saved banner is displayed"""
-        return self.edit_contribution_areas_preferences_saved_banner
-
     def is_kb_contributors_checkbox_checked(self) -> bool:
         """Check if the kb contributors checkbox is checked"""
         return self._is_checkbox_checked(self.edit_contribution_areas_kb_contributors)
diff --git a/playwright_tests/pages/user_pages/my_profile_edit_settings_page.py b/playwright_tests/pages/user_pages/my_profile_edit_settings_page.py
index 32d50000ae2..41f1b3c75ad 100644
--- a/playwright_tests/pages/user_pages/my_profile_edit_settings_page.py
+++ b/playwright_tests/pages/user_pages/my_profile_edit_settings_page.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,7 +6,7 @@ class MyProfileEditSettingsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # My profile edit settings page locators.
+        """Locators belonging to the edit profile settings page."""
         self.edit_settings_page_header = page.locator("h3[class='sumo-page-heading']")
         self.edit_settings_checkbox_options_label = page.locator(
             "div[class='field checkbox'] label")
@@ -34,7 +33,7 @@ def __init__(self, page: Page):
         self.my_profile_user_navbar = page.locator("ul#user-nav li")
         self.my_profile_user_navbar_selected_element = page.locator("a[class='selected']")
 
-    # My profile edit settings page actions.
+    """Actions against the edit profile settings page locators."""
     def get_edit_settings_page_header(self) -> str:
         """Get edit settings page header text"""
         return self._get_text_of_element(self.edit_settings_page_header)
@@ -108,10 +107,6 @@ def is_send_emails_for_private_messages_checkbox_checked(self) -> bool:
         """Check if send emails for private messages checkbox is checked"""
         return self._is_checkbox_checked(self.send_emails_for_private_messages_checkbox)
 
-    def notification_banner_element(self) -> Locator:
-        """Get the notification banner element"""
-        return self.your_settings_have_been_saved_notification_banner
-
     def are_all_checkbox_checked(self) -> bool:
         """Check if all checkboxes are checked"""
         return all([
diff --git a/playwright_tests/pages/user_pages/my_profile_my_questions_page.py b/playwright_tests/pages/user_pages/my_profile_my_questions_page.py
index e5dd71b9f56..9cc72b73177 100644
--- a/playwright_tests/pages/user_pages/my_profile_my_questions_page.py
+++ b/playwright_tests/pages/user_pages/my_profile_my_questions_page.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import Locator, Page
-
+from playwright.sync_api import Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,7 +6,7 @@ class MyProfileMyQuestionsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # My profile my questions page locators.
+        """Locators belonging to the My Questions profile page."""
         self.questions_page_heading = page.locator("h2[class='sumo-page-subheading']")
         self.questions_no_question_message = page.locator("article#profile p")
         self.questions_list = page.locator("article#profile ul a")
@@ -17,15 +16,7 @@ def __init__(self, page: Page):
         self.question_by_name = lambda name: page.locator("article#profile ul a li").get_by_text(
             name, exact=True)
 
-    # My profile my questions page actions.
-    def get_list_of_profile_questions_locators(self) -> Locator:
-        """Returns the locator of the question list."""
-        return self.questions_list
-
-    def get_list_of_profile_no_question_message_locator(self) -> Locator:
-        """Returns the locator of the no question message."""
-        return self.questions_no_question_message
-
+    """Actions against the My Questions profile page locators."""
     def get_text_of_no_question_message(self) -> str:
         """Returns the text of the no question message."""
         return self._get_text_of_element(self.questions_no_question_message)
@@ -42,13 +33,10 @@ def click_on_a_question_by_name(self, question_title: str):
         """Clicks on a question by its title."""
         self._click(self.question_by_name(question_title))
 
-    def get_text_of_first_listed_question(self) -> str:
+    def get_text_of_listed_question_by_index(self, index: int) -> str:
         """Returns the text of the first listed question."""
-        return self._get_element_inner_text_from_page(self.questions_by_index(1))
+        return self._get_element_inner_text_from_page(self.questions_by_index(index))
 
-    def get_listed_question(self, question_name: str) -> Locator:
-        """Returns the locator of a question by its name."""
-        return self.question_by_name(question_name)
 
     def get_all_my_posted_questions(self) -> list[str]:
         """Returns a list of all the posted questions."""
diff --git a/playwright_tests/pages/user_pages/my_profile_page.py b/playwright_tests/pages/user_pages/my_profile_page.py
index ca209de5c6b..b829617fe1d 100644
--- a/playwright_tests/pages/user_pages/my_profile_page.py
+++ b/playwright_tests/pages/user_pages/my_profile_page.py
@@ -1,5 +1,4 @@
-from playwright.sync_api import ElementHandle, Locator, Page
-
+from playwright.sync_api import ElementHandle, Page
 from playwright_tests.core.basepage import BasePage
 
 
@@ -7,11 +6,11 @@ class MyProfilePage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
 
-        # Sidebar locators
+        """Locators belonging to the sidebar."""
         self.user_navbar_options = page.locator("ul#user-nav li a")
         self.user_navbar_selected_element = page.locator("a.selected")
 
-        # Admin/other user actions locators
+        """Locators available for admin & other users."""
         self.edit_user_profile_option = page.locator("div#admin-actions").get_by_role(
             "link").filter(has_text="Edit user profile")
         self.report_abuse_profile_option = page.locator("article#profile").get_by_role(
@@ -21,7 +20,7 @@ def __init__(self, page: Page):
             "input[value='Deactivate this user and mark all content as spam']")
         self.private_message_button = page.locator("p.pm").get_by_role("link")
 
-        # Report Abuse locators
+        """Locators belonging to the 'Report Abuse' section."""
         self.report_abuse_panel = page.locator("section#report-abuse-")
         self.spam_or_other_unrelated_content_option = page.locator("label").filter(
             has_text="Spam or other unrelated content")
@@ -36,7 +35,7 @@ def __init__(self, page: Page):
             "section#report-abuse- button[type='submit']")
         self.reported_user_confirmation_message = page.locator("span[class='message']")
 
-        # Contributions section locators
+        """Locators belonging to the contributions section."""
         self.questions_link = page.locator("section[class='contributions']").get_by_role(
             "link").filter(has_text="question")
         self.answers_link = page.locator("section[class='contributions']").get_by_role(
@@ -46,7 +45,7 @@ def __init__(self, page: Page):
         self.provided_documents_link = page.locator("section[class='contributions']").get_by_role(
             "link").filter(has_text="document")
 
-        # My Profile page details locators
+        """Locators belonging to the My profile page details section."""
         self.page_header = page.locator("h1[class='sumo-page-heading']")
         self.page_subheading = page.locator("article#profile h2[class*='sumo-page-subheading']")
         self.email_address = page.locator("p strong")
@@ -76,19 +75,11 @@ def __init__(self, page: Page):
         self.group_by_name = lambda group_name: page.locator(
             "section[class='groups']").get_by_role("link", name=group_name, exact=True)
 
-    # My profile page actions.
+    """Actions against the My Profile page locators."""
     def get_my_profile_display_name_header_text(self) -> str:
         """Get the display name header text."""
         return self._get_text_of_element(self.display_name_header)
 
-    def get_expected_header_locator(self, expected_username: str) -> Locator:
-        """Get the expected header locator.
-
-        Args:
-            expected_username (str): The expected username
-        """
-        return self.display_name_by_username(expected_username)
-
     def get_my_profile_display_name_username_text(self) -> str:
         """Get the display name username text."""
         return self._get_text_of_element(self.username_info)
@@ -249,18 +240,10 @@ def click_on_private_message_button(self, expected_url=None):
         """
         self._click(self.private_message_button, expected_url=expected_url)
 
-    def publicly_displayed_email_element(self) -> Locator:
-        """Get the locator for the publicly displayed email element."""
-        return self.displayed_email_address
-
     def is_website_information_displayed(self) -> bool:
         """Check if the website information is displayed."""
         return self._is_element_visible(self.website_info)
 
-    def groups_section_element(self) -> Locator:
-        """Get the locator for the groups section."""
-        return self.groups_section
-
     def click_on_a_particular_profile_group(self, group_name: str):
         """Click on a particular profile group.
 
@@ -268,23 +251,3 @@ def click_on_a_particular_profile_group(self, group_name: str):
             group_name (str): The name of the group to click on
         """
         self._click(self.group_by_name(group_name))
-
-    def edit_user_profile_option_element(self) -> Locator:
-        """Get the locator for the edit user profile option."""
-        return self.edit_user_profile_option
-
-    def is_report_user_option_displayed(self) -> Locator:
-        """Get the locator for the report user option."""
-        return self.report_abuse_profile_option
-
-    def is_report_abuse_panel_displayed(self) -> Locator:
-        """Get the locator for the report abuse panel."""
-        return self.report_abuse_panel
-
-    def is_deactivate_this_user_button_displayed(self) -> Locator:
-        """Get the locator for the deactivate this user button."""
-        return self.deactivate_this_user_button
-
-    def deactivate_user_and_mark_content_as_spam_button(self) -> Locator:
-        """Get the locator for the deactivate user and mark content as spam button."""
-        return self.deactivate_this_user_and_mark_all_content_as_spam
diff --git a/playwright_tests/pages/user_pages/my_profile_user_navbar.py b/playwright_tests/pages/user_pages/my_profile_user_navbar.py
index caae85e4f02..59d412c1434 100644
--- a/playwright_tests/pages/user_pages/my_profile_user_navbar.py
+++ b/playwright_tests/pages/user_pages/my_profile_user_navbar.py
@@ -1,11 +1,12 @@
 from playwright.sync_api import Page
-
 from playwright_tests.core.basepage import BasePage
 
 
 class UserNavbar(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
+
+        """Locators belonging to the profile navbar section."""
         self.my_profile_option = page.locator("ul#user-nav").get_by_role(
             "link", name="My profile", exact=True)
         self.edit_my_profile_option = page.locator("ul#user-nav").get_by_role(
@@ -19,7 +20,7 @@ def __init__(self, page: Page):
         self.edit_my_profile_my_questions_option = page.locator("ul#user-nav").get_by_role(
             "link", name="My questions", exact=True)
 
-    # My profile navbar actions.
+    """Actions against the My Profile navbar section."""
     def click_on_my_profile_option(self):
         """Click on my profile option in the navbar."""
         self._click(self.my_profile_option)
diff --git a/playwright_tests/test_data/aaq_question.json b/playwright_tests/test_data/aaq_question.json
index abd1f212ffc..0ced4917cce 100644
--- a/playwright_tests/test_data/aaq_question.json
+++ b/playwright_tests/test_data/aaq_question.json
@@ -1,11 +1,10 @@
 {
   "valid_firefox_question": {
-    "subject": "NVDA does not work with Firefox ",
+    "subject": "Screen Reader Output Not Working on a specific page with Firefox version ",
     "subject_updated": "NVDA does not work with Firefox Updated",
     "topic_value": "Accessibility",
-    "question_body": "'''I have a problem''' when I ''access'', the following link: [https://www.mediafax.ro adipiscing], the Firefox browser is unable to output the messages coming from the screen reader. I've tried reading the following article: [[Stage test owl|sed]] but it doesn't help me understand what is the root cause and how can I fix the missing content. Can somebody please help me with this accessibility issue?",
+    "question_body": "I'm experiencing an accessibility '''issue''' when ''accessing'', the following link: [https://www.mozilla.org/en-US/ adipiscing]. When I open the page in Firefox, the browser does not output any of the messages from my screen reader. I've reviewed the following article: [[Stage test owl|sed]] but it didn't clarify what might be causing the problem or how to resolve the missing content. I'm not sure whether this is an issue with the webpage, the browser or my screen reader configuration. Could someone help me identify the root cause and suggest how to fix this accessibility issue?",
     "body_updated": "I have a problem when I access, any links on the internet, the Firefox browser is unable to output the messages coming from the screen reader. I've tried reading an article but it doesn't help me understand what is the root cause and how can I fix the missing content. Can somebody please help me with this accessibility issue? Updated",
-    "simple_body_text": "Firefox doesn't work in combination with the NVDA screen reader",
     "image_name": "test.image.jpg",
     "image_path": "test_data/test-image.png",
     "question_reply": "Test reply to question",
@@ -127,4 +126,4 @@
       "default_slug": "focus-firefox"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/playwright_tests/test_data/add_kb_article.json b/playwright_tests/test_data/add_kb_article.json
index 09251fd425e..ddb5497c54c 100644
--- a/playwright_tests/test_data/add_kb_article.json
+++ b/playwright_tests/test_data/add_kb_article.json
@@ -1,10 +1,18 @@
 {
   "kb_article_title": "Automation test article ",
   "kb_template_title": "Template: Automation test article",
-  "kb_template_category": "Templates",
   "updated_kb_article_title": "Updated test article",
   "different_slug": "different-slug-",
-  "category_options": "Troubleshooting",
+  "category_options": {
+      "10": "Troubleshooting",
+      "20": "How To",
+      "30": "How to contribute",
+      "40": "Administration",
+      "50": "Navigation",
+      "60": "Templates",
+      "70": "Canned Responses",
+      "ro-translation-category": "Depanare"
+  },
   "relevant_to_product": "Firefox",
   "selected_parent_topic": "Accounts",
   "selected_child_topic": "Profiles",
diff --git a/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_aaq_form_page.py b/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_aaq_form_page.py
index b7e638ec2c9..6a9e79896f1 100644
--- a/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_aaq_form_page.py
+++ b/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_aaq_form_page.py
@@ -18,7 +18,6 @@
 @pytest.mark.aaqPage
 def test_community_card_and_helpful_tip_are_displayed_for_freemium_product(page: Page,
                                                                            create_user_factory):
-
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -32,9 +31,9 @@ def test_community_card_and_helpful_tip_are_displayed_for_freemium_product(page:
                 utilities.aaq_question_test_data["products_aaq_url"][freemium_product]
             )
 
-            with allure.step(f"Verifying that the helpful tip card is displayed for the "
-                             f"{freemium_product} product"):
-                expect(sumo_pages.aaq_form_page.get_helpful_tip_locator()).to_be_visible()
+            with check, allure.step(f"Verifying that the helpful tip card is displayed for the "
+                                    f"{freemium_product} product"):
+                expect(sumo_pages.aaq_form_page.helpful_tip_section).to_be_visible()
 
             with allure.step("Clicking on the 'Learn More' button from the community help "
                              "card and verifying that we are on the contribute messages page"):
@@ -60,32 +59,27 @@ def test_community_card_and_helpful_tip_not_displayed_for_premium_products(page:
                 utilities.aaq_question_test_data["products_aaq_url"][premium_product]
             )
 
-            with allure.step(f"Verifying that the helpful tip options is displayed for the "
-                             f"{premium_product}"):
-                expect(sumo_pages.aaq_form_page.get_helpful_tip_locator()).to_be_hidden()
+            with check, allure.step(f"Verifying that the helpful tip options is not displayed for"
+                                    f" the {premium_product}"):
+                expect(sumo_pages.aaq_form_page.helpful_tip_section).to_be_hidden()
 
             with allure.step("Verifying that the 'Learn More' button from the community help "
                              "banner is not displayed"):
-                expect(sumo_pages.common_web_elements.get_learn_more_button_locator()
-                       ).to_be_hidden()
+                expect(sumo_pages.common_web_elements.learn_more_button).to_be_hidden()
 
 
 # C1511570
 @pytest.mark.aaqPage
-@pytest.mark.parametrize("user_type", ['', 'Simple user', 'Forum Moderator'])
-def test_scam_banner_premium_products_not_displayed(page: Page, user_type,
-                                                    create_user_factory):
+@pytest.mark.parametrize("user_type", ['','Simple User', 'Forum Moderator'])
+def test_scam_banner_premium_products_not_displayed(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory(groups=["Forum Moderators"])
+    user_map = {'Simple User': test_user, 'Forum Moderator': test_user_two}
 
-    if user_type == "Simple user":
-        with allure.step("Singing in a simple user"):
-            utilities.start_existing_session(cookies=test_user)
-    elif user_type == "Forum Moderator":
-        with allure.step("Signing in with a Forum Moderator"):
-            utilities.start_existing_session(cookies=test_user_two)
+    with allure.step("Signing in to SUMO"):
+        utilities.start_existing_session(cookies=user_map.get(user_type))
 
     with allure.step("Navigating to each premium product solutions page"):
         for premium_product in utilities.general_test_data["premium_products"]:
@@ -93,9 +87,9 @@ def test_scam_banner_premium_products_not_displayed(page: Page, user_type,
                 utilities.general_test_data["product_solutions"][premium_product]
             )
 
-            with allure.step(f"Verifying that the sam banner is not displayed for "
-                             f"{premium_product} card"):
-                expect(sumo_pages.product_solutions_page.get_scam_banner_locator()).to_be_hidden()
+            with check, allure.step(f"Verifying that the sam banner is not displayed for "
+                                    f"{premium_product} card"):
+                expect(sumo_pages.product_solutions_page.support_scams_banner).to_be_hidden()
 
             if user_type != '':
                 with allure.step("Clicking on the Ask Now button and verifying that the scam "
@@ -104,26 +98,22 @@ def test_scam_banner_premium_products_not_displayed(page: Page, user_type,
                     utilities.wait_for_url_to_be(
                         utilities.aaq_question_test_data["products_aaq_url"][premium_product]
                     )
-                    expect(sumo_pages.product_solutions_page.get_scam_banner_locator()
-                           ).to_be_hidden()
+                    expect(sumo_pages.product_solutions_page.support_scams_banner).to_be_hidden()
 
 
 # C2190040
 @pytest.mark.aaqPage
-@pytest.mark.parametrize("user_type", ['', 'Simple user', 'Forum Moderator'])
+@pytest.mark.parametrize("user_type", ['', 'Simple User', 'Forum Moderator'])
 def test_scam_banner_for_freemium_products_is_displayed(page: Page, user_type,
                                                         create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory(groups=["Forum Moderators"])
+    user_map = {'Simple User': test_user, 'Forum Moderator': test_user_two}
 
-    if user_type == "Simple user":
-        with allure.step("Signing in with a simple user"):
-            utilities.start_existing_session(cookies=test_user)
-    elif user_type == "Forum Moderator":
-        with allure.step("Signing in with a Forum Moderator"):
-            utilities.start_existing_session(cookies=test_user_two)
+    with allure.step("Sign in to SUMO"):
+        utilities.start_existing_session(cookies=user_map.get(user_type))
 
     with allure.step("Navigating to each freemium product solutions page"):
         for freemium_product in utilities.general_test_data["freemium_products"]:
@@ -149,8 +139,7 @@ def test_scam_banner_for_freemium_products_is_displayed(page: Page, user_type,
 
 # T5696596
 @pytest.mark.aaqPage
-def test_corresponding_aaq_product_name_and_image_are_displayed(page: Page,
-                                                                create_user_factory):
+def test_corresponding_aaq_product_name_and_image_are_displayed(page: Page, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -165,12 +154,12 @@ def test_corresponding_aaq_product_name_and_image_are_displayed(page: Page,
 
             # This needs to change when we add the Mozilla Account icon/product.
             if product != "Mozilla Account":
-                with allure.step("Verifying that the product image is displayed"):
-                    expect(sumo_pages.aaq_form_page.get_product_image_locator()).to_be_visible()
+                with check, allure.step("Verifying that the product image is displayed"):
+                    expect(sumo_pages.aaq_form_page.aaq_page_logo).to_be_visible()
             else:
-                with allure.step("Verifying that the product image is hidden for Mozilla "
-                                 "Account product"):
-                    expect(sumo_pages.aaq_form_page.get_product_image_locator()).to_be_visible()
+                with check, allure.step("Verifying that the product image is hidden for Mozilla "
+                                        "Account product"):
+                    expect(sumo_pages.aaq_form_page.aaq_page_logo).to_be_visible()
 
             with check, allure.step("Verifying that the correct product header is displayed"):
                 assert sumo_pages.aaq_form_page.get_aaq_form_page_heading() == product
@@ -196,13 +185,12 @@ def test_progress_milestone_redirect(page: Page, create_user_factory):
                 assert sumo_pages.aaq_form_page.get_in_progress_item_label(
                 ) == AAQFormMessages.IN_PROGRESS_MILESTONE
 
-            with allure.step(f"Clicking on the {AAQFormMessages.COMPLETED_MILESTONE_TWO} "
-                             f"milestone and verifying that we are on the correct product "
-                             f"solutions page"):
+            with check, allure.step(f"Clicking on the {AAQFormMessages.COMPLETED_MILESTONE_TWO} "
+                                    f"milestone and verifying that we are on the correct product "
+                                    f"solutions page"):
                 sumo_pages.aaq_form_page.click_on_a_particular_completed_milestone(
                     AAQFormMessages.COMPLETED_MILESTONE_TWO)
-                expect(page).to_have_url(
-                    utilities.general_test_data["product_solutions"][product])
+                expect(page).to_have_url(utilities.general_test_data["product_solutions"][product])
 
             with allure.step(f"Navigating back to the aaq form and clicking on the "
                              f"{AAQFormMessages.COMPLETED_MILESTONE_ONE} milestone"):
@@ -231,8 +219,7 @@ def test_aaq_form_cancel_button_freemium_products(page: Page, create_user_factor
             with allure.step("Adding data inside the AAQ form fields and clicking on the "
                              "cancel button"):
                 sumo_pages.aaq_flow.add__valid_data_to_all_aaq_fields_without_submitting(
-                    subject=utilities.aaq_question_test_data["valid_firefox_question"]
-                    ["subject"],
+                    subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
                     topic_value=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
                     body_text=utilities.aaq_question_test_data["valid_firefox_question"]
                     ["question_body"]
@@ -241,20 +228,17 @@ def test_aaq_form_cancel_button_freemium_products(page: Page, create_user_factor
 
             with allure.step("Verifying that we are redirected back to the correct product "
                              "solutions page"):
-                expect(page).to_have_url(
-                    utilities.general_test_data["product_solutions"][product])
+                expect(page).to_have_url(utilities.general_test_data["product_solutions"][product])
 
             with check, allure.step("Navigating back to the My Profile page and verifying "
-                                    "that the correct number of posted questions is "
-                                    "displayed"):
+                                    "that the correct number of posted questions is displayed"):
                 sumo_pages.top_navbar.click_on_view_profile_option()
                 expect(sumo_pages.my_profile_page.questions_link).to_be_hidden()
 
 
 # T5696597, T5696601, T5696602
 @pytest.mark.aaqPage
-def test_post_aaq_questions_for_all_freemium_products_topics(page: Page,
-                                                             create_user_factory):
+def test_post_aaq_questions_for_all_freemium_products_topics(page: Page, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
@@ -304,7 +288,7 @@ def test_post_aaq_questions_for_all_freemium_products_topics(page: Page,
                                  "that the posted question is displayed inside the 'My "
                                  "Questions page"):
                     sumo_pages.question_page.click_on_my_questions_banner_option()
-                    expect(sumo_pages.my_questions_page.get_listed_question(
+                    expect(sumo_pages.my_questions_page.question_by_name(
                         question_info['aaq_subject'])).to_be_visible()
 
                 with allure.step(f"Navigating back to the {product} product aa form"):
@@ -337,8 +321,7 @@ def test_share_firefox_data_functionality(page: Page, create_user_factory):
         sumo_pages.aaq_flow.add__valid_data_to_all_aaq_fields_without_submitting(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_value=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body_text=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["question_body"]
+            body_text=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"]
         )
 
     with allure.step("Adding text inside the troubleshooting information field and "
@@ -355,15 +338,13 @@ def test_share_firefox_data_functionality(page: Page, create_user_factory):
     with allure.step("Verifying that the troubleshooting information is displayed"):
         sumo_pages.question_page.click_on_question_details_button()
         sumo_pages.question_page.click_on_more_system_details_option()
-        expect(
-            sumo_pages.question_page.get_more_information_with_text_locator(
-                utilities.aaq_question_test_data["troubleshooting_information"]
-            )
-        ).to_be_visible()
+        expect(sumo_pages.question_page.more_information_with_text(
+            utilities.aaq_question_test_data["troubleshooting_information"])).to_be_visible()
 
-    with allure.step("Closing the additional details panel and deleting the posted question"):
+    with allure.step("Closing the additional details panel and verifying that the panel is no "
+                     "longer displayed"):
         sumo_pages.question_page.click_on_the_additional_system_panel_close()
-        sumo_pages.aaq_flow.deleting_question_flow()
+        expect(sumo_pages.question_page.more_system_details_modal).to_be_hidden()
 
 
 @pytest.mark.aaqPage
@@ -382,8 +363,7 @@ def test_additional_system_details_user_agent_information(page: Page, create_use
 
             with allure.step(f"Submitting a question for the {product} product"):
                 sumo_pages.aaq_flow.submit_an_aaq_question(
-                    subject=utilities.aaq_question_test_data["valid_firefox_question"]
-                    ["subject"],
+                    subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
                     topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
                     body=utilities.aaq_question_test_data["valid_firefox_question"]
                     ["question_body"],
@@ -431,12 +411,10 @@ def test_system_details_information(page: Page, create_user_factory):
                                  "product version and OS fields"):
                     sumo_pages.aaq_form_page.click_on_show_details_option()
                     sumo_pages.aaq_form_page.add_text_to_product_version_field(
-                        utilities.aaq_question_test_data[
-                            "troubleshoot_product_and_os_versions"][1]
+                        utilities.aaq_question_test_data["troubleshoot_product_and_os_versions"][1]
                     )
                     sumo_pages.aaq_form_page.add_text_to_os_field(
-                        utilities.aaq_question_test_data[
-                            "troubleshoot_product_and_os_versions"][0]
+                        utilities.aaq_question_test_data["troubleshoot_product_and_os_versions"][0]
                     )
 
                 with check, allure.step("Submitting the AAQ question and verifying that the "
@@ -453,9 +431,6 @@ def test_system_details_information(page: Page, create_user_factory):
                     assert sumo_pages.question_page.get_system_details_information(
                     ) == troubleshooting_info
 
-                with allure.step("Deleting the posted question"):
-                    sumo_pages.aaq_flow.deleting_question_flow()
-
 
 # T5696704
 @pytest.mark.aaqPage
diff --git a/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_anti_spam_measures.py b/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_anti_spam_measures.py
index ed495d462ba..2df56c92941 100644
--- a/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_anti_spam_measures.py
+++ b/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_anti_spam_measures.py
@@ -2,7 +2,6 @@
 import pytest
 from playwright.sync_api import Page
 from pytest_check import check
-
 from playwright_tests.core.utilities import Utilities
 from playwright_tests.messages.ask_a_question_messages.AAQ_messages.question_page_messages import (
     QuestionPageMessages,
@@ -13,7 +12,7 @@
 
 # C946237
 @pytest.mark.antiSpamTests
-@pytest.mark.parametrize("user_type", ['', 'Simple user'])
+@pytest.mark.parametrize("user_type", ['', 'Simple User'])
 def test_anti_spam_banner(page: Page, user_type, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
@@ -27,8 +26,7 @@ def test_anti_spam_banner(page: Page, user_type, create_user_factory):
         question_info_one = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["simple_body_text"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -38,8 +36,8 @@ def test_anti_spam_banner(page: Page, user_type, create_user_factory):
     else:
         utilities.delete_cookies()
 
-    with allure.step("Navigating to each available product support forum and verifying that the "
-                     "scam banner is displayed"):
+    with check, allure.step("Navigating to each available product support forum and verifying that"
+                            " the scam banner is displayed"):
         for product, url in utilities.general_test_data["product_forums"].items():
             utilities.navigate_to_link(url)
             assert sumo_pages.common_web_elements.get_scam_banner_text() == (
@@ -70,8 +68,7 @@ def test_valid_tld_in_question_comment(page: Page, create_user_factory):
         sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["simple_body_text"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -82,8 +79,7 @@ def test_valid_tld_in_question_comment(page: Page, create_user_factory):
 
     with allure.step("Leaving a comment with an invalid TLD"):
         reply_one = sumo_pages.aaq_flow.post_question_reply_flow(
-            repliant_username=test_user_two["username"],
-            reply=invalid_tld
+            repliant_username=test_user_two["username"], reply=invalid_tld
         )
 
     with check, allure.step("Verifying that the invalid TLD comment is not marked as spam "
@@ -93,8 +89,7 @@ def test_valid_tld_in_question_comment(page: Page, create_user_factory):
 
     with allure.step("Leaving a comment with a valid TLD"):
         sumo_pages.aaq_flow.post_question_reply_flow(
-            repliant_username=test_user_two["username"],
-            reply=valid_tld
+            repliant_username=test_user_two["username"], reply=valid_tld
         )
 
     with check, allure.step("Verifying that the valid TLD comment is marked as spam and the "
diff --git a/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_posted_questions.py b/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_posted_questions.py
index 59cf9a3a8ad..9042ebccc58 100644
--- a/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_posted_questions.py
+++ b/playwright_tests/tests/ask_a_question_tests/aaq_tests/test_posted_questions.py
@@ -19,7 +19,7 @@
 
 # C2191086, C2191094, C2191263,  C2191263, C2191087, C2191088
 @pytest.mark.postedQuestions
-@pytest.mark.parametrize("user_type", ['simple user', ''])
+@pytest.mark.parametrize("user_type", ['Simple User', ''])
 def test_posted_question_details(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
@@ -34,10 +34,10 @@ def test_posted_question_details(page: Page, user_type, create_user_factory):
         utilities.delete_cookies()
 
     with allure.step("Verifying that the scam banner is displayed"):
-        expect(sumo_pages.product_solutions_page.get_scam_banner_locator()).to_be_visible()
+        expect(sumo_pages.product_solutions_page.support_scams_banner).to_be_visible()
 
     with allure.step("Verifying that the still need help banner is displayed"):
-        expect(sumo_pages.common_web_elements.get_still_need_help_locator()).to_be_visible()
+        expect(sumo_pages.common_web_elements.still_need_help_subheading).to_be_visible()
 
     with check, allure.step("Verifying that the Learn More button contains the correct link"):
         assert sumo_pages.product_solutions_page.get_scam_alert_banner_link(
@@ -46,8 +46,8 @@ def test_posted_question_details(page: Page, user_type, create_user_factory):
     with allure.step("Signing in with a Forum Moderator and verifying that the scam banner is "
                      "displayed and the still need help banner is displayed"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.product_solutions_page.get_scam_banner_locator()).to_be_visible()
-        expect(sumo_pages.common_web_elements.get_still_need_help_locator()).to_be_visible()
+        expect(sumo_pages.product_solutions_page.support_scams_banner).to_be_visible()
+        expect(sumo_pages.common_web_elements.still_need_help_subheading).to_be_visible()
 
     with check, allure.step("Verifying that the Learn More button contains the correct link"):
         assert sumo_pages.product_solutions_page.get_scam_alert_banner_link(
@@ -68,28 +68,26 @@ def test_edit_this_question_functionality_not_signed_in(page: Page, create_user_
     with allure.step("Deleting user session and verifying that the 'edit this question' nav "
                      "option is not available"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.get_edit_this_question_option_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.edit_this_question_option).to_be_hidden()
 
     with allure.step("Navigating to the edit endpoint and verifying that the user is "
                      "redirected to the auth page"):
         utilities.navigate_to_link(
             utilities.get_page_url() + QuestionPageMessages.EDIT_QUESTION_URL_ENDPOINT
         )
-        assert (
-            FxAPageMessages.AUTH_PAGE_URL in utilities.get_page_url()
-        )
+        assert FxAPageMessages.AUTH_PAGE_URL in utilities.get_page_url()
 
 
-# C2191262, C2436105,  C2191263
+# C2191262, C2436105, C2191263
 # To add image tests
 @pytest.mark.postedQuestions
 @pytest.mark.parametrize("user_type", ['Simple User', 'Forum Moderator'])
-def test_cancel_edit_this_question_functionality(page: Page, user_type,
-                                                 create_user_factory):
+def test_cancel_edit_this_question_functionality(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_three = create_user_factory(groups=["Forum Moderators"])
+
     with allure.step("Signing in with a simple user account and posting a Firefox product "
                      "question"):
         posted_question = post_firefox_product_question_flow(page, test_user)
@@ -112,8 +110,7 @@ def test_cancel_edit_this_question_functionality(page: Page, user_type,
 
     with allure.step("Editing the question with new data"):
         sumo_pages.aaq_flow.editing_question_flow(
-            subject=utilities.aaq_question_test_data['valid_firefox_question']
-            ['subject_updated'],
+            subject=utilities.aaq_question_test_data['valid_firefox_question']['subject_updated'],
             body=utilities.aaq_question_test_data['valid_firefox_question']['body_updated'],
             troubleshoot=utilities.aaq_question_test_data['troubleshooting_information'],
             submit_edit=False
@@ -122,24 +119,22 @@ def test_cancel_edit_this_question_functionality(page: Page, user_type,
     with check, allure.step("Clicking on the 'Cancel' button and verifying that the modified "
                             "text is not displayed"):
         sumo_pages.aaq_form_page.click_aaq_form_cancel_button()
-        expect(sumo_pages.question_page.get_modified_question_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.modified_question_section).to_be_hidden()
         assert sumo_pages.question_page.get_question_header(
         ) == posted_question['question_details']['aaq_subject']
         assert sumo_pages.question_page.get_question_body(
-        ) == posted_question['question_details']['question_body'] + '\n'
+        ) == utilities.strip_wiki_syntax(posted_question['question_details']['question_body']
+                                         ) + "\n"
 
     if user_type == 'Simple User':
         with allure.step("Verifying that the additional question details option is hidden"):
-            expect(sumo_pages.question_page.get_question_details_button_locator()).to_be_hidden()
+            expect(sumo_pages.question_page.question_details_button).to_be_hidden()
     elif user_type == "Forum Moderator":
         with allure.step("Verifying that the more information section from the 'More System "
                          "Details' is not displayed"):
             sumo_pages.question_page.click_on_question_details_button()
             sumo_pages.question_page.click_on_more_system_details_option()
-            expect(sumo_pages.question_page.get_more_information_locator()).to_be_hidden()
-
-        with allure.step("Closing the more information panel"):
-            sumo_pages.question_page.click_on_the_additional_system_panel_close()
+            expect(sumo_pages.question_page.more_information_panel_header).to_be_hidden()
 
 
 # C2191263
@@ -156,15 +151,14 @@ def test_edit_other_user_question_non_admin(page: Page, create_user_factory):
     with allure.step("Signing in with a non Forum Moderator user account and verifying that the "
                      "'Edit this question' option is not available"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.question_page.get_edit_this_question_option_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.edit_this_question_option).to_be_hidden()
 
     with check, allure.step("Manually navigating to the '/edit' endpoint and verifying that "
                             "403 is returned"):
         with page.expect_navigation() as navigation_info:
-            utilities.navigate_to_link(
-                posted_question['question_details']
-                ['question_page_url'] + QuestionPageMessages.
-                EDIT_QUESTION_URL_ENDPOINT)
+            utilities.navigate_to_link(posted_question['question_details']
+                                       ['question_page_url'] + QuestionPageMessages.
+                                       EDIT_QUESTION_URL_ENDPOINT)
         response = navigation_info.value
         assert response.status == 403
 
@@ -200,12 +194,11 @@ def test_edit_this_question_functionality(page: Page, user_type, create_user_fac
                             "modified text is displayed and the username is displayed inside"
                             " the modified text"):
         sumo_pages.aaq_flow.editing_question_flow(
-            subject=utilities.aaq_question_test_data['valid_firefox_question']
-            ['subject_updated'],
+            subject=utilities.aaq_question_test_data['valid_firefox_question']['subject_updated'],
             body=utilities.aaq_question_test_data['valid_firefox_question']['body_updated'],
             troubleshoot=utilities.aaq_question_test_data['troubleshooting_information']
         )
-        expect(sumo_pages.question_page.get_modified_question_locator()).to_be_visible()
+        expect(sumo_pages.question_page.modified_question_section).to_be_visible()
 
         username = (test_user["username"] if user_type == "Simple User" else test_user_two
                     ["username"])
@@ -217,18 +210,14 @@ def test_edit_this_question_functionality(page: Page, user_type, create_user_fac
 
     if user_type == 'Simple User':
         with allure.step("Verifying that the additional question details option is hidden"):
-            expect(sumo_pages.question_page.get_question_details_button_locator()).to_be_hidden()
+            expect(sumo_pages.question_page.question_details_button).to_be_hidden()
     else:
         with allure.step("Verifying that the more information section displays the updated "
                          "information"):
             sumo_pages.question_page.click_on_question_details_button()
             sumo_pages.question_page.click_on_more_system_details_option()
-            expect(sumo_pages.question_page.get_more_information_with_text_locator(
-                utilities.aaq_question_test_data['troubleshooting_information']
-            )
-            ).to_be_visible()
-
-        sumo_pages.question_page.click_on_the_additional_system_panel_close()
+            expect(sumo_pages.question_page.more_information_with_text(
+                utilities.aaq_question_test_data['troubleshooting_information'])).to_be_visible()
 
 
 # T5696750, T5696779, T5696752
@@ -250,7 +239,7 @@ def test_delete_question_cancel_button(page: Page, create_user_factory):
     with allure.step("Navigating to the posted question by a different user an verifying "
                      "that the 'Delete this question' option is not available"):
         utilities.navigate_to_link(posted_question_one['question_details']['question_page_url'])
-        expect(sumo_pages.question_page.get_delete_this_question_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.delete_this_question_option).to_be_hidden()
 
     with check, allure.step("Manually navigating to the delete endpoint and verifying that "
                             "403 is returned"):
@@ -264,7 +253,7 @@ def test_delete_question_cancel_button(page: Page, create_user_factory):
     with allure.step("Navigating to the posted question by self and verifying that the "
                      "'Delete this question' option is not available"):
         utilities.navigate_to_link(posted_question_two['question_details']['question_page_url'])
-        expect(sumo_pages.question_page.get_delete_this_question_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.delete_this_question_option).to_be_hidden()
 
     with check, allure.step("Manually navigating to the delete endpoint and verifying that "
                             "403 is returned"):
@@ -307,8 +296,7 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
         question_info_two = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["simple_body_text"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -319,11 +307,11 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
     if status == "locked":
         with allure.step("Verifying that the 'Lock this question' option is not available for "
                          "other posted questions"):
-            expect(sumo_pages.question_page.get_lock_this_question_locator()).to_be_hidden()
+            expect(sumo_pages.question_page.lock_this_question_option).to_be_hidden()
     elif status == "archived":
         with allure.step("Verifying that the 'Archive this question' option is not available "
                          "for other posted questions"):
-            expect(sumo_pages.question_page.get_archive_this_question_locator()).to_be_hidden()
+            expect(sumo_pages.question_page.archive_this_question_option).to_be_hidden()
 
     with allure.step("Navigating to the question posted by self"):
         utilities.navigate_to_link(question_info_two['question_page_url'])
@@ -331,11 +319,11 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
     if status == "locked":
         with allure.step("Verifying that the 'Lock this question is not available for self "
                          "posted questions"):
-            expect(sumo_pages.question_page.get_lock_this_question_locator()).to_be_hidden()
+            expect(sumo_pages.question_page.lock_this_question_option).to_be_hidden()
     elif status == "archived":
         with allure.step("Verifying that the 'Archive this question' is not available for "
                          "self posted questions"):
-            expect(sumo_pages.question_page.get_archive_this_question_locator()).to_be_hidden()
+            expect(sumo_pages.question_page.archive_this_question_option).to_be_hidden()
 
     with allure.step("Signing in with a superuser account"):
         utilities.start_existing_session(
@@ -372,32 +360,32 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
 
     if status == "locked":
         with allure.step("Verifying that the 'Unlock this question option' is not available'"):
-            expect(sumo_pages.question_page.get_lock_this_question_locator()).to_be_hidden()
+            expect(sumo_pages.question_page.lock_this_question_option).to_be_hidden()
     elif status == "archived":
         with allure.step("Verifying that the 'Archive this question' options is not "
                          "available"):
-            expect(sumo_pages.question_page.get_archive_this_question_locator()).to_be_hidden()
+            expect(sumo_pages.question_page.archive_this_question_option).to_be_hidden()
 
     with allure.step("Verifying that the post a reply textarea field is not displayed"):
-        expect(sumo_pages.question_page.get_post_a_reply_textarea_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.post_a_reply_textarea).to_be_hidden()
 
     with allure.step("Verifying that the 'needs more information from the user' checkbox is "
                      "not displayed"):
-        expect(sumo_pages.question_page.get_needs_more_information_checkbox_locator()
+        expect(sumo_pages.question_page.needs_more_information_from_the_user_checkbox
                ).to_be_hidden()
 
     with allure.step("Verifying that the 'Add images section is not displayed'"):
-        expect(sumo_pages.question_page.get_add_image_section_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.add_image_button).to_be_hidden()
 
     with allure.step("Signing in with a superuser account and verifying that the 'needs more"
                      " information from the user' checkbox is available"):
         utilities.start_existing_session(
             session_file_name=utilities.username_extraction_from_email(utilities.staff_user))
-        expect(sumo_pages.question_page.get_needs_more_information_checkbox_locator()
+        expect(sumo_pages.question_page.needs_more_information_from_the_user_checkbox
                ).to_be_visible()
 
     with allure.step("Verifying that the 'Add images' section is available"):
-        expect(sumo_pages.question_page.get_add_image_section_locator()).to_be_visible()
+        expect(sumo_pages.question_page.add_image_button).to_be_visible()
 
     with allure.step("Submitting a reply to the question and verifying that the posted reply "
                      "is visible"):
@@ -405,12 +393,12 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
             repliant_username=utilities.username_extraction_from_email(utilities.staff_user),
             reply=utilities.aaq_question_test_data['valid_firefox_question']['question_reply']
         )
-        expect(sumo_pages.question_page.get_posted_reply_locator(reply_id)).to_be_visible()
+        expect(sumo_pages.question_page.question(reply_id)).to_be_visible()
 
     with allure.step("Signing in with a normal user account and verifying that the admin's "
                      "reply is visible"):
         utilities.start_existing_session(test_user)
-        expect(sumo_pages.question_page.get_posted_reply_locator(reply_id)).to_be_visible()
+        expect(sumo_pages.question_page.question(reply_id)).to_be_visible()
 
     with allure.step("Signing in with a superuser account"):
         utilities.start_existing_session(
@@ -426,7 +414,7 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
     with allure.step("Signing in with a non-admin account and verifying that the 'Thread "
                      "locked' banner is not displayed"):
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.question_page.get_thread_locked_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.lock_this_thread_banner).to_be_hidden()
 
     with allure.step("Submitting a reply to the question and verifying that the posted reply "
                      "is visible"):
@@ -434,7 +422,7 @@ def test_lock_and_archive_this_question(page: Page, status, create_user_factory)
             repliant_username=test_user["username"],
             reply=utilities.aaq_question_test_data['valid_firefox_question']['question_reply']
         )
-        expect(sumo_pages.question_page.get_posted_reply_locator(reply_id_two)).to_be_visible()
+        expect(sumo_pages.question_page.question(reply_id_two)).to_be_visible()
 
 
 # T5696750, T5696783, T5696752, T5696764
@@ -455,8 +443,7 @@ def test_subscribe_to_feed_option(page: Page, is_firefox, create_user_factory):
         question_info_one = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["simple_body_text"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -469,8 +456,7 @@ def test_subscribe_to_feed_option(page: Page, is_firefox, create_user_factory):
         question_info_two = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["simple_body_text"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -581,12 +567,12 @@ def test_mark_as_spam_functionality(page: Page, create_user_factory):
     with allure.step("Deleting user session and verifying that the 'Mark as spam' option is "
                      "not displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.get_mark_as_spam_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.mark_as_spam_option).to_be_hidden()
 
     with allure.step("Signing in with a user account and verifying that the 'Mark as spam' option"
                      " is not displayed"):
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.question_page.get_mark_as_spam_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.mark_as_spam_option).to_be_hidden()
 
     with check, allure.step("Signing in with a Forum Moderator account, clicking on the 'mark as "
                             "spam' option and verifying that the correct spam banner message"
@@ -617,17 +603,17 @@ def test_mark_as_spam_functionality(page: Page, create_user_factory):
                      "option and verifying that the 'Mark as spam' banner is not displayed"):
         utilities.start_existing_session(cookies=test_user_two)
         sumo_pages.question_page.click_on_mark_as_spam_option()
-        expect(sumo_pages.question_page.get_marked_as_spam_banner_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.marked_as_spam_banner).to_be_hidden()
 
     with allure.step("Deleting the user session and verifying that the 'Marked as spam' "
                      "banner is not displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.get_marked_as_spam_banner_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.marked_as_spam_banner).to_be_hidden()
 
     with allure.step("Signing in with user account and verifying that the 'Marked as spam'"
                      " banner is not displayed"):
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.question_page.get_marked_as_spam_banner_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.marked_as_spam_banner).to_be_hidden()
 
 
 # T5696756, T5696758, T5696760
@@ -645,7 +631,7 @@ def test_question_topics(page: Page, user_type, create_user_factory):
         posted_question = post_firefox_product_question_flow(page, test_user_three)
 
     with allure.step("Verifying that Tags cannot be added by OP user"):
-        expect(sumo_pages.question_page.get_add_a_tag_input_field()).to_be_hidden()
+        expect(sumo_pages.question_page.add_a_tag_input_field).to_be_hidden()
 
     with allure.step("Deleting user session"):
         utilities.delete_cookies()
@@ -656,11 +642,11 @@ def test_question_topics(page: Page, user_type, create_user_factory):
 
     with allure.step("Verifying that the 'Add a tag' input field is not displayed for "
                      "permissionless accounts"):
-        expect(sumo_pages.question_page.get_add_a_tag_input_field()).to_be_hidden()
+        expect(sumo_pages.question_page.add_a_tag_input_field).to_be_hidden()
 
     with allure.step("Verifying that the remove tag button is not displayed"):
         for tag in sumo_pages.question_page.get_question_tag_options(is_moderator=False):
-            expect(sumo_pages.question_page.get_remove_tag_button_locator(tag)).to_be_hidden()
+            expect(sumo_pages.question_page.delete_tag(tag)).to_be_hidden()
 
     with allure.step("Signing in with a Forum Moderator account, adding data inside the 'Add a "
                      "tag' input field"):
@@ -712,7 +698,7 @@ def test_question_topics(page: Page, user_type, create_user_factory):
         utilities.wait_for_given_timeout(1000)
 
     with allure.step("Verifying that the tag was removed"):
-        expect(sumo_pages.question_page.get_a_certain_tag(
+        expect(sumo_pages.question_page.tag(
             utilities.aaq_question_test_data['valid_firefox_question']['custom_tag']
         )
         ).to_be_hidden()
@@ -725,7 +711,7 @@ def test_question_topics(page: Page, user_type, create_user_factory):
             utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Verifying that the tag was removed"):
-        expect(sumo_pages.question_page.get_a_certain_tag(
+        expect(sumo_pages.question_page.tag(
             utilities.aaq_question_test_data['valid_firefox_question']['custom_tag']
         )
         ).to_be_hidden()
@@ -747,17 +733,17 @@ def test_email_updates_option_visibility(page: Page, create_user_factory):
     with allure.step("Deleting user session and verifying that the 'Get  email updates' "
                      "option is displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.get_email_updates_option()).to_be_visible()
+        expect(sumo_pages.question_page.stop_email_updates_option).to_be_visible()
 
     with allure.step("Signing in with another user account and verifying that the 'Get email"
                      " updates' option is displayed"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.question_page.get_email_updates_option()).to_be_visible()
+        expect(sumo_pages.question_page.stop_email_updates_option).to_be_visible()
 
     with allure.step("Signing in with a Forum Moderator and verifying that the 'Get email "
                      "updated' options is displayed"):
         utilities.start_existing_session(cookies=test_user_three)
-        expect(sumo_pages.question_page.get_email_updates_option()).to_be_visible()
+        expect(sumo_pages.question_page.stop_email_updates_option).to_be_visible()
 
     with allure.step("Deleting the posted question"):
         sumo_pages.aaq_flow.deleting_question_flow()
@@ -794,14 +780,14 @@ def test_mark_reply_as_spam(page: Page, create_user_factory):
     with allure.step("Clicking on the self reply menu and verifying that the 'mark as spam' "
                      "option is not displayed for non-admin users"):
         sumo_pages.question_page.click_on_reply_more_options_button(reply_id_two)
-        expect(sumo_pages.question_page.get_mark_as_spam_reply_locator(reply_id_two)
+        expect(sumo_pages.question_page.mark_reply_as_spam(reply_id_two)
                ).to_be_hidden()
         sumo_pages.question_page.click_on_reply_more_options_button(reply_id_two)
 
     with allure.step("Clicking on other user posted reply menu and verifying that the 'mark "
                      "as spam' option is not displayed for non-admin users"):
         sumo_pages.question_page.click_on_reply_more_options_button(reply_id_one)
-        expect(sumo_pages.question_page.get_mark_as_spam_reply_locator(reply_id_one)
+        expect(sumo_pages.question_page.mark_reply_as_spam(reply_id_one)
                ).to_be_hidden()
         sumo_pages.question_page.click_on_reply_more_options_button(reply_id_one)
 
@@ -816,47 +802,47 @@ def test_mark_reply_as_spam(page: Page, create_user_factory):
     with allure.step("Deleting user session and verifying that the reply marked as spam is "
                      "no longer displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.get_reply_section_locator(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.reply_section(reply_id_one)).to_be_hidden()
 
     with allure.step("Signing in with a simple user and verifying that reply marked as spam "
                      "is no longer displayed"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.question_page.get_reply_section_locator(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.reply_section(reply_id_one)).to_be_hidden()
 
     with allure.step("Signing in with the reply OP user account and verifying that the reply "
                      "marked as spam is no longer displayed"):
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.question_page.get_reply_section_locator(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.reply_section(reply_id_one)).to_be_hidden()
 
     with allure.step("Signing in with the Forum Moderator, unmarking the reply from spam and "
                      "verifying that the 'Marked as spam' message is no longer displayed"):
         utilities.start_existing_session(cookies=test_user_three)
         sumo_pages.aaq_flow.spam_marking_a_reply(reply_id_one)
-        expect(sumo_pages.question_page.get_marked_as_spam_locator(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.marked_as_spam(reply_id_one)).to_be_hidden()
 
     with allure.step("Deleting the user session and verifying that the reply is visible to "
                      "the logged out users"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.get_reply_section_locator(reply_id_one)).to_be_visible()
+        expect(sumo_pages.question_page.reply_section(reply_id_one)).to_be_visible()
 
     with allure.step("Verifying that the 'Marked as spam' message is no longer displayed"):
-        expect(sumo_pages.question_page.get_marked_as_spam_locator(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.marked_as_spam(reply_id_one)).to_be_hidden()
 
     with allure.step("Signing in with a different simple user and verifying that the reply is "
                      "visible again"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.question_page.get_reply_section_locator(reply_id_one)).to_be_visible()
+        expect(sumo_pages.question_page.reply_section(reply_id_one)).to_be_visible()
 
     with allure.step("Verifying that the 'Marked as spam' message is no longer displayed"):
-        expect(sumo_pages.question_page.get_marked_as_spam_locator(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.marked_as_spam(reply_id_one)).to_be_hidden()
 
     with allure.step("Signing in with the reply OP and verifying that the reply is visible "
                      "again"):
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.question_page.get_reply_section_locator(reply_id_one)).to_be_visible()
+        expect(sumo_pages.question_page.reply_section(reply_id_one)).to_be_visible()
 
     with allure.step("Verifying that the 'Marked as spam' message is no longer displayed"):
-        expect(sumo_pages.question_page.get_marked_as_spam_locator(reply_id_one)).to_be_hidden()
+        expect(sumo_pages.question_page.marked_as_spam(reply_id_one)).to_be_hidden()
 
 
 # Need to expand this to contain additional text format.
@@ -899,8 +885,7 @@ def test_edit_reply(page: Page, user_type, create_user_factory):
         with allure.step("Clicking on the more options for the reply posted by another user "
                          "and verifying that the 'edit this post' option is not displayed"):
             sumo_pages.question_page.click_on_reply_more_options_button(reply_id)
-            expect(sumo_pages.question_page.get_edit_this_post_reply_locator(reply_id)
-                   ).to_be_hidden()
+            expect(sumo_pages.question_page.edit_this_post_for_answer(reply_id)).to_be_hidden()
 
         with check, allure.step("Manually navigating to edit reply endpoint and verifying "
                                 "that 403 is returned"):
@@ -917,17 +902,12 @@ def test_edit_reply(page: Page, user_type, create_user_factory):
             utilities.navigate_to_link(page_url)
             reply_id = sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user_two["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']
-                ['question_reply']
+                reply=utilities.aaq_question_test_data['valid_firefox_question']['question_reply']
             )
             assert sumo_pages.question_page.get_display_name_of_question_reply_author(
                 reply_id
             ) == test_user_two["username"]
-            expect(
-                sumo_pages.question_page.get_displayed_user_title_of_question_reply_locator(
-                    reply_id
-                )
-            ).to_be_hidden()
+            expect(sumo_pages.question_page.reply_user_title(reply_id)).to_be_hidden()
     else:
         utilities.start_existing_session(cookies=test_user_three)
         user_two = test_user_three["username"]
@@ -941,9 +921,8 @@ def test_edit_reply(page: Page, user_type, create_user_factory):
 
     with allure.step("Editing the question reply"):
         sumo_pages.aaq_flow.editing_reply_flow(
-            reply_body=utilities.aaq_question_test_data['valid_firefox_question']
-            ['updated_reply'],
-            submit_reply=False
+            reply_body=utilities.aaq_question_test_data['valid_firefox_question']['updated_reply'],
+            submit_reply=False, answer_id=reply_id
         )
 
     with check, allure.step("Verifying that the question reply is the original one"):
@@ -952,8 +931,7 @@ def test_edit_reply(page: Page, user_type, create_user_factory):
 
     with allure.step("Verifying that the 'Modified by' message is not displayed for the "
                      "reply"):
-        expect(sumo_pages.question_page.get_posted_reply_modified_by_locator(reply_id)
-               ).to_be_hidden()
+        expect(sumo_pages.question_page.modified_by_text(reply_id)).to_be_hidden()
 
     with check, allure.step("Clicking on the 'Edit this post option' and verifying that the "
                             "textarea contains the original reply"):
@@ -965,8 +943,8 @@ def test_edit_reply(page: Page, user_type, create_user_factory):
     with check, allure.step("Editing the reply and verifying that the reply contains the "
                             "updated text"):
         sumo_pages.aaq_flow.editing_reply_flow(
-            reply_body=utilities.aaq_question_test_data['valid_firefox_question']
-            ['updated_reply']
+            reply_body=utilities.aaq_question_test_data['valid_firefox_question']['updated_reply'],
+            answer_id=reply_id
         )
         assert sumo_pages.question_page.get_posted_reply_text(reply_id).strip(
         ) == utilities.aaq_question_test_data['valid_firefox_question']['updated_reply']
@@ -998,8 +976,7 @@ def test_delete_reply(page: Page, user_type, create_user_factory):
             repliant_username=test_user["username"],
             reply=utilities.aaq_question_test_data['valid_firefox_question']['question_reply']
         )
-        expect(sumo_pages.question_page.get_delete_this_post_reply_locator(reply_id)
-               ).to_be_hidden()
+        expect(sumo_pages.question_page.delete_this_post_for_answer(reply_id)).to_be_hidden()
 
     with check, allure.step("Verifying that manually navigating to the delete page for the "
                             "posted reply returns 403"):
@@ -1018,14 +995,13 @@ def test_delete_reply(page: Page, user_type, create_user_factory):
             utilities.start_existing_session(cookies=test_user_two)
             sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user_two["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']
-                ['question_reply']
+                reply=utilities.aaq_question_test_data['valid_firefox_question']['question_reply']
             )
 
             with allure.step("Verifying that the 'Delete this post' option is not available "
                              "for replies posted by others"):
                 sumo_pages.question_page.click_on_reply_more_options_button(reply_id)
-                expect(sumo_pages.question_page.get_delete_this_post_reply_locator(reply_id)
+                expect(sumo_pages.question_page.delete_this_post_for_answer(reply_id)
                        ).to_be_hidden()
 
             with check, allure.step("Verifying that manually navigating to the delete page "
@@ -1044,15 +1020,14 @@ def test_delete_reply(page: Page, user_type, create_user_factory):
                      "delete reply confirmation box and verifying that the reply was not deleted"):
         utilities.start_existing_session(cookies=test_user_three)
         sumo_pages.aaq_flow.delete_question_reply(answer_id=reply_id, delete_reply=False)
-        expect(sumo_pages.question_page.get_posted_reply_locator(reply_id)).to_be_visible()
+        expect(sumo_pages.question_page.question(reply_id)).to_be_visible()
 
     with allure.step("Deleting the reply and verifying that the reply is no longer displayed"):
         sumo_pages.aaq_flow.delete_question_reply(answer_id=reply_id, delete_reply=True)
-        expect(sumo_pages.question_page.get_posted_reply_locator(reply_id)).to_be_hidden()
+        expect(sumo_pages.question_page.question(reply_id)).to_be_hidden()
 
 
 # T5696788, T5696767
-# Need to re-verify this for signed out case before submitting this
 @pytest.mark.postedQuestions
 def test_i_have_this_problem_too(page: Page, create_user_factory):
     utilities = Utilities(page)
@@ -1068,7 +1043,7 @@ def test_i_have_this_problem_too(page: Page, create_user_factory):
     with allure.step("Verifying that the 'I have this problem too' button is not displayed "
                      "for self posted questions"):
         problem_counter = sumo_pages.question_page.get_i_have_this_problem_too_counter()
-        expect(sumo_pages.question_page.get_i_have_this_problem_too_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.i_have_this_problem_too_button).to_be_hidden()
 
     with check, allure.step("Deleting the user session, clicking on the 'I have this problem "
                             "too' button and verifying tha the 'have this problem' counter "
@@ -1090,7 +1065,7 @@ def test_i_have_this_problem_too(page: Page, create_user_factory):
 
     with allure.step("Verifying that the 'I have this problem too' button is no longer "
                      "displayed"):
-        expect(sumo_pages.question_page.get_i_have_this_problem_too_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.i_have_this_problem_too_button).to_be_hidden()
 
     with check, allure.step("Signing in with an Forum Moderator account, clicking on the 'I have "
                             "this problem too' and verifying that the 'have this problem' counter "
@@ -1103,7 +1078,7 @@ def test_i_have_this_problem_too(page: Page, create_user_factory):
 
     with allure.step("Verifying that the 'I have this problem too' button is no longer "
                      "displayed"):
-        expect(sumo_pages.question_page.get_i_have_this_problem_too_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.i_have_this_problem_too_button).to_be_hidden()
 
 
 # T5696789
@@ -1129,14 +1104,12 @@ def test_solves_this_problem(page: Page, create_user_factory):
     with allure.step("Deleting user session and verifying that the 'Solved the problem' "
                      "button is not displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.question_page.get_solved_the_problem_button_locator(reply_id)
-               ).to_be_hidden()
+        expect(sumo_pages.question_page.reply_solves_the_problem(reply_id)).to_be_hidden()
 
     with allure.step("Signing in with a different user account and verifying that the "
                      "'Solved the problem' button is not displayed"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.question_page.get_solved_the_problem_button_locator(reply_id)
-               ).to_be_hidden()
+        expect(sumo_pages.question_page.reply_solves_the_problem(reply_id)).to_be_hidden()
 
     with check, allure.step("Signing in with the first username, clicking on the 'Solved the "
                             "problem' button and verifying that the correct banner is "
@@ -1174,15 +1147,15 @@ def test_solves_this_problem(page: Page, create_user_factory):
         ) == QuestionPageMessages.UNDOING_A_SOLUTION
 
     with allure.step("Verifying that the 'Solved the problem' option is not displayed"):
-        expect(sumo_pages.question_page.get_chosen_solution_section_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.problem_solved_reply_section).to_be_hidden()
 
     with allure.step("Verifying that the 'Chosen solution' banner is not displayed for the "
                      "previously provided solution"):
-        expect(sumo_pages.question_page.get_chosen_solution_reply_message_locator(reply_id)
+        expect(sumo_pages.question_page.reply_solution_header(reply_id)
                ).to_be_hidden()
 
     with allure.step("Verifying that the 'Undo' option is not available"):
-        expect(sumo_pages.question_page.get_undo_button_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.undo_solves_problem).to_be_hidden()
 
     with check, allure.step("Signing in with a Forum Moderator, clicking on the 'solved this "
                             "problem option' and verifying the chosen solution text"):
@@ -1206,15 +1179,22 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
     # any group in order to catch cases like https://github.com/mozilla/sumo/issues/1676
     with allure.step("Signing in with a non admin user account and posting a Firefox product "
                      "question"):
-        posted_question = post_firefox_product_question_flow(page, test_user)
+        utilities.start_existing_session(cookies=test_user)
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
+            subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
+            topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["body_updated"],
+            attach_image=False,
+            expected_locator=sumo_pages.question_page.questions_header
+        )
     question_id = sumo_pages.question_page.get_question_id()
 
     if quote_on == "reply":
         with allure.step("Posting a reply to the question"):
             reply_id = sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']
-                ['question_reply']
+                reply=utilities.aaq_question_test_data['valid_firefox_question']['question_reply']
             )
     with allure.step("Signing in with a simple user"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -1223,8 +1203,7 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
         with allure.step("Posting a quoted reply for question reply"):
             quote_id = sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user_two["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']
-                ['updated_reply'],
+                reply=utilities.aaq_question_test_data['valid_firefox_question']['updated_reply'],
                 quoted_reply=True,
                 reply_for_id=reply_id
             )
@@ -1232,8 +1211,7 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
         with allure.step("Posting a quoted reply for question"):
             quote_id = sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user_two["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']
-                ['updated_reply'],
+                reply=utilities.aaq_question_test_data['valid_firefox_question']['updated_reply'],
                 quoted_reply=True,
                 reply_for_id=question_id
             )
@@ -1253,7 +1231,7 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
         with check, allure.step("Verifying that the question details is displayed inside the "
                                 "quote"):
             assert (utilities.aaq_question_test_data['valid_firefox_question']
-                    ['simple_body_text'] == sumo_pages.question_page
+                    ['body_updated'] == sumo_pages.question_page
                     .get_blockquote_reply_text(quote_id).strip())
 
     with check, allure.step("Verifying that the new reply text is also displayed"):
@@ -1267,12 +1245,12 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
     if quote_on == "reply":
         with check, allure.step("Verifying that the correct url is displayed"):
             expect(page).to_have_url(
-                posted_question['question_details']['question_page_url'] + "#" + reply_id
+                question_details['question_page_url'] + "#" + reply_id
             )
     else:
         with check, allure.step("Verifying that the correct url is displayed"):
             expect(page).to_have_url(
-                posted_question['question_details']['question_page_url'] + "#" + question_id
+                question_details['question_page_url'] + "#" + question_id
             )
 
     with allure.step("Signing in with a Forum Moderator account"):
@@ -1282,8 +1260,7 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
         with allure.step("Posting a quoted reply for question reply"):
             quote_id = sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user_two["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']
-                ['updated_reply'],
+                reply=utilities.aaq_question_test_data['valid_firefox_question']['updated_reply'],
                 quoted_reply=True,
                 reply_for_id=reply_id
             )
@@ -1291,8 +1268,7 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
         with allure.step("Posting a quoted reply for question reply"):
             quote_id = sumo_pages.aaq_flow.post_question_reply_flow(
                 repliant_username=test_user_two["username"],
-                reply=utilities.aaq_question_test_data['valid_firefox_question']
-                ['updated_reply'],
+                reply=utilities.aaq_question_test_data['valid_firefox_question']['updated_reply'],
                 quoted_reply=True,
                 reply_for_id=question_id
             )
@@ -1311,7 +1287,7 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
     else:
         with check, allure.step("Verifying that the question is displayed inside the quote"):
             assert (utilities.aaq_question_test_data['valid_firefox_question']
-                    ['simple_body_text'] == sumo_pages.question_page
+                    ['body_updated'] == sumo_pages.question_page
                     .get_blockquote_reply_text(quote_id).strip())
 
     with check, allure.step("Verifying that the new reply text is also displayed"):
@@ -1325,12 +1301,12 @@ def test_quote_reply_functionality(page: Page, quote_on, create_user_factory):
     if quote_on == "reply":
         with allure.step("Verifying that the correct url is displayed"):
             expect(page).to_have_url(
-                posted_question['question_details']['question_page_url'] + "#" + reply_id
+                question_details['question_page_url'] + "#" + reply_id
             )
     else:
         with allure.step("Verifying that the correct url is displayed"):
             expect(page).to_have_url(
-                posted_question['question_details']['question_page_url'] + "#" + question_id
+                question_details['question_page_url'] + "#" + question_id
             )
 
 
@@ -1357,14 +1333,13 @@ def test_quote_reply_functionality_signed_out(page: Page, create_user_factory):
             posted_question['question_details']['question_page_url'] + "#question-reply")
 
     with allure.step("Verifying that the reply textarea field is not displayed"):
-        expect(sumo_pages.question_page.get_post_a_reply_textarea_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.post_a_reply_textarea).to_be_hidden()
 
     with allure.step("Verifying that the 'Ask a question' signed out card is not displayed"):
-        expect(sumo_pages.question_page.ask_a_question_signed_out_card_option_locator()
-               ).to_be_hidden()
+        expect(sumo_pages.question_page.ask_a_question_signed_out_card_option).to_be_hidden()
 
     with allure.step("Verifying that the 'I have this problem, too' option is not displayed"):
-        expect(sumo_pages.question_page.get_i_have_this_problem_too_signed_out_card_locator()
+        expect(sumo_pages.question_page.i_have_this_problem_too_signed_out_card_option
                ).to_be_hidden()
 
     with allure.step("Clicking on the 'start a new question' signed out card link and "
@@ -1392,14 +1367,13 @@ def test_quote_reply_functionality_signed_out(page: Page, create_user_factory):
         )
 
     with allure.step("Verifying that the reply textarea field is not displayed"):
-        expect(sumo_pages.question_page.get_post_a_reply_textarea_locator()).to_be_hidden()
+        expect(sumo_pages.question_page.post_a_reply_textarea).to_be_hidden()
 
     with allure.step("Verifying that the 'Ask a question' signed out card is displayed"):
-        expect(sumo_pages.question_page.ask_a_question_signed_out_card_option_locator()
-               ).to_be_visible()
+        expect(sumo_pages.question_page.ask_a_question_signed_out_card_option).to_be_visible()
 
     with allure.step("Verifying that the 'I have this problem, too' option is displayed"):
-        expect(sumo_pages.question_page.get_i_have_this_problem_too_signed_out_card_locator()
+        expect(sumo_pages.question_page.i_have_this_problem_too_signed_out_card_option
                ).to_be_visible()
 
     with allure.step("Clicking on the 'Ask a question' and verifying that we are redirected "
@@ -1420,7 +1394,7 @@ def test_quote_reply_functionality_signed_out(page: Page, create_user_factory):
         expect(page).to_have_url(posted_question['question_details']['question_page_url'])
 
     with allure.step("Verifying that the textarea field is displayed"):
-        expect(sumo_pages.question_page.get_post_a_reply_textarea_locator()).to_be_visible()
+        expect(sumo_pages.question_page.post_a_reply_textarea).to_be_visible()
 
 
 # T5696770
@@ -1447,7 +1421,7 @@ def test_question_reply_votes(page: Page, create_user_factory):
         reply_id = sumo_pages.question_page.click_on_post_reply_button(test_user["username"])
 
     with allure.step("Verifying the vote reply is not available for self posted questions"):
-        expect(sumo_pages.question_page.get_reply_votes_section_locator(reply_id)).to_be_hidden()
+        expect(sumo_pages.question_page.reply_vote_section(reply_id)).to_be_hidden()
 
     with check, allure.step("Signing in a different user and verifying that the correct vote "
                             "header is displayed"):
@@ -1475,11 +1449,11 @@ def test_question_reply_votes(page: Page, create_user_factory):
                     get_not_helpful_count(reply_id)) == number_of_thumbs_down_votes)
 
     with allure.step("Verifying that the thumbs up button contains the disabled attribute"):
-        expect(sumo_pages.question_page.get_thumbs_up_button_locator(reply_id)
+        expect(sumo_pages.question_page.reply_vote_thumbs_up(reply_id)
                ).to_have_attribute(name="disabled", value="")
 
     with allure.step("Verifying that the thumbs down button contains the disabled attribute"):
-        expect(sumo_pages.question_page.get_thumbs_down_button_locator(reply_id)
+        expect(sumo_pages.question_page.reply_vote_thumbs_down(reply_id)
                ).to_have_attribute(name="disabled",value="")
 
     with check, allure.step("Refreshing the page and verifying that the correct number of "
@@ -1510,11 +1484,11 @@ def test_question_reply_votes(page: Page, create_user_factory):
                     get_not_helpful_count(reply_id)) == number_of_thumbs_down_votes)
 
     with allure.step("Verifying that the thumbs up button contains the disabled attribute"):
-        expect(sumo_pages.question_page.get_thumbs_up_button_locator(reply_id)
+        expect(sumo_pages.question_page.reply_vote_thumbs_up(reply_id)
                ).to_have_attribute(name="disabled", value="")
 
     with allure.step("Verifying that the thumbs down button contains the disabled attribute"):
-        expect(sumo_pages.question_page.get_thumbs_down_button_locator(reply_id)
+        expect(sumo_pages.question_page.reply_vote_thumbs_down(reply_id)
                ).to_have_attribute(name="disabled", value="")
 
     with check, allure.step("Refreshing the page and verifying that the correct number of "
@@ -1585,7 +1559,7 @@ def test_report_abuse(page: Page, flagged_content, user_type, create_user_factor
                 sumo_pages.question_page.get_question_id()
             )
             expect(
-                sumo_pages.question_page.get_click_on_report_abuse_reply_locator(
+                sumo_pages.question_page.report_answer_as_abuse(
                     sumo_pages.question_page.get_question_id()
                 )
             ).to_be_hidden()
@@ -1594,8 +1568,7 @@ def test_report_abuse(page: Page, flagged_content, user_type, create_user_factor
         with allure.step("Clicking on the more options for the reply and verifying that the "
                          "report abuse options is not displayed for signed out users"):
             sumo_pages.question_page.click_on_reply_more_options_button(reply_id)
-            expect(sumo_pages.question_page.get_click_on_report_abuse_reply_locator(
-                reply_id)).to_be_hidden()
+            expect(sumo_pages.question_page.report_answer_as_abuse(reply_id)).to_be_hidden()
 
     if user_type == "Forum Moderator":
         with allure.step("Signing in with a Forum Moderator account"):
@@ -1626,15 +1599,17 @@ def test_report_abuse(page: Page, flagged_content, user_type, create_user_factor
     with allure.step("Navigating to 'Moderate forum content page' and verifying that the "
                      "question exists inside the moderate forum content page"):
         sumo_pages.top_navbar.click_on_moderate_forum_content_option()
+        if sumo_pages.moderate_forum_content_page.is_paginator_visible():
+            sumo_pages.moderate_forum_content_page.click_on_last_pagination_element()
         if flagged_content == "question_content":
             expect(
-                sumo_pages.moderate_forum_content_page.get_flagged_question_locator(
+                sumo_pages.moderate_forum_content_page.flagged_question(
                     posted_question['question_details']['aaq_subject']
                 )
             ).to_be_visible()
         else:
             expect(
-                sumo_pages.moderate_forum_content_page.get_flagged_question_locator(
+                sumo_pages.moderate_forum_content_page.flagged_question(
                     reply_content
                 )
             ).to_be_visible()
@@ -1656,21 +1631,19 @@ def test_report_abuse(page: Page, flagged_content, user_type, create_user_factor
                 posted_question['question_details']['aaq_subject']
             )
         else:
-            sumo_pages.moderate_forum_content_page.click_on_the_update_button(
-                reply_content
-            )
+            sumo_pages.moderate_forum_content_page.click_on_the_update_button(reply_content)
 
     with allure.step("Verifying that the question no longer exists inside the moderate forum "
                      "content page"):
         if flagged_content == "question_content":
             expect(
-                sumo_pages.moderate_forum_content_page.get_flagged_question_locator(
+                sumo_pages.moderate_forum_content_page.flagged_question(
                     posted_question['question_details']['aaq_subject']
                 )
             ).to_be_hidden()
         else:
             expect(
-                sumo_pages.moderate_forum_content_page.get_flagged_question_locator(
+                sumo_pages.moderate_forum_content_page.flagged_question(
                     reply_content
                 )
             ).to_be_hidden()
@@ -1767,8 +1740,7 @@ def post_firefox_product_question_flow(page: Page, user: Union[dict, str]):
         username = user["username"]
     else:
         username = utilities.username_extraction_from_email(user)
-        utilities.start_existing_session(
-            session_file_name=username)
+        utilities.start_existing_session(session_file_name=username)
 
     with allure.step("Posting a Firefox product question"):
         utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
@@ -1776,8 +1748,7 @@ def post_firefox_product_question_flow(page: Page, user: Union[dict, str]):
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["simple_body_text"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
diff --git a/playwright_tests/tests/ask_a_question_tests/community_forums/test_community_forums_by_product.py b/playwright_tests/tests/ask_a_question_tests/community_forums/test_community_forums_by_product.py
index 6b80b365565..9d5e84fb41e 100644
--- a/playwright_tests/tests/ask_a_question_tests/community_forums/test_community_forums_by_product.py
+++ b/playwright_tests/tests/ask_a_question_tests/community_forums/test_community_forums_by_product.py
@@ -45,7 +45,6 @@ def test_ask_the_community_button_redirect(page: Page):
     with allure.step("Navigating to the all products community forums page"):
         sumo_pages.top_navbar.click_on_view_all_forums_option()
 
-
     with check, allure.step("Clicking on the 'Ask the Community' button for each community forum "
                             "and verifying that the user is redirected to the correct product "
                             "solutions page"):
@@ -78,8 +77,7 @@ def test_question_transitions_from_attention_needed_to_responded(page: Page, cre
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["simple_body_text"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -153,15 +151,13 @@ def test_spam_tab_filter_visibility(page: Page, create_user_factory):
     test_user = create_user_factory()
     test_user_two = create_user_factory(groups=["Forum Moderators"])
 
-
     with allure.step("Creating a question and marking it as spam"):
         utilities.start_existing_session(cookies=test_user_two)
         utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["simple_body_text"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -173,7 +169,7 @@ def test_spam_tab_filter_visibility(page: Page, create_user_factory):
         utilities.navigate_to_link(utilities.general_test_data['product_forums']
                                    ['All Products Forum'])
         sumo_pages.product_support_forum.click_on_a_certain_tab_filter("All")
-        assert len(sumo_pages.product_support_forum.get_list_of_is_spam_locators()) == 0
+        assert len(sumo_pages.product_support_forum.is_spam_locator.all()) == 0
 
     with check, allure.step("Clicking on the 'Spam' filter and verifying that the spam-marked"
                             " question is displayed with the correct spam tag"):
@@ -184,13 +180,13 @@ def test_spam_tab_filter_visibility(page: Page, create_user_factory):
     with check, allure.step("Signing out from SUMO and verifying that spam questions and the Spam"
                             " tab filter is not displayed"):
         utilities.delete_cookies()
-        assert len(sumo_pages.product_support_forum.get_list_of_is_spam_locators()) == 0
+        assert len(sumo_pages.product_support_forum.is_spam_locator.all()) == 0
         assert not sumo_pages.product_support_forum.is_tab_filter_displayed("Spam")
 
     with check, allure.step("Signing in with a normal user and verifying that the spam questions"
                             " and the spam tab filter is not displayed"):
         utilities.start_existing_session(cookies=test_user)
-        assert len(sumo_pages.product_support_forum.get_list_of_is_spam_locators()) == 0
+        assert len(sumo_pages.product_support_forum.is_spam_locator.all()) == 0
 
 
 # C3171622
@@ -207,8 +203,7 @@ def test_question_transitions_to_spam_tab_filter(page: Page, create_user_factory
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["simple_body_text"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -277,8 +272,7 @@ def test_spam_marked_question_does_not_transition_from_spam_tab_filter(page: Pag
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["simple_body_text"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -346,8 +340,7 @@ def test_questions_transitions_on_status_change(page: Page, create_user_factory,
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["simple_body_text"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
             )
diff --git a/playwright_tests/tests/ask_a_question_tests/popular_topics_page_tests/test_popular_topics_page.py b/playwright_tests/tests/ask_a_question_tests/popular_topics_page_tests/test_popular_topics_page.py
index 7d2dc19d253..9c1ca6875e6 100644
--- a/playwright_tests/tests/ask_a_question_tests/popular_topics_page_tests/test_popular_topics_page.py
+++ b/playwright_tests/tests/ask_a_question_tests/popular_topics_page_tests/test_popular_topics_page.py
@@ -16,6 +16,7 @@
 def test_popular_topics_navbar(page: Page):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
+
     with allure.step("Navigating to product topics pages"):
         for product_topic in utilities.general_test_data["product_topics"]:
             topic_url = utilities.general_test_data["product_topics"][product_topic]
diff --git a/playwright_tests/tests/conftest.py b/playwright_tests/tests/conftest.py
index ae9dfba3ef0..40db4a173b2 100644
--- a/playwright_tests/tests/conftest.py
+++ b/playwright_tests/tests/conftest.py
@@ -15,14 +15,14 @@
 @pytest.fixture(autouse=True)
 def navigate_to_homepage(page: Page):
     """
-    This fixture is used in all functions. It navigates to the SuMo homepage and returns the page
-    object.
+    This fixture is used in all functions.
+    1. Sets the default navigation timeout to 30 seconds.
+    2. Blocks all requests to pontoon in the current page context.
+    3. Handles 502 errors by reloading the page after 5 seconds.
+    4. It navigates to the SuMo homepage and returns the page object for further usage.
     """
     utilities = Utilities(page)
-    # Set default navigation timeout to 30 seconds.
     page.set_default_navigation_timeout(30000)
-
-    # Block pontoon requests in the current page context.
     page.route("**/pontoon.mozilla.org/**", utilities.block_request)
 
     def handle_502_error(response):
@@ -43,10 +43,7 @@ def handle_502_error(response):
                     print("TimeoutError encountered after reload.")
 
     page.context.on("response", handle_502_error)
-
-    # Navigate to the SUMO stage homepage.
     page.goto(HomepageMessages.STAGE_HOMEPAGE_URL)
-
     return page
 
 @pytest.hookimpl(hookwrapper=True)
@@ -98,12 +95,12 @@ def create_user_factory(page: Page, request):
 
     def _create_user(username: str = None, groups: [str] = None, permissions: [str] = None):
         """
-        This helper function which creates a test user account.
+        This helper function creates a test user account.
 
         Args:
-            username (str): The username of the test user account
-            groups (list[str]): The groups to which the user belongs
-            permissions (list[str]): The permissions of the user
+            username (str): The username of the test user account.
+            groups (list[str]): The groups to which the user belongs.
+            permissions (list[str]): The permissions of the user.
         """
         if username is None:
             username = ''.join(random.choice(
@@ -135,6 +132,9 @@ def _create_user(username: str = None, groups: [str] = None, permissions: [str]
                 utilities.wait_for_given_timeout(5000)
 
     def _cleanup():
+        """
+        Test finalizer function which triggers the deletion of the newly created test accounts.
+        """
         endpoint = HomepageMessages.STAGE_HOMEPAGE_URL_EN_US + "users/api/trigger-delete"
         for username in created_users:
             print("Deleting created users")
diff --git a/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_page.py b/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_page.py
index 1c1b755e15c..311e9293053 100644
--- a/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_page.py
+++ b/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_page.py
@@ -119,22 +119,20 @@ def test_contributor_discussions_forums_title_redirect(page: Page, create_user_f
 
 @pytest.mark.smokeTest
 @pytest.mark.contributorDiscussions
-@pytest.mark.parametrize("user", [None, 'simple_user', 'moderator'])
+@pytest.mark.parametrize("user", [None, 'Simple User', 'Forum Moderator'])
 def test_forum_moderators_availability(page: Page, user, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory(groups=["forum-contributors", "Forum Moderators"])
+    user_map = {'Simple User': test_user, 'Forum Moderator': test_user_two}
 
-    if user == 'simple_user':
-        utilities.start_existing_session(cookies=test_user)
-    elif user == 'moderator':
-        utilities.start_existing_session(cookies=test_user_two)
+    utilities.start_existing_session(cookies=user_map.get(user))
 
     with allure.step("Navigating to the Contributor Discussions forum"):
         utilities.navigate_to_link(ConDiscussionsMessages.PAGE_URL)
 
-    if user == 'simple_user' or user is None:
+    if user == 'Simple User' or user is None:
         with check, allure.step("Verifying that the 'Forum Moderators' forum is not available"):
             assert (ForumModerators.PAGE_TITLE not in sumo_pages.contributor_discussions_page.
                     get_contributor_discussions_forums_titles())
@@ -189,8 +187,7 @@ def test_threads_number_and_last_post_details(page: Page, create_user_factory):
 
     with allure.step("Creating a new thread to the 'Off topic' forum"):
         post_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     thread_link = utilities.get_page_url()
@@ -273,8 +270,7 @@ def test_number_of_threads_and_last_post_details_updates_when_moving_a_thread(pa
 
     with allure.step("Creating a new thread to the 'Localization Discussions' forum"):
         post_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     thread_link = utilities.get_page_url()
@@ -373,8 +369,7 @@ def test_contributor_discussions_last_post_redirects(page: Page, create_user_fac
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         post_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
     thread_link = utilities.get_page_url()
 
diff --git a/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_threads.py b/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_threads.py
index 0b85e908602..bcdc676709b 100644
--- a/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_threads.py
+++ b/playwright_tests/tests/contribute_tests/contributor_discussions/test_contributor_discussions_threads.py
@@ -104,8 +104,7 @@ def test_new_thread_creation_cancel_button(page: Page, create_user_factory):
     with allure.step("Adding valid data to both title and body fields and clicking on the 'Cancel'"
                      " button"):
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body'],
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body'],
             cancel=True
         )
 
@@ -134,8 +133,7 @@ def test_thread_title_edit(page: Page, create_user_factory):
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     thread_url = urlsplit(utilities.get_page_url())._replace(query="").geturl()
@@ -218,8 +216,7 @@ def test_thread_deletion(page: Page, create_user_factory):
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     thread_url = urlsplit(utilities.get_page_url())._replace(query="").geturl()
@@ -275,8 +272,7 @@ def test_thread_locking(page: Page, create_user_factory):
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     thread_url = utilities.get_page_url()
@@ -367,8 +363,7 @@ def test_sticky_this_thread(page: Page, create_user_factory):
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     thread_link = utilities.get_page_url()
@@ -455,8 +450,7 @@ def test_thread_breadcrumbs(page: Page, create_user_factory):
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     with check, allure.step("Verifying that the thread title is displayed inside the list of "
@@ -495,8 +489,7 @@ def test_forum_post_side_navbar_redirects(page: Page, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     navbar_items = sumo_pages.forum_thread_page.get_contributor_discussions_side_navbar_items()
@@ -518,7 +511,7 @@ def test_forum_post_side_navbar_redirects(page: Page, create_user_factory):
 
 # C3010846
 @pytest.mark.contributorDiscussionsThreads
-@pytest.mark.parametrize("user_type", [None, 'simple_user', 'moderator'])
+@pytest.mark.parametrize("user_type", [None, 'Simple User', 'Forum Moderator'])
 def test_forum_moderators_availability_inside_the_forum_post_page(page: Page, user_type,
                                                                   create_user_factory):
     sumo_pages = SumoPages(page)
@@ -536,14 +529,13 @@ def test_forum_moderators_availability_inside_the_forum_post_page(page: Page, us
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     utilities.delete_cookies()
 
-    if user_type in ['simple_user', None]:
-        account = test_user if user_type == 'simple_user' else None
+    if user_type in ['Simple User', None]:
+        account = test_user if user_type == 'Simple User' else None
         if account:
             utilities.start_existing_session(cookies=account)
         with check, allure.step("Verifying that the 'Forum Moderators' forum is not available "
@@ -560,7 +552,7 @@ def test_forum_moderators_availability_inside_the_forum_post_page(page: Page, us
 
 # C3016247
 @pytest.mark.contributorDiscussionsThreads
-@pytest.mark.parametrize("user_type", ['simple_user', 'moderator'])
+@pytest.mark.parametrize("user_type", ['Simple User', 'Forum Moderator'])
 def test_edit_own_forum_post(page: Page, user_type, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
@@ -568,7 +560,7 @@ def test_edit_own_forum_post(page: Page, user_type, create_user_factory):
     test_user_two = create_user_factory(groups=["forum-contributors", "Forum Moderators"])
 
     with allure.step("Signing in to SUMO"):
-        account = test_user if user_type == 'simple_user' else test_user_two
+        account = test_user if user_type == 'Simple User' else test_user_two
         utilities.start_existing_session(cookies=account)
 
     with allure.step("Creating a new forum thread"):
@@ -576,15 +568,11 @@ def test_edit_own_forum_post(page: Page, user_type, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         thread_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     with allure.step("Editing the own forum thread post"):
-        sumo_pages.contributor_thread_flow.edit_thread_post(
-            thread_id,
-            "Edited thread body"
-        )
+        sumo_pages.contributor_thread_flow.edit_thread_post(thread_id, "Edited thread body")
 
     with check, allure.step("Verifying that the edited post is displayed"):
         assert sumo_pages.forum_thread_page.is_thread_post_by_name_visible("Edited thread body")
@@ -610,8 +598,7 @@ def test_edit_forum_posts(page: Page, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         thread_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
         thread_url = utilities.get_page_url()
 
@@ -666,8 +653,7 @@ def test_delete_this_post(page: Page, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
         thread_url = utilities.get_page_url()
 
@@ -734,8 +720,7 @@ def test_delete_this_post_option_availability(page: Page, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         first_thread_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     with allure.step("Creating a new thread post"):
@@ -774,8 +759,7 @@ def test_quote_this_post(page: Page, create_user_factory):
             utilities.generate_random_number(1, 1000))
         thread_body = utilities.discussion_thread_data['thread_body']
         thread_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=thread_body
+            thread_title=thread_title, thread_body=thread_body
         )
 
     with check, allure.step("Signing in with a different account and quoting the first post"):
@@ -814,8 +798,7 @@ def test_link_to_this_post_option(page: Page, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         thread_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
 
     with check, allure.step("Signing in with a different user and clicking on the 'Link to this "
@@ -846,8 +829,7 @@ def test_private_message_option(page: Page, create_user_factory):
         thread_title = utilities.discussion_thread_data['thread_title'] + (
             utilities.generate_random_number(1, 1000))
         thread_id = sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body']
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
         )
         thread_url = utilities.get_page_url()
 
@@ -857,21 +839,19 @@ def test_private_message_option(page: Page, create_user_factory):
 
         sumo_pages.forum_thread_page.click_on_private_message_option(thread_id)
         sumo_pages.messaging_system_flow.complete_send_message_form_with_data(
-            message_body=message,
-            expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL
+            message_body=message, expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL
         )
 
     with check, allure.step("Verifying that the sent message is displayed inside the sent "
                             "messages page"):
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
-        expect(sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message)
-               ).to_be_visible()
+        expect(sumo_pages.sent_message_page.sent_message_by_subject(message)).to_be_visible()
 
     with check, allure.step("Signing in with the receiver account and verifying that the message "
                             "is displayed inside the inbox section"):
         utilities.start_existing_session(cookies=test_user)
         sumo_pages.top_navbar.click_on_inbox_option()
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message)).to_be_visible()
+        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message)).to_be_visible()
 
     with check, allure.step("Navigating back to the thread, signing out and verifying that the "
                             "'Private message' option redirects the user to the auth page"):
diff --git a/playwright_tests/tests/contribute_tests/dashboards_tests/test_kb_dashboard.py b/playwright_tests/tests/contribute_tests/dashboards_tests/test_kb_dashboard.py
index 132271e8f5f..7824bb6cad4 100644
--- a/playwright_tests/tests/contribute_tests/dashboards_tests/test_kb_dashboard.py
+++ b/playwright_tests/tests/contribute_tests/dashboards_tests/test_kb_dashboard.py
@@ -23,7 +23,7 @@ def test_unreviewed_articles_visibility_in_kb_dashboard(page: Page, create_user_
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Create a new simple article"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
 
     with allure.step("Navigating to the kb dashboards and clicking on the 'Complete "
                      "overview' option"):
@@ -43,11 +43,8 @@ def test_unreviewed_articles_visibility_in_kb_dashboard(page: Page, create_user_
     with allure.step("Signing out and verifying that the article is not displayed since it "
                      "is not live yet"):
         utilities.delete_cookies()
-        expect(
-            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
-                article_details['article_title']
-            )
-        ).to_be_hidden()
+        expect(sumo_pages.kb_dashboard_page.article_title(
+                article_details['article_title'])).to_be_hidden()
 
     with allure.step("Navigating to the homepage and performing the sign in step since the "
                      "kb overview takes quite a bit to refresh/load"):
@@ -58,10 +55,8 @@ def test_unreviewed_articles_visibility_in_kb_dashboard(page: Page, create_user_
                      "displayed since it is not live yet"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         expect(
-            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
-                article_details['article_title']
-            )
-        ).to_be_hidden()
+            sumo_pages.kb_dashboard_page.article_title(
+                article_details['article_title'])).to_be_hidden()
 
     with allure.step("Signing in with a Knowledge Base Reviewer account"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
@@ -82,16 +77,13 @@ def test_unreviewed_articles_visibility_in_kb_dashboard(page: Page, create_user_
                             "correct live status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_a_particular_article_status(
-            article_details['article_title']
-        ).strip() == kb_dashboard_page_messages.KB_LIVE_STATUS
+            article_details['article_title']).strip() == kb_dashboard_page_messages.KB_LIVE_STATUS
 
     with allure.step("Signing out and verifying that the article is visible"):
         utilities.delete_cookies()
         expect(
-            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
-                article_details['article_title']
-            )
-        ).to_be_visible()
+            sumo_pages.kb_dashboard_page.article_title(
+                article_details['article_title'])).to_be_visible()
 
     with allure.step("Signing in with a non-admin user"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
@@ -102,10 +94,8 @@ def test_unreviewed_articles_visibility_in_kb_dashboard(page: Page, create_user_
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['kb_overview'])
         expect(
-            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
-                article_details['article_title']
-            )
-        ).to_be_visible()
+            sumo_pages.kb_dashboard_page.article_title(
+                article_details['article_title'])).to_be_visible()
 
 
 # C2266376
@@ -120,8 +110,8 @@ def test_kb_dashboard_articles_status(page: Page, create_user_factory):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new simple article"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page,approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step("Creating a new revision for the document"):
         second_revision = sumo_pages.submit_kb_article_flow.submit_new_kb_revision()
@@ -147,8 +137,7 @@ def test_kb_dashboard_articles_status(page: Page, create_user_factory):
                             "status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_a_particular_article_status(
-            article_details['article_title']
-        ).strip() == kb_dashboard_page_messages.KB_LIVE_STATUS
+            article_details['article_title']).strip() == kb_dashboard_page_messages.KB_LIVE_STATUS
 
 
 # C2496647
@@ -163,8 +152,8 @@ def test_kb_dashboard_revision_deferred_status(page: Page, create_user_factory):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new simple article"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page,approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     article_show_history_url = utilities.get_page_url()
 
@@ -191,8 +180,7 @@ def test_kb_dashboard_revision_deferred_status(page: Page, create_user_factory):
                             "correct status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_a_particular_article_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.KB_LIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.KB_LIVE_STATUS
 
 
 # C2496646
@@ -206,8 +194,8 @@ def test_kb_dashboard_needs_update_when_reviewing_a_revision(page: Page, create_
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new simple article"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page,approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step("Creating an new article revision for the document"):
         second_revision = sumo_pages.submit_kb_article_flow.submit_new_kb_revision()
@@ -235,8 +223,8 @@ def test_kb_dashboard_needs_update_edit_metadata(page: Page, create_user_factory
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Create a new simple article"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step("Clicking on the 'Edit Article Metadata' option and enabling the 'Needs "
                      "change with comment' option"):
@@ -271,9 +259,7 @@ def test_kb_dashboard_needs_update_edit_metadata(page: Page, create_user_factory
     with check, allure.step("Navigating to the kb overview page and verifying that the "
                             "correct needs change status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
-        assert sumo_pages.kb_dashboard_page.is_needs_change_empty(
-            article_details['article_title']
-        )
+        assert sumo_pages.kb_dashboard_page.is_needs_change_empty(article_details['article_title'])
 
 
 # C2266378, C2489548
@@ -289,7 +275,7 @@ def test_ready_for_l10n_kb_dashboard_revision_approval(page: Page, create_user_f
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Create a new simple article"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
 
     revision_id = article_details['first_revision_id']
 
@@ -301,8 +287,7 @@ def test_ready_for_l10n_kb_dashboard_revision_approval(page: Page, create_user_f
                             "the correct l10n status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
 
 # C2266378
@@ -318,15 +303,14 @@ def test_ready_for_l10n_kb_dashboard_revision_l10n_status(page: Page, create_use
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with check, allure.step("Navigating to the kb dashboard overview page and verifying that "
                             "the correct l10n status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Navigating back to the article page and marking the revision as ready "
                      "for l10n"):
@@ -341,8 +325,7 @@ def test_ready_for_l10n_kb_dashboard_revision_l10n_status(page: Page, create_use
                      "correct l10n status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
 
 # C2875533
@@ -359,15 +342,14 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
 
     with allure.step("Creating a new kb article and approving the first revision without marking "
                      "it as ready for l10n"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=False)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=False)
 
     with check, allure.step("Verifying that the correct kb dashboard l10n status is displayed "
                             "(No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with check, allure.step("Approving the KB article without marking it as ready for l10n and "
                             "verifying that the correct l10N status is displayed inside the KB "
@@ -377,8 +359,7 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
             revision_id=article_details["first_revision_id"])
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new revision and approve it as minor significance"):
         utilities.navigate_to_link(article_details["article_url"])
@@ -389,8 +370,7 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "(No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new revision and approving it as normal significance and ready "
                      "for localization"):
@@ -403,8 +383,7 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "(Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
     with allure.step("Creating a new revision and approving it as normal significance and not "
                      "ready for localization"):
@@ -417,8 +396,7 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new minor revision and approving it"):
         utilities.navigate_to_link(article_details["article_url"])
@@ -430,8 +408,7 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new major revision and not marking it as ready for localization"):
         utilities.navigate_to_link(article_details["article_url"])
@@ -443,8 +420,7 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new minor revision and approving it"):
         utilities.navigate_to_link(article_details["article_url"])
@@ -456,8 +432,7 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new major revision and marking it as ready for localization"):
         utilities.navigate_to_link(article_details["article_url"])
@@ -469,8 +444,7 @@ def test_ready_for_l10n_kb_dashboard_status_update(page: Page, create_user_facto
                             "dashboard (Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
 
 # C2875537
@@ -487,8 +461,8 @@ def test_ready_for_l10n_status_update_via_history_page(page: Page, create_user_f
 
     with allure.step("Creating a new kb article and approving the first revision without marking "
                      "it as ready for l10n"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step("Creating a new revision and approving it as Normal significance and not"
                      "ready for localization"):
@@ -500,8 +474,7 @@ def test_ready_for_l10n_status_update_via_history_page(page: Page, create_user_f
                             "displayed inside the KB dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Marking the newly submitted revision as ready for localization via the"
                      " /history page"):
@@ -515,8 +488,7 @@ def test_ready_for_l10n_status_update_via_history_page(page: Page, create_user_f
                             "inside the KB dashboard (Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
     with check, allure.step("Creating a new minor revision"):
         utilities.navigate_to_link(article_details["article_show_history_url"])
@@ -528,8 +500,7 @@ def test_ready_for_l10n_status_update_via_history_page(page: Page, create_user_f
                             " inside the KB dashboard (Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
     with allure.step("Creating a new major significance revision"):
         utilities.navigate_to_link(article_details["article_show_history_url"])
@@ -541,8 +512,7 @@ def test_ready_for_l10n_status_update_via_history_page(page: Page, create_user_f
                             " inside the KB dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Marking the newly submitted revision as ready for localization via the"
                      " /history page"):
@@ -556,8 +526,7 @@ def test_ready_for_l10n_status_update_via_history_page(page: Page, create_user_f
                             " inside the KB dashboard (Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
 
 # C2875536
@@ -574,8 +543,8 @@ def test_deferring_revision_does_not_impact_l10n_kb_dashboard_status(page: Page,
 
     with allure.step("Creating a new kb article and approving the first revision without marking "
                      "it as ready for l10n"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step("Creating a new kb article revision and deferring it instead of approving"):
         second_revision = sumo_pages.submit_kb_article_flow.submit_new_kb_revision()
@@ -585,8 +554,7 @@ def test_deferring_revision_does_not_impact_l10n_kb_dashboard_status(page: Page,
                             " inside the KB dashboard (No)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
     with allure.step("Creating a new revision of normal significance and approving it by marking"
                      "it as ready for localization"):
@@ -599,8 +567,7 @@ def test_deferring_revision_does_not_impact_l10n_kb_dashboard_status(page: Page,
                             " inside the KB dashboard (Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
     with allure.step("Creating a new revision and deferring it instead of approving"):
         utilities.navigate_to_link(article_details["article_show_history_url"])
@@ -611,8 +578,7 @@ def test_deferring_revision_does_not_impact_l10n_kb_dashboard_status(page: Page,
                             " inside the KB dashboard (Yes)"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_POSITIVE_STATUS
 
 
 # C2266378
@@ -628,16 +594,14 @@ def test_article_translation_not_allowed_kb_dashboard(page: Page, create_user_fa
 
     with allure.step("Creating a new simple article & unchecking the allow translations"):
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            allow_translations=False,
-            approve_first_revision=True
+            allow_translations=False, approve_first_revision=True
         )
 
     with allure.step("Navigating to the kb dashboard overview page and verifying that the "
                      "correct l10n status is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert sumo_pages.kb_dashboard_page.get_ready_for_l10n_status(
-            article_details['article_title']
-        ) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
+            article_details['article_title']) == kb_dashboard_page_messages.GENERAL_NEGATIVE_STATUS
 
 
 # C2266379, C2266380
@@ -675,16 +639,13 @@ def test_article_stale_kb_dashboard(page: Page, create_user_factory):
                      "non-stale expiry date"):
         utilities.navigate_to_link(article_url)
         sumo_pages.submit_kb_article_flow.submit_new_kb_revision(
-            expiry_date=utilities.kb_article_test_data['expiry_date'],
-            approve_revision=True
+            expiry_date=utilities.kb_article_test_data['expiry_date'], approve_revision=True
         )
 
     with check, allure.step("Navigating to the kb dashboard and verifying that the correct "
                             "stale status and date is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
-        assert sumo_pages.kb_dashboard_page.is_stale_status_empty(
-            article_details['article_title']
-        )
+        assert sumo_pages.kb_dashboard_page.is_stale_status_empty(article_details['article_title'])
         assert sumo_pages.kb_dashboard_page.get_existing_expiry_date(
             article_details['article_title']
         ) == utilities.convert_string_to_datetime(utilities.kb_article_test_data['expiry_date'])
@@ -700,17 +661,15 @@ def test_article_title_update(page: Page, create_user_factory):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step("Navigating to the kb dashboard overview page and verifying that the "
                      "correct title is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         expect(
-            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
-                article_details['article_title']
-            )
-        ).to_be_visible()
+            sumo_pages.kb_dashboard_page.article_title(
+                article_details['article_title'])).to_be_visible()
 
     with allure.step("Navigating to the article's 'Edit Metadata page' page and changing the "
                      "title"):
@@ -721,6 +680,4 @@ def test_article_title_update(page: Page, create_user_factory):
     with allure.step("Navigating back to the kb dashboard page and verifying that the "
                      "correct title is displayed"):
         utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
-        expect(sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
-            new_article_title)
-        ).to_be_visible()
+        expect(sumo_pages.kb_dashboard_page.article_title(new_article_title)).to_be_visible()
diff --git a/playwright_tests/tests/contribute_tests/dashboards_tests/test_recent_revisions_dashboard.py b/playwright_tests/tests/contribute_tests/dashboards_tests/test_recent_revisions_dashboard.py
index 1f5392ae30f..fadd96bd8ea 100644
--- a/playwright_tests/tests/contribute_tests/dashboards_tests/test_recent_revisions_dashboard.py
+++ b/playwright_tests/tests/contribute_tests/dashboards_tests/test_recent_revisions_dashboard.py
@@ -2,7 +2,6 @@
 import pytest
 from playwright.sync_api import Page, expect
 from pytest_check import check
-
 from playwright_tests.core.utilities import Utilities
 from playwright_tests.messages.explore_help_articles.kb_article_revision_page_messages import (
     KBArticleRevision,
@@ -28,7 +27,7 @@ def test_recent_revisions_revision_availability(page: Page, create_user_factory)
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
 
     with allure.step("Navigating to the recent revisions dashboard and verifying that the "
                      "posted article is displayed for admin accounts"):
@@ -36,29 +35,22 @@ def test_recent_revisions_revision_availability(page: Page, create_user_factory)
             utilities.general_test_data['dashboard_links']['recent_revisions']
         )
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
-                article_details['article_title']
-            )
-        ).to_be_visible()
+            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
+                article_details['article_title'])).to_be_visible()
 
     with allure.step("Deleting the user session and verifying that the revision is not "
                      "displayed for signed out users"):
         utilities.delete_cookies()
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
-                article_details['article_title']
-            )
-        ).to_be_hidden()
+            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
+                article_details['article_title'])).to_be_hidden()
 
     with allure.step("Typing the article creator username inside the 'Users' field and "
                      "verifying that the article is not displayed"):
         sumo_pages.recent_revisions_page.fill_in_users_field(test_user["username"])
-        utilities.wait_for_given_timeout(2000)
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
-                article_details['article_title']
-            )
-        ).to_be_hidden()
+            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
+                article_details['article_title'])).to_be_hidden()
 
     with allure.step("Clearing the user search field and signing in with a different "
                      "non-admin account"):
@@ -67,20 +59,15 @@ def test_recent_revisions_revision_availability(page: Page, create_user_factory)
 
     with allure.step("Verifying that the revision is not displayed for non-admin accounts"):
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
-                article_details['article_title']
-            )
-        ).to_be_hidden()
+            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
+                article_details['article_title'])).to_be_hidden()
 
     with allure.step("Typing the article creator username inside the 'Users' field and "
                      "verifying that the article is not displayed"):
         sumo_pages.recent_revisions_page.fill_in_users_field(test_user["username"])
-        utilities.wait_for_given_timeout(2000)
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
-                article_details['article_title']
-            )
-        ).to_be_hidden()
+            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
+                article_details['article_title'])).to_be_hidden()
 
     with allure.step("Clearing the user search field and signing in back with a Knowledge Base"
                      " Reviewer account"):
@@ -97,10 +84,8 @@ def test_recent_revisions_revision_availability(page: Page, create_user_factory)
             utilities.general_test_data['dashboard_links']['recent_revisions']
         )
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
-                article_details['article_title']
-            )
-        ).to_be_hidden()
+            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
+                article_details['article_title'])).to_be_hidden()
 
 
 # C2266240
@@ -117,8 +102,8 @@ def test_second_revisions_availability(page: Page, create_user_factory):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step("Signing in with simple user account"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -134,37 +119,29 @@ def test_second_revisions_availability(page: Page, create_user_factory):
             utilities.general_test_data['dashboard_links']['recent_revisions']
         )
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
-                article_details['article_title'], username
-            )
-        ).to_be_visible()
+            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
+                article_details['article_title'], username)).to_be_visible()
 
     with allure.step("Deleting user session and verifying that the recent revision is "
                      "displayed"):
         utilities.delete_cookies()
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
-                article_details['article_title'], username
-            )
-        ).to_be_visible()
+            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
+                article_details['article_title'], username)).to_be_visible()
 
     with allure.step("Signing in with a different non-admin user and verifying that the "
                      "revision is displayed"):
         utilities.start_existing_session(cookies=test_user_three)
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
-                article_details['article_title'], username
-            )
-        ).to_be_visible()
+            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
+                article_details['article_title'], username)).to_be_visible()
 
     with allure.step("Signing in with an admin account and verifying that the revision is "
                      "displayed"):
         utilities.start_existing_session(cookies=test_user)
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
-                article_details['article_title'], username
-            )
-        ).to_be_visible()
+            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
+                article_details['article_title'], username)).to_be_visible()
 
     with allure.step("Navigating to the article and approving the revision"):
         utilities.navigate_to_link(article_details["article_show_history_url"])
@@ -178,19 +155,15 @@ def test_second_revisions_availability(page: Page, create_user_factory):
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['recent_revisions'])
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
-                article_details['article_title'], username
-            )
-        ).to_be_visible()
+            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
+                article_details['article_title'], username)).to_be_visible()
 
     with allure.step("Signing in with a different non-admin user account and verifying that "
                      "the revision is visible"):
         utilities.start_existing_session(cookies=test_user_three)
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
-                article_details['article_title'], username
-            )
-        ).to_be_visible()
+            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
+                article_details['article_title'], username)).to_be_visible()
 
     with allure.step("Signing back in with an admin account an deleting the article"):
         utilities.start_existing_session(cookies=test_user)
@@ -203,22 +176,19 @@ def test_second_revisions_availability(page: Page, create_user_factory):
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['recent_revisions']
         )
-        utilities.wait_for_given_timeout(1000)
+        sumo_pages.recent_revisions_page._wait_for_locator(
+            sumo_pages.recent_revisions_page.revisions_table)
         utilities.delete_cookies()
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
-                article_details['article_title'], username
-            )
-        ).to_be_hidden()
+            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
+                article_details['article_title'], username)).to_be_hidden()
 
     with allure.step("Signing in with a different non-admin account and verifying that the "
                      "revision is no longer displayed for the deleted kb article"):
         utilities.start_existing_session(cookies=test_user_two)
         expect(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article_title_and_user(
-                article_details['article_title'], username
-            )
-        ).to_be_hidden()
+            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
+                article_details['article_title'], username)).to_be_hidden()
 
 
 # C2266240
@@ -234,15 +204,15 @@ def test_recent_revisions_dashboard_links(page: Page, create_user_factory):
     first_username = sumo_pages.top_navbar.get_text_of_logged_in_username()
 
     with allure.step("Creating a new kb article"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step("Navigating to the recent revisions dashboard and verifying that the "
                      "'Show Diff' option is not available for first revisions"):
         sumo_pages.top_navbar.click_on_recent_revisions_option()
         utilities.wait_for_given_timeout(3000)
         expect(
-            sumo_pages.recent_revisions_page.get_show_diff_article_locator(
+            sumo_pages.recent_revisions_page.show_diff(
                 article_title=article_details['article_title'], creator=first_username
             )
         ).to_be_hidden()
@@ -258,7 +228,6 @@ def test_recent_revisions_dashboard_links(page: Page, create_user_factory):
                      "on the revision date link and verifying that the user is redirected to"
                      "the correct page"):
         sumo_pages.top_navbar.click_on_recent_revisions_option()
-        utilities.wait_for_given_timeout(3000)
         utilities.delete_cookies()
         sumo_pages.recent_revisions_page.click_on_revision_date_for_article(
             article_title=article_details['article_title'], username=username
@@ -302,7 +271,7 @@ def test_recent_revisions_dashboard_links(page: Page, create_user_factory):
         sumo_pages.recent_revisions_page.click_on_show_diff_for_article(
             article_title=article_details['article_title'], creator=username
         )
-        expect(sumo_pages.recent_revisions_page.get_diff_section_locator()).to_be_visible()
+        expect(sumo_pages.recent_revisions_page.revision_diff_section).to_be_visible()
 
 
 # C2266240, C2243449
@@ -316,8 +285,8 @@ def test_recent_revisions_dashboard_title_and_username_update(page: Page, create
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step("Changing the article title via the 'Edit Article Metadata' page"):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(
@@ -336,12 +305,11 @@ def test_recent_revisions_dashboard_title_and_username_update(page: Page, create
     with allure.step("Navigating to the recent revisions dashboard and verifying that the "
                      "correct new username and article title arte displayed"):
         sumo_pages.top_navbar.click_on_recent_revisions_option()
-        utilities.wait_for_given_timeout(3000)
         expect(
-            sumo_pages.recent_revisions_page.get_revision_and_username_locator(
+            sumo_pages.recent_revisions_page.recent_revisions_based_on_article_and_user(
                 article_title=(utilities.kb_article_test_data
                                ['updated_kb_article_title'] + article_details['article_title']),
-                username=new_username
+                user=new_username
             )
         ).to_be_visible()
 
@@ -352,7 +320,6 @@ def test_recent_revisions_dashboard_title_and_username_update(page: Page, create
             expected_url=MyProfileMessages.get_my_profile_stage_url(test_user["username"])
         )
 
-
 # C2266241
 @pytest.mark.recentRevisionsDashboard
 def test_recent_revisions_dashboard_filters(page: Page):
@@ -365,11 +332,11 @@ def test_recent_revisions_dashboard_filters(page: Page):
             utilities.general_test_data['dashboard_links']['recent_revisions']
         )
 
-    utilities.wait_for_given_timeout(3000)
+    sumo_pages.recent_revisions_page._wait_for_locator(
+        sumo_pages.recent_revisions_page.revisions_table)
     with check, allure.step("Selecting the ro locale from the locale filter and verifying "
                             "that all the displayed revisions are for the 'ro' locale"):
         sumo_pages.recent_revisions_page.select_locale_option("ro")
-        utilities.wait_for_given_timeout(5000)
         for tag in sumo_pages.recent_revisions_page.get_list_of_all_locale_tage():
             assert tag == "ro"
 
@@ -377,13 +344,11 @@ def test_recent_revisions_dashboard_filters(page: Page):
                             "'Users' filter and verifying that all the displayed revisions are "
                             "for the posted user"):
         sumo_pages.recent_revisions_page.select_locale_option("en-US")
-        utilities.wait_for_given_timeout(5000)
         display_name_one = "Smith"
         display_name_two = "Ryan Johnson"
         username_one = "sellis1"
         username_two = "ryanjohnson"
         sumo_pages.recent_revisions_page.fill_in_users_field(display_name_one)
-        utilities.wait_for_given_timeout(5000)
         for user in sumo_pages.recent_revisions_page.get_list_of_all_editors():
             assert user == display_name_one
 
@@ -391,24 +356,20 @@ def test_recent_revisions_dashboard_filters(page: Page):
                             "content is returned"):
         sumo_pages.recent_revisions_page.fill_in_users_field(f"{display_name_one}, "
                                                              f"{display_name_two}")
-        utilities.wait_for_given_timeout(5000)
         for user in sumo_pages.recent_revisions_page.get_list_of_all_editors():
             assert user in [display_name_one, display_name_two]
 
     with check, allure.step("Clearing the username filter and adding both usernames inside the "
                             "filter and verifying that the correct content is displayed"):
         sumo_pages.recent_revisions_page.fill_in_users_field(f"{username_one}, {username_two}")
-        utilities.wait_for_given_timeout(5000)
         for user in sumo_pages.recent_revisions_page.get_list_of_all_editors():
             assert user in [display_name_one, display_name_two]
 
     with allure.step("Clearing the user filter, adding data inside the start and end fields"):
         sumo_pages.recent_revisions_page.clearing_the_user_field()
-        utilities.wait_for_given_timeout(5000)
 
         sumo_pages.recent_revisions_page.add_start_date("04052023")
         sumo_pages.recent_revisions_page.add_end_date("05012023")
-        utilities.wait_for_given_timeout(5000)
     with check, allure.step("Verifying that the displayed revision dates are between ("
                             "inclusive) the set start and end date filters"):
         extracted_date = []
diff --git a/playwright_tests/tests/contribute_tests/test_groups.py b/playwright_tests/tests/contribute_tests/test_groups.py
index 5c5703170d6..50003383ac9 100644
--- a/playwright_tests/tests/contribute_tests/test_groups.py
+++ b/playwright_tests/tests/contribute_tests/test_groups.py
@@ -123,7 +123,7 @@ def test_change_group_avatar(page: Page, create_user_factory):
     with allure.step("Signing in with a group leader and accessing the test group"):
         utilities.start_existing_session(cookies=test_user)
         group_url = utilities.get_page_url()
-        utilities.screenshot_the_locator(sumo_pages.user_groups.get_group_avatar_locator(),
+        utilities.screenshot_the_locator(sumo_pages.user_groups.group_avatar_image,
                                          displayed_image)
 
     with allure.step("Clicking on the 'Change' avatar button, uploading the image and clicking on"
@@ -146,7 +146,7 @@ def test_change_group_avatar(page: Page, create_user_factory):
 
     with check, allure.step("Verifying that the uploaded image is successfully displayed inside "
                             "the group"):
-        utilities.screenshot_the_locator(sumo_pages.user_groups.get_group_avatar_locator(),
+        utilities.screenshot_the_locator(sumo_pages.user_groups.group_avatar_image,
                                          displayed_image)
         assert not utilities.are_images_different(displayed_image, first_uploaded_image)
 
@@ -154,11 +154,9 @@ def test_change_group_avatar(page: Page, create_user_factory):
                             "uploaded image is successfully displayed inside the image preview"):
         sumo_pages.user_groups.click_on_change_uploaded_avatar_button()
         utilities.screenshot_the_locator(
-            sumo_pages.user_groups.get_change_avatar_image_preview_locator(),
-            displayed_image
+            sumo_pages.user_groups.upload_avatar_image_preview, displayed_image
         )
-        assert not utilities.are_images_different(displayed_image,
-                                                  first_uploaded_image)
+        assert not utilities.are_images_different(displayed_image, first_uploaded_image)
 
     with check, allure.step("Verifying that the correct page header is displayed"):
         assert (sumo_pages.user_groups.get_upload_avatar_page_header() == UserGroupMessages.
@@ -178,7 +176,7 @@ def test_change_group_avatar(page: Page, create_user_factory):
                               second_uploaded_image)
         sumo_pages.user_groups.click_on_upload_avatar_button(expected_url=group_url)
 
-        utilities.screenshot_the_locator(sumo_pages.user_groups.get_group_avatar_locator(),
+        utilities.screenshot_the_locator(sumo_pages.user_groups.group_avatar_image,
                                          displayed_image)
         assert not utilities.are_images_different(displayed_image, second_uploaded_image)
 
@@ -192,13 +190,13 @@ def test_change_group_avatar(page: Page, create_user_factory):
                 DELETE_AVATAR_PAGE_INFO)
 
         utilities.screenshot_the_locator(
-            sumo_pages.user_groups.get_delete_avatar_image_preview_locator(), displayed_image)
+            sumo_pages.user_groups.delete_uploaded_avatar_image_preview, displayed_image)
         assert not utilities.are_images_different(displayed_image, second_uploaded_image)
 
     with allure.step("Clicking on the 'Cancel' button and verifying that the image was not "
                      "deleted"):
         sumo_pages.user_groups.click_on_cancel_delete_avatar_button()
-        utilities.screenshot_the_locator(sumo_pages.user_groups.get_group_avatar_locator(),
+        utilities.screenshot_the_locator(sumo_pages.user_groups.group_avatar_image,
                                          displayed_image)
         assert not utilities.are_images_different(displayed_image, second_uploaded_image)
 
@@ -206,7 +204,7 @@ def test_change_group_avatar(page: Page, create_user_factory):
                      "verifying that the image was deleted"):
         sumo_pages.user_groups.click_on_delete_uploaded_avatar_button()
         sumo_pages.user_groups.click_on_delete_avatar_button()
-        utilities.screenshot_the_locator(sumo_pages.user_groups.get_group_avatar_locator(),
+        utilities.screenshot_the_locator(sumo_pages.user_groups.group_avatar_image,
                                          displayed_image)
         assert utilities.are_images_different(displayed_image, second_uploaded_image)
 
diff --git a/playwright_tests/tests/explore_help_articles_tests/articles/test_article_show_history.py b/playwright_tests/tests/explore_help_articles_tests/articles/test_article_show_history.py
index 425e5650ab4..4f295898976 100644
--- a/playwright_tests/tests/explore_help_articles_tests/articles/test_article_show_history.py
+++ b/playwright_tests/tests/explore_help_articles_tests/articles/test_article_show_history.py
@@ -32,7 +32,7 @@ def test_kb_article_removal(page: Page, create_user_factory):
 
     utilities.start_existing_session(cookies=test_user)
 
-    article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
+    article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
     revision_id_number = utilities.number_extraction_from_string(
         article_details['first_revision_id']
     )
@@ -41,8 +41,7 @@ def test_kb_article_removal(page: Page, create_user_factory):
                      "revision"):
         expect(
             sumo_pages.kb_article_show_history_page.delete_revision(
-                article_details['first_revision_id']
-            )
+                article_details['first_revision_id'])
         ).to_be_hidden()
 
     with allure.step("Verifying that manually navigating to the delete revision endpoint returns "
@@ -58,7 +57,8 @@ def test_kb_article_removal(page: Page, create_user_factory):
     with allure.step("Navigating back and verifying that the delete button for the article "
                      "is not displayed"):
         utilities.navigate_to_link(article_details["article_show_history_url"])
-        expect(sumo_pages.kb_article_show_history_page.delete_this_document_button).to_be_hidden()
+        expect(sumo_pages.kb_article_show_history_page.delete_this_document_button
+        ).to_be_hidden()
 
     with allure.step("Verifying that manually navigating to the delete endpoint returns 403"):
         with page.expect_navigation() as navigation_info:
@@ -217,7 +217,7 @@ def test_kb_article_contributor_removal(page: Page, create_user_factory):
     test_user_two = create_user_factory(permissions=["add_revision"])
 
     utilities.start_existing_session(cookies=test_user)
-    article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
+    article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
 
     with allure.step("Verifying that no users are added inside the contributors list"):
         expect(sumo_pages.kb_article_show_history_page.all_contributors_list_items).to_be_hidden()
@@ -390,7 +390,7 @@ def test_contributors_can_be_manually_added(page: Page, create_user_factory):
 
     with allure.step("Clicking on the 'Edit Contributors' option, adding and selecting the "
                      "username from the search field"):
-        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
+        sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
         sumo_pages.kb_article_show_history_page.click_on_edit_contributors_option()
         (sumo_pages.kb_article_show_history_page
          .add_a_new_contributor_inside_the_contributor_field(test_user_two["username"]))
@@ -427,7 +427,7 @@ def test_kb_article_contributor_profile_access(page: Page, create_user_factory):
 
     utilities.start_existing_session(cookies=test_user)
 
-    sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page, approve_revision=True)
+    sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
     sumo_pages.kb_article_page.click_on_article_option()
     article_url = utilities.get_page_url()
 
@@ -512,8 +512,8 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
     with allure.step(f"Signing in with {test_user['username']} account and creating a new "
                      f"article and approving it's first revision"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step(f"Signing in with {test_user_two['username']} user account"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -543,25 +543,23 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
 
     with allure.step("Verifying that the revision information content is expanded by default"):
         expect(
-            sumo_pages.kb_article_preview_revision_page.get_revision_information_content_locator(
-            )).to_be_visible()
+            sumo_pages.kb_article_preview_revision_page.revision_information_content
+        ).to_be_visible()
 
     with allure.step("Clicking on the 'Revision Information' foldout section and Verifying "
                      "that the revision information content is collapsed/no longer displayed"):
-        (sumo_pages.kb_article_preview_revision_page
-         .click_on_revision_information_foldout_section())
+        sumo_pages.kb_article_preview_revision_page.click_on_revision_information_foldout_section()
         expect(
-            sumo_pages.kb_article_preview_revision_page.get_revision_information_content_locator(
-            )).to_be_hidden()
+            sumo_pages.kb_article_preview_revision_page.revision_information_content
+            ).to_be_hidden()
 
     with allure.step("Clicking on the 'Revision Information' foldout section"):
-        (sumo_pages.kb_article_preview_revision_page
-         .click_on_revision_information_foldout_section())
+        sumo_pages.kb_article_preview_revision_page.click_on_revision_information_foldout_section()
 
     with allure.step("Verifying that the revision information content is displayed"):
         expect(
-            sumo_pages.kb_article_preview_revision_page.get_revision_information_content_locator(
-            )).to_be_visible()
+            sumo_pages.kb_article_preview_revision_page.revision_information_content
+            ).to_be_visible()
 
     with allure.step("Verifying that the revision id is the correct one"):
         assert (sumo_pages.kb_article_preview_revision_page.
@@ -595,18 +593,13 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
                 KB_ARTICLE_REVISION_NO_STATUS)
 
     with allure.step("Verifying that the reviewed by locator is hidden"):
-        expect(
-            sumo_pages.kb_article_preview_revision_page.get_reviewed_by_locator()).to_be_hidden()
+        expect(sumo_pages.kb_article_preview_revision_page.reviewed_by).to_be_hidden()
 
     with allure.step("Verifying that the is approved locator is hidden"):
-        expect(
-            sumo_pages.kb_article_preview_revision_page.get_is_approved_text_locator()
-        ).to_be_hidden()
+        expect(sumo_pages.kb_article_preview_revision_page.is_approved).to_be_hidden()
 
     with allure.step("Verifying that the is current revision locator is hidden"):
-        expect(
-            sumo_pages.kb_article_preview_revision_page.is_current_revision_locator()
-        ).to_be_hidden()
+        expect(sumo_pages.kb_article_preview_revision_page.is_current_revision).to_be_hidden()
 
     with allure.step("Verifying that the correct ready for localization locator is displayed"):
         assert (sumo_pages.kb_article_preview_revision_page.
@@ -614,18 +607,16 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
                 KB_ARTICLE_REVISION_NO_STATUS)
 
     with allure.step("Verifying that the readied for localization by is hidden"):
-        expect(sumo_pages.kb_article_preview_revision_page.readied_for_localization_by_locator(
-        )).to_be_hidden()
+        expect(sumo_pages.kb_article_preview_revision_page.readied_for_localization_by
+        ).to_be_hidden()
 
     with allure.step("Verifying that the 'Edit article based on this revision' is not "
                      "displayed"):
-        expect(
-            (sumo_pages.kb_article_preview_revision_page
-             .get_edit_article_based_on_this_revision_link_locator())).to_be_hidden()
+        expect(sumo_pages.kb_article_preview_revision_page.edit_article_based_on_revision_link
+               ).to_be_hidden()
 
     with allure.step("Verifying that the 'Revision Source' section is hidden by default"):
-        expect((sumo_pages.kb_article_preview_revision_page
-                .get_preview_revision_source_textarea_locator())).to_be_hidden()
+        expect(sumo_pages.kb_article_preview_revision_page.revision_source_textarea).to_be_hidden()
 
     with allure.step("Clicking on the 'Revision Source' foldout section option and verifying that "
                      "the 'Revision Source' textarea contains the correct details"):
@@ -635,14 +626,14 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
                 kb_article_test_data['updated_article_content'])
 
     with allure.step("Verifying that the 'Revision Content' section is hidden by default"):
-        expect(sumo_pages.kb_article_preview_revision_page.get_revision_content_html_locator(
-        )).to_be_hidden()
+        expect(sumo_pages.kb_article_preview_revision_page.revision_content_html_section
+               ).to_be_hidden()
 
     with allure.step("Clicking on the 'Revision Content' foldout option and verifying that "
                      "the 'Revision Content' section is visible"):
         sumo_pages.kb_article_preview_revision_page.click_on_revision_content_foldout_section()
-        expect(sumo_pages.kb_article_preview_revision_page.get_revision_content_html_locator(
-        )).to_be_visible()
+        expect(sumo_pages.kb_article_preview_revision_page.revision_content_html_section
+        ).to_be_visible()
 
     with allure.step(f"Signing in with {test_user['username']} user account and approving the "
                      f"revision"):
@@ -663,8 +654,7 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
                 KB_ARTICLE_REVISION_YES_STATUS)
 
     with allure.step("Verifying that the reviewed by date is displayed"):
-        expect((sumo_pages.kb_article_preview_revision_page
-                .get_preview_revision_reviewed_date_locator())).to_be_visible()
+        expect(sumo_pages.kb_article_preview_revision_page.reviewed_time).to_be_visible()
 
     with allure.step("Verifying that the correct 'Reviewed by' text is displayed"):
         assert (sumo_pages.kb_article_preview_revision_page.
@@ -685,7 +675,7 @@ def test_kb_article_revision_date_functionality(page: Page, create_user_factory)
 
     with allure.step("Verifying that the 'Readied for localization' date is displayed"):
         expect(
-            sumo_pages.kb_article_preview_revision_page.ready_for_localization_date()
+            sumo_pages.kb_article_preview_revision_page.readied_for_localization_date
         ).to_be_visible()
 
     with allure.step("Verifying that the correct localization by text is displayed"):
diff --git a/playwright_tests/tests/explore_help_articles_tests/articles/test_article_threads.py b/playwright_tests/tests/explore_help_articles_tests/articles/test_article_threads.py
index c859ff5ef75..3c102db6d9f 100644
--- a/playwright_tests/tests/explore_help_articles_tests/articles/test_article_threads.py
+++ b/playwright_tests/tests/explore_help_articles_tests/articles/test_article_threads.py
@@ -17,8 +17,8 @@ def test_article_thread_field_validation(page: Page, create_user_factory):
     with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
 
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
         sumo_pages.kb_article_page.click_on_editing_tools_discussion_option()
 
@@ -86,7 +86,7 @@ def test_article_thread_field_validation(page: Page, create_user_factory):
             utilities.kb_new_thread_test_data['new_thread_reduced_title']
         )
         sumo_pages.kb_article_discussion_page.click_on_cancel_new_thread_button()
-        expect(sumo_pages.kb_article_discussion_page.get_thread_by_title_locator(
+        expect(sumo_pages.kb_article_discussion_page.thread_by_title(
             utilities.kb_new_thread_test_data['new_thread_reduced_title']
         )
         ).to_be_hidden()
@@ -111,7 +111,7 @@ def test_article_thread_field_validation(page: Page, create_user_factory):
         )
         utilities.navigate_to_link(
             article_details["article_url"] + KBArticlePageMessages.KB_ARTICLE_DISCUSSIONS_ENDPOINT)
-        expect(sumo_pages.kb_article_discussion_page.get_posted_thread_locator(thread_id)
+        expect(sumo_pages.kb_article_discussion_page.posted_thread(thread_id)
                ).to_be_visible()
 
 
@@ -125,8 +125,8 @@ def test_thread_replies_counter_increment(page: Page, create_user_factory):
     with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
 
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step("Manually navigating to the article endpoint and clicking on the "
                      "article option"):
@@ -174,8 +174,8 @@ def test_thread_replies_counter_decrement(page: Page, create_user_factory):
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
         utilities.navigate_to_link(article_details["article_url"])
 
     with allure.step("Clicking on the 'Post a new thread button' and posting a new kb "
@@ -223,18 +223,17 @@ def test_thread_replies_counter_decrement(page: Page, create_user_factory):
 
 
 @pytest.mark.articleThreads
-@pytest.mark.parametrize("user_type", ['Simple user', 'Forum Moderator', ''])
+@pytest.mark.parametrize("user_type", ['Simple User', 'Forum Moderator', ''])
 def test_article_thread_author_filter(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-    test_user = create_user_factory(groups=["Forum Moderators"],
-                                    permissions=["review_revision"])
+    test_user = create_user_factory(groups=["Forum Moderators"], permissions=["review_revision"])
     test_user_two = create_user_factory()
 
     with allure.step(f"Signing in with with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
         utilities.navigate_to_link(article_details["article_url"])
 
     with allure.step("Posting a new kb article discussion thread"):
@@ -254,7 +253,7 @@ def test_article_thread_author_filter(page: Page, user_type, create_user_factory
     if user_type == 'Forum Moderator':
         with allure.step(f"Signing in with the {test_user['username']} user account"):
             utilities.start_existing_session(cookies=test_user)
-    elif user_type != 'Simple user':
+    elif user_type != 'Simple User':
         with allure.step("Signing out from SUMO"):
             utilities.delete_cookies()
 
@@ -272,18 +271,17 @@ def test_article_thread_author_filter(page: Page, user_type, create_user_factory
 
 
 @pytest.mark.articleThreads
-@pytest.mark.parametrize("user_type", ['Simple user', 'Forum Moderator', ''])
+@pytest.mark.parametrize("user_type", ['Simple User', 'Forum Moderator', ''])
 def test_article_thread_replies_filter(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-    test_user = create_user_factory(groups=["Forum Moderators"],
-                                    permissions=["review_revision"])
+    test_user = create_user_factory(groups=["Forum Moderators"], permissions=["review_revision"])
     test_user_two = create_user_factory()
 
     with allure.step(f"Signing in with the {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
         utilities.navigate_to_link(article_details["article_url"])
 
     with allure.step("Clicking on the 'Post a new thread button' and posting a new kb "
@@ -302,7 +300,7 @@ def test_article_thread_replies_filter(page: Page, user_type, create_user_factor
     with allure.step("Navigating back to the article discussion page"):
         utilities.navigate_to_link(thread_info['article_discussion_url'])
 
-    if user_type == "Simple user":
+    if user_type == "Simple User":
         with allure.step(f"Signing in with the {test_user_two['username']} account"):
             utilities.start_existing_session(cookies=test_user_two)
     elif user_type == '':
@@ -332,7 +330,7 @@ def test_article_lock_thread_non_admin_users(page: Page, create_user_factory):
     with allure.step(f"Signing in with {test_user['username']} user account and creating a new"
                      f" article"):
         utilities.start_existing_session(cookies=test_user)
-    article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
+    article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
 
     with allure.step(f"Signing in with the {test_user_two['username']} user account and approving"
                      f" the article"):
@@ -359,8 +357,7 @@ def test_article_lock_thread_non_admin_users(page: Page, create_user_factory):
         utilities.navigate_to_link(thread_info_one["article_discussion_url"])
         sumo_pages.kb_article_discussion_page.click_on_a_particular_thread(
             thread_info_one['thread_id'])
-        expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator()
-               ).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
 
     with allure.step("Navigating back to the article discussions page, clicking on the "
                      "thread posted by self and verifying that the 'Lock thread' option is "
@@ -368,30 +365,26 @@ def test_article_lock_thread_non_admin_users(page: Page, create_user_factory):
         utilities.navigate_to_link(thread_info_one["article_discussion_url"])
         sumo_pages.kb_article_discussion_page.click_on_a_particular_thread(
             thread_info_two['thread_id'])
-        expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator()
-               ).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
 
     with allure.step("Deleting user sessions and verifying that the 'Lock thread' options is "
                      "not available"):
         utilities.delete_cookies()
-        expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator()
-               ).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
 
 
 #  C2260810
 @pytest.mark.articleThreads
-@pytest.mark.parametrize("user_type", ['Forum Moderator', 'Simple user', ''])
+@pytest.mark.parametrize("user_type", ['Forum Moderator', 'Simple User', ''])
 def test_article_lock_thread_functionality(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-    test_user = create_user_factory(groups=["Forum Moderators"],
-                                    permissions=["review_revision"])
+    test_user = create_user_factory(groups=["Forum Moderators"], permissions=["review_revision"])
     test_user_two = create_user_factory()
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
-        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page,
-                                                                      approve_revision=True)
+        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
 
     with allure.step("Posting a new kb article discussion thread"):
         thread_info_one = sumo_pages.kb_article_thread_flow.add_new_kb_discussion_thread()
@@ -415,7 +408,7 @@ def test_article_lock_thread_functionality(page: Page, user_type, create_user_fa
             thread_info_one['thread_id'])
         sumo_pages.kb_article_discussion_page.click_on_lock_this_article_thread_option()
 
-    if user_type == 'Simple user':
+    if user_type == 'Simple User':
         with allure.step("Signing in with a non-admin account and verifying that the correct"
                          " thread locked message is displayed"):
             utilities.start_existing_session(cookies=test_user_two)
@@ -427,11 +420,11 @@ def test_article_lock_thread_functionality(page: Page, user_type, create_user_fa
             utilities.delete_cookies()
 
     with allure.step("Verifying that the 'Post a reply' textarea field is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.get_thread_post_a_reply_textarea_field()
+        expect(sumo_pages.kb_article_discussion_page.thread_post_a_reply_textarea_field
                ).to_be_hidden()
 
     with allure.step("Verifying that the 'Locked' status is displayed under article header"):
-        expect(sumo_pages.kb_article_discussion_page.get_locked_article_status()).to_be_visible()
+        expect(sumo_pages.kb_article_discussion_page.article_thread_locked_status).to_be_visible()
 
     with allure.step("Navigating back to the discussions page"):
         utilities.navigate_to_link(thread_info_one["article_discussion_url"])
@@ -446,7 +439,7 @@ def test_article_lock_thread_functionality(page: Page, user_type, create_user_fa
             thread_info_two['thread_id'])
         sumo_pages.kb_article_discussion_page.click_on_lock_this_article_thread_option()
 
-    if user_type == 'Simple user':
+    if user_type == 'Simple User':
         with allure.step("Signing in with a non-admin account and verifying that the correct"
                          " thread locked message is displayed"):
             utilities.start_existing_session(cookies=test_user_two)
@@ -457,29 +450,27 @@ def test_article_lock_thread_functionality(page: Page, user_type, create_user_fa
             utilities.delete_cookies()
 
     with allure.step("Verifying that the 'Locked' status is displayed under article header"):
-        expect(sumo_pages.kb_article_discussion_page.get_locked_article_status()).to_be_visible()
+        expect(sumo_pages.kb_article_discussion_page.article_thread_locked_status).to_be_visible()
 
     with allure.step("Verifying that the 'Post a reply' textarea field is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.get_thread_post_a_reply_textarea_field()
+        expect(sumo_pages.kb_article_discussion_page.thread_post_a_reply_textarea_field
                ).to_be_hidden()
 
 
 # C2260810
 @pytest.mark.articleThreads
-@pytest.mark.parametrize("user_type", ['Forum Moderator', 'Simple user', ''])
+@pytest.mark.parametrize("user_type", ['Forum Moderator', 'Simple User', ''])
 def test_article_unlock_thread_functionality(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-    test_user = create_user_factory(groups=["Forum Moderators"],
-                                    permissions=["review_revision"])
+    test_user = create_user_factory(groups=["Forum Moderators"], permissions=["review_revision"])
     test_user_two = create_user_factory()
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Navigating to the article endpoint"):
-        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page,
-                                                                      approve_revision=True)
+        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
 
     with allure.step("Posting a new kb article discussion thread"):
         thread_info_one = sumo_pages.kb_article_thread_flow.add_new_kb_discussion_thread()
@@ -512,18 +503,16 @@ def test_article_unlock_thread_functionality(page: Page, user_type, create_user_
         assert (sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_option_text(
         ) == KBArticlePageMessages.KB_ARTICLE_UNLOCK_THIS_THREAD_OPTION)
 
-    if user_type == 'Simple user':
+    if user_type == 'Simple User':
         with allure.step(f"Signing in with {test_user_two['username']} user account and verifying"
                          f" that the 'Unlock this thread' option is not displayed"):
             utilities.start_existing_session(cookies=test_user_two)
-            expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator(
-            )).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
     if user_type == '':
         with allure.step("Deleting user session and verifying that the 'Unlock this thread' "
                          "option is no displayed"):
             utilities.delete_cookies()
-            expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator(
-            )).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
 
     if user_type != 'Forum Moderator':
         with allure.step(f"Signing in with {test_user['username']} user account"):
@@ -532,25 +521,24 @@ def test_article_unlock_thread_functionality(page: Page, user_type, create_user_
     with allure.step("Clicking on the 'Unlock this thread'"):
         sumo_pages.kb_article_discussion_page.click_on_lock_this_article_thread_option()
 
-    if user_type == 'Simple user':
+    if user_type == 'Simple User':
         with allure.step(f"Signing in with {test_user_two['username']} user account and verifying"
                          f" that the textarea field is available"):
             utilities.start_existing_session(cookies=test_user_two)
-            expect(sumo_pages.kb_article_discussion_page.get_thread_post_a_reply_textarea_field(
-            )).to_be_visible()
+            expect(sumo_pages.kb_article_discussion_page.thread_post_a_reply_textarea_field
+            ).to_be_visible()
     if user_type == '':
         with allure.step("Deleting user session and verifying that the textarea field is not "
                          "available"):
             utilities.delete_cookies()
-            expect(sumo_pages.kb_article_discussion_page.get_thread_post_a_reply_textarea_field(
-            )).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.thread_post_a_reply_textarea_field
+            ).to_be_hidden()
 
     with allure.step("Verifying that the 'Locked' header text is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.get_locked_article_status()).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.article_thread_locked_status).to_be_hidden()
 
     with allure.step("Verifying that the 'Thread locked' page message is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.get_text_of_locked_article_thread_locator(
-        )).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.article_thread_locked_message).to_be_hidden()
 
     if user_type != "Forum Moderator":
         with allure.step("Signing in with an admin account"):
@@ -572,18 +560,16 @@ def test_article_unlock_thread_functionality(page: Page, user_type, create_user_
         assert (sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_option_text(
         ) == KBArticlePageMessages.KB_ARTICLE_UNLOCK_THIS_THREAD_OPTION)
 
-    if user_type == 'Simple user':
+    if user_type == 'Simple User':
         with allure.step(f"Signing in with {test_user_two['username']} user account and verifying"
                          f" that the 'Unlock this thread' option is displayed"):
             utilities.start_existing_session(cookies=test_user_two)
-            expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator(
-            )).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
     if user_type == '':
         with allure.step("Deleting the user session and verifying that the 'Unlock this "
                          "thread' option is not displayed"):
             utilities.delete_cookies()
-            expect(sumo_pages.kb_article_discussion_page.get_lock_this_article_thread_locator(
-            )).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.lock_this_thread).to_be_hidden()
 
     if user_type != 'Forum Moderator':
         with allure.step(f"Signing in with {test_user['username']} user account and clicking on"
@@ -591,35 +577,33 @@ def test_article_unlock_thread_functionality(page: Page, user_type, create_user_
             utilities.start_existing_session(cookies=test_user)
     sumo_pages.kb_article_discussion_page.click_on_lock_this_article_thread_option()
 
-    if user_type == 'Simple user':
+    if user_type == 'Simple User':
         with allure.step(f"Signing in with {test_user_two['username']} user account and verifying"
                          f" that the textarea field is available"):
             utilities.start_existing_session(cookies=test_user_two)
-            expect(sumo_pages.kb_article_discussion_page.get_thread_post_a_reply_textarea_field(
-            )).to_be_visible()
+            expect(sumo_pages.kb_article_discussion_page.thread_post_a_reply_textarea_field
+            ).to_be_visible()
     if user_type == '':
         with allure.step("Deleting user session and verifying that the textarea field is not "
                          "available"):
             utilities.delete_cookies()
-            expect(sumo_pages.kb_article_discussion_page.get_thread_post_a_reply_textarea_field(
-            )).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.thread_post_a_reply_textarea_field
+            ).to_be_hidden()
 
     with allure.step("Verifying that the 'Locked' header text is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.get_locked_article_status()).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.article_thread_locked_status).to_be_hidden()
 
     with allure.step("Verifying that the 'Thread locked' page message is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.get_text_of_locked_article_thread_locator(
-        )).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.article_thread_locked_message).to_be_hidden()
 
 
 # C2260811
 @pytest.mark.articleThreads
-@pytest.mark.parametrize("user_type", ['Forum Moderator', 'Simple user', ''])
+@pytest.mark.parametrize("user_type", ['Forum Moderator', 'Simple User', ''])
 def test_article_thread_sticky(page: Page, user_type, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-    test_user = create_user_factory(groups=["Forum Moderators"],
-                                    permissions=["review_revision"])
+    test_user = create_user_factory(groups=["Forum Moderators"], permissions=["review_revision"])
     test_user_two = create_user_factory()
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
@@ -643,8 +627,7 @@ def test_article_thread_sticky(page: Page, user_type, create_user_factory):
         )
 
     with allure.step("Verifying that the 'Sticky this thread' option is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.get_sticky_this_thread_locator()
-               ).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.sticky_this_thread).to_be_hidden()
 
     with allure.step("Navigating back to the discussions page"):
         utilities.navigate_to_link(thread_info_one['article_discussion_url'])
@@ -662,25 +645,22 @@ def test_article_thread_sticky(page: Page, user_type, create_user_factory):
         assert (sumo_pages.kb_article_discussion_page.get_text_of_sticky_this_thread_option(
         ) == KBArticlePageMessages.KB_ARTICLE_UNSTICKY_OPTION)
 
-    if user_type == 'Simple user':
+    if user_type == 'Simple User':
         with allure.step(f"Signing in with {test_user_two['username']} user account and "
                          f"verifying that the unsticky this thread option is not available"):
             utilities.start_existing_session(cookies=test_user_two)
-            expect(sumo_pages.kb_article_discussion_page.get_sticky_this_thread_locator()
-                   ).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.sticky_this_thread).to_be_hidden()
     if user_type == '':
         with allure.step("Deleting user session and verifying that the unsticky this thread "
                          "option is not available"):
             utilities.delete_cookies()
-            expect(sumo_pages.kb_article_discussion_page.get_sticky_this_thread_locator()
-                   ).to_be_hidden()
+            expect(sumo_pages.kb_article_discussion_page.sticky_this_thread).to_be_hidden()
 
     with allure.step("Verifying that the 'Sticky' status is displayed"):
-        expect(sumo_pages.kb_article_discussion_page.get_sticky_this_thread_status_locator()
-               ).to_be_visible()
+        expect(sumo_pages.kb_article_discussion_page.article_thread_sticky_status).to_be_visible()
 
     with allure.step("Navigating back to the discussions page and verifying that the sticky "
-                     "article is displayed in top of the list"):
+                     "thread is displayed in top of the list"):
         utilities.navigate_to_link(thread_info_one['article_discussion_url'])
         assert (
             sumo_pages.kb_article_discussion_page.
@@ -698,7 +678,7 @@ def test_article_thread_sticky(page: Page, user_type, create_user_factory):
         assert (sumo_pages.kb_article_discussion_page.get_text_of_sticky_this_thread_option(
         ) == KBArticlePageMessages.KB_ARTICLE_STICKY_THIS_THREAD_OPTION)
 
-    if user_type == 'Simple user':
+    if user_type == 'Simple User':
         with allure.step(f"Signing in with {test_user_two['username']} user account"):
             utilities.start_existing_session(cookies=test_user_two)
     if user_type == '':
@@ -706,8 +686,7 @@ def test_article_thread_sticky(page: Page, user_type, create_user_factory):
             utilities.delete_cookies()
 
     with allure.step("Verifying that the 'Sticky' status is not displayed"):
-        expect(sumo_pages.kb_article_discussion_page.get_sticky_this_thread_status_locator()
-               ).to_be_hidden()
+        expect(sumo_pages.kb_article_discussion_page.article_thread_sticky_status).to_be_hidden()
 
     with allure.step("Navigating back to the discussions page and verifying that the sticky"
                      " article is not displayed in top of the list"):
@@ -722,8 +701,7 @@ def test_article_thread_sticky(page: Page, user_type, create_user_factory):
 def test_article_thread_content_edit(page: Page, thread_author, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
-    test_user = create_user_factory(groups=["Forum Moderators"],
-                                    permissions=["review_revision"])
+    test_user = create_user_factory(groups=["Forum Moderators"], permissions=["review_revision"])
     test_user_two = create_user_factory()
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
@@ -767,7 +745,7 @@ def test_article_thread_content_edit(page: Page, thread_author, create_user_fact
     with allure.step("Deleting user session and verifying that the edit this thread option "
                      "is not displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.kb_article_discussion_page.get_edit_this_thread_locator()
+        expect(sumo_pages.kb_article_discussion_page.article_thread_edit_this_thread
                ).to_be_hidden()
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
diff --git a/playwright_tests/tests/explore_help_articles_tests/articles/test_article_translation.py b/playwright_tests/tests/explore_help_articles_tests/articles/test_article_translation.py
index dcf8be7657b..8b66e4074a8 100644
--- a/playwright_tests/tests/explore_help_articles_tests/articles/test_article_translation.py
+++ b/playwright_tests/tests/explore_help_articles_tests/articles/test_article_translation.py
@@ -3,7 +3,6 @@
 from playwright.sync_api import Page, expect
 from pytest_check import check
 from slugify import slugify
-
 from kitsune.settings import FALLBACK_LANGUAGES, NON_SUPPORTED_LOCALES, SUMO_LANGUAGES
 from playwright_tests.core.utilities import Utilities
 from playwright_tests.messages.explore_help_articles.kb_article_page_messages import (
@@ -18,8 +17,7 @@
 
 # C2489548, C2490043, C946153
 @pytest.mark.kbArticleTranslation
-def test_not_ready_for_localization_articles_dashboard_status(page: Page,
-                                                              create_user_factory):
+def test_not_ready_for_localization_articles_dashboard_status(page: Page, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     kb_translation_messages = KbTranslationMessages()
@@ -51,7 +49,7 @@ def test_not_ready_for_localization_articles_dashboard_status(page: Page,
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations']
         )
-        expect(sumo_pages.most_visited_translations_page.get_a_particular_article_title_locator(
+        expect(sumo_pages.most_visited_translations_page.article_title(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Navigating to the localization unreviewed page and verifying that the "
@@ -59,7 +57,7 @@ def test_not_ready_for_localization_articles_dashboard_status(page: Page,
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['localization_unreviewed']
         )
-        expect(sumo_pages.localization_unreviewed_page.get_listed_article(
+        expect(sumo_pages.localization_unreviewed_page.listed_article(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Navigating back to the translation page and performing a translation"):
@@ -73,7 +71,7 @@ def test_not_ready_for_localization_articles_dashboard_status(page: Page,
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations']
         )
-        expect(sumo_pages.most_visited_translations_page.get_a_particular_article_title_locator(
+        expect(sumo_pages.most_visited_translations_page.article_title(
             translation['translation_title'])).to_be_hidden()
 
     with allure.step("Navigating to the localization unreviewed page and verifying that the "
@@ -81,7 +79,7 @@ def test_not_ready_for_localization_articles_dashboard_status(page: Page,
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['localization_unreviewed']
         )
-        expect(sumo_pages.localization_unreviewed_page.get_listed_article(
+        expect(sumo_pages.localization_unreviewed_page.listed_article(
             translation['translation_title'])).to_be_visible()
 
     with allure.step("Verifying that the correct modified by text is displayed"):
@@ -100,7 +98,7 @@ def test_not_ready_for_localization_articles_dashboard_status(page: Page,
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations']
         )
-        expect(sumo_pages.localization_unreviewed_page.get_listed_article(
+        expect(sumo_pages.localization_unreviewed_page.listed_article(
             translation['translation_title'])).to_be_hidden()
 
     with allure.step("Navigating to the localization dashboard and verifying that the article is"
@@ -108,7 +106,7 @@ def test_not_ready_for_localization_articles_dashboard_status(page: Page,
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations']
         )
-        expect(sumo_pages.localization_unreviewed_page.get_listed_article(
+        expect(sumo_pages.localization_unreviewed_page.listed_article(
             translation['translation_title'])).to_be_hidden()
 
     with allure.step("Navigating to the parent article and marking it as ready for l10n"):
@@ -175,7 +173,7 @@ def test_ready_for_localization_articles_dashboard_status(page: Page, create_use
                             "banner is displayed"):
         sumo_pages.most_visited_translations_page.click_on_a_particular_article_status(
             article_details['article_title'])
-        expect(sumo_pages.translate_article_page.get_unready_for_translation_banner()
+        expect(sumo_pages.translate_article_page.translating_an_unready_article_banner
                ).to_be_hidden()
 
     with allure.step("Performing an article translation"):
@@ -266,7 +264,7 @@ def test_revisions_cannot_be_marked_as_ready_for_l10n_if_lacking_permissions(pag
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations']
         )
-        expect(sumo_pages.most_visited_translations_page.get_a_particular_article_title_locator(
+        expect(sumo_pages.most_visited_translations_page.article_title(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Navigating to the localization unreviewed page and verifying that the "
@@ -274,7 +272,7 @@ def test_revisions_cannot_be_marked_as_ready_for_l10n_if_lacking_permissions(pag
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['localization_unreviewed']
         )
-        expect(sumo_pages.localization_unreviewed_page.get_listed_article(
+        expect(sumo_pages.localization_unreviewed_page.listed_article(
             article_details['article_title'])).to_be_hidden()
 
 
@@ -286,13 +284,9 @@ def test_unsupported_locales_fallback(page: Page):
         for key, value in NON_SUPPORTED_LOCALES.items():
             utilities.navigate_to_link(HomepageMessages.STAGE_HOMEPAGE_URL + f"/{key}/")
             if value is None:
-                expect(
-                    page
-                ).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL_EN_US)
+                expect(page).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL_EN_US)
             else:
-                expect(
-                    page
-                ).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL + f"/{value}/")
+                expect(page).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL + f"/{value}/")
 
 
 # C2625000
@@ -316,8 +310,7 @@ def test_supported_languages(page: Page):
                 continue
             else:
                 with page.expect_navigation() as navigation_info:
-                    utilities.navigate_to_link(
-                        HomepageMessages.STAGE_HOMEPAGE_URL + f"/{locale}/")
+                    utilities.navigate_to_link(HomepageMessages.STAGE_HOMEPAGE_URL + f"/{locale}/")
                 response = navigation_info.value
                 assert response.status == 200
                 assert locale in utilities.get_page_url()
@@ -355,9 +348,7 @@ def test_sumo_locale_priority(page: Page, create_user_factory):
 
     with allure.step("Sending a request by modifying the 'Accept-Language' header to a "
                      "different locale"):
-        headers = {
-            'Accept-Language': 'it'
-        }
+        headers = {'Accept-Language': 'it'}
         utilities.set_extra_http_headers(headers)
         utilities.navigate_to_link(HomepageMessages.STAGE_HOMEPAGE_URL)
         expect(page).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL + "/ro/")
@@ -365,8 +356,7 @@ def test_sumo_locale_priority(page: Page, create_user_factory):
     with allure.step("Changing the preferred language back to english and signing out"):
         utilities.navigate_to_link(HomepageMessages.STAGE_HOMEPAGE_URL + '/en-US/')
         sumo_pages.top_navbar.click_on_edit_profile_option()
-        sumo_pages.edit_my_profile_page.select_preferred_language_dropdown_option_by_value(
-            "en-US")
+        sumo_pages.edit_my_profile_page.select_preferred_language_dropdown_option_by_value("en-US")
         sumo_pages.edit_my_profile_page.click_update_my_profile_button()
         utilities.delete_cookies()
 
@@ -378,9 +368,7 @@ def test_sumo_locale_priority(page: Page, create_user_factory):
     with allure.step("Sending the request with the modified 'Accept-Language' to point out "
                      "to an invalid locale and a fallback and verifying that the user is "
                      "redirected to the correct first fallback locale"):
-        headers = {
-            'Accept-Language': 'test, de, it'
-        }
+        headers = {'Accept-Language': 'test, de, it'}
         utilities.set_extra_http_headers(headers)
         utilities.navigate_to_link(HomepageMessages.STAGE_HOMEPAGE_URL)
         expect(page).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL + "/de/")
@@ -540,8 +528,7 @@ def test_article_translation_on_locale_switch(page: Page, create_user_factory):
 
 
 @pytest.mark.kbArticleTranslation
-def test_locale_redirect_from_article_without_en_us_parent(page: Page,
-                                                           create_user_factory):
+def test_locale_redirect_from_article_without_en_us_parent(page: Page, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers"])
@@ -550,7 +537,7 @@ def test_locale_redirect_from_article_without_en_us_parent(page: Page,
 
     with allure.step("Creating a new kb article directly inside the RO locale"):
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True, locale="ro", article_category="Depanare"
+            approve_first_revision=True, locale="ro", article_category="ro-translation-category"
         )
         sumo_pages.kb_article_page.click_on_a_particular_breadcrumb(
             article_details['article_title']
diff --git a/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_article_creation_and_access.py b/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_article_creation_and_access.py
index fb5e722517f..b1bb8df58e5 100644
--- a/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_article_creation_and_access.py
+++ b/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_article_creation_and_access.py
@@ -35,8 +35,8 @@ def test_kb_editing_tools_visibility(page: Page, user_type, create_user_factory)
     if user_type == 'Simple user':
         utilities.start_existing_session(cookies=test_user_two)
         with allure.step("Verifying that only some editing tools options are displayed"):
-            expect(sumo_pages.kb_article_page.get_article_option_locator()).to_be_visible()
-            expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_visible()
+            expect(sumo_pages.kb_article_page.editing_tools_article_option).to_be_visible()
+            expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_visible()
             expect(sumo_pages.kb_article_page.get_edit_article_option_locator()).to_be_visible()
             expect(sumo_pages.kb_article_page.get_edit_article_metadata_locator()).to_be_hidden()
             expect(sumo_pages.kb_article_page.get_translate_article_option_locator()
@@ -48,8 +48,8 @@ def test_kb_editing_tools_visibility(page: Page, user_type, create_user_factory)
     elif user_type == '':
         utilities.delete_cookies()
         with allure.step("Verifying that all the editing tools options are not displayed"):
-            expect(sumo_pages.kb_article_page.get_article_option_locator()).to_be_hidden()
-            expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_hidden()
+            expect(sumo_pages.kb_article_page.editing_tools_article_option).to_be_hidden()
+            expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
             expect(sumo_pages.kb_article_page.get_edit_article_option_locator()).to_be_hidden()
             expect(sumo_pages.kb_article_page.get_edit_article_metadata_locator()).to_be_hidden()
             expect(sumo_pages.kb_article_page.get_translate_article_option_locator()
@@ -60,8 +60,8 @@ def test_kb_editing_tools_visibility(page: Page, user_type, create_user_factory)
             expect(sumo_pages.kb_article_page.get_show_history_option_locator()).to_be_hidden()
     else:
         with (allure.step("Verifying that all the editing tools options are displayed")):
-            expect(sumo_pages.kb_article_page.get_article_option_locator()).to_be_visible()
-            expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_visible()
+            expect(sumo_pages.kb_article_page.editing_tools_article_option).to_be_visible()
+            expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_visible()
             expect(sumo_pages.kb_article_page.get_edit_article_option_locator()).to_be_visible()
             expect(sumo_pages.kb_article_page.get_edit_article_metadata_locator()).to_be_visible()
             expect(sumo_pages.kb_article_page.get_translate_article_option_locator()
@@ -282,7 +282,7 @@ def test_articles_discussions_allowed(page: Page, create_user_factory):
 
     with allure.step("Verifying that the posted thread is successfully displayed"):
         expect(
-            sumo_pages.kb_article_discussion_page.get_posted_thread_locator(
+            sumo_pages.kb_article_discussion_page.posted_thread(
                 thread_info['thread_id']
             )
         ).to_be_visible()
@@ -305,7 +305,7 @@ def test_articles_discussions_allowed(page: Page, create_user_factory):
     with allure.step("Deleting user session and verifying that the discussion editing tools "
                      "option is not available"):
         utilities.delete_cookies()
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_hidden()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
 
     with allure.step("Manually navigating to the discuss endpoint and verifying that the "
                      "posted thread is successfully displayed"):
@@ -313,7 +313,7 @@ def test_articles_discussions_allowed(page: Page, create_user_factory):
             article_url + KBArticlePageMessages.KB_ARTICLE_DISCUSSIONS_ENDPOINT
         )
         expect(
-            sumo_pages.kb_article_discussion_page.get_posted_thread_locator(
+            sumo_pages.kb_article_discussion_page.posted_thread(
                 thread_info['thread_id']
             )
         ).to_be_visible()
@@ -343,7 +343,7 @@ def test_articles_discussions_allowed(page: Page, create_user_factory):
             article_url + KBArticlePageMessages.KB_ARTICLE_DISCUSSIONS_ENDPOINT
         )
         expect(
-            sumo_pages.kb_article_discussion_page.get_posted_thread_locator(
+            sumo_pages.kb_article_discussion_page.posted_thread(
                 thread_info['thread_id']
             )
         ).to_be_visible()
@@ -369,9 +369,7 @@ def test_articles_discussions_not_allowed(page: Page, create_user_factory):
                      "option is not displayed"):
         sumo_pages.kb_article_page.click_on_article_option()
         article_url = utilities.get_page_url()
-        expect(
-            sumo_pages.kb_article_page.editing_tools_discussion_locator()
-        ).to_be_hidden()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
 
     with check, allure.step("Manually navigating to the 'Discuss' endpoint and verifying "
                             "that the 404 is displayed"):
@@ -395,7 +393,7 @@ def test_articles_discussions_not_allowed(page: Page, create_user_factory):
     with allure.step("Navigating back to the article page and verifying that the "
                      "'Discussion' option is not displayed"):
         utilities.navigate_to_link(article_url)
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_hidden()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
 
     with check, allure.step("Manually navigating to the 'Discuss' endpoint and verifying "
                             "that the 404 page is returned"):
@@ -412,7 +410,7 @@ def test_articles_discussions_not_allowed(page: Page, create_user_factory):
         utilities.delete_cookies()
 
     with allure.step("Verifying that the 'Discussion' option is not displayed"):
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_hidden()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
 
     with check, allure.step("Manually navigating to the 'Discuss' endpoint and verifying "
                             "that the 404 page is displayed"):
@@ -731,7 +729,7 @@ def test_kb_article_keyword_and_summary_update(page: Page, create_user_factory):
     with check, allure.step("Navigating to the 'Edit Article' form and verifying that the "
                             "edit keyword field is not displayed"):
         sumo_pages.kb_article_page.click_on_edit_article_option()
-        expect(sumo_pages.kb_edit_article_page.get_edit_keywords_field_locator()).to_be_hidden()
+        expect(sumo_pages.kb_edit_article_page.edit_article_keywords_field).to_be_hidden()
 
     with allure.step("Navigating back to the article"):
         sumo_pages.kb_article_page.click_on_article_option()
@@ -752,9 +750,7 @@ def test_kb_article_keyword_and_summary_update(page: Page, create_user_factory):
         sumo_pages.submit_kb_article_flow.submit_new_kb_revision(
             keywords=utilities.kb_article_test_data['updated_keywords'],
             search_result_summary=utilities.kb_article_test_data
-            ['updated_search_result_summary'],
-            approve_revision=True,
-            is_admin=True
+            ['updated_search_result_summary'], approve_revision=True, is_admin=True
         )
 
     with allure.step("Clicking on the top navbar sumo nav logo"):
@@ -929,9 +925,7 @@ def test_edit_article_metadata_category(page: Page, create_user_factory):
         )
 
     with allure.step("Selecting a different category"):
-        sumo_pages.edit_article_metadata_flow.edit_article_metadata(
-            category="Templates"
-        )
+        sumo_pages.edit_article_metadata_flow.edit_article_metadata(category="Templates")
 
     with check, allure.step("Verifying that the correct error message is displayed"):
         assert (sumo_pages.kb_article_edit_article_metadata_page.
@@ -948,9 +942,7 @@ def test_edit_article_metadata_category(page: Page, create_user_factory):
             [article_details['article_category']]
         )
         expect(
-            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
-                article_details['article_title']
-            )
+            sumo_pages.kb_category_page.article_from_list(article_details['article_title'])
         ).to_be_hidden()
 
     with check, allure.step("Verifying that the article is displayed inside the new category"):
@@ -958,9 +950,7 @@ def test_edit_article_metadata_category(page: Page, create_user_factory):
             utilities.different_endpoints['kb_categories_links']["Navigation"]
         )
         expect(
-            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
-                article_details['article_title']
-            )
+            sumo_pages.kb_category_page.article_from_list(article_details['article_title'])
         ).to_be_visible()
 
     article_template_title = "Template:" + article_details['article_title']
@@ -977,9 +967,7 @@ def test_edit_article_metadata_category(page: Page, create_user_factory):
             utilities.different_endpoints['kb_categories_links']["Navigation"]
         )
         expect(
-            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
-                article_template_title
-            )
+            sumo_pages.kb_category_page.article_from_list(article_template_title)
         ).to_be_hidden()
 
     with check, allure.step("Verifying that the article is displayed inside the new category"):
@@ -987,9 +975,7 @@ def test_edit_article_metadata_category(page: Page, create_user_factory):
             utilities.different_endpoints['kb_categories_links']["Templates"]
         )
         expect(
-            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
-                article_template_title
-            )
+            sumo_pages.kb_category_page.article_from_list(article_template_title)
         ).to_be_visible()
 
 
@@ -1051,14 +1037,14 @@ def test_edit_metadata_article_discussions(page: Page, create_user_factory):
         )
 
     with check, allure.step("Verifying that the 'Discussion' is visible for admin users"):
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_visible()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_visible()
 
     with allure.step(f"Signing in with {test_user['username']} and verifying that the discussion "
                      "options is visible"):
         utilities.start_existing_session(cookies=test_user)
 
     with check, allure.step("Verifying that the 'Discussion' is visible for non-admin users"):
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_visible()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_visible()
 
     with allure.step(f"Signing in with {test_user_two['username']} and disabling article "
                      f"discussions via edit article metadata form"):
@@ -1066,7 +1052,7 @@ def test_edit_metadata_article_discussions(page: Page, create_user_factory):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(discussions=False)
 
     with check, allure.step("Verifying that 'Discussion' is not displayed for admin users"):
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_hidden()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
 
     with check, allure.step("Navigating to the /discuss endpoint and verifying that 404 is "
                             "returned"):
@@ -1081,7 +1067,7 @@ def test_edit_metadata_article_discussions(page: Page, create_user_factory):
                             "non-admin users"):
         utilities.navigate_to_link(article_details['article_url'])
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_hidden()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_hidden()
 
     with check, allure.step("Navigating to the /discuss endpoint and verifying that 404 is "
                             "returned"):
@@ -1099,12 +1085,12 @@ def test_edit_metadata_article_discussions(page: Page, create_user_factory):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(discussions=True)
 
     with check, allure.step("Verifying that the 'Discussion' is visible for admin users"):
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_visible()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_visible()
 
     with check, allure.step(f"Verifying that the 'Discussion' is visible for"
                             f" {test_user['username']}"):
         utilities.start_existing_session(cookies=test_user)
-        expect(sumo_pages.kb_article_page.editing_tools_discussion_locator()).to_be_visible()
+        expect(sumo_pages.kb_article_page.editing_tools_discussion_option).to_be_visible()
 
 
 # C2244014
@@ -1133,7 +1119,7 @@ def test_edit_metadata_article_multiple_users(page: Page, create_user_factory):
     with allure.step("Clicking on the 'Edit Article Metadata' option"):
         sumo_pages.kb_article_page.click_on_edit_article_metadata()
 
-    with check, allure.step("Verifying that the correct error message is displayed"):
+    with check, allure.step("Verifying that the correct warning message is displayed"):
         assert (sumo_pages.kb_edit_article_page.
                 get_edit_article_warning_message() == kb_revision.
                 get_article_warning_message(test_user_two['username']))
@@ -1141,7 +1127,7 @@ def test_edit_metadata_article_multiple_users(page: Page, create_user_factory):
     with allure.step("Clicking on the 'Edit Anyway' option and verifying that the warning "
                      "banner is no longer displayed"):
         sumo_pages.kb_edit_article_page.click_on_edit_anyway_option()
-        expect(sumo_pages.kb_edit_article_page.get_warning_banner_locator()).to_be_hidden()
+        expect(sumo_pages.kb_edit_article_page.edit_by_another_user_warning_banner).to_be_hidden()
 
 
 # C2271119, C2243454
@@ -1277,8 +1263,8 @@ def test_article_creation_and_frequent_topics_cards(page: Page, create_user_fact
                         is_frequent_topic_card_displayed(test_topic_card))
 
     with allure.step("Creating a new kb article under the Test Topic and approving the revision"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, product="1", topic="506", approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            product="Firefox", article_topic="Firefox test topic", approve_first_revision=True)
 
     with check, allure.step("Verifying that the article topic card and article is successfully "
                             "listed and the 'View all {x} counter' is the correct one"):
@@ -1294,8 +1280,8 @@ def test_article_creation_and_frequent_topics_cards(page: Page, create_user_fact
                 get_frequent_topic_card_view_all_articles_link_text(test_topic_card)))
 
     with allure.step("Creating a new kb article and not approving the revision"):
-        second_article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, product="1", topic="506")
+        second_article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            product="Firefox", article_topic="Firefox test topic")
 
     with check, allure.step("Verifying that the unapproved article is not listed inside the "
                             "topic card list and the 'View all {x} articles' counter has not "
@@ -1363,8 +1349,9 @@ def test_article_update_and_frequent_topics_cards(page: Page, create_user_factor
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article under the Test Topic and approving the revision"):
-        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, product="8", topic="505", approve_revision=True)
+        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            product="Thunderbird", article_topic="Thunderbird test topic",
+            approve_first_revision=True)
 
     with allure.step("Updating the title of the article"):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(title=new_article_name)
@@ -1391,8 +1378,9 @@ def test_obsolete_articles_and_frequent_topics_cards(page: Page, create_user_fac
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article under the Test Topic and approving the revision"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, product="8", topic="505", approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            product="Thunderbird", article_topic="Thunderbird test topic",
+            approve_first_revision=True)
 
     with allure.step("Marking the article as Obsolete via the 'Edit Article Metadata' page"):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(obsolete=True)
@@ -1434,8 +1422,9 @@ def test_ignored_article_types_from_frequent_topics_cards(page: Page, category,
 
     with allure.step("Creating a new kb article of 'Canned Responses' type, under the Test Topic "
                      "and approving the revision"):
-        article = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, product="19", topic="507", approve_revision=True, category=category)
+        article = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            product="Pocket", article_topic="Pocket test topic", approve_first_revision=True,
+            article_category=category, is_template= (category == "60"))
 
     with check, allure.step("Verifying that the article is not displayed inside the topic card"):
         for link in ["product_support", "product_solutions"]:
@@ -1458,8 +1447,8 @@ def test_article_topic_and_product_change(page: Page, create_user_factory):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new kb article under the Test Topic and approving the revision"):
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, product="19", topic="507", approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            product="Pocket", article_topic="Pocket test topic", approve_first_revision=True)
 
     with allure.step("Updating the article metadata to add the MDN product and test topic"):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(
@@ -1511,8 +1500,7 @@ def test_article_helpfulness_votes(page: Page, vote_type, create_user_factory):
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Create a new simple article"):
-        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
 
     with allure.step(f"Sign in with {test_user['username']} user account"):
@@ -1570,8 +1558,7 @@ def test_article_helpfulness_cancel_vote(page: Page, vote_type, create_user_fact
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Create a new simple article"):
-        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
 
     with allure.step(f"Sign in with {test_user['username']} user account"):
@@ -1629,8 +1616,7 @@ def test_article_unhelpfulness_votes(page: Page, vote_type, create_user_factory)
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Create a new simple article"):
-        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
 
     with allure.step(f"Sign in with {test_user['username']} user account"):
@@ -1691,8 +1677,7 @@ def test_article_unhelpfulness_cancel_vote(page: Page, vote_type, create_user_fa
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Create a new simple article"):
-        sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        sumo_pages.submit_kb_article_flow.submit_simple_kb_article(approve_first_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
 
     with allure.step(f"Sign in with {test_user['username']} user account"):
@@ -1743,8 +1728,8 @@ def test_article_helpfulness_metadata_count(page: Page, create_user_factory):
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Create a new simple article"):
-        article_info = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page,topic=374, approve_revision=True)
+        article_info = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            article_topic="Browse", approve_first_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
 
     with allure.step("Voting the article as helpful"):
@@ -1795,8 +1780,8 @@ def test_voting_the_same_article_twice_is_not_possible(page: Page, context: Brow
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Create a new simple article"):
-        article_info = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, topic=374, approve_revision=True)
+        article_info = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            article_topic="Browse", approve_first_revision=True)
         sumo_pages.kb_article_page.click_on_article_option()
 
     with allure.step("Sign in with a different user"):
@@ -1830,8 +1815,8 @@ def test_adding_and_removing_related_documents(page: Page, create_user_factory):
     with allure.step("Creating 3 test articles"):
         counter = 1
         while counter <= 3:
-            article_info = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-                page=page, product="19", topic="507", approve_revision=True)
+            article_info = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+                product="Pocket", article_topic="Pocket test topic", approve_first_revision=True)
             test_article_titles.append(article_info["article_title"])
             test_articles_url.append(article_info["article_url"])
             counter += 1
@@ -1888,8 +1873,8 @@ def test_same_article_cannot_be_added_as_related_article(page: Page, create_user
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Creating a new KB article"):
-        article_info = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, product="19", topic="507", approve_revision=True)
+        article_info = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            product="Pocket", article_topic="Pocket test topic", approve_first_revision=True)
 
     with allure.step("Wait for ~1 minute until the kb article is available in search"):
         utilities.wait_for_given_timeout(90000)
@@ -1906,8 +1891,7 @@ def test_same_article_cannot_be_added_as_related_article(page: Page, create_user
 
 #  C3065910
 @pytest.mark.kbArticleCreationAndAccess
-def test_restricted_visibility_related_document_in_article_page(page: Page,
-                                                                create_user_factory):
+def test_restricted_visibility_related_document_in_article_page(page: Page, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_articles_url = []
@@ -1922,8 +1906,8 @@ def test_restricted_visibility_related_document_in_article_page(page: Page,
     with allure.step("Creating 3 new articles"):
         counter = 1
         while counter <= 3:
-            article_info = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-                page=page, product="19", topic="507", approve_revision=True)
+            article_info = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+                product="Pocket", article_topic="Pocket test topic", approve_first_revision=True)
             test_article_titles.append(article_info["article_title"])
             test_articles_url.append(article_info["article_url"])
             counter += 1
diff --git a/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_restricted_visibility.py b/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_restricted_visibility.py
index 564128c9036..587913d0b37 100644
--- a/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_restricted_visibility.py
+++ b/playwright_tests/tests/explore_help_articles_tests/articles/test_kb_restricted_visibility.py
@@ -1,10 +1,8 @@
 from typing import Any
-
 import allure
 import pytest
 from playwright.sync_api import Page, expect
 from pytest_check import check
-
 from playwright_tests.core.utilities import Utilities
 from playwright_tests.messages.explore_help_articles.kb_article_page_messages import (
     KBArticlePageMessages,
@@ -26,21 +24,18 @@ def test_kb_restrict_visibility(page: Page, is_template, create_user_factory):
     whitelisted_groups = utilities.kb_article_test_data['restricted_visibility_groups']
 
     utilities.start_existing_session(cookies=test_user)
-
     article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-        approve_first_revision=True,
-        single_group=whitelisted_groups[0],
-        is_template=is_template
+        approve_first_revision=True, single_group=whitelisted_groups[0], is_template=is_template
     )
 
-    sumo_pages.kb_article_page.click_on_article_option()
-    article_url = utilities.get_page_url()
     with check, allure.step("Navigating to the article and verifying that 404 is not returned"):
         with page.expect_navigation() as navigation_info:
-            utilities.navigate_to_link(article_url)
+            sumo_pages.kb_article_page.click_on_article_option()
         response = navigation_info.value
         assert response.status != 404
 
+        article_url = utilities.get_page_url()
+
     with check, allure.step("Verifying that the correct restricted banner is displayed"):
         assert (KBArticlePageMessages.KB_ARTICLE_RESTRICTED_BANNER in sumo_pages.kb_article_page
                 .get_restricted_visibility_banner_text())
@@ -54,7 +49,7 @@ def test_kb_restrict_visibility(page: Page, is_template, create_user_factory):
         response = navigation_info.value
         assert response.status == 404
 
-    with check, allure.step("Signing in with a user which is not part of the whitelisted group"):
+    with allure.step("Signing in with a user which is not part of the whitelisted group"):
         utilities.start_existing_session(cookies=test_user_two)
 
     with check, allure.step("Navigating to the article and verifying that 404 is returned"):
@@ -63,11 +58,11 @@ def test_kb_restrict_visibility(page: Page, is_template, create_user_factory):
         response = navigation_info.value
         assert response.status == 404
 
-    with check, allure.step("Signing in with a user which is part of the whitelisted group"):
+    with allure.step("Signing in with a user which is part of the whitelisted group"):
         utilities.start_existing_session(cookies=test_user_three)
 
-    with check, allure.step("Navigating to the article and verifying that 404 is not "
-                            "returned"):
+    with allure.step("Navigating to the article and verifying that group and verifying that 404 is"
+                     " not returned"):
         with page.expect_navigation() as navigation_info:
             utilities.navigate_to_link(article_url)
         response = navigation_info.value
@@ -82,9 +77,11 @@ def test_kb_restrict_visibility(page: Page, is_template, create_user_factory):
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(
             single_group=whitelisted_groups[1]
         )
+
     with allure.step("Signing in with a user which is part of the whitelisted groups"):
         utilities.start_existing_session(cookies=test_user_four)
 
+
     with check, allure.step("Navigating to the article and verifying that 404 is not returned"):
         with page.expect_navigation() as navigation_info:
             utilities.navigate_to_link(article_url)
@@ -175,8 +172,7 @@ def test_restricted_visibility_in_search_results(page: Page, create_user_factory
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True,
-            single_group=whitelisted_group[0]
+            approve_first_revision=True, single_group=whitelisted_group[0]
         )
 
     with allure.step("Wait for ~1 minute until the kb article is available in search"):
@@ -188,16 +184,13 @@ def test_restricted_visibility_in_search_results(page: Page, create_user_factory
     with check, allure.step("Verifying that the article is not displayed inside the search "
                             "results"):
         sumo_pages.search_page.fill_into_searchbar(article_details['article_title'])
-        expect(
-            sumo_pages.search_page.get_locator_of_a_particular_article(
-                article_details['article_title'])
-        ).to_be_hidden()
+        expect(sumo_pages.search_page.get_locator_of_a_particular_article(
+            article_details['article_title'])).to_be_hidden()
 
     with allure.step("Signing in with an account that is part of that whitelisted group"):
         utilities.start_existing_session(cookies=test_user_three)
 
-    with check, allure.step("Verifying that the article is not inside the search "
-                            "results"):
+    with check, allure.step("Verifying that the article is not inside the search results"):
         sumo_pages.search_page.fill_into_searchbar(article_details['article_title'])
         expect(sumo_pages.search_page.get_locator_of_a_particular_article(
             article_details['article_title'])).to_be_hidden()
@@ -223,8 +216,7 @@ def test_restricted_visibility_in_search_results(page: Page, create_user_factory
 # C2466518
 @pytest.mark.kbRestrictedVisibility
 @pytest.mark.parametrize("is_template", [False, True])
-def test_restricted_visibility_in_recent_revisions(page: Page, is_template,
-                                                   create_user_factory):
+def test_restricted_visibility_in_recent_revisions(page: Page, is_template, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers", "Staff",
@@ -237,8 +229,7 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True,
-            single_group=whitelisted_groups[0],
+            approve_first_revision=True, single_group=whitelisted_groups[0],
             is_template=is_template
         )
 
@@ -246,7 +237,7 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template,
                             "article is displayed"):
         sumo_pages.top_navbar.click_on_recent_revisions_option()
         assert utilities.expect_locator_visibility(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
+            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
                 article_details['article_title'])
         )
 
@@ -255,7 +246,7 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template,
 
     with check, allure.step("Verifying that the article is displayed"):
         assert utilities.expect_locator_visibility(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
+            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
                 article_details['article_title'])
         )
 
@@ -263,7 +254,7 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user_three)
 
     with allure.step("Verifying that the article is not displayed"):
-        expect(sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
+        expect(sumo_pages.recent_revisions_page.recent_revision_based_on_article(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Signing in with an admin account and whitelisting a new group"):
@@ -280,7 +271,7 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template,
 
     with allure.step("Verifying that the article is displayed"):
         assert utilities.expect_locator_visibility(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
+            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
                 article_details['article_title'])
         )
 
@@ -297,7 +288,7 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template,
             utilities.general_test_data['dashboard_links']['recent_revisions']
         )
         assert utilities.expect_locator_visibility(
-            sumo_pages.recent_revisions_page.get_recent_revision_based_on_article(
+            sumo_pages.recent_revisions_page.recent_revision_based_on_article(
                 article_details['article_title'])
         )
 
@@ -305,8 +296,7 @@ def test_restricted_visibility_in_recent_revisions(page: Page, is_template,
 # C2466524
 @pytest.mark.kbRestrictedVisibility
 @pytest.mark.parametrize("is_template", [False, True])
-def test_kb_restricted_visibility_media_gallery(page: Page, is_template,
-                                                create_user_factory):
+def test_kb_restricted_visibility_media_gallery(page: Page, is_template, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers", "Staff",
@@ -319,8 +309,7 @@ def test_kb_restricted_visibility_media_gallery(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True,
-            single_group=whitelisted_groups[0],
+            approve_first_revision=True, single_group=whitelisted_groups[0],
             article_content_image=utilities.kb_article_test_data['article_image'],
             is_template=is_template
         )
@@ -427,8 +416,7 @@ def test_kb_restricted_visibility_discussion(page: Page, is_template, create_use
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True,
-            single_group=whitelisted_groups[0],
+            approve_first_revision=True, single_group=whitelisted_groups[0],
             is_template=is_template
         )
 
@@ -439,28 +427,26 @@ def test_kb_restricted_visibility_discussion(page: Page, is_template, create_use
 
     with check, allure.step("Verifying that the the kb article is displayed for admin users"):
         assert utilities.expect_locator_visibility(
-            sumo_pages.article_discussions_page
-            .is_title_for_article_discussion_displayed(thread['thread_title'])
+            sumo_pages.article_discussions_page.article_discussion_title(thread['thread_title'])
         )
 
     with check, allure.step("Verifying that the kb article is displayed for whitelisted "
                             "group users"):
         utilities.start_existing_session(cookies=test_user_two)
         assert utilities.expect_locator_visibility(
-            sumo_pages.article_discussions_page
-            .is_title_for_article_discussion_displayed(thread['thread_title'])
+            sumo_pages.article_discussions_page.article_discussion_title(thread['thread_title'])
         )
 
     with check, allure.step("Verifying that the kb article is not displayed for signed out users"):
         utilities.delete_cookies()
         expect(sumo_pages.article_discussions_page
-               .is_title_for_article_discussion_displayed(thread['thread_title'])).to_be_hidden()
+               .article_discussion_title(thread['thread_title'])).to_be_hidden()
 
     with allure.step("Verifying that the kb article is displayed for non-whitelisted group "
                      "users"):
         utilities.start_existing_session(cookies=test_user_three)
         expect(sumo_pages.article_discussions_page
-               .is_title_for_article_discussion_displayed(thread['thread_title'])).to_be_hidden()
+               .article_discussion_title(thread['thread_title'])).to_be_hidden()
 
     with allure.step("Signing in with an admin account and whitelisting a new group"):
         utilities.start_existing_session(cookies=test_user)
@@ -477,8 +463,7 @@ def test_kb_restricted_visibility_discussion(page: Page, is_template, create_use
             utilities.general_test_data['discussions_links']['article_discussions']
         )
         assert utilities.expect_locator_visibility(
-            sumo_pages.article_discussions_page
-            .is_title_for_article_discussion_displayed(thread['thread_title'])
+            sumo_pages.article_discussions_page.article_discussion_title(thread['thread_title'])
         )
 
     with allure.step("Removing restrictions"):
@@ -494,8 +479,7 @@ def test_kb_restricted_visibility_discussion(page: Page, is_template, create_use
             utilities.general_test_data['discussions_links']['article_discussions']
         )
         assert utilities.expect_locator_visibility(
-            sumo_pages.article_discussions_page
-            .is_title_for_article_discussion_displayed(thread['thread_title'])
+            sumo_pages.article_discussions_page.article_discussion_title(thread['thread_title'])
         )
 
 
@@ -514,8 +498,7 @@ def test_kb_restricted_visibility_in_topics_page(page: Page, create_user_factory
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True,
-            single_group=whitelisted_groups[0]
+            approve_first_revision=True, single_group=whitelisted_groups[0]
         )
 
     sumo_pages.kb_article_page.click_on_article_option()
@@ -575,8 +558,7 @@ def test_kb_restricted_visibility_in_topics_page(page: Page, create_user_factory
 #  C2539825
 @pytest.mark.kbRestrictedVisibility
 @pytest.mark.parametrize("is_template", [False, True])
-def test_kb_restricted_visibility_profile_level(page: Page, is_template,
-                                                create_user_factory):
+def test_kb_restricted_visibility_profile_level(page: Page, is_template, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers", "Staff",
@@ -589,8 +571,7 @@ def test_kb_restricted_visibility_profile_level(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True,
-            single_group=whitelisted_groups[0],
+            approve_first_revision=True, single_group=whitelisted_groups[0],
             is_template=is_template
         )
 
@@ -604,8 +585,7 @@ def test_kb_restricted_visibility_profile_level(page: Page, is_template,
     with check, allure.step("Verifying that the article is displayed inside the document "
                             "contribution page for admin users"):
         assert utilities.expect_locator_visibility(
-            sumo_pages.my_documents_page.get_a_particular_document_locator(
-                article_details['article_title'])
+            sumo_pages.my_documents_page.document_by_name(article_details['article_title'])
         )
 
     with check, allure.step("Verifying that the article is displayed inside the op document "
@@ -613,16 +593,15 @@ def test_kb_restricted_visibility_profile_level(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user_two)
         utilities.navigate_to_link(op_document_contributions_link)
         assert utilities.expect_locator_visibility(
-            sumo_pages.my_documents_page.get_a_particular_document_locator(
-                article_details['article_title'])
+            sumo_pages.my_documents_page.document_by_name(article_details['article_title'])
         )
 
     with allure.step("Verifying that the article is not displayed inside the op document "
                      "contributions list for a non whitelisted user"):
         utilities.start_existing_session(cookies=test_user_three)
         utilities.navigate_to_link(op_document_contributions_link)
-        expect(sumo_pages.my_documents_page.get_a_particular_document_locator(
-            article_details['article_title'])).to_be_hidden()
+        expect(sumo_pages.my_documents_page.document_by_name(article_details['article_title'])
+               ).to_be_hidden()
 
     with allure.step("Signing in with an admin account and whitelisting a new group"):
         utilities.start_existing_session(cookies=test_user)
@@ -641,8 +620,7 @@ def test_kb_restricted_visibility_profile_level(page: Page, is_template,
                      "contributions list for the newly whitelisted users group"):
         utilities.start_existing_session(cookies=test_user_three)
         assert utilities.expect_locator_visibility(
-            sumo_pages.my_documents_page.get_a_particular_document_locator(
-                article_details['article_title'])
+            sumo_pages.my_documents_page.document_by_name(article_details['article_title'])
         )
 
     with allure.step("Removing restrictions"):
@@ -662,16 +640,14 @@ def test_kb_restricted_visibility_profile_level(page: Page, is_template,
                      "for signed out users"):
         utilities.delete_cookies()
         assert utilities.expect_locator_visibility(
-            sumo_pages.my_documents_page.get_a_particular_document_locator(
-                article_details['article_title'])
+            sumo_pages.my_documents_page.document_by_name(article_details['article_title'])
         )
 
 
 # C2468303
 @pytest.mark.kbRestrictedVisibility
 @pytest.mark.parametrize("is_template", [False, True])
-def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template,
-                                                     create_user_factory):
+def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers", "Staff",
@@ -684,10 +660,8 @@ def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True,
-            ready_for_localization=True,
-            single_group=whitelisted_group,
-            is_template=is_template
+            approve_first_revision=True, ready_for_localization=True,
+            single_group=whitelisted_group, is_template=is_template
         )
 
     with check, allure.step("Verifying that the article is displayed for admin users inside "
@@ -695,8 +669,7 @@ def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template,
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations'])
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
-                article_details['article_title'])
+            sumo_pages.kb_dashboard_page.article_title(article_details['article_title'])
         )
 
     with check, allure.step("Verifying that the article is displayed for users belonging to "
@@ -705,8 +678,7 @@ def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template,
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations'])
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
-                article_details['article_title'])
+            sumo_pages.kb_dashboard_page.article_title(article_details['article_title'])
         )
 
     with allure.step("Verifying that the article is not displayed for users belonging to "
@@ -714,7 +686,7 @@ def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user_three)
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations'])
-        expect(sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+        expect(sumo_pages.kb_dashboard_page.article_title(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Removing restrictions"):
@@ -730,15 +702,13 @@ def test_kb_restricted_visibility_in_l10n_dashboards(page: Page, is_template,
         utilities.navigate_to_link(
             utilities.general_test_data['dashboard_links']['l10n_most_visited_translations'])
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
-                article_details['article_title']))
+            sumo_pages.kb_dashboard_page.article_title(article_details['article_title']))
 
 
 # C2466519
 @pytest.mark.kbRestrictedVisibility
 @pytest.mark.parametrize("is_template", [False, True])
-def test_kb_restricted_visibility_in_dashboards(page: Page, is_template,
-                                                create_user_factory):
+def test_kb_restricted_visibility_in_dashboards(page: Page, is_template, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers", "Staff",
@@ -750,39 +720,32 @@ def test_kb_restricted_visibility_in_dashboards(page: Page, is_template,
     with allure.step("Creating a new kb article with restricted visibility"):
         utilities.start_existing_session(cookies=test_user)
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True,
-            ready_for_localization=True,
-            single_group=whitelisted_group,
-            is_template=is_template
+            approve_first_revision=True, ready_for_localization=True,
+            single_group=whitelisted_group, is_template=is_template
         )
 
     with check, allure.step("Verifying that the article is displayed for admin users inside "
                             "the kb-overview dashboard"):
-        utilities.navigate_to_link(
-            utilities.general_test_data['dashboard_links']['kb_overview'])
+        utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
-                article_details['article_title'])
+            sumo_pages.kb_dashboard_page.article_title(article_details['article_title'])
         )
 
     with check, allure.step("Verifying that the article is displayed for users belonging to "
                             "the whitelisted group"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         utilities.start_existing_session(cookies=test_user_two)
-        utilities.navigate_to_link(
-            utilities.general_test_data['dashboard_links']['kb_overview'])
+        utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
-                article_details['article_title'])
+            sumo_pages.kb_dashboard_page.article_title(article_details['article_title'])
         )
 
     with allure.step("Verifying that the article is not displayed for users belonging to "
                      "non-whitelisted groups"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         utilities.start_existing_session(cookies=test_user_three)
-        utilities.navigate_to_link(
-            utilities.general_test_data['dashboard_links']['kb_overview'])
-        expect(sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
+        utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
+        expect(sumo_pages.kb_dashboard_page.article_title(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Removing restrictions"):
@@ -795,11 +758,9 @@ def test_kb_restricted_visibility_in_dashboards(page: Page, is_template,
     with allure.step("Signing out and verifying that the article is displayed inside the "
                      "kb-overview dashboard"):
         utilities.delete_cookies()
-        utilities.navigate_to_link(
-            utilities.general_test_data['dashboard_links']['kb_overview'])
+        utilities.navigate_to_link(utilities.general_test_data['dashboard_links']['kb_overview'])
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_dashboard_page.get_a_particular_article_title_locator(
-                article_details['article_title'])
+            sumo_pages.kb_dashboard_page.article_title(article_details['article_title'])
         )
 
 
@@ -820,10 +781,8 @@ def test_kb_restricted_visibility_what_links_here_page(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user)
 
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True,
-            ready_for_localization=True,
-            single_group=whitelisted_groups[0],
-            is_template=is_template
+            approve_first_revision=True, ready_for_localization=True,
+            single_group=whitelisted_groups[0], is_template=is_template
         )
 
     with allure.step("Navigating to the test article linked to the document"):
@@ -833,7 +792,7 @@ def test_kb_restricted_visibility_what_links_here_page(page: Page, is_template,
                             "restricted article is displayed for admin accounts"):
         sumo_pages.kb_article_page.click_on_what_links_here_option()
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_what_links_here_page.get_a_particular_what_links_here_article_locator(
+            sumo_pages.kb_what_links_here_page.what_links_here_for_article(
                 article_details['article_title'])
         )
 
@@ -842,7 +801,7 @@ def test_kb_restricted_visibility_what_links_here_page(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user_two)
         assert utilities.expect_locator_visibility(
             sumo_pages.kb_what_links_here_page
-            .get_a_particular_what_links_here_article_locator(article_details['article_title'])
+            .what_links_here_for_article(article_details['article_title'])
         )
 
     with check, allure.step("Verifying that the restricted article is not displayed for "
@@ -850,14 +809,12 @@ def test_kb_restricted_visibility_what_links_here_page(page: Page, is_template,
         utilities.start_existing_session(cookies=test_user_three)
         expect(
             sumo_pages.kb_what_links_here_page
-            .get_a_particular_what_links_here_article_locator(article_details['article_title'])
-        ).to_be_hidden()
+            .what_links_here_for_article(article_details['article_title'])).to_be_hidden()
 
     with (allure.step("Verifying that the article is not displayed for signed out users")):
         utilities.delete_cookies()
         expect(sumo_pages.kb_what_links_here_page.
-               get_a_particular_what_links_here_article_locator(article_details['article_title'])
-               ).to_be_hidden()
+               what_links_here_for_article(article_details['article_title'])).to_be_hidden()
 
     with allure.step("Signing in with an admin account and whitelisting a new group"):
         utilities.start_existing_session(cookies=test_user)
@@ -875,7 +832,7 @@ def test_kb_restricted_visibility_what_links_here_page(page: Page, is_template,
         sumo_pages.kb_article_page.click_on_what_links_here_option()
         assert utilities.expect_locator_visibility(
             sumo_pages.kb_what_links_here_page
-            .get_a_particular_what_links_here_article_locator(article_details['article_title'])
+            .what_links_here_for_article(article_details['article_title'])
         )
 
     with allure.step("Removing restrictions"):
@@ -894,15 +851,14 @@ def test_kb_restricted_visibility_what_links_here_page(page: Page, is_template,
         utilities.delete_cookies()
         assert utilities.expect_locator_visibility(
             sumo_pages.kb_what_links_here_page
-            .get_a_particular_what_links_here_article_locator(article_details['article_title'])
+            .what_links_here_for_article(article_details['article_title'])
         )
 
 
 # C2539824
 @pytest.mark.kbRestrictedVisibility
 @pytest.mark.parametrize("is_template", [False, True])
-def test_kb_restricted_visibility_category_page(page: Page, is_template,
-                                                create_user_factory):
+def test_kb_restricted_visibility_category_page(page: Page, is_template, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Knowledge Base Reviewers", "Staff",
@@ -914,10 +870,8 @@ def test_kb_restricted_visibility_category_page(page: Page, is_template,
     with allure.step("Creating a new kb article with restricted visibility"):
         utilities.start_existing_session(cookies=test_user)
         article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
-            approve_first_revision=True,
-            ready_for_localization=True,
-            single_group=whitelisted_groups[0],
-            is_template=is_template
+            approve_first_revision=True, ready_for_localization=True,
+            single_group=whitelisted_groups[0], is_template=is_template
         )
 
     with check, allure.step("Navigating to the article category field and verifying that the "
@@ -927,28 +881,26 @@ def test_kb_restricted_visibility_category_page(page: Page, is_template,
         sumo_pages.kb_article_show_history_page.click_on_show_history_category()
 
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
-                article_details['article_title'])
+            sumo_pages.kb_category_page.article_from_list(article_details['article_title'])
         )
 
     with check, allure.step("Verifying that the restricted kb article is displayed for users "
                             "belonging to a whitelisted group"):
         utilities.start_existing_session(cookies=test_user_two)
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
-                article_details['article_title'])
+            sumo_pages.kb_category_page.article_from_list(article_details['article_title'])
         )
 
-    with check, allure.step("Verifying that the restricted kb article is displayed for users "
+    with check, allure.step("Verifying that the restricted kb article is not displayed for users "
                             "belonging to a non-whitelisted group"):
         utilities.start_existing_session(cookies=test_user_three)
-        expect(sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
+        expect(sumo_pages.kb_category_page.article_from_list(
             article_details['article_title'])).to_be_hidden()
 
-    with allure.step("Verifying that the restricted kb article is displayed for signed out "
+    with allure.step("Verifying that the restricted kb article is not displayed for signed out "
                      "users"):
         utilities.delete_cookies()
-        expect(sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
+        expect(sumo_pages.kb_category_page.article_from_list(
             article_details['article_title'])).to_be_hidden()
 
     with allure.step("Signing in with an admin account and whitelisting a new group"):
@@ -965,8 +917,7 @@ def test_kb_restricted_visibility_category_page(page: Page, is_template,
         sumo_pages.kb_article_page.click_on_show_history_option()
         sumo_pages.kb_article_show_history_page.click_on_show_history_category()
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
-                article_details['article_title'])
+            sumo_pages.kb_category_page.article_from_list(article_details['article_title'])
         )
 
     with allure.step("Removing restrictions"):
@@ -984,8 +935,7 @@ def test_kb_restricted_visibility_category_page(page: Page, is_template,
                      "article is displayed for signed out users"):
         utilities.delete_cookies()
         assert utilities.expect_locator_visibility(
-            sumo_pages.kb_category_page.get_a_particular_article_locator_from_list(
-                article_details['article_title'])
+            sumo_pages.kb_category_page.article_from_list(article_details['article_title'])
         )
 
 
diff --git a/playwright_tests/tests/explore_help_articles_tests/articles/test_product_support_page.py b/playwright_tests/tests/explore_help_articles_tests/articles/test_product_support_page.py
index c33dfc15ea9..4abbdb91af8 100644
--- a/playwright_tests/tests/explore_help_articles_tests/articles/test_product_support_page.py
+++ b/playwright_tests/tests/explore_help_articles_tests/articles/test_product_support_page.py
@@ -1,10 +1,8 @@
 import random
-
 import allure
 import pytest
 from playwright.sync_api import Page, expect
 from pytest_check import check
-
 from playwright_tests.core.utilities import Utilities
 from playwright_tests.messages.ask_a_question_messages.product_solutions_messages import (
     ProductSolutionsMessages,
diff --git a/playwright_tests/tests/explore_help_articles_tests/explore_by_topic_tests/test_explore_by_topics.py b/playwright_tests/tests/explore_help_articles_tests/explore_by_topic_tests/test_explore_by_topics.py
index 7f77eac6f5c..4e44c6a8485 100644
--- a/playwright_tests/tests/explore_help_articles_tests/explore_by_topic_tests/test_explore_by_topics.py
+++ b/playwright_tests/tests/explore_help_articles_tests/explore_by_topic_tests/test_explore_by_topics.py
@@ -1,4 +1,3 @@
-import time
 import allure
 import pytest
 from playwright.sync_api import Page
@@ -26,7 +25,6 @@ def test_explore_by_topic_product_filter(page: Page):
         topic = topic.strip()
         if topic != "Browse":
             sumo_pages.explore_by_topic_page.click_on_a_topic_filter(topic)
-            utilities.wait_for_dom_to_load()
         with allure.step("Verifying that the correct page header is displayed"):
             assert topic == (sumo_pages.explore_by_topic_page
                              .get_explore_by_topic_page_header().strip())
@@ -40,7 +38,6 @@ def test_explore_by_topic_product_filter(page: Page):
                         product.strip())
                 response = navigation_info.value
                 if response is None:
-                    print("Navigation did not occur. Refreshing the page.")
                     utilities.refresh_page()
                 if not sumo_pages.explore_by_topic_page.get_metadata_of_all_listed_articles():
                     pytest.fail(f"There is no sublist for {product}")
@@ -69,7 +66,6 @@ def test_explore_by_topic_aaq_widget_text(page: Page, create_user_factory):
         for product in sumo_pages.explore_by_topic_page.get_all_filter_by_product_options():
             product = product.strip()
             sumo_pages.explore_by_topic_page.select_a_filter_by_product_option(product)
-            utilities.wait_for_given_timeout(2000)
             with allure.step("Verifying the correct AAQ widget text is displayed for products"):
                 if product == "All Products":
                     assert (sumo_pages.common_web_elements
@@ -110,7 +106,6 @@ def test_explore_by_topic_aaq_widget_redirect(page: Page, create_user_factory):
             product = product.strip()
             current_url = utilities.get_page_url()
             sumo_pages.explore_by_topic_page.select_a_filter_by_product_option(product)
-            utilities.wait_for_given_timeout(2000)
             with page.expect_navigation() as navigation_info:
                 sumo_pages.common_web_elements.click_on_aaq_button()
             response = navigation_info.value
diff --git a/playwright_tests/tests/footer_tests/test_footer.py b/playwright_tests/tests/footer_tests/test_footer.py
index c44fdd7b81d..cbada25720e 100644
--- a/playwright_tests/tests/footer_tests/test_footer.py
+++ b/playwright_tests/tests/footer_tests/test_footer.py
@@ -14,8 +14,6 @@ def test_all_footer_links_are_working(page: Page):
         relative_url = link.get_attribute("href")
 
         if relative_url == "https://twitter.com/firefox":
-            print("Skipping Twitter link because it returned 400 due to custom user agent being"
-                  "used by playwright")
             continue
 
         # Verify if URL is absolute, and construct the full URL if it's not
diff --git a/playwright_tests/tests/homepage_tests/test_homepage.py b/playwright_tests/tests/homepage_tests/test_homepage.py
index ab5060f84a6..3798713e9ad 100644
--- a/playwright_tests/tests/homepage_tests/test_homepage.py
+++ b/playwright_tests/tests/homepage_tests/test_homepage.py
@@ -20,8 +20,7 @@ def test_join_our_community_card_learn_more_redirects_to_contribute_page(page: P
 
     with allure.step("Verifying that we are redirected to the 'Contribute' page successfully"):
         assert (
-            utilities.get_page_url()
-            == ContributePageMessages.STAGE_CONTRIBUTE_PAGE_URL
+            utilities.get_page_url() == ContributePageMessages.STAGE_CONTRIBUTE_PAGE_URL
         ), "We are not on the Contribute page!"
 
 
@@ -29,9 +28,8 @@ def test_join_our_community_card_learn_more_redirects_to_contribute_page(page: P
 @pytest.mark.homePageTests
 def test_join_our_community_card_has_the_correct_content(page: Page):
     sumo_pages = SumoPages(page)
-    with allure.step(
-        "Verifying that the 'Join Our Community' card has the correct strings applied"
-    ):
+    with allure.step( "Verifying that the 'Join Our Community' card has the correct strings"
+                      " applied"):
         assert (
             sumo_pages.common_web_elements.get_volunteer_learn_more_card_header()
             == HomepageMessages.JOIN_OUR_COMMUNITY_CARD_TITLE
diff --git a/playwright_tests/tests/messaging_system_tests/test_messaging_system.py b/playwright_tests/tests/messaging_system_tests/test_messaging_system.py
index c04e0fe913d..a89c1537459 100644
--- a/playwright_tests/tests/messaging_system_tests/test_messaging_system.py
+++ b/playwright_tests/tests/messaging_system_tests/test_messaging_system.py
@@ -41,7 +41,6 @@ def test_no_messages_here_text_is_displayed_when_no_messages_are_available(page:
 
 
 # T5697913, C2706735
-# This test needs to be updated to fetch the username from a different place
 @pytest.mark.messagingSystem
 def test_private_messages_can_be_sent_via_user_profiles(page: Page, is_firefox,
                                                         create_user_factory):
@@ -84,9 +83,7 @@ def test_private_messages_can_be_sent_via_user_profiles(page: Page, is_firefox,
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
 
     with allure.step("Verifying that the sent message is displayed"):
-        expect(
-            sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
-        ).to_be_visible()
+        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_visible()
 
     with allure.step("Deleting the message from the sent messages page"):
         sumo_pages.messaging_system_flow.delete_message_flow(
@@ -100,8 +97,7 @@ def test_private_messages_can_be_sent_via_user_profiles(page: Page, is_firefox,
                 DELETE_MESSAGE_BANNER_TEXT)
 
     with allure.step("Verifying that messages from user two are not displayed"):
-        expect(sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
-               ).to_be_hidden()
+        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_hidden()
 
     with allure.step("Signing in with the user which received the message"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -110,11 +106,11 @@ def test_private_messages_can_be_sent_via_user_profiles(page: Page, is_firefox,
         sumo_pages.top_navbar.click_on_inbox_option()
 
     with allure.step("Verifying that the inbox contains the previously sent messages"):
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_visible()
+        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
 
     with allure.step("Fetching the unread messages count and verifying that the counter displays"
                      " the correct data"):
-        unread_messages = len(sumo_pages.inbox_page.get_all_unread_messages())
+        unread_messages = len(sumo_pages.inbox_page.all_unread_messages.all())
         sumo_pages.top_navbar.mouse_over_profile_avatar()
         assert (unread_messages == sumo_pages.top_navbar.
                 get_unread_message_notification_counter_value())
@@ -126,8 +122,7 @@ def test_private_messages_can_be_sent_via_user_profiles(page: Page, is_firefox,
         )
 
     with allure.step("Verifying that the messages are no longer displayed inside the inbox"):
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(excerpt=message_body)
-               ).to_be_hidden()
+        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(excerpt=message_body)).to_be_hidden()
 
     with allure.step("Verifying that the correct banner is displayed"):
         assert sumo_pages.sent_message_page.get_sent_message_deleted_banner_text(
@@ -142,10 +137,6 @@ def test_private_message_can_be_sent_via_new_message_page(page: Page, create_use
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory()
-
-    print(test_user)
-    print(test_user_two)
-
     message_body = "Test " + utilities.generate_random_number(1, 1000)
 
     with allure.step(f"Signing in with {test_user['username']} user account"):
@@ -168,27 +159,13 @@ def test_private_message_can_be_sent_via_new_message_page(page: Page, create_use
     with allure.step("Verifying that the sent message is displayed inside the sent messages "
                      "page"):
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
-        expect(sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
-               ).to_be_visible()
-
-    with allure.step("Clearing the sent messages list"):
-        sumo_pages.messaging_system_flow.delete_message_flow(
-            excerpt=message_body, from_sent_list=True,
-            expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL
-        )
+        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_visible()
 
     with allure.step("Signing in with the receiver account and verifying that the message is "
                      "displayed inside the inbox section"):
         utilities.start_existing_session(cookies=test_user_two)
         sumo_pages.top_navbar.click_on_inbox_option()
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)
-               ).to_be_visible()
-
-    with allure.step("Clearing the inbox"):
-        sumo_pages.messaging_system_flow.delete_message_flow(
-            excerpt=message_body, from_inbox_list=True,
-            expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL
-        )
+        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
 
 
 # C891412, C891413
@@ -209,7 +186,7 @@ def test_navbar_options_redirect_and_options_and_highlight(page: Page, create_us
                      "option is highlighted"):
         expect(page).to_have_url(InboxPageMessages.INBOX_PAGE_STAGE_URL)
         expect(
-            sumo_pages.mess_system_user_navbar.get_inbox_navbar_element()
+            sumo_pages.mess_system_user_navbar.messaging_system_user_navbar_inbox_option
         ).to_have_css("background-color", InboxPageMessages.NAVBAR_INBOX_SELECTED_BG_COLOR)
 
     with allure.step("Clicking on the sent messages navbar option"):
@@ -217,11 +194,9 @@ def test_navbar_options_redirect_and_options_and_highlight(page: Page, create_us
 
     with check, allure.step("Verifying that we are on the correct page and the 'Sent Messages' "
                             "navbar option is highlighted"):
+        expect(page).to_have_url(SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
         expect(
-            page
-        ).to_have_url(SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
-        expect(
-            sumo_pages.mess_system_user_navbar.get_sent_messages_navbar_element()
+            sumo_pages.mess_system_user_navbar.messaging_system_user_navbar_sent_messages_option
         ).to_have_css("background-color",
                       SentMessagesPageMessages.NAVBAR_SENT_MESSAGES_SELECTED_BG_COLOR)
 
@@ -232,7 +207,7 @@ def test_navbar_options_redirect_and_options_and_highlight(page: Page, create_us
                             " navbar option is successfully highlighted"):
         expect(page).to_have_url(NewMessagePageMessages.NEW_MESSAGE_PAGE_STAGE_URL)
         expect(
-            sumo_pages.mess_system_user_navbar.get_new_message_navbar_element()
+            sumo_pages.mess_system_user_navbar.messaging_system_user_navbar_new_message_option
         ).to_have_css("background-color",
                       NewMessagePageMessages.NAVBAR_NEW_MESSAGE_SELECTED_BG_COLOR)
 
@@ -243,7 +218,7 @@ def test_navbar_options_redirect_and_options_and_highlight(page: Page, create_us
                      "option is highlighted"):
         expect(page).to_have_url(InboxPageMessages.INBOX_PAGE_STAGE_URL)
         expect(
-            sumo_pages.mess_system_user_navbar.get_inbox_navbar_element()
+            sumo_pages.mess_system_user_navbar.messaging_system_user_navbar_inbox_option
         ).to_have_css("background-color", InboxPageMessages.NAVBAR_INBOX_SELECTED_BG_COLOR)
 
 
@@ -279,7 +254,7 @@ def test_new_message_field_validation(page: Page, create_user_factory):
 
     with allure.step("Verifying that the characters remaining color is the expected one"):
         expect(
-            sumo_pages.new_message_page.get_characters_remaining_text_locator()
+            sumo_pages.new_message_page.textarea_remaining_characters_message
         ).to_have_css("color", NewMessagePageMessages.ENOUGH_CHARACTERS_REMAINING_COLOR)
 
     with allure.step("Adding 9990 characters inside the input field"):
@@ -293,7 +268,7 @@ def test_new_message_field_validation(page: Page, create_user_factory):
         ) in NewMessagePageMessages.TEN_CHARACTERS_REMAINING_MESSAGE
 
     with allure.step("Verifying that the characters remaining color is the expected one"):
-        expect(sumo_pages.new_message_page.get_characters_remaining_text_locator()
+        expect(sumo_pages.new_message_page.textarea_remaining_characters_message
                ).to_have_css("color", NewMessagePageMessages.ENOUGH_CHARACTERS_REMAINING_COLOR)
 
     # elif self.browser == "firefox":
@@ -316,7 +291,7 @@ def test_new_message_field_validation(page: Page, create_user_factory):
         ) in NewMessagePageMessages.NINE_CHARACTERS_REMAINING_MESSAGE
 
     with allure.step("Verifying that the characters remaining color is the expected one"):
-        expect(sumo_pages.new_message_page.get_characters_remaining_text_locator()
+        expect(sumo_pages.new_message_page.textarea_remaining_characters_message
                ).to_have_css("color", NewMessagePageMessages.NO_CHARACTERS_REMAINING_COLOR)
 
     # elif self.browser == "firefox":
@@ -336,7 +311,7 @@ def test_new_message_field_validation(page: Page, create_user_factory):
 
     with allure.step("Verifying that the char remaining string is updated accordingly"):
         expect(
-            sumo_pages.new_message_page.get_characters_remaining_text_locator()
+            sumo_pages.new_message_page.textarea_remaining_characters_message
         ).to_have_css("color", NewMessagePageMessages.NO_CHARACTERS_REMAINING_COLOR)
 
     # elif self.browser == "firefox":
@@ -350,7 +325,7 @@ def test_new_message_field_validation(page: Page, create_user_factory):
 
     with allure.step("Verifying that the characters remaining color is the expected one"):
         expect(
-            sumo_pages.new_message_page.get_characters_remaining_text_locator()
+            sumo_pages.new_message_page.textarea_remaining_characters_message
         ).to_have_css("color", NewMessagePageMessages.NO_CHARACTERS_REMAINING_COLOR)
 
     # elif self.browser == "firefox":
@@ -390,23 +365,22 @@ def test_new_message_cancel_button(page: Page, create_user_factory):
                      "redirected back to the inbox page"):
         sumo_pages.new_message_page.click_cancel_button()
         expect(
-            sumo_pages.mess_system_user_navbar.get_inbox_navbar_element()
+            sumo_pages.mess_system_user_navbar.messaging_system_user_navbar_inbox_option
         ).to_have_css("background-color", InboxPageMessages.NAVBAR_INBOX_SELECTED_BG_COLOR)
         expect(page).to_have_url(InboxPageMessages.INBOX_PAGE_STAGE_URL)
 
     with allure.step("Navigating to the 'Sent Messages' page and verifying that the message "
                      "was not sent"):
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
-        expect(sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
-               ).to_be_hidden()
+        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_hidden()
 
-    with allure.step("Signing out and signing in with the receiver account"):
+    with allure.step("Signing in with the receiver account"):
         utilities.start_existing_session(cookies=test_user_two)
 
     with allure.step("Navigating to the receiver inbox and verifying that no message was "
                      "received"):
         sumo_pages.top_navbar.click_on_inbox_option()
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_hidden()
+        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_hidden()
 
 
 # C2706741, C2706736, C2706740, C2706739, C2706735
@@ -442,11 +416,6 @@ def test_messaging_system_unread_notification_after_message_deletion(page: Page,
             expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL
         )
 
-    with allure.step("Deleting sent messages"):
-        sumo_pages.sent_message_page.delete_all_sent_messages_via_delete_selected_button(
-            expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL
-        )
-
     with allure.step("Signing in with the recipient"):
         utilities.start_existing_session(cookies=test_user_two)
 
@@ -455,11 +424,11 @@ def test_messaging_system_unread_notification_after_message_deletion(page: Page,
 
     with allure.step("Verifying that the avatar notification and the new message counter is "
                      "correct"):
-        inbox_messages_count = len(sumo_pages.inbox_page.get_all_unread_messages())
+        inbox_messages_count = len(sumo_pages.inbox_page.all_unread_messages.all())
         sumo_pages.top_navbar.mouse_over_profile_avatar()
         assert (sumo_pages.top_navbar
                 .get_unread_message_notification_counter_value() == inbox_messages_count)
-        assert sumo_pages.top_navbar.is_unread_message_notification_displayed()
+        assert sumo_pages.top_navbar.unread_message_profile_notification.is_visible()
 
     with allure.step("Marking the first received message as read"):
         sumo_pages.inbox_page.check_a_particular_message_based_on_excerpt(content_first_message)
@@ -470,11 +439,11 @@ def test_messaging_system_unread_notification_after_message_deletion(page: Page,
 
     with allure.step("Verifying that the new message notification counter resembles the unread "
                      "inbox message count"):
-        inbox_messages_count = len(sumo_pages.inbox_page.get_all_unread_messages())
+        inbox_messages_count = len(sumo_pages.inbox_page.all_unread_messages.all())
         sumo_pages.top_navbar.mouse_over_profile_avatar()
         assert (sumo_pages.top_navbar
                 .get_unread_message_notification_counter_value() == inbox_messages_count)
-        assert sumo_pages.top_navbar.is_unread_message_notification_displayed()
+        assert sumo_pages.top_navbar.unread_message_profile_notification.is_visible()
 
     with allure.step("Deleting the first message"):
         sumo_pages.messaging_system_flow.delete_message_flow(
@@ -484,11 +453,11 @@ def test_messaging_system_unread_notification_after_message_deletion(page: Page,
 
     with allure.step("Verifying that the new message notification counter resembles the unread "
                      "inbox message count"):
-        inbox_messages_count = len(sumo_pages.inbox_page.get_all_unread_messages())
+        inbox_messages_count = len(sumo_pages.inbox_page.all_unread_messages.all())
         sumo_pages.top_navbar.mouse_over_profile_avatar()
         assert (sumo_pages.top_navbar
                 .get_unread_message_notification_counter_value() == inbox_messages_count)
-        assert sumo_pages.top_navbar.is_unread_message_notification_displayed()
+        assert sumo_pages.top_navbar.unread_message_profile_notification.is_visible()
 
     with allure.step("Marking the second received message as read"):
         sumo_pages.inbox_page.check_a_particular_message_based_on_excerpt(content_second_message)
@@ -496,15 +465,15 @@ def test_messaging_system_unread_notification_after_message_deletion(page: Page,
 
     with allure.step("Verifying that the new message notification counter resembles the unread "
                      "inbox message count"):
-        inbox_messages_count = len(sumo_pages.inbox_page.get_all_unread_messages())
+        inbox_messages_count = len(sumo_pages.inbox_page.all_unread_messages.all())
         sumo_pages.top_navbar.mouse_over_profile_avatar()
         if inbox_messages_count == 0:
-            assert not sumo_pages.top_navbar.is_unread_message_notification_counter_visible()
-            assert not sumo_pages.top_navbar.is_unread_message_notification_displayed()
+            assert sumo_pages.top_navbar.unread_message_count.is_hidden()
+            assert sumo_pages.top_navbar.unread_message_profile_notification.is_hidden()
         else:
             assert (sumo_pages.top_navbar
                     .get_unread_message_notification_counter_value() == inbox_messages_count)
-            assert sumo_pages.top_navbar.is_unread_message_notification_displayed()
+            assert sumo_pages.top_navbar.unread_message_profile_notification.is_visible()
 
     with allure.step("Deleting the second received message"):
         sumo_pages.messaging_system_flow.delete_message_flow(
@@ -514,10 +483,10 @@ def test_messaging_system_unread_notification_after_message_deletion(page: Page,
 
     with allure.step("Verifying that the new message notification counter resembles the unread "
                      "inbox message count"):
-        inbox_messages_count = len(sumo_pages.inbox_page.get_all_unread_messages())
+        inbox_messages_count = len(sumo_pages.inbox_page.all_unread_messages.all())
         sumo_pages.top_navbar.mouse_over_profile_avatar()
         if inbox_messages_count == 0:
-            assert not sumo_pages.top_navbar.is_unread_message_notification_counter_visible()
+            assert sumo_pages.top_navbar.unread_message_count.is_hidden()
         else:
             assert (sumo_pages.top_navbar
                     .get_unread_message_notification_counter_value() == inbox_messages_count)
@@ -548,7 +517,7 @@ def test_new_message_preview(page: Page, create_user_factory):
     with allure.step("Clicking on the 'Preview' button and verifying that the preview "
                      "section is successfully displayed"):
         sumo_pages.new_message_page.click_on_preview_button()
-        expect(sumo_pages.new_message_page.get_preview_section_locator()).to_be_visible()
+        expect(sumo_pages.new_message_page.preview_section).to_be_visible()
 
     with allure.step("Verifying that all the preview items are displayed"):
         assert sumo_pages.new_message_page.get_text_of_previewed_data_first_paragraph(
@@ -578,11 +547,8 @@ def test_new_message_preview(page: Page, create_user_factory):
         assert sumo_pages.new_message_page.get_text_of_previewed_data_bulleted_list_items(
         ) == bulleted_list_items
 
-        expect(sumo_pages.new_message_page.get_preview_external_link_test_data_locator()
-               ).to_be_visible()
-
-        expect(sumo_pages.new_message_page.get_preview_internal_link_test_data_locator()
-               ).to_be_visible()
+        expect(sumo_pages.new_message_page.preview_external_link).to_be_visible()
+        expect(sumo_pages.new_message_page.preview_internal_link).to_be_visible()
 
     with allure.step("Clicking on the internal link and verifying that the user is "
                      "redirected to the correct article"):
@@ -600,14 +566,14 @@ def test_new_message_preview(page: Page, create_user_factory):
                      "'Sent Messages page'"):
         sumo_pages.top_navbar.click_on_inbox_option()
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
-        expect(sumo_pages.sent_message_page.sent_messages_by_username(
+        expect(sumo_pages.sent_message_page.sender_username(
             username=test_user_two["username"])).to_be_hidden()
 
     with allure.step("Signing in with the potential message receiver and verifying that no "
                      "message were received"):
         utilities.start_existing_session(cookies=test_user_two)
         sumo_pages.top_navbar.click_on_inbox_option()
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_sender(username=test_user["username"])
+        expect(sumo_pages.inbox_page.sender_username(username=test_user["username"])
                ).to_be_hidden()
 
 
@@ -646,9 +612,7 @@ def test_messages_can_be_selected_and_deleted(page: Page, create_user_factory):
 
     with allure.step("Verifying that the message is still listed inside the sent messages "
                      "section"):
-        expect(
-            sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
-        ).to_be_visible()
+        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_visible()
 
     with allure.step("Sending another message to self twice"):
         for i in range(2):
@@ -666,15 +630,14 @@ def test_messages_can_be_selected_and_deleted(page: Page, create_user_factory):
             expected_locator=sumo_pages.inbox_page.message_action_banner)
         assert sumo_pages.inbox_page.get_action_banner_text(
         ) in InboxPageMessages.NO_MESSAGES_SELECTED_BANNER_TEXT
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body).first
-               ).to_be_visible()
+        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body).first).to_be_visible()
 
     with allure.step("Selecting the messages and deleting it via the delete selected button"):
         sumo_pages.inbox_page.delete_all_inbox_messages_via_delete_selected_button(
             message_body, expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL)
 
     with allure.step("Verifying that the messages are no longer displayed"):
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_hidden()
+        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_hidden()
         assert sumo_pages.inbox_page.get_action_banner_text(
         ) in InboxPageMessages.MULTIPLE_MESSAGES_DELETION_BANNER_TEXT
 
@@ -685,8 +648,7 @@ def test_messages_can_be_selected_and_deleted(page: Page, create_user_factory):
             message_body, expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
 
     with allure.step("Verifying that the messages are no longer displayed"):
-        expect(sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
-               ).to_be_hidden()
+        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_hidden()
 
     with check, allure.step("Verifying that the correct banner is displayed"):
         assert sumo_pages.sent_message_page.get_sent_message_deleted_banner_text(
@@ -697,16 +659,15 @@ def test_messages_can_be_selected_and_deleted(page: Page, create_user_factory):
         sumo_pages.top_navbar.click_on_inbox_option()
 
     with allure.step("Verifying that the messages are displayed inside the inbox section"):
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_visible()
+        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
 
-    with allure.step("Deleting all messages from the inbox page via the delete selected "
-                     "button'"):
+    with allure.step("Deleting all messages from the inbox page via the delete selected button'"):
         sumo_pages.inbox_page.delete_all_inbox_messages_via_delete_selected_button(
             message_body, expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL)
 
     with allure.step("Verifying that the messages are no longer displayed inside the inbox"
                      " section and the correct banner is displayed"):
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_hidden()
+        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_hidden()
         assert sumo_pages.inbox_page.get_action_banner_text(
         ) in InboxPageMessages.MESSAGE_DELETED_BANNER_TEXT
 
@@ -731,8 +692,8 @@ def test_group_messages_cannot_be_sent_by_non_staff_users(page: Page, create_use
             utilities.user_message_test_data['test_groups'][0]
         )
 
-    with allure.step("Verifying that no users are returned"):
-        expect(sumo_pages.new_message_page.get_no_user_message_locator()).to_be_visible(timeout=15000)
+    with allure.step("Verifying that no groups are returned"):
+        expect(sumo_pages.new_message_page.no_user_search_results_text).to_be_visible(timeout=15000)
 
     with allure.step("Navigating to the groups page"):
         utilities.navigate_to_link(utilities.general_test_data['groups'])
@@ -740,18 +701,18 @@ def test_group_messages_cannot_be_sent_by_non_staff_users(page: Page, create_use
             utilities.user_message_test_data['test_groups'][0])
 
     with allure.step("Verifying that the pm group members button is not displayed"):
-        expect(sumo_pages.user_groups.get_pm_group_members_button()).to_be_hidden()
+        expect(sumo_pages.user_groups.private_message_group_members_button).to_be_hidden()
 
     with allure.step("Deleting the user session and verifying that the pm group members "
                      "button is not displayed"):
         utilities.delete_cookies()
-        expect(sumo_pages.user_groups.get_pm_group_members_button()).to_be_hidden()
+        expect(sumo_pages.user_groups.private_message_group_members_button).to_be_hidden()
 
     # The PM group members button was removed for staff members as well.
     with allure.step("Signing in with a staff account and verifying that the pm group "
                      "members button is not displayed"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.user_groups.get_pm_group_members_button()).to_be_hidden()
+        expect(sumo_pages.user_groups.private_message_group_members_button).to_be_hidden()
 
 
 # C2566115, C2566116, C2566119
@@ -791,32 +752,22 @@ def test_staff_users_can_send_group_messages(page: Page, create_user_factory):
                      "was sent"):
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
         expect(
-            sumo_pages.sent_message_page.sent_messages_to_group(targeted_test_group, message_body)
+            sumo_pages.sent_message_page.sent_message_by_group(targeted_test_group, message_body)
         ).to_be_visible()
 
-    with allure.step("Deleting the outbox"):
-        sumo_pages.sent_message_page.delete_all_sent_messages_via_delete_selected_button(
-            message_body, expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
-
     with allure.step("Signing in with all targeted group members, verifying that the message "
-                     "was received and clearing the inbox"):
+                     "was received."):
         for user in group_members:
             utilities.start_existing_session(cookies=user)
-
             sumo_pages.top_navbar.click_on_inbox_option()
-            expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)
-                   ).to_be_visible()
-            sumo_pages.inbox_page.delete_all_inbox_messages_via_delete_selected_button(
-                message_body, expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL)
+            expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
 
     with allure.step("Signing in with users from second test group and verifying that the "
                      "message was not received"):
         for user in second_group:
             utilities.start_existing_session(cookies=user)
-
             sumo_pages.top_navbar.click_on_inbox_option()
-            expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)
-                   ).to_be_hidden()
+            expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_hidden()
 
 
 # C2566117, C2566119
@@ -854,20 +805,12 @@ def test_staff_users_can_send_messages_to_multiple_groups(page: Page, create_use
         sumo_pages.sent_message_page.click_on_sent_message_subject(message_body)
         assert sumo_pages.sent_message_page.get_text_of_all_sent_groups() == targeted_test_group
 
-    with allure.step("Deleting the outbox"):
-        utilities.navigate_back()
-        sumo_pages.sent_message_page.delete_all_sent_messages_via_delete_selected_button(
-            message_body, expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
-
     with allure.step("Signing in with all targeted group members, verifying that the message "
-                     "was received and clearing the inbox"):
+                     "was received."):
         for user in [test_user_two, test_user_three]:
             utilities.start_existing_session(user)
             sumo_pages.top_navbar.click_on_inbox_option()
-            expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)
-                   ).to_be_visible()
-            sumo_pages.inbox_page.delete_all_inbox_messages_via_delete_selected_button(
-                message_body, expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL)
+            expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
 
 
 # C2566118, C2566119, C2566120
@@ -904,27 +847,17 @@ def test_staff_users_can_send_messages_to_both_groups_and_user(page: Page, creat
         assert (test_user_three["username"] in sumo_pages.sent_message_page.
                 get_text_of_all_recipients())
 
-    with allure.step("Deleting the outbox"):
-        utilities.navigate_back()
-        sumo_pages.sent_message_page.delete_all_sent_messages_via_delete_selected_button(
-            message_body, expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
-
     with allure.step("Signing in with all targeted group members, verifying that the message "
                      "was received and clearing the inbox"):
         for user in [test_user_two, test_user_three]:
             utilities.start_existing_session(user)
-
             sumo_pages.top_navbar.click_on_inbox_option()
-            expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)
-                   ).to_be_visible()
-            sumo_pages.inbox_page.delete_all_inbox_messages_via_delete_selected_button(
-                message_body, expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL)
+            expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
 
 
 # C2566116
 @pytest.mark.messagingSystem
-def test_removed_group_users_do_not_receive_group_messages(page: Page,
-                                                           create_user_factory):
+def test_removed_group_users_do_not_receive_group_messages(page: Page, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Staff"], permissions=["change_groupprofile"])
@@ -932,14 +865,12 @@ def test_removed_group_users_do_not_receive_group_messages(page: Page,
         groups=[utilities.user_message_test_data['test_groups'][0]])
     test_user_three = create_user_factory(
         groups=[utilities.user_message_test_data['test_groups'][0]])
-
     message_body = "Test " + utilities.generate_random_number(1, 1000)
     targeted_test_group = utilities.user_message_test_data['test_groups'][0]
 
     with allure.step("Signing in with a staff account and removing a user from the targeted "
                      "group"):
         utilities.start_existing_session(cookies=test_user)
-
         utilities.navigate_to_link(utilities.general_test_data['groups'])
         sumo_pages.user_groups.click_on_a_particular_group(targeted_test_group)
         sumo_pages.user_group_flow.remove_a_user_from_group(test_user_two["username"])
@@ -953,27 +884,20 @@ def test_removed_group_users_do_not_receive_group_messages(page: Page,
             expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL
         )
 
-    with allure.step("Deleting the outbox"):
-        sumo_pages.sent_message_page.delete_all_sent_messages_via_delete_selected_button(
-            message_body, expected_url=SentMessagesPageMessages.SENT_MESSAGES_PAGE_URL)
-
     with allure.step(f"Signing in with {test_user_three['username']} user which is still part of "
                      f"the group and verifying that the message was received"):
         utilities.start_existing_session(cookies=test_user_three)
         sumo_pages.top_navbar.click_on_inbox_option()
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_visible()
-        sumo_pages.inbox_page.delete_all_inbox_messages_via_delete_selected_button(
-            message_body, expected_url=InboxPageMessages.INBOX_PAGE_STAGE_URL)
+        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
 
     with allure.step("Verifying that the removed user has not received the group message"):
         utilities.start_existing_session(cookies=test_user_two)
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_hidden()
+        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_hidden()
 
 
 # C2584835
 @pytest.mark.messagingSystem
-def test_unable_to_send_group_messages_to_profiless_groups(page: Page,
-                                                           create_user_factory):
+def test_unable_to_send_group_messages_to_profiless_groups(page: Page, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(groups=["Staff"])
@@ -988,8 +912,8 @@ def test_unable_to_send_group_messages_to_profiless_groups(page: Page,
     with allure.step("Typing in a profiless group name inside the To field"):
         sumo_pages.new_message_page.type_into_to_input_field("kb-contributors")
 
-    with allure.step("Verifying that no users are returned"):
-        expect(sumo_pages.new_message_page.get_no_user_message_locator()).to_be_visible(timeout=15000)
+    with allure.step("Verifying that no groups are returned"):
+        expect(sumo_pages.new_message_page.no_user_search_results_text).to_be_visible(timeout=15000)
 
 
 # C2083482
@@ -1041,13 +965,7 @@ def test_pm_group_member(page: Page, is_firefox, create_user_factory):
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
 
     with allure.step("Verifying that the sent message is displayed"):
-        expect(
-            sumo_pages.sent_message_page.sent_messages_by_excerpt_locator(message_body)
-        ).to_be_visible()
-
-    with allure.step("Deleting the message from the sent messages page"):
-        sumo_pages.messaging_system_flow.delete_message_flow(
-            excerpt=message_body, from_sent_list=True)
+        expect(sumo_pages.sent_message_page.sent_message_by_subject(message_body)).to_be_visible()
 
     with allure.step("Signing in with the user which received the message"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -1056,8 +974,4 @@ def test_pm_group_member(page: Page, is_firefox, create_user_factory):
         sumo_pages.top_navbar.click_on_inbox_option()
 
     with allure.step("Verifying that the inbox contains the previously sent messages"):
-        expect(sumo_pages.inbox_page.get_inbox_message_locator_based_on_excerpt(message_body)).to_be_visible()
-
-    with allure.step("Deleting the messages from the inbox section"):
-        sumo_pages.messaging_system_flow.delete_message_flow(
-            excerpt=message_body, from_inbox_list=True)
+        expect(sumo_pages.inbox_page.inbox_message_by_excerpt(message_body)).to_be_visible()
diff --git a/playwright_tests/tests/search_tests/test_contributor_forums_seach.py b/playwright_tests/tests/search_tests/test_contributor_forums_seach.py
index 7556433534c..c3f79c5e833 100644
--- a/playwright_tests/tests/search_tests/test_contributor_forums_seach.py
+++ b/playwright_tests/tests/search_tests/test_contributor_forums_seach.py
@@ -1,5 +1,4 @@
 import random
-
 import allure
 import pytest
 from playwright.sync_api import Page
@@ -37,7 +36,7 @@ def test_by_thread_title(page: Page, create_user_factory):
 
 # C1350866, C1350867, C1350868
 @pytest.mark.contributorForumSearch
-def test_and_or_not_operators_in_community_forums(page: Page, create_user_factory):
+def test_and_or_not_operators_in_community_hub(page: Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["forum-contributors"])
@@ -218,7 +217,7 @@ def test_searching_in_contributor_forums_return_results_only_to_that_forum(page,
             "Support Forum discussions")
 
     with check, allure.step("Searching this forum for the posted thread and verifying that the "
-                            "thread is returned"):
+                            "thread is not returned"):
         sumo_pages.forum_discussions_page.search_in_community_discussion(thread_title)
         assert (thread_title not in sumo_pages.forum_discussions_page.
                 get_all_thread_titles_from_search_results())
diff --git a/playwright_tests/tests/search_tests/test_main_searchbar.py b/playwright_tests/tests/search_tests/test_main_searchbar.py
index d3550650890..c284b690b81 100644
--- a/playwright_tests/tests/search_tests/test_main_searchbar.py
+++ b/playwright_tests/tests/search_tests/test_main_searchbar.py
@@ -178,10 +178,8 @@ def test_searchbar_functionality_and_search_filters(page: Page, create_user_fact
         utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_info = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
-            topic_name=utilities.
-            aaq_question_test_data["valid_firefox_question"]["topic_value"],
-            body=utilities.
-            aaq_question_test_data["valid_firefox_question"]["question_body"],
+            topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             expected_locator=sumo_pages.question_page.questions_header
         )
         question_tile = question_info["aaq_subject"]
@@ -244,7 +242,6 @@ def test_searchbar_functionality_and_search_filters(page: Page, create_user_fact
     with allure.step("Using the searchbar to search for a particular question"):
         sumo_pages.search_page.clear_the_searchbar(is_sidebar=True)
         sumo_pages.search_page.fill_into_searchbar(question_tile, is_sidebar=True)
-        utilities.wait_for_given_timeout(2000)
         result_count = utilities.number_extraction_from_string(
             sumo_pages.search_page.get_search_results_header())
 
@@ -306,18 +303,15 @@ def test_searchbar_functionality_on_article_page(page: Page, create_user_factory
     with allure.step("Submitting a new KB article against the Firefox product and using the "
                      "searchbar to search for a particular kb Article"):
         utilities.start_existing_session(cookies=test_user)
-
         sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
         sumo_pages.kb_article_page.click_on_article_option()
-
         utilities.wait_for_given_timeout(2000)
         sumo_pages.search_page.fill_into_searchbar(test_article_name, is_sidebar=True)
 
     with allure.step("Verifying that the article is successfully returned"):
         assert test_article_name in sumo_pages.search_page.get_all_search_results_article_titles()
 
-    with allure.step("Verifying that the filter by product is applied to the correct "
-                     "product"):
+    with allure.step("Verifying that the filter by product is applied to the correct product"):
         assert sumo_pages.search_page.get_the_highlighted_side_nav_item() == "Firefox"
 
     with allure.step("Using the searchbar to search for a particular question"):
@@ -329,7 +323,6 @@ def test_searchbar_functionality_on_article_page(page: Page, create_user_factory
 
     with allure.step("Verifying that the filter by product is applied to the correct product"):
         assert sumo_pages.search_page.get_the_highlighted_side_nav_item() == "Firefox"
-    sumo_pages.search_page.clear_the_searchbar(is_sidebar=True)
 
 
 # C1329220
@@ -392,7 +385,6 @@ def test_popular_searches_products(page: Page):
                 with allure.step("Navigating back"):
                     utilities.navigate_back()
 
-
 # C1329221
 @pytest.mark.searchTests
 def test_stopwords(page: Page):
@@ -421,13 +413,13 @@ def test_synonyms(page: Page):
     search_terms = ['addon', 'add-on', 'add', 'how to add bookmarks', 'how to add themes',
                     'pop-ups', 'popups', 'pop ups', 'bookmarks bar', 'bookmark bar',
                     'bookmarks toolbar', 'bookmark toolbar']
+
     with allure.step("Adding a search term and validating the search results"):
         for search_term in search_terms:
             sumo_pages.search_page.fill_into_searchbar(search_term)
             for title in sumo_pages.search_page.get_all_search_results_article_titles():
                 content = sumo_pages.search_page.get_all_search_results_article_bolded_content(
                     title)
-
                 assert _verify_search_results(page, search_term, 'english', title, content)
 
 
@@ -470,13 +462,13 @@ def test_brand_synonyms(page: Page):
     sumo_pages = SumoPages(page)
     search_terms = ['mozilla', 'modzilla', 'mozzila', 'mozzilla', 'mozila', 'ios', 'ipad',
                     'iphone', 'ipod']
+
     with allure.step("Adding a search term inside the search bar and validating search results"):
         for search_term in search_terms:
             sumo_pages.search_page.fill_into_searchbar(search_term)
             for title in sumo_pages.search_page.get_all_search_results_article_titles():
                 content = sumo_pages.search_page.get_all_search_results_article_bolded_content(
                     title)
-
                 assert _verify_search_results(page, search_term, 'english', title, content)
 
 
@@ -614,20 +606,6 @@ def test_conjunctions_and_disjunction_operators(page: Page):
                                                                 f"{title} and bolded content: "
                                                                 f"{content}")
 
-# C1358447
-@pytest.mark.searchTests
-def test_search_by_doc_id(page: Page):
-    sumo_pages = SumoPages(page)
-
-    # 67390 is the docId for the DoNotDelete article
-    search_string = "field:doc_id.en-US:67390"
-    document_title = "DoNotDelete"
-
-    with allure.step("Searching by document Id and verifying that the correct document is"
-                     " returned"):
-        sumo_pages.search_page.fill_into_searchbar(search_string)
-        assert document_title in sumo_pages.search_page.get_all_search_results_article_titles()
-
 
 # C1350861, C1349864, C1352398
 @pytest.mark.searchTests
@@ -679,12 +657,10 @@ def test_not_operator(page: Page):
                                                       f"{title} and bolded content: "
                                                       f"{content}")
 
-
 # C1350991, C1352392, C1352394
 @pytest.mark.searchTests
 def test_exact_phrase_searching(page: Page):
     sumo_pages = SumoPages(page)
-    utilities = Utilities(page)
     search_term = '"Firefox desktop"'
     second_search_term = '"Firefox desktop'
     no_results_search_term = '"test test bla blatest test"'
@@ -722,7 +698,6 @@ def test_exact_phrase_searching(page: Page):
 
         with allure.step("Adding an exact search phrase which should return 0 results"):
             sumo_pages.search_page.fill_into_searchbar(no_results_search_term)
-            utilities.wait_for_given_timeout(2000)
 
         with allure.step("Verifying that no results are returned for the given exact search "
                          "phrase"):
@@ -735,7 +710,6 @@ def test_keywords_field_and_content_operator(page: Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(permissions=["review_revision"])
-
     utilities.start_existing_session(cookies=test_user)
 
     search_term_keyword = "field:keywords.en-US:playwright search test"
@@ -967,8 +941,8 @@ def test_obsolete_marked_documents_visibility(page: Page, create_user_factory):
     utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Submitting a new KB article"):
-        test_article = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        test_article = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
         utilities.wait_for_given_timeout(65000)
 
     with allure.step("Verifying that the article is successfully returned"):
@@ -977,7 +951,7 @@ def test_obsolete_marked_documents_visibility(page: Page, create_user_factory):
         assert (test_article["article_title"] in sumo_pages.search_page.
                 get_all_search_results_article_titles())
 
-    with allure.step("Marking the question as obsolete"):
+    with allure.step("Marking the article as obsolete"):
         utilities.navigate_to_link(test_article["article_url"])
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(obsolete=True)
         utilities.wait_for_given_timeout(65000)
@@ -988,7 +962,7 @@ def test_obsolete_marked_documents_visibility(page: Page, create_user_factory):
         assert (test_article["article_title"] not in sumo_pages.search_page.
                 get_all_search_results_article_titles())
 
-    with allure.step("Unmarking the question as obsolete"):
+    with allure.step("Unmarking the article as obsolete"):
         utilities.navigate_to_link(test_article["article_url"])
         sumo_pages.edit_article_metadata_flow.edit_article_metadata(obsolete=False)
         utilities.wait_for_given_timeout(65000)
@@ -1070,8 +1044,8 @@ def test_article_product_metadata_update_and_search_filter_by_product(page: Page
 
 # C2873849
 @pytest.mark.searchTests
-def test_archived_questions_are_returned_advanced_search_results_only(page: Page,
-                                                                      create_user_factory):
+def test_archived_questions_are_returned_in_advanced_search_results_only(page: Page,
+                                                                         create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory()
@@ -1084,8 +1058,7 @@ def test_archived_questions_are_returned_advanced_search_results_only(page: Page
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=sumo_pages.aaq_form_page.get_aaq_form_topic_options()[0],
-            body=utilities.aaq_question_test_data["valid_firefox_question"]
-            ["simple_body_text"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
             attach_image=False,
             expected_locator=sumo_pages.question_page.questions_header
         )
@@ -1094,8 +1067,8 @@ def test_archived_questions_are_returned_advanced_search_results_only(page: Page
                      "results"):
         question_reply = (
             utilities.aaq_question_test_data['valid_firefox_question']['question_reply'])
-        sumo_pages.aaq_flow.post_question_reply_flow( repliant_username=test_user['username'],
-                                                      reply=question_reply)
+        sumo_pages.aaq_flow.post_question_reply_flow(repliant_username=test_user['username'],
+                                                     reply=question_reply)
         utilities.start_existing_session(session_file_name=user)
         sumo_pages.question_page.click_on_archive_this_question_option()
 
@@ -1119,8 +1092,8 @@ def test_archived_questions_are_returned_advanced_search_results_only(page: Page
 
         sumo_pages.search_page.clear_the_searchbar()
         sumo_pages.search_page.fill_into_searchbar(
-            f"field:question_content.en-US:{question_details['question_body']}")
-        utilities.wait_for_given_timeout(2000)
+            f"field:question_content.en-US:I'm experiencing an accessibility issue "
+        )
 
         while sumo_pages.common_web_elements.is_next_pagination_item_visible():
             search_titles = sumo_pages.search_page.get_all_search_results_article_titles()
@@ -1140,7 +1113,6 @@ def test_aaq_question_id_and_is_archived_fields_search(page:Page, create_user_fa
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
-
     utilities.start_existing_session(cookies=test_user)
 
     with check, allure.step("Searching archived questions using the question_is_archived:true and "
@@ -1195,16 +1167,13 @@ def test_aaq_question_is_locked_field_search(page:Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
-
     utilities.start_existing_session(cookies=test_user)
 
-    with check, allure.step("Searching for question_is_locked:false inside the searchobx and "
+    with check, allure.step("Searching for question_is_locked:false inside the searchbox and "
                             "verifying that the returned questions are locked"):
         sumo_pages.search_page.fill_into_searchbar("field:question_is_locked:false")
-        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
-        print(sumo_pages.question_page.get_thread_locked_text())
         if sumo_pages.question_page.is_thread_locked_banner_displayed():
             assert sumo_pages.question_page.get_thread_locked_text() not in (
                 [QuestionPageMessages.LOCKED_AND_ARCHIVED_BANNER,
@@ -1213,11 +1182,10 @@ def test_aaq_question_is_locked_field_search(page:Page, create_user_factory):
         else:
             assert True
 
-    with allure.step("Searching for question_is_locked:true inside the searchobx and verifying"
+    with allure.step("Searching for question_is_locked:true inside the searchbox and verifying"
                      " that the returned questions are not locked"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         sumo_pages.search_page.fill_into_searchbar("field:question_is_locked:true")
-        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         assert sumo_pages.question_page.get_thread_locked_text() in (
@@ -1231,22 +1199,19 @@ def test_aaq_question_has_solution_field_search(page:Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
-
     utilities.start_existing_session(cookies=test_user)
 
-    with check, allure.step("Searching for question_has_solution:false inside the searchobx and "
+    with check, allure.step("Searching for question_has_solution:false inside the searchbox and "
                             "verifying that the returned questions don't have a solution"):
         sumo_pages.search_page.fill_into_searchbar("field:question_has_solution:false")
-        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         assert not sumo_pages.question_page.is_solution_section_displayed()
 
-    with allure.step("Searching for question_has_solution:true inside the searchobx and verifying"
+    with allure.step("Searching for question_has_solution:true inside the searchbox and verifying"
                      " that the returned questions have a solution"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         sumo_pages.search_page.fill_into_searchbar("field:question_has_solution:true")
-        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         assert sumo_pages.question_page.is_solution_section_displayed()
@@ -1258,25 +1223,22 @@ def test_aaq_question_product_id_field_search(page:Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
-
     utilities.start_existing_session(cookies=test_user)
 
-    with check, allure.step("Searching for question_product id 1 inside the searchobx and "
+    with check, allure.step("Searching for question_product id 1 inside the searchbox and "
                             "verifying that the returned questions are filled under the Firefox"
                             "product"):
         sumo_pages.search_page.fill_into_searchbar("field:question_product_id:1")
-        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         sumo_pages.question_page.click_on_question_details_button()
         assert sumo_pages.question_page.get_question_details_product() == "Firefox"
 
-    with allure.step("Searching for question_product id 2 inside the searchobx and verifying"
+    with allure.step("Searching for question_product id 2 inside the searchbox and verifying"
                      " that the returned questions are filled under the Firefox for Android"
                      " product"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         sumo_pages.search_page.fill_into_searchbar("field:question_product_id:2")
-        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         sumo_pages.question_page.click_on_question_details_button()
@@ -1289,24 +1251,21 @@ def test_aaq_question_topic_id_field_search(page:Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
-
     utilities.start_existing_session(cookies=test_user)
 
-    with check, allure.step("Searching for question_topic 383 inside the searchobx and "
+    with check, allure.step("Searching for question_topic 383 inside the searchbox and "
                             "verifying that returned questions are filled against the"
                             " Accessibility topic"):
         sumo_pages.search_page.fill_into_searchbar("field:question_topic_id:383")
-        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         sumo_pages.question_page.click_on_question_details_button()
         assert sumo_pages.question_page.get_question_details_topic() == "Accessibility"
 
-    with allure.step("Searching for question_topic 410 inside the searchobx and verifying"
+    with allure.step("Searching for question_topic 410 inside the searchbox and verifying"
                      " that the returned questions are filled against the Accounts topic"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         sumo_pages.search_page.fill_into_searchbar("field:question_topic_id:410")
-        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         sumo_pages.question_page.click_on_question_details_button()
@@ -1319,23 +1278,20 @@ def test_aaq_question_tag_id_field_search(page:Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["Forum Moderators"])
-
     utilities.start_existing_session(cookies=test_user)
 
-    with check, allure.step("Searching for question_tag_id 2272 inside the searchobx and "
+    with check, allure.step("Searching for question_tag_id 2272 inside the searchbox and "
                             "verifying that the returned questions contain the accessibility tag"):
         sumo_pages.search_page.fill_into_searchbar("field:question_tag_ids:2772")
-        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         sumo_pages.question_page.click_on_question_details_button()
         assert "accessibility" in sumo_pages.question_page.get_question_tag_options(True)
 
-    with allure.step("Searching for question_tag_id 2273 inside the searchobx and verifying"
+    with allure.step("Searching for question_tag_id 2273 inside the searchbox and verifying"
                      " that the returned questions contain the firefox tag"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         sumo_pages.search_page.fill_into_searchbar("field:question_tag_ids:2773")
-        utilities.wait_for_given_timeout(2000)
         results = sumo_pages.search_page.get_all_search_results_handles()
         random.choice(results).click()
         sumo_pages.question_page.click_on_question_details_button()
@@ -1346,12 +1302,10 @@ def test_aaq_question_tag_id_field_search(page:Page, create_user_factory):
 @pytest.mark.searchTests
 def test_aaq_question_votes_field_search(page:Page):
     sumo_pages = SumoPages(page)
-    utilities = Utilities(page)
 
     with check, allure.step("Searching for question_num_votes:0 and verifying that the search"
                             " results contain the queried number of question votes"):
         sumo_pages.search_page.fill_into_searchbar("field:question_num_votes:0")
-        utilities.wait_for_given_timeout(2000)
         assert all("0" in search_result for search_result in sumo_pages.search_page.
                    get_text_of_question_votes())
 
@@ -1359,7 +1313,6 @@ def test_aaq_question_votes_field_search(page:Page):
                      " that the returned questions contain the queried number of votes"):
         sumo_pages.top_navbar.click_on_sumo_nav_logo()
         sumo_pages.search_page.fill_into_searchbar("field:question_num_votes:3")
-        utilities.wait_for_given_timeout(2000)
         assert all("3" in search_result for search_result in sumo_pages.
                    search_page.get_text_of_question_votes())
 
diff --git a/playwright_tests/tests/top_navbar_section_tests/test_top_navbar.py b/playwright_tests/tests/top_navbar_section_tests/test_top_navbar.py
index 795cbdc8574..8bc16f17dc5 100644
--- a/playwright_tests/tests/top_navbar_section_tests/test_top_navbar.py
+++ b/playwright_tests/tests/top_navbar_section_tests/test_top_navbar.py
@@ -19,6 +19,7 @@
 @pytest.mark.topNavbarTests
 def test_number_of_options_not_signed_in(page: Page):
     sumo_pages = SumoPages(page)
+
     with check, allure.step("Verifying that the SUMO logo is successfully displayed"):
         image = sumo_pages.top_navbar.get_sumo_nav_logo()
         image_link = image.get_attribute("src")
@@ -63,10 +64,11 @@ def test_number_of_options_signed_in(page: Page, create_user_factory):
 def test_explore_by_product_redirects(page: Page):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
+
     with allure.step("Clicking on all options from the 'Explore Help Articles' and verifying the "
                      "redirect"):
-        for index, option in enumerate(sumo_pages.top_navbar
-                                       .get_all_explore_by_product_options_locators()):
+        for index, option in enumerate(
+            sumo_pages.top_navbar.get_all_explore_by_product_options_locators()):
             if index > 0:
                 sumo_pages.top_navbar.hover_over_explore_by_product_top_navbar_option()
             current_option = re.sub(
@@ -93,6 +95,7 @@ def test_explore_by_product_redirects(page: Page):
 @pytest.mark.topNavbarTests
 def test_explore_by_topic_redirects(page: Page):
     sumo_pages = SumoPages(page)
+
     with allure.step("Clicking on all options from the 'Explore by topic' and verifying the "
                      "redirect"):
         for index, option in enumerate(sumo_pages.top_navbar.get_all_explore_by_topic_locators()):
@@ -127,13 +130,12 @@ def test_browse_by_product_community_forum_redirect(page: Page, create_user_fact
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory()
-
     utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Clicking on all options from the 'Browse by product' and verifying the "
                      "redirect"):
-        for index, option in enumerate(sumo_pages.top_navbar
-                                       .get_all_browse_by_product_options_locators()):
+        for index, option in enumerate(
+            sumo_pages.top_navbar.get_all_browse_by_product_options_locators()):
             if index > 0:
                 sumo_pages.top_navbar.hover_over_community_forums_top_navbar_option()
             current_option = re.sub(
@@ -162,12 +164,12 @@ def test_browse_all_forum_threads_by_topic_redirect(page: Page, create_user_fact
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory()
-
     utilities.start_existing_session(cookies=test_user)
+
     with allure.step("Clicking on all options from the 'Browse all forum threads by topic' and "
                      "verifying the redirect"):
-        for index, option in enumerate(sumo_pages.top_navbar
-                                       .get_all_browse_all_forum_threads_by_topic_locators()):
+        for index, option in enumerate(
+            sumo_pages.top_navbar.get_all_browse_all_forum_threads_by_topic_locators()):
             if index > 0:
                 sumo_pages.top_navbar.hover_over_community_forums_top_navbar_option()
             current_option = re.sub(
@@ -192,6 +194,7 @@ def test_browse_all_forum_threads_by_topic_redirect(page: Page, create_user_fact
 def test_ask_a_question_top_navbar_redirect(page: Page):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
+
     with allure.step("Clicking on all options from the 'Ask a Question' and verifying the "
                      "redirect"):
         for index, option in enumerate(sumo_pages.top_navbar.get_all_ask_a_question_locators()):
@@ -225,7 +228,6 @@ def test_contribute_top_navbar_redirects(page: Page, create_user_factory):
     sumo_pages = SumoPages(page)
     utilities = Utilities(page)
     test_user = create_user_factory(groups=["forum-contributors"])
-
     utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Clicking on the 'Contributor discussions' top-navbar option and verifying "
diff --git a/playwright_tests/tests/user_deletion_tests/forums/community_forums/test_user_deletion_in_community_forums.py b/playwright_tests/tests/user_deletion_tests/forums/community_forums/test_user_deletion_in_community_forums.py
index 27cf7aee316..9642561ef7f 100644
--- a/playwright_tests/tests/user_deletion_tests/forums/community_forums/test_user_deletion_in_community_forums.py
+++ b/playwright_tests/tests/user_deletion_tests/forums/community_forums/test_user_deletion_in_community_forums.py
@@ -19,9 +19,7 @@ def test_user_deletion_on_archived_locked_no_replies_and_votes_question(page: Pa
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(
-            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
-        )
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -60,9 +58,7 @@ def test_user_deletion_on_spam_no_replies_and_votes_question(page: Page, questio
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(
-            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
-        )
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -94,8 +90,7 @@ def test_user_deletion_on_spam_no_replies_and_votes_question(page: Page, questio
 # C2979514, C2979647
 @pytest.mark.userDeletion
 @pytest.mark.parametrize("question_type", ["archived", "locked", "archived-locked"])
-def test_user_deletion_on_archived_locked_with_replies_question(page: Page,
-                                                                question_type,
+def test_user_deletion_on_archived_locked_with_replies_question(page: Page, question_type,
                                                                 create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
@@ -104,9 +99,7 @@ def test_user_deletion_on_archived_locked_with_replies_question(page: Page,
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(
-            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
-        )
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -143,7 +136,6 @@ def test_user_deletion_on_archived_locked_with_replies_question(page: Page,
     with allure.step("Deleting the question"):
         sumo_pages.aaq_flow.deleting_question_flow()
 
-
 # C2979648, C2807894
 @pytest.mark.userDeletion
 @pytest.mark.parametrize("question_type", ["spam", "archived-locked"])
@@ -156,9 +148,7 @@ def test_user_deletion_on_spam_with_replies_question(page: Page, question_type,
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(
-            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
-        )
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -178,7 +168,6 @@ def test_user_deletion_on_spam_with_replies_question(page: Page, question_type,
                 sumo_pages.question_page.click_on_archive_this_question_option()
                 sumo_pages.question_page.click_on_mark_as_spam_option()
 
-
     with allure.step("Signing in with the test user and initiating the user deletion flow"):
         utilities.start_existing_session(cookies=test_user)
         sumo_pages.edit_profile_flow.close_account()
@@ -198,9 +187,7 @@ def test_user_deletion_on_question_with_spam_replies(page: Page, create_user_fac
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(
-            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
-        )
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -229,8 +216,7 @@ def test_user_deletion_on_question_with_spam_replies(page: Page, create_user_fac
 @pytest.mark.smokeTest
 @pytest.mark.userDeletion
 @pytest.mark.parametrize("question_type", ["archived", "non-archived"])
-def test_user_deletion_on_question_with_replies_from_other_user(page: Page,
-                                                                question_type,
+def test_user_deletion_on_question_with_replies_from_other_user(page: Page, question_type,
                                                                 create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
@@ -239,9 +225,7 @@ def test_user_deletion_on_question_with_replies_from_other_user(page: Page,
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(
-            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
-        )
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -271,15 +255,14 @@ def test_user_deletion_on_question_with_replies_from_other_user(page: Page,
                     general_test_data["system_account_name"])
             assert (sumo_pages.question_page
                     .get_display_name_of_question_reply_author(reply_id) == staff)
+
     with allure.step("Deleting the question"):
         sumo_pages.aaq_flow.deleting_question_flow()
 
-
 # C2807314
 @pytest.mark.userDeletion
 @pytest.mark.parametrize("question_type", ["archived", "non-archived"])
-def test_user_deletion_on_question_with_replies_from_same_user(page: Page,
-                                                               question_type,
+def test_user_deletion_on_question_with_replies_from_same_user(page: Page, question_type,
                                                                create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
@@ -288,9 +271,7 @@ def test_user_deletion_on_question_with_replies_from_same_user(page: Page,
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(
-            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
-        )
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -324,7 +305,6 @@ def test_user_deletion_on_question_with_replies_from_same_user(page: Page,
     with allure.step("Deleting the question"):
         sumo_pages.aaq_flow.deleting_question_flow()
 
-
 # C2807314
 @pytest.mark.smokeTest
 @pytest.mark.userDeletion
@@ -337,9 +317,7 @@ def test_user_deletion_on_question_with_solution(page: Page, question_type, crea
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(
-            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
-        )
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -377,7 +355,6 @@ def test_user_deletion_on_question_with_solution(page: Page, question_type, crea
     with allure.step("Deleting the question"):
         sumo_pages.aaq_flow.deleting_question_flow()
 
-
 # C2807314
 @pytest.mark.userDeletion
 @pytest.mark.parametrize("question_type", ["archived", "non-archived"])
@@ -389,9 +366,7 @@ def test_user_deletion_on_voted_question(page: Page, question_type, create_user_
 
     with allure.step("Signing in with the test user and posting a question to a freemium product"):
         utilities.start_existing_session(cookies=test_user)
-        utilities.navigate_to_link(
-            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
-        )
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -418,14 +393,12 @@ def test_user_deletion_on_voted_question(page: Page, question_type, create_user_
         assert response.status == 404
 
 
-
 # C2807938, C2807940, C2926133, C2807890, C2807892, C2807893
 @pytest.mark.smokeTest
 @pytest.mark.userDeletion
 @pytest.mark.parametrize("answer_type", ["simple", "solution", "voted"])
 @pytest.mark.parametrize("question_type", ["archived", "non-archived"])
-def test_user_deletion_on_question_reply_for_archived_questions(page: Page,
-                                                                answer_type,
+def test_user_deletion_on_question_reply_for_archived_questions(page: Page, answer_type,
                                                                 question_type,
                                                                 create_user_factory):
     utilities = Utilities(page)
@@ -436,9 +409,7 @@ def test_user_deletion_on_question_reply_for_archived_questions(page: Page,
     with allure.step("Signing in with the staff user  and posting a question to a freemium "
                      "product"):
         utilities.start_existing_session(session_file_name=staff)
-        utilities.navigate_to_link(
-            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
-        )
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         question_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
             topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
@@ -479,3 +450,4 @@ def test_user_deletion_on_question_reply_for_archived_questions(page: Page,
 
     with allure.step("Deleting the question"):
         sumo_pages.aaq_flow.deleting_question_flow()
+
diff --git a/playwright_tests/tests/user_deletion_tests/forums/contributor_forums/test_user_deletion_in_contributor_forums.py b/playwright_tests/tests/user_deletion_tests/forums/contributor_forums/test_user_deletion_in_contributor_forums.py
index 6f87bef650b..20375b47de9 100644
--- a/playwright_tests/tests/user_deletion_tests/forums/contributor_forums/test_user_deletion_in_contributor_forums.py
+++ b/playwright_tests/tests/user_deletion_tests/forums/contributor_forums/test_user_deletion_in_contributor_forums.py
@@ -352,8 +352,8 @@ def test_quoted_first_post_is_moved_to_system_account(page: Page, create_user_fa
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory()
-    thread_title = "Test thread " + utilities.generate_random_number(1, 1000)
     staff_user = utilities.username_extraction_from_email(utilities.staff_user)
+    thread_title = "Test thread " + utilities.generate_random_number(1, 1000)
 
     with allure.step("Signing in to SUMO and posting a new contributor forum thread"):
         utilities.start_existing_session(cookies=test_user)
@@ -381,9 +381,9 @@ def test_quoted_first_post_is_moved_to_system_account(page: Page, create_user_fa
         assert (test_user["username"] in sumo_pages.forum_thread_page.
                 get_thread_post_mention_text(thread_reply_id))
 
-    with allure.step("Deleting the thread"):
-        utilities.start_existing_session(session_file_name=staff_user)
-        sumo_pages.contributor_thread_flow.delete_thread()
+        with allure.step("Deleting the thread"):
+            utilities.start_existing_session(session_file_name=staff_user)
+            sumo_pages.contributor_thread_flow.delete_thread()
 
 
 # C2952021
@@ -435,6 +435,6 @@ def test_quoted_replies_are_moved_to_system_account(page: Page, create_user_fact
         assert (test_user_two["username"] in sumo_pages.forum_thread_page.
                 get_thread_post_mention_text(third_thread_reply))
 
-    with allure.step("Deleting the thread"):
-        utilities.start_existing_session(session_file_name=staff_user)
-        sumo_pages.contributor_thread_flow.delete_thread()
+        with allure.step("Deleting the thread"):
+            utilities.start_existing_session(session_file_name=staff_user)
+            sumo_pages.contributor_thread_flow.delete_thread()
diff --git a/playwright_tests/tests/user_deletion_tests/kb/test_user_deletion_and_article_contributions.py b/playwright_tests/tests/user_deletion_tests/kb/test_user_deletion_and_article_contributions.py
index f7dd53d805f..68f59cc870e 100644
--- a/playwright_tests/tests/user_deletion_tests/kb/test_user_deletion_and_article_contributions.py
+++ b/playwright_tests/tests/user_deletion_tests/kb/test_user_deletion_and_article_contributions.py
@@ -19,8 +19,8 @@ def test_reviewed_revisions_assignment_to_system_account(page: Page, create_user
 
     with allure.step("Signing in with the first test user and creating a new kb article"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step("Signing in with the second account and creating a new revision"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -70,7 +70,6 @@ def test_reviewed_revisions_assignment_to_system_account(page: Page, create_user
     with allure.step("Deleting the test article"):
         sumo_pages.kb_article_deletion_flow.delete_kb_article()
 
-
 # C2952003, C2952016
 @pytest.mark.smokeTest
 @pytest.mark.userDeletion
@@ -82,7 +81,7 @@ def test_unreviewed_revisions_are_not_assigned_to_system_account(page: Page, cre
 
     with allure.step("Signing in with the first test user and creating a new kb article"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
         sumo_pages.submit_kb_article_flow.submit_new_kb_revision()
 
     with allure.step("Navigating to the 'Edit profile' and delete the account via the "
@@ -102,12 +101,11 @@ def test_deferred_revisions_are_not_assigned_to_system_account(page:Page, create
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory(groups=["Knowledge Base Reviewers"])
-    staff_user = utilities.username_extraction_from_email(utilities.staff_user)
 
     with allure.step("Creating a new article and approving it's first revision"):
         utilities.start_existing_session(cookies=test_user_two)
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True)
 
     with allure.step("Signing in with a different user and submitting a new article revision "
                      "without approving it"):
@@ -126,10 +124,6 @@ def test_deferred_revisions_are_not_assigned_to_system_account(page:Page, create
         assert not sumo_pages.kb_article_show_history_page.is_revision_displayed(
             second_revision["revision_id"])
 
-    with allure.step("Deleting the article"):
-        utilities.start_existing_session(session_file_name=staff_user)
-        sumo_pages.kb_article_deletion_flow.delete_kb_article()
-
 
 #  C2979501, C2979502
 @pytest.mark.smokeTest
@@ -141,10 +135,10 @@ def test_localization_revisions_are_assigned_to_system_account(page: Page, creat
     staff = utilities.username_extraction_from_email(utilities.staff_user)
 
     with allure.step("Signing in with the KB reviewer and creating a new kb article, approving "
-                     "it's first revision and markit it as ready for localization"):
+                     "it's first revision and marking it as ready for localization"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(
-            page=page, approve_revision=True, ready_for_l10n=True)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article(
+            approve_first_revision=True, ready_for_localization=True)
 
     with allure.step("Deleting the user"):
         sumo_pages.edit_profile_flow.close_account()
@@ -159,7 +153,6 @@ def test_localization_revisions_are_assigned_to_system_account(page: Page, creat
     with allure.step("Deleting the article"):
         sumo_pages.kb_article_deletion_flow.delete_kb_article()
 
-
 # C2979502
 @pytest.mark.userDeletion
 def test_reviewed_by_assignment_to_system_account(page: Page, create_user_factory):
@@ -167,11 +160,10 @@ def test_reviewed_by_assignment_to_system_account(page: Page, create_user_factor
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory(groups=["Knowledge Base Reviewers"])
-    staff_user = utilities.username_extraction_from_email(utilities.staff_user)
 
     with allure.step("Signing in and creating a new kb article"):
         utilities.start_existing_session(cookies=test_user)
-        article_details = sumo_pages.submit_kb_article_flow.kb_article_creation_via_api(page=page)
+        article_details = sumo_pages.submit_kb_article_flow.submit_simple_kb_article()
 
     with allure.step("Signing in with a KB reviewer and approving the revision"):
         utilities.start_existing_session(cookies=test_user_two)
@@ -202,6 +194,5 @@ def test_reviewed_by_assignment_to_system_account(page: Page, create_user_factor
             second_revision["revision_id"])
         assert sumo_pages.kb_article_preview_revision_page.get_reviewed_by_text() == "SumoBot"
 
-    with allure.step("Deleting the revision"):
-        utilities.start_existing_session(session_file_name=staff_user)
+    with allure.step("Deleting the article"):
         sumo_pages.kb_article_deletion_flow.delete_kb_article()
diff --git a/playwright_tests/tests/user_deletion_tests/media_gallery/test_user_deletion_in_media_gallery.py b/playwright_tests/tests/user_deletion_tests/media_gallery/test_user_deletion_in_media_gallery.py
index f4100fc8ba9..582ab5d8c82 100644
--- a/playwright_tests/tests/user_deletion_tests/media_gallery/test_user_deletion_in_media_gallery.py
+++ b/playwright_tests/tests/user_deletion_tests/media_gallery/test_user_deletion_in_media_gallery.py
@@ -2,7 +2,6 @@
 import pytest
 from playwright.sync_api import Page
 from pytest_check import check
-
 from playwright_tests.core.utilities import Utilities
 from playwright_tests.pages.sumo_pages import SumoPages
 
@@ -31,7 +30,6 @@ def test_media_file_ownership_reassignment_to_system_account(page: Page, create_
         assert sumo_pages.media_gallery.get_image_creator_text() == test_user["username"]
 
     with allure.step("Deleting the test user account"):
-        sumo_pages.top_navbar.click_on_edit_profile_option()
         sumo_pages.edit_profile_flow.close_account()
 
     with check, allure.step("Navigating back to the image preview and verifying that the system "
diff --git a/playwright_tests/tests/user_deletion_tests/messaging_system/test_user_deletion_in_messaging_system.py b/playwright_tests/tests/user_deletion_tests/messaging_system/test_user_deletion_in_messaging_system.py
index 8bd71cc058d..28c83141020 100644
--- a/playwright_tests/tests/user_deletion_tests/messaging_system/test_user_deletion_in_messaging_system.py
+++ b/playwright_tests/tests/user_deletion_tests/messaging_system/test_user_deletion_in_messaging_system.py
@@ -42,7 +42,7 @@ def test_deleted_user_is_displayed_in_both_inbox_and_outbox(page: Page, create_u
         utilities.start_existing_session(cookies=test_user)
         sumo_pages.top_navbar.click_on_inbox_option()
 
-    with check, allure.step("Verifying that sender of the message is the 'delete user'"):
+    with check, allure.step("Verifying that sender of the message is the 'deleted user'"):
         assert (sumo_pages.inbox_page.
                 get_sender_by_excerpt(second_message_body) == deleted_user_username)
 
@@ -60,7 +60,6 @@ def test_deleted_user_is_displayed_in_both_inbox_and_outbox(page: Page, create_u
 
     with check, allure.step("Navigating to the outbox and verifying that the 'delete user' is the "
                             "recipient of the sent message"):
-        utilities.wait_for_dom_to_load()
         sumo_pages.mess_system_user_navbar.click_on_messaging_system_nav_sent_messages()
         assert (sumo_pages.sent_message_page.
                 get_deleted_user_recipient_based_on_excerpt(first_message_body
@@ -88,5 +87,5 @@ def test_messages_cannot_be_sent_to_system_user(page: Page, create_user_factory)
                      "user is not returned"):
         sumo_pages.new_message_page.type_into_to_input_field(
             utilities.general_test_data["system_account_name"])
-        expect(sumo_pages.new_message_page.get_no_user_message_locator()).to_be_visible(
+        expect(sumo_pages.new_message_page.no_user_search_results_text).to_be_visible(
             timeout=15000)
diff --git a/playwright_tests/tests/user_page_tests/test_edit_contribution_areas.py b/playwright_tests/tests/user_page_tests/test_edit_contribution_areas.py
index b3c38ed7d69..dfa7c92cf07 100644
--- a/playwright_tests/tests/user_page_tests/test_edit_contribution_areas.py
+++ b/playwright_tests/tests/user_page_tests/test_edit_contribution_areas.py
@@ -48,8 +48,6 @@ def test_all_checkboxes_can_be_selected_and_saved(page: Page, create_user_factor
 
     with check, allure.step("Navigating to the user page and verifying that the user groups is"
                             " successfully displayed"):
-        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(
-            first_user['username']))
         for option in contribution_options:
             assert option in (sumo_pages.my_profile_page.get_my_profile_groups_items_text())
 
@@ -76,7 +74,5 @@ def test_all_checkboxes_can_be_selected_and_saved(page: Page, create_user_factor
 
     with allure.step("Navigating to the my profile page and verifying that the added groups are "
                      "no longer displayed"):
-        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(
-            first_user['username']))
         for option in contribution_options:
             assert option not in (sumo_pages.my_profile_page.get_my_profile_groups_items_text())
diff --git a/playwright_tests/tests/user_page_tests/test_edit_my_profile.py b/playwright_tests/tests/user_page_tests/test_edit_my_profile.py
index 2f16bd0fb40..31efcbb6577 100644
--- a/playwright_tests/tests/user_page_tests/test_edit_my_profile.py
+++ b/playwright_tests/tests/user_page_tests/test_edit_my_profile.py
@@ -26,7 +26,7 @@ def test_username_field_is_automatically_populated(page: Page, create_user_facto
     with allure.step(f"Signing in with {test_user['username']} user account and navigating to the "
                      f"'Edit Profile' page"):
         utilities.start_existing_session(cookies=test_user)
-    sumo_pages.top_navbar.click_on_edit_profile_option()
+        sumo_pages.top_navbar.click_on_edit_profile_option()
 
     with allure.step("Verifying that username field is automatically populated with the correct "
                      "data"):
@@ -48,10 +48,8 @@ def test_edit_profile_field_validation_with_symbols(page: Page, create_user_fact
         utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         article_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
-            topic_name=utilities
-            .aaq_question_test_data["valid_firefox_question"]["topic_value"],
-            body=utilities.
-            aaq_question_test_data["valid_firefox_question"]["question_body"],
+            topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
         )
 
     usernames = utilities.profile_edit_test_data["valid_user_edit_with_symbols"]
@@ -63,12 +61,11 @@ def test_edit_profile_field_validation_with_symbols(page: Page, create_user_fact
         with allure.step("Clearing the username, display name fields and inserting the new one"):
             sumo_pages.edit_my_profile_page.clear_username_field()
             sumo_pages.edit_my_profile_page.clear_display_name_field()
-
         sumo_pages.edit_my_profile_page.send_text_to_username_field(value)
 
         with allure.step("Clicking on the 'Update My Profile' button"):
             sumo_pages.edit_my_profile_page.click_update_my_profile_button(
-                expected_locator=sumo_pages.my_profile_page.get_expected_header_locator(value)
+                expected_locator=sumo_pages.my_profile_page.display_name_by_username(value)
             )
 
         with check, allure.step("Verify that the newly set username is successfully applied to the"
@@ -176,7 +173,6 @@ def test_cancel_profile_edit(page: Page, create_user_factory):
 @pytest.mark.editUserProfileTests
 def test_manage_firefox_account_redirects_to_firefox_account_settings_page(page: Page,
                                                                            create_user_factory):
-
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -266,8 +262,7 @@ def test_profile_username_field_cannot_be_left_empty(page: Page, create_user_fac
 
 # C1491018, C891531,C1491021
 @pytest.mark.editUserProfileTests
-def test_username_can_contain_uppercase_and_lowercase_letters(page: Page,
-                                                              create_user_factory):
+def test_username_can_contain_uppercase_and_lowercase_letters(page: Page, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -325,8 +320,8 @@ def test_display_name_replaces_the_username_text(page: Page, create_user_factory
             expected_url=MyProfileMessages.get_my_profile_stage_url(test_user["username"])
         )
 
-    with check, allure.step("Verifying that the top navbar username updates with the display"
-                            " name"):
+    with check, allure.step("Verifying that the top navbar username updates with the display "
+                            "name"):
         assert sumo_pages.top_navbar.get_text_of_logged_in_username() == new_display_name
 
     with check, allure.step(f"Verifying that the 'My profile' display name contains "
@@ -335,10 +330,6 @@ def test_display_name_replaces_the_username_text(page: Page, create_user_factory
                 get_my_profile_display_name_header_text() == f"{new_display_name} ("
                                                              f"{test_user['username']})")
 
-        assert (sumo_pages.my_profile_page.
-                get_my_profile_display_name_header_text() == f"{new_display_name} ("
-                                                             f"{test_user['username']})")
-
     with allure.step("Reverting back and deleting the display name"):
         sumo_pages.top_navbar.click_on_edit_profile_option()
         sumo_pages.edit_my_profile_page.clear_display_name_field()
@@ -434,18 +425,14 @@ def test_email_visibility(page: Page, create_user_factory):
     with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
 
-    with check, allure.step("Accessing the previous user profile and verifying that the email"
-                            " address is displayed"):
-        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(staff_username))
+    with check, allure.step("Verifying that the email address is displayed"):
         assert sumo_pages.my_profile_page.get_text_of_publicly_displayed_username() == staff_email
 
     with allure.step("Signing out"):
         utilities.delete_cookies()
 
-    with allure.step("Accessing the previous user profile and verifying that the email "
-                     "address is not displayed to signed out users"):
-        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(staff_username))
-        expect(sumo_pages.my_profile_page.publicly_displayed_email_element()).to_be_hidden()
+    with allure.step("Verifying that the email address is not displayed to signed out users"):
+        expect(sumo_pages.my_profile_page.displayed_email_address).to_be_hidden()
 
     with allure.step("Accessing the 'Edit My Profile' page and unchecking the make email "
                      "visible checkbox"):
@@ -460,16 +447,14 @@ def test_email_visibility(page: Page, create_user_factory):
             )
 
     with check, allure.step("Verifying that the email is not displayed"):
-        expect(sumo_pages.my_profile_page.publicly_displayed_email_element()).to_be_hidden()
+        expect(sumo_pages.my_profile_page.displayed_email_address).to_be_hidden()
 
     with allure.step("Signing in with a different non-admin user"):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Accessing the previous user profile and verifying that the email "
                      "address is not displayed"):
-        # This also needs an update
-        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(staff_username))
-        expect(sumo_pages.my_profile_page.publicly_displayed_email_element()).to_be_hidden()
+        expect(sumo_pages.my_profile_page.displayed_email_address).to_be_hidden()
 
 
 # T5697918, T5697919, T5697921, T5697920, T5697922, T5697923, T5697924, T5697925
@@ -493,11 +478,40 @@ def test_profile_information(page: Page, create_user_factory):
         "country", "city", "involved_from_month", "involved_from_year"
     ]
 
-    for key in profile_info_keys:
-        with allure.step(f"Verifying that the correct {key.replace('_', ' ')} "
-                         f"information is displayed"):
-            assert (_validate_profile_info(page, key, profile_info[key],
-                                           test_user["username"], test_user_two))
+    profile_info_getters = {
+        "website": sumo_pages.my_profile_page.get_my_profile_website_text,
+        "twitter": sumo_pages.my_profile_page.get_my_profile_twitter_text,
+        "community_portal": sumo_pages.my_profile_page.get_my_profile_community_portal_text,
+        "people_directory": sumo_pages.my_profile_page.get_my_profile_people_directory_text,
+        "matrix_nickname": sumo_pages.my_profile_page.get_my_profile_matrix_text,
+        "country": sumo_pages.my_profile_page.get_my_profile_location_text,
+        "city": sumo_pages.my_profile_page.get_my_profile_location_text,
+        "involved_from_month": sumo_pages.my_profile_page.get_my_contributed_from_text,
+        "involved_from_year": sumo_pages.my_profile_page.get_my_contributed_from_text,
+    }
+
+    with check, allure.step("Verifying profile info as logged-in user"):
+        utilities.start_existing_session(cookies=test_user_two)
+        displayed_values = {
+            key: getter()
+            for key, getter in profile_info_getters.items()
+        }
+
+        for key in profile_info_keys:
+            assert profile_info[key] in displayed_values[key], \
+                f"Incorrect value for '{key}' when logged in."
+
+    with check, allure.step("Verifying profile info after logout"):
+        utilities.delete_cookies()
+
+        displayed_values = {
+            key: getter()
+            for key, getter in profile_info_getters.items()
+        }
+
+        for key in profile_info_keys:
+            assert profile_info[key] in displayed_values[key], \
+                f"Incorrect value for '{key}' when logged out."
 
 
 # T5697906, T5697929
@@ -505,7 +519,6 @@ def test_profile_information(page: Page, create_user_factory):
 @pytest.mark.editUserProfileTests
 def test_edit_user_profile_button_is_not_displayed_for_non_admin_users(page: Page,
                                                                        create_user_factory):
-
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -516,7 +529,7 @@ def test_edit_user_profile_button_is_not_displayed_for_non_admin_users(page: Pag
             test_user["username"]))
 
     with check, allure.step("Verifying that the 'Edit user profile' option is not displayed"):
-        expect(sumo_pages.my_profile_page.edit_user_profile_option_element()).to_be_hidden()
+        expect(sumo_pages.my_profile_page.edit_user_profile_option).to_be_hidden()
 
     with check, allure.step("Navigating to the profile edit link directly and verifying that the"
                             " user is redirected to the auth page"):
@@ -524,7 +537,7 @@ def test_edit_user_profile_button_is_not_displayed_for_non_admin_users(page: Pag
             EditMyProfilePageMessages.get_url_of_other_profile_edit_page(test_user["username"])
         )
         assert sumo_pages.auth_page.is_continue_with_firefox_button_displayed()
-        expect(sumo_pages.edit_my_profile_page.get_my_profile_edit_form_locator()).to_be_hidden()
+        expect(sumo_pages.edit_my_profile_page.edit_my_profile_edit_input_form).to_be_hidden()
 
     with allure.step(f"Signing in with {test_user_two['username']} user account and accessing "
                      f"another user account"):
@@ -534,7 +547,7 @@ def test_edit_user_profile_button_is_not_displayed_for_non_admin_users(page: Pag
             test_user["username"]))
 
     with check, allure.step("Verifying that the 'Edit user profile' option is not displayed"):
-        expect(sumo_pages.my_profile_page.edit_user_profile_option_element()).to_be_hidden()
+        expect(sumo_pages.my_profile_page.edit_user_profile_option).to_be_hidden()
 
     with allure.step("Navigating to the profile edit link directly, verifying that the correct"
                      " message is displayed and that the edit form is not displayed"):
@@ -547,7 +560,7 @@ def test_edit_user_profile_button_is_not_displayed_for_non_admin_users(page: Pag
         assert (sumo_pages.edit_my_profile_page.
                 get_access_denied_subheading_text() == EditMyProfilePageMessages.
                 PROFILE_ACCESS_DENIED_SUBHEADING)
-        expect(sumo_pages.edit_my_profile_page.get_my_profile_edit_form_locator()).to_be_hidden()
+        expect(sumo_pages.edit_my_profile_page.edit_my_profile_edit_input_form).to_be_hidden()
 
 
 # T5697928
@@ -555,7 +568,6 @@ def test_edit_user_profile_button_is_not_displayed_for_non_admin_users(page: Pag
 @pytest.mark.editUserProfileTests
 def test_report_user_is_displayed_and_accessible_for_signed_in_users_only(page: Page,
                                                                           create_user_factory):
-
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -569,32 +581,28 @@ def test_report_user_is_displayed_and_accessible_for_signed_in_users_only(page:
         utilities.navigate_to_link(
             MyProfileMessages.get_my_profile_stage_url(test_user_two["username"])
         )
-        expect(sumo_pages.my_profile_page.is_report_user_option_displayed()).to_be_visible()
+        expect(sumo_pages.my_profile_page.report_abuse_profile_option).to_be_visible()
 
     with check, allure.step("Clicking on the 'Report Abuse' option and verifying that the report "
                             "abuse panel is displayed"):
         sumo_pages.my_profile_page.click_on_report_abuse_option()
-        expect(sumo_pages.my_profile_page.is_report_abuse_panel_displayed()).to_be_visible()
+        expect(sumo_pages.my_profile_page.report_abuse_panel).to_be_visible()
 
     with check, allure.step("Closing the report abuse panel and verifying that the report user "
                             "panel is no longer displayed"):
         sumo_pages.my_profile_page.click_on_report_abuse_close_button()
-        expect(sumo_pages.my_profile_page.is_report_abuse_panel_displayed()).to_be_hidden()
+        expect(sumo_pages.my_profile_page.report_abuse_panel).to_be_hidden()
 
     with allure.step("Signing out and verifying that the 'Report Abuse' option is not "
                      "displayed on user profiles"):
         utilities.delete_cookies()
-        utilities.navigate_to_link(
-            MyProfileMessages.get_my_profile_stage_url(test_user_two["username"])
-        )
-        expect(sumo_pages.my_profile_page.is_report_user_option_displayed()).to_be_hidden()
+        expect(sumo_pages.my_profile_page.report_abuse_profile_option).to_be_hidden()
 
 
 # T5697930
 @pytest.mark.editUserProfileTests
 def test_private_message_button_redirects_signed_out_users_to_fxa_login_flow(page: Page,
                                                                              create_user_factory):
-
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -606,9 +614,7 @@ def test_private_message_button_redirects_signed_out_users_to_fxa_login_flow(pag
     with allure.step("Clicking on the 'Private Message' button and verifying that the non-signed "
                      "in user is redirected to the fxa page"):
         sumo_pages.my_profile_page.click_on_private_message_button()
-        assert (
-            sumo_pages.auth_page.is_continue_with_firefox_button_displayed()
-        ), "The auth page is not displayed! It should be!"
+        assert sumo_pages.auth_page.is_continue_with_firefox_button_displayed()
 
 
 # C916055, C916054
@@ -616,52 +622,40 @@ def test_private_message_button_redirects_signed_out_users_to_fxa_login_flow(pag
 @pytest.mark.editUserProfileTests
 def test_deactivate_this_user_buttons_are_displayed_only_for_admin_users(page: Page,
                                                                          create_user_factory):
-
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
     test_user_two = create_user_factory()
-    test_user_with_deactivation_perms = create_user_factory(
-        permissions=["deactivate_users"])
+    test_user_with_deactivation_perms = create_user_factory(permissions=["deactivate_users"])
 
     with allure.step("Navigating ot a user profile while not signed in with a user"):
         utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(
             test_user["username"]))
 
     with check, allure.step("Verifying that the deactivate user buttons are not displayed"):
-        expect(sumo_pages.my_profile_page.is_deactivate_this_user_button_displayed()
-               ).to_be_hidden()
-
-        expect(sumo_pages.my_profile_page.deactivate_user_and_mark_content_as_spam_button()
+        expect(sumo_pages.my_profile_page.deactivate_this_user_button).to_be_hidden()
+        expect(sumo_pages.my_profile_page.deactivate_this_user_and_mark_all_content_as_spam
                ).to_be_hidden()
 
     with allure.step(f"Signing in with {test_user_two['username']} user account"):
-        sumo_pages.top_navbar.click_on_sumo_nav_logo()
         utilities.start_existing_session(cookies=test_user_two)
 
     with check, allure.step("Accessing another user profile and verifying that the deactivate "
                             "buttons are not displayed"):
-        utilities.navigate_to_link(
-            MyProfileMessages.get_my_profile_stage_url(test_user["username"])
-        )
-        expect(sumo_pages.my_profile_page.is_deactivate_this_user_button_displayed()
-               ).to_be_hidden()
-        expect(sumo_pages.my_profile_page.deactivate_user_and_mark_content_as_spam_button()
+        expect(sumo_pages.my_profile_page.deactivate_this_user_button).to_be_hidden()
+        expect(sumo_pages.my_profile_page.deactivate_this_user_and_mark_all_content_as_spam
                ).to_be_hidden()
 
     with allure.step("Signing in with a user that has user deactivation permissions "
                      f"({test_user_with_deactivation_perms['username']})"):
-        sumo_pages.top_navbar.click_on_sumo_nav_logo()
-        utilities.delete_cookies()
         utilities.start_existing_session(cookies=test_user_with_deactivation_perms)
 
     with allure.step("Accessing another user profile and verifying that the deactivate user "
                      "buttons are displayed"):
         utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(
             test_user["username"]))
-        expect(sumo_pages.my_profile_page.is_deactivate_this_user_button_displayed()
-               ).to_be_visible()
-        expect(sumo_pages.my_profile_page.deactivate_user_and_mark_content_as_spam_button()
+        expect(sumo_pages.my_profile_page.deactivate_this_user_button).to_be_visible()
+        expect(sumo_pages.my_profile_page.deactivate_this_user_and_mark_all_content_as_spam
                ).to_be_visible()
 
 
@@ -692,10 +686,8 @@ def normalize_time(timezone: str) -> str:
         utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
         article_details = sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
-            topic_name=utilities
-            .aaq_question_test_data["valid_firefox_question"]["topic_value"],
-            body=utilities.
-            aaq_question_test_data["valid_firefox_question"]["question_body"],
+            topic_name=utilities.aaq_question_test_data["valid_firefox_question"]["topic_value"],
+            body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
         )
 
     with allure.step("Accessing the 'Edit My Profile' page and changing the timezone to "
@@ -712,8 +704,6 @@ def normalize_time(timezone: str) -> str:
         reply_id = sumo_pages.aaq_flow.post_question_reply_flow(
             repliant_username=test_user["username"], reply="Test test test")
 
-        print("Sumo returned time: ", sumo_pages.question_page.get_time_from_reply(reply_id))
-        print("Actual timezone time: ",normalize_time("Europe/Bucharest"))
         # Verifying that the time difference is less than 1 minute
         time_difference = abs(
             (datetime.datetime.strptime(
@@ -724,7 +714,7 @@ def normalize_time(timezone: str) -> str:
                 normalize_time("Europe/Bucharest").replace("Today at ", ""),
                 "%I:%M %p")).total_seconds() / 60
         )
-        print("Time difference: ", time_difference)
+
         assert time_difference <= 1, (f"Time difference is more than 1 minute: {time_difference} "
                                       f"minutes")
 
@@ -741,8 +731,6 @@ def normalize_time(timezone: str) -> str:
         utilities.navigate_to_link(article_details["question_page_url"])
         reply_id = sumo_pages.aaq_flow.post_question_reply_flow(
             repliant_username=test_user["username"], reply="Test test test")
-        print("Sumo returned time: ", sumo_pages.question_page.get_time_from_reply(reply_id))
-        print("Actual timezone time: ", normalize_time("US/Central"))
 
         # Verifying that the time difference is less than 1 minute
         time_difference = abs(
@@ -794,42 +782,5 @@ def test_close_account_and_delete_profile_information(page:Page, create_user_fac
     with allure.step("Deleting the user via the 'Close account and delete all profile information'"
                      "modal"):
         sumo_pages.edit_profile_flow.close_account()
-        assert utilities.get_page_url() ==  utilities.profile_edit_test_data["close_account_page"]
-        assert sumo_pages.top_navbar.is_sign_in_up_button_displayed()
-
-
-def _validate_profile_info(page: Page, target: str, profile_info: str, username: str,
-                           second_user_session_cookies: dict) -> bool:
-    utilities = Utilities(page)
-    sumo_pages = SumoPages(page)
-
-    profile_info_getters = {
-        "website": sumo_pages.my_profile_page.get_my_profile_website_text,
-        "twitter": sumo_pages.my_profile_page.get_my_profile_twitter_text,
-        "community_portal": sumo_pages.my_profile_page.get_my_profile_community_portal_text,
-        "people_directory": sumo_pages.my_profile_page.get_my_profile_people_directory_text,
-        "matrix_nickname": sumo_pages.my_profile_page.get_my_profile_matrix_text,
-        "country": sumo_pages.my_profile_page.get_my_profile_location_text,
-        "city": sumo_pages.my_profile_page.get_my_profile_location_text,
-        "involved_from_month": sumo_pages.my_profile_page.get_my_contributed_from_text,
-        "involved_from_year": sumo_pages.my_profile_page.get_my_contributed_from_text,
-    }
-
-    with allure.step("Signing in with a different non-admin user"):
-        utilities.start_existing_session(cookies=second_user_session_cookies)
-
-    with allure.step("Verifying that the correct information is displayed for the first user"):
-        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(username))
-        print(profile_info_getters.get(target, lambda: None)())
-        print(profile_info)
-        if profile_info not in profile_info_getters.get(target, lambda: None)():
-            return False
-
-    with allure.step("Signing out and verifying the information again"):
-        utilities.delete_cookies()
-        utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(username))
-        if profile_info not in profile_info_getters.get(target, lambda: None)():
-            return False
-
-    utilities.navigate_to_link(MyProfileMessages.get_my_profile_stage_url(username))
-    return True
+        assert utilities.get_page_url() == utilities.profile_edit_test_data["close_account_page"]
+        assert sumo_pages.top_navbar.signin_signup_button.is_visible()
diff --git a/playwright_tests/tests/user_page_tests/test_my_profile_page.py b/playwright_tests/tests/user_page_tests/test_my_profile_page.py
index 0dc79b412fd..a36f602cc95 100644
--- a/playwright_tests/tests/user_page_tests/test_my_profile_page.py
+++ b/playwright_tests/tests/user_page_tests/test_my_profile_page.py
@@ -60,13 +60,12 @@ def test_my_profile_sign_out_button_functionality(page: Page, create_user_factor
         expect(page).to_have_url(HomepageMessages.STAGE_HOMEPAGE_URL_EN_US)
 
     with allure.step("Verify that the 'Sign in/Up' button from the page header is displayed"):
-        expect(sumo_pages.top_navbar.sign_in_up_button_displayed_element()).to_be_visible()
+        expect(sumo_pages.top_navbar.signin_signup_button).to_be_visible()
 
 
 # C2108828, C891410
 @pytest.mark.userProfile
-def test_provided_solutions_number_is_successfully_displayed(page: Page,
-                                                             create_user_factory):
+def test_provided_solutions_number_is_successfully_displayed(page: Page, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -83,54 +82,40 @@ def test_provided_solutions_number_is_successfully_displayed(page: Page,
                 subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
                 topic_name=utilities.
                 aaq_question_test_data["valid_firefox_question"]["topic_value"],
-                body=utilities.
-                aaq_question_test_data["valid_firefox_question"]["question_body"],
+                body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
                 expected_locator=sumo_pages.question_page.questions_header
             )
         )
 
-    with allure.step("Navigating to the user profile page and extracting the original number "
-                     "of posted question solutions"):
-        sumo_pages.top_navbar.click_on_view_profile_option()
-        if sumo_pages.my_profile_page.is_solutions_displayed():
-            original_number_of_solutions = utilities.number_extraction_from_string(
-                sumo_pages.my_profile_page.get_my_profile_solutions_text()
-            )
-        else:
-            original_number_of_solutions = 0
-
-    with allure.step("Navigating to the previously posted question and posting a reply to it"):
-        utilities.navigate_to_link(question_info["question_page_url"])
-        question_test_data = utilities.question_test_data
-        sumo_pages.question_page.add_text_to_post_a_reply_textarea(
-            question_test_data["question_reply_solution"]
-        )
-        answer_id = sumo_pages.question_page.click_on_post_reply_button(
-            repliant_username=test_user["username"]
+    with allure.step("Posting a reply to the question"):
+        utilities.start_existing_session(cookies=second_user)
+        answer_id = sumo_pages.aaq_flow.post_question_reply_flow(
+            repliant_username=second_user["username"],
+            reply=utilities.question_test_data["question_reply_solution"]
         )
 
     with allure.step("Marking the reply as the question solution"):
+        utilities.start_existing_session(cookies=test_user)
         sumo_pages.question_page.click_on_solves_the_problem_button(target_reply_id=answer_id)
 
     with check, allure.step("Accessing the 'My profile' page of the account which provided the"
                             " solution and verifying that the original number of solutions has "
                             "incremented"):
+        utilities.start_existing_session(cookies=second_user)
         sumo_pages.top_navbar.click_on_view_profile_option()
-        utilities.number_extraction_from_string(
-            sumo_pages.my_profile_page.get_my_profile_solutions_text()
-        )
-        assert (utilities.number_extraction_from_string(
-            sumo_pages.my_profile_page.get_my_profile_solutions_text()
-        ) == original_number_of_solutions + 1)
 
-    with allure.step(f"Signing in with a user that has the 'Can delete question' perm "
-                     f"({second_user['username']}), Deleting the posted question and verifying "
-                     f"that we are redirected to the product support forum page after deletion"):
+        assert sumo_pages.my_profile_page.get_my_profile_solutions_text() == "1 solution"
+
+    with allure.step("Signing in with the OP and undoing the solution"):
+        utilities.start_existing_session(cookies=test_user)
         utilities.navigate_to_link(question_info["question_page_url"])
+        sumo_pages.question_page.click_on_undo_button()
+
+    with allure.step("Signing in back with the user that has provided the solution and verifying "
+                     "that the solution counter is not displayed"):
         utilities.start_existing_session(cookies=second_user)
-        sumo_pages.question_page.click_delete_this_question_question_tools_option()
-        sumo_pages.question_page.click_delete_this_question_button()
-        expect(sumo_pages.product_support_page.product_product_title_element()).to_be_visible()
+        sumo_pages.top_navbar.click_on_view_profile_option()
+        assert not sumo_pages.my_profile_page.is_solutions_displayed()
 
 
 # C1318760
@@ -150,8 +135,8 @@ def test_number_of_answers_and_questions_for_contributor_thread_contributions(pa
         thread_title = (utilities.discussion_thread_data['thread_title'] + utilities.
                         generate_random_number(1, 1000))
         sumo_pages.contributor_thread_flow.post_a_new_thread(
-            thread_title=thread_title,
-            thread_body=utilities.discussion_thread_data['thread_body'])
+            thread_title=thread_title, thread_body=utilities.discussion_thread_data['thread_body']
+        )
 
     with allure.step("Creating a new thread reply"):
         sumo_pages.contributor_thread_flow.post_thread_reply(
@@ -166,8 +151,7 @@ def test_number_of_answers_and_questions_for_contributor_thread_contributions(pa
 
 # C890832,  C2094281, C891410, C2245210, C2245211, C2245212, C2245209
 @pytest.mark.userProfile
-def test_number_of_my_profile_answers_is_successfully_displayed(page: Page,
-                                                                create_user_factory):
+def test_number_of_my_profile_answers_is_successfully_displayed(page: Page, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -184,28 +168,21 @@ def test_number_of_my_profile_answers_is_successfully_displayed(page: Page,
                 subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
                 topic_name=utilities.
                 aaq_question_test_data["valid_firefox_question"]["topic_value"],
-                body=utilities.
-                aaq_question_test_data["valid_firefox_question"]["question_body"],
+                body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
                 expected_locator=sumo_pages.question_page.questions_header
             )
         )
 
     with allure.step("Posting a reply for the question"):
-        question_test_data = utilities.question_test_data
-        reply_text = question_test_data["non_solution_reply"]
-        sumo_pages.question_page.add_text_to_post_a_reply_textarea(reply_text)
-        answer_id = sumo_pages.question_page.click_on_post_reply_button(
-            repliant_username=test_user["username"]
+        reply_text = utilities.question_test_data["non_solution_reply"]
+        answer_id = sumo_pages.aaq_flow.post_question_reply_flow(
+            repliant_username=test_user["username"], reply=reply_text
         )
 
     with check, allure.step("Accessing the 'My profile' page and verifying that the number of"
                             " answers has incremented successfully"):
         sumo_pages.question_page.click_on_the_reply_author(answer_id)
-        utilities.number_extraction_from_string(
-            sumo_pages.my_profile_page.get_my_profile_answers_text()
-        )
-        assert (utilities.number_extraction_from_string(
-            sumo_pages.my_profile_page.get_my_profile_answers_text()) == 1)
+        assert sumo_pages.my_profile_page.get_my_profile_answers_text() == "1 answer"
 
     with check, allure.step("Clicking on the my profile answers and verifying that the posted"
                             " answer is successfully displayed inside the list"):
@@ -216,23 +193,18 @@ def test_number_of_my_profile_answers_is_successfully_displayed(page: Page,
 
     with allure.step("Updating the question title and question reply"):
         sumo_pages.my_answers_page.click_on_specific_answer(answer_id)
-        sumo_pages.question_page.click_on_edit_this_question_question_tools_option()
         updated_title_text = ("Updated Question Title " + utilities.
                               generate_random_number(1,1000))
         updated_reply_text = "Updated reply"
-        sumo_pages.aaq_flow.editing_question_flow(
-            subject=updated_title_text,
-            submit_edit=True
+        sumo_pages.aaq_flow.editing_question_flow(subject=updated_title_text, submit_edit=True)
+        sumo_pages.aaq_flow.editing_reply_flow(
+            answer_id=answer_id, reply_body=updated_reply_text, submit_reply=True
         )
-        sumo_pages.question_page.click_on_reply_more_options_button(answer_id)
-        sumo_pages.question_page.click_on_edit_this_post_for_a_certain_reply(answer_id)
-        sumo_pages.aaq_flow.editing_reply_flow(reply_body=updated_reply_text, submit_reply=True)
 
     with check, allure.step("Navigating back to the answers page from the profile section and"
                             " verifying that the updates are reflected"):
         sumo_pages.question_page.click_on_the_reply_author(answer_id)
-        assert (utilities.number_extraction_from_string(
-            sumo_pages.my_profile_page.get_my_profile_answers_text()) == 1)
+        assert sumo_pages.my_profile_page.get_my_profile_answers_text() == "1 answer"
 
         sumo_pages.my_profile_page.click_my_profile_answers_link()
         assert (updated_reply_text == sumo_pages.my_answers_page.get_my_answer_text(
@@ -243,16 +215,14 @@ def test_number_of_my_profile_answers_is_successfully_displayed(page: Page,
     with allure.step("Navigating back to the posted question and posting a reply to it"):
         sumo_pages.my_answers_page.click_on_specific_answer(answer_id)
         reply_text = "A new reply"
-        sumo_pages.question_page.add_text_to_post_a_reply_textarea(reply_text)
-        second_answer_id = sumo_pages.question_page.click_on_post_reply_button(
-            repliant_username=test_user["username"]
+        second_answer_id = sumo_pages.aaq_flow.post_question_reply_flow(
+            repliant_username=test_user["username"], reply=reply_text
         )
 
     with check, allure.step("Navigating back to the answers page from the profile section and"
                             " verifying that the updates are reflected"):
         sumo_pages.question_page.click_on_the_reply_author(second_answer_id)
-        assert (utilities.number_extraction_from_string(
-            sumo_pages.my_profile_page.get_my_profile_answers_text()) == 2)
+        assert sumo_pages.my_profile_page.get_my_profile_answers_text() == "2 answers"
         sumo_pages.my_profile_page.click_my_profile_answers_link()
         assert (reply_text == sumo_pages.my_answers_page.get_my_answer_text(
             answer_id=second_answer_id))
@@ -262,8 +232,7 @@ def test_number_of_my_profile_answers_is_successfully_displayed(page: Page,
 
 #  C2094285, C2094284, C891309, C891410, C2245213
 @pytest.mark.userProfile
-def test_number_of_posted_articles_is_successfully_displayed(page: Page,
-                                                             create_user_factory):
+def test_number_of_posted_articles_is_successfully_displayed(page: Page, create_user_factory):
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -277,8 +246,7 @@ def test_number_of_posted_articles_is_successfully_displayed(page: Page,
     with check, allure.step("Accessing the profile page and verifying that the number of posted"
                             " documents has incremented"):
         sumo_pages.top_navbar.click_on_view_profile_option()
-        assert (utilities.number_extraction_from_string(
-            sumo_pages.my_profile_page.get_my_profile_documents_text()) == 1)
+        assert sumo_pages.my_profile_page.get_my_profile_documents_text() == "1 document"
 
     with check, allure.step("Clicking on my posted documents link and verifying that the posted"
                             " document is listed"):
@@ -295,8 +263,7 @@ def test_number_of_posted_articles_is_successfully_displayed(page: Page,
     with check, allure.step("Accessing the profile page and verifying that the number of posted"
                             " documents is the same"):
         sumo_pages.top_navbar.click_on_view_profile_option()
-        assert (utilities.number_extraction_from_string(
-            sumo_pages.my_profile_page.get_my_profile_documents_text()) == 1)
+        assert sumo_pages.my_profile_page.get_my_profile_documents_text() == "1 document"
 
     with allure.step("Clicking on my posted documents link and verifying that the new document"
                      " title is listed"):
@@ -308,7 +275,6 @@ def test_number_of_posted_articles_is_successfully_displayed(page: Page,
 @pytest.mark.userProfile
 def test_accounts_with_symbols_are_getting_a_corresponding_valid_username(page: Page,
                                                                           create_user_factory):
-
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(username="tes@tU.se-r4")
diff --git a/playwright_tests/tests/user_page_tests/test_my_questions.py b/playwright_tests/tests/user_page_tests/test_my_questions.py
index 3e757d6bb63..93a21d39b80 100644
--- a/playwright_tests/tests/user_page_tests/test_my_questions.py
+++ b/playwright_tests/tests/user_page_tests/test_my_questions.py
@@ -16,13 +16,11 @@ def test_number_of_questions_is_incremented_when_posting_a_question(page: Page,
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
 
-    with allure.step(f"Signing in with {test_user['username']} a user account"):
+    with allure.step(f"Signing in with {test_user['username']} user account"):
         utilities.start_existing_session(cookies=test_user)
 
     with allure.step("Navigating to the AAQ form and posting a new AAQ question"):
-        utilities.navigate_to_link(
-            utilities.aaq_question_test_data["products_aaq_url"]["Firefox"]
-        )
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
 
         sumo_pages.aaq_flow.submit_an_aaq_question(
             subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
@@ -42,7 +40,6 @@ def test_number_of_questions_is_incremented_when_posting_a_question(page: Page,
 @pytest.mark.userQuestions
 def test_my_contributions_questions_reflects_my_questions_page_numbers(page: Page,
                                                                        create_user_factory):
-
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -58,8 +55,8 @@ def test_my_contributions_questions_reflects_my_questions_page_numbers(page: Pag
             )
             sumo_pages.aaq_flow.submit_an_aaq_question(
                 subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
-                topic_name=utilities.aaq_question_test_data[
-                    "valid_firefox_question"]["topic_value"],
+                topic_name=utilities.
+                aaq_question_test_data["valid_firefox_question"]["topic_value"],
                 body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
                 expected_locator=sumo_pages.question_page.questions_header
             )
@@ -83,7 +80,6 @@ def test_my_contributions_questions_reflects_my_questions_page_numbers(page: Pag
 @pytest.mark.userQuestions
 def test_correct_messages_is_displayed_if_user_has_no_posted_questions(page: Page,
                                                                        create_user_factory):
-
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory(permissions=["delete_question"])
@@ -100,8 +96,7 @@ def test_correct_messages_is_displayed_if_user_has_no_posted_questions(page: Pag
                 NO_POSTED_QUESTIONS_MESSAGE)
 
     with check, allure.step("Verifying that the question list is not displayed"):
-        expect(sumo_pages.my_questions_page.get_list_of_profile_questions_locators()
-               ).to_be_hidden()
+        expect(sumo_pages.my_questions_page.questions_list).to_be_hidden()
 
     with allure.step("Navigating to the Firefox AAQ form and posting a new AAQ question for "
                      "the Firefox product"):
@@ -111,10 +106,8 @@ def test_correct_messages_is_displayed_if_user_has_no_posted_questions(page: Pag
                 subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
                 topic_name=utilities
                 .aaq_question_test_data["valid_firefox_question"]["topic_value"],
-                body=utilities.
-                aaq_question_test_data["valid_firefox_question"]["question_body"],
+                body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
                 expected_locator=sumo_pages.question_page.questions_header
-
             )
         )
 
@@ -122,8 +115,7 @@ def test_correct_messages_is_displayed_if_user_has_no_posted_questions(page: Pag
                             " message is no longer displayed"):
         sumo_pages.top_navbar.click_on_view_profile_option()
         sumo_pages.user_navbar.click_on_my_questions_option()
-        expect(sumo_pages.my_questions_page.get_list_of_profile_no_question_message_locator()
-               ).to_be_hidden()
+        expect(sumo_pages.my_questions_page.questions_no_question_message).to_be_hidden()
 
     with allure.step("Deleting the question"):
         utilities.navigate_to_link(question_info["question_page_url"])
@@ -142,7 +134,6 @@ def test_correct_messages_is_displayed_if_user_has_no_posted_questions(page: Pag
 @pytest.mark.userQuestions
 def test_question_page_reflects_posted_questions_and_redirects_to_question(page: Page,
                                                                            create_user_factory):
-
     utilities = Utilities(page)
     sumo_pages = SumoPages(page)
     test_user = create_user_factory()
@@ -152,13 +143,22 @@ def test_question_page_reflects_posted_questions_and_redirects_to_question(page:
 
     with allure.step("Navigating to the Firefox AAQ form and posting a new AAQ question"):
         utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
-        question_info = (
+        first_question = (
             sumo_pages.aaq_flow.submit_an_aaq_question(
                 subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
                 topic_name=utilities.
                 aaq_question_test_data["valid_firefox_question"]["topic_value"],
-                body=utilities.
-                aaq_question_test_data["valid_firefox_question"]["question_body"],
+                body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
+                expected_locator=sumo_pages.question_page.questions_header
+            )
+        )
+        utilities.navigate_to_link(utilities.aaq_question_test_data["products_aaq_url"]["Firefox"])
+        second_question = (
+            sumo_pages.aaq_flow.submit_an_aaq_question(
+                subject=utilities.aaq_question_test_data["valid_firefox_question"]["subject"],
+                topic_name=utilities.
+                aaq_question_test_data["valid_firefox_question"]["topic_value"],
+                body=utilities.aaq_question_test_data["valid_firefox_question"]["question_body"],
                 expected_locator=sumo_pages.question_page.questions_header
             )
         )
@@ -166,10 +166,19 @@ def test_question_page_reflects_posted_questions_and_redirects_to_question(page:
     with check, allure.step("Navigating to my questions profile page and verifying that the first "
                             "element from the My Questions page is the recently posted question"):
         sumo_pages.top_navbar.click_on_my_questions_profile_option()
-        assert (sumo_pages.my_questions_page.get_text_of_first_listed_question().
-                strip() == question_info["aaq_subject"].strip())
+        assert (sumo_pages.my_questions_page.get_text_of_listed_question_by_index(1).
+                strip() == second_question["aaq_subject"].strip())
+        assert (sumo_pages.my_questions_page.get_text_of_listed_question_by_index(2).
+                strip() == first_question["aaq_subject"].strip())
 
     with allure.step("Clicking on the first list item and verifying that the user is "
                      "redirected to the correct question"):
         sumo_pages.my_questions_page.click_on_a_question_by_index(1)
-        expect(page).to_have_url(question_info["question_page_url"])
+        expect(page).to_have_url(second_question["question_page_url"])
+
+    with allure.step("Navigating back, clicking on the second listed item and verifying that the "
+                     "user is redirected to the correct question"):
+        utilities.navigate_back()
+        sumo_pages.my_questions_page.click_on_a_question_by_index(2)
+        expect(page).to_have_url(first_question["question_page_url"])
+

From 628c64aa81cff1740286b67ce147047d5fc5de2b Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Wed, 17 Dec 2025 16:01:42 +0100
Subject: [PATCH 08/13] Merge conflict properly

---
 .../jinja2/questions/includes/aaq_macros.html | 43 ++++++++-----------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/kitsune/questions/jinja2/questions/includes/aaq_macros.html b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
index e6f2c58d7aa..cb44a628b8d 100644
--- a/kitsune/questions/jinja2/questions/includes/aaq_macros.html
+++ b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
@@ -190,31 +190,26 @@ <h2 class="sumo-page-subheading">{{ _('Topics') }}</h2>
 
 {% macro troubleshooting_instructions(field) %}
   <div>
-    <div id="api-section">
-      <div id="troubleshooting-button" class="sumo-button-wrap">
-        <button class="sumo-button" id="share-data" type="button">
-          {{ _('Share Data') }}
-        </button>
-      </div>
-      <p id="troubleshooting-manual" class="hide-until-expanded">
-        {# L10n: Deprecated #}
-        {% set deprecated_share_data_fallback %}
-          {% trans %}
-            We can't automatically get your browser's troubleshooting data, please
-            <a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox">try these manual steps</a>.
-          {% endtrans %}
-        {% endset %}
-        {# L10n: Try these manual steps refers to https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox #}
-        {% trans a_open='<a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox" target="_blank">'|safe, a_close='</a>'|safe %}
-          We can't automatically get your browser's troubleshooting data, please {{ a_open }}try these manual steps{{ a_close }}.
+    <div id="troubleshooting-button" class="sumo-button-wrap">
+      <button class="sumo-button" id="share-data" type="button" aria-describedby="{{ field.help_id }}">
+        {{ _('Share Data') }}
+      </button>
+    </div>
+    <div id="troubleshooting-manual" class="hide-until-expanded" class="field-help-text">
+      {# L10n: Deprecated #}
+      {% set deprecated_share_data_fallback %}
+        {% trans %}
+          We can't automatically get your browser's troubleshooting data, please
+          <a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox">try these manual steps</a>.
         {% endtrans %}
-      </p>
-      <div id="troubleshooting-field" class="hide-until-expanded field full-width">
-        {{ field }}
-      </div>
-      <p>
-        {{ _('This information gives details about the internal workings of your browser that will help in answering your question.') }}
-      </p>
+      {% endset %}
+      {# L10n: Try these manual steps refers to https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox #}
+      {% trans a_open='<a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox" target="_blank">'|safe, a_close='</a>'|safe %}
+        We can't automatically get your browser's troubleshooting data, please {{ a_open }}try these manual steps{{ a_close }}.
+      {% endtrans %}
+    </div>
+    <div id="troubleshooting-field" class="hide-until-expanded field full-width">
+      {{ field }}
     </div>
   </div>
 {% endmacro %}

From 698d5a3cff2950faabb2e916d4d585fb4f542f54 Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Mon, 5 Jan 2026 11:15:43 +0100
Subject: [PATCH 09/13] Improve troubleshooting-manual text

Improve troubleshooting-manual text according to Donna's suggestion
---
 kitsune/questions/jinja2/questions/includes/aaq_macros.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kitsune/questions/jinja2/questions/includes/aaq_macros.html b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
index cb44a628b8d..18a593757d2 100644
--- a/kitsune/questions/jinja2/questions/includes/aaq_macros.html
+++ b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
@@ -205,7 +205,7 @@ <h2 class="sumo-page-subheading">{{ _('Topics') }}</h2>
       {% endset %}
       {# L10n: Try these manual steps refers to https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox #}
       {% trans a_open='<a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox" target="_blank">'|safe, a_close='</a>'|safe %}
-        We can't automatically get your browser's troubleshooting data, please {{ a_open }}try these manual steps{{ a_close }}.
+        We’re unable to pull your browser’s troubleshooting data – please {{ a_open }}try these manual steps{{ a_close }}.
       {% endtrans %}
     </div>
     <div id="troubleshooting-field" class="hide-until-expanded field full-width">

From e7c27312db1b52a7521807c36e64b20f656b21a7 Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Mon, 5 Jan 2026 11:30:38 +0100
Subject: [PATCH 10/13] Fix deprecated string history

---
 kitsune/questions/jinja2/questions/includes/aaq_macros.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kitsune/questions/jinja2/questions/includes/aaq_macros.html b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
index 18a593757d2..937615eeb75 100644
--- a/kitsune/questions/jinja2/questions/includes/aaq_macros.html
+++ b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
@@ -203,6 +203,12 @@ <h2 class="sumo-page-subheading">{{ _('Topics') }}</h2>
           <a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox">try these manual steps</a>.
         {% endtrans %}
       {% endset %}
+      {# L10n: Deprecated. Try these manual steps refers to https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox #}
+      {% set deprecated_share_data_fallback_2 %}
+        {% trans %}
+          We can't automatically get your browser's troubleshooting data, please {{ a_open }}try these manual steps{{ a_close }}.
+        {% endtrans %}
+      {% endset %}
       {# L10n: Try these manual steps refers to https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox #}
       {% trans a_open='<a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox" target="_blank">'|safe, a_close='</a>'|safe %}
         We’re unable to pull your browser’s troubleshooting data – please {{ a_open }}try these manual steps{{ a_close }}.

From 509f84485df1aa316809d65cc767367d3998708d Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Sat, 10 Jan 2026 14:11:46 +0100
Subject: [PATCH 11/13] Add l10n comments

Add l10n comments
Improve i18n, internationalize some alt strings
Move repeated Helpful Tip code to a macro
Remove an unused variable from forms.py
---
 .../jinja2/flagit/content_moderation.html     |  1 +
 kitsune/flagit/jinja2/flagit/queue.html       |  1 +
 .../flagit/jinja2/flagit/zendesk_spam.html    |  1 +
 kitsune/questions/forms.py                    | 66 ++++++++++++-------
 .../jinja2/questions/edit_question.html       |  1 +
 .../jinja2/questions/includes/aaq_macros.html | 39 ++++++++++-
 .../includes/question_editing_frame.html      | 38 +++++------
 .../jinja2/questions/new_question.html        |  1 +
 .../jinja2/questions/question_details.html    |  8 +--
 kitsune/questions/views.py                    |  9 +++
 .../sumo/jinja2/includes/common_macros.html   |  1 +
 .../sumo/js/form-wizard-configure-step.js     |  4 +-
 .../sumo/js/form-wizard-sign-in-step.js       |  4 +-
 kitsune/users/jinja2/users/auth.html          |  1 +
 .../jinja2/wiki/includes/document_macros.html |  3 +-
 15 files changed, 123 insertions(+), 55 deletions(-)

diff --git a/kitsune/flagit/jinja2/flagit/content_moderation.html b/kitsune/flagit/jinja2/flagit/content_moderation.html
index 121cf922470..87c0be08fe6 100644
--- a/kitsune/flagit/jinja2/flagit/content_moderation.html
+++ b/kitsune/flagit/jinja2/flagit/content_moderation.html
@@ -45,6 +45,7 @@ <h3 class="sumo-card-heading"><br>{{ _('Update Status:') }}</h3>
                 hx-swap="delete">
             {% csrf_token %}
             <select name="status">
+              {# L10n: A default option for dropdown menus (displayed when none of the actual options is selected). #}
               <option value="">{{ _('Please select...') }}</option>
               <option value="1">{{ _('Content categorization is updated.') }}</option>
               <option value="2">{{ _('Content is appropriately categorized.') }}</option>
diff --git a/kitsune/flagit/jinja2/flagit/queue.html b/kitsune/flagit/jinja2/flagit/queue.html
index 36b32cda625..038162d1ef2 100644
--- a/kitsune/flagit/jinja2/flagit/queue.html
+++ b/kitsune/flagit/jinja2/flagit/queue.html
@@ -21,6 +21,7 @@ <h3 class="sumo-card-heading"><br>{{ _('Update Status:') }}</h3>
           <form class="update inline-form" action="{{ object.form_action }}" method="post">
             {% csrf_token %}
             <select name="status">
+              {# L10n: A default option for dropdown menus (displayed when none of the actual options is selected). #}
               <option value="">{{ _('Please select...') }}</option>
               {% if object.reason == "spam" %}
                 <option value="1">{{ _('Removed spam content.') }}</option>
diff --git a/kitsune/flagit/jinja2/flagit/zendesk_spam.html b/kitsune/flagit/jinja2/flagit/zendesk_spam.html
index 0429ef736b5..fa36f87fa74 100644
--- a/kitsune/flagit/jinja2/flagit/zendesk_spam.html
+++ b/kitsune/flagit/jinja2/flagit/zendesk_spam.html
@@ -26,6 +26,7 @@ <h3 class="sumo-card-heading"><br>{{ _('Update Status:') }}</h3>
           <form class="update inline-form" action="{{ object.form_action }}" method="post">
             {% csrf_token %}
             <select name="status">
+              {# L10n: A default option for dropdown menus (displayed when none of the actual options is selected). #}
               <option value="">{{ _('Please select...') }}</option>
               <option value="1">{{ _('Removed spam content.') }}</option>
               <option value="2">{{ _('No spam found.') }}</option>
diff --git a/kitsune/questions/forms.py b/kitsune/questions/forms.py
index 77e7ef3dff2..9d509e0357e 100644
--- a/kitsune/questions/forms.py
+++ b/kitsune/questions/forms.py
@@ -14,50 +14,66 @@
 from kitsune.sumo.forms import KitsuneBaseForumForm
 from kitsune.upload.models import ImageAttachment
 
-# labels and help text
+# unused labels and help text
+# L10n: Unused. A label for a field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
 SITE_AFFECTED_LABEL = _lazy("URL of affected site")
+# L10n: Unused. A label for a field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
 CRASH_ID_LABEL = _lazy("Crash ID(s)")
-CRASH_ID_HELP = _lazy(
-    "If you submit information to Mozilla when you crash, "
-    "you'll be given a crash ID which uniquely identifies "
-    "your crash and lets us look at details that may help "
-    "identify the cause. To find your recently submitted "
-    "crash IDs, go to <strong>about:crashes</strong> in "
-    "your location bar. <a href='https://support.mozilla."
-    "com/en-US/kb/Firefox+crashes#Getting_the_most_"
-    "accurate_help_with_your_Firefox_crash' "
-    "target='_blank'>Click for detailed instructions</a>."
-)
-TROUBLESHOOTING_LABEL = _lazy("Troubleshooting Information")
-TROUBLESHOOTING_HELP = _lazy(
-    "This information gives details about the "
-    "internal workings of your browser that will "
-    "help in answering your question."
-)
+# if you want to use the following string, update it to remove "en-US" from the link first
+# when updating, don't remove the original string, just mark it as deprecated and create a new one
+# L10n: Unused. A description of the "Crash ID(s)" field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
+CRASH_ID_HELP = _lazy("If you submit information to Mozilla when you crash, you'll be given a crash ID which uniquely identifies your crash and lets us look at details that may help identify the cause. To find your recently submitted crash IDs, go to <strong>about:crashes</strong> in your location bar. <a href='https://support.mozilla.com/en-US/kb/Firefox+crashes#Getting_the_most_accurate_help_with_your_Firefox_crash' target='_blank'>Click for detailed instructions</a>.")
+# L10n: Unused. A label for a field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
 FREQUENCY_LABEL = _lazy("This happens")
 FREQUENCY_CHOICES = [
     ("", ""),
+    # L10n: Unused. An option for the "This happens" field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
     ("NOT_SURE", _lazy("Not sure how often")),
+    # L10n: Unused. An option for the "This happens" field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
     ("ONCE_OR_TWICE", _lazy("Just once or twice")),
+    # L10n: Unused. An option for the "This happens" field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
     ("FEW_TIMES_WEEK", _lazy("A few times a week")),
+    # L10n: Unused. An option for the "This happens" field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
     ("EVERY_TIME", _lazy("Every time Firefox opened")),
 ]
+# L10n: Unused. A label for a field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
 STARTED_LABEL = _lazy("This started when...")
+# L10n: Unused. A label for a field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
+PLUGINS_LABEL = _lazy("Installed plugins")
+# L10n: Unused. A label for a field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
+ADDON_LABEL = _lazy("Extension/plugin you are having trouble with")
+# L10n: Unused. A label for a field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
+DEVICE_LABEL = _lazy("Mobile device")
+
+# unused labels and help text
+# L10n: A label for a field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
+TROUBLESHOOTING_LABEL = _lazy("Troubleshooting Information")
+# L10n: A description of the "Troubleshooting Information" field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
+TROUBLESHOOTING_HELP = _lazy("This information gives details about the internal workings of your browser that will help in answering your question.")
+# L10n: A label for a field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
 TITLE_LABEL = _lazy("Summarize your question")
+# L10n: A description of the "Summarize your question" field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
 TITLE_HELP_TEXT = _lazy("Please summarize your question in one sentence:")
+# L10n: A label for a field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
 CONTENT_LABEL = _lazy("How can we help?")
+# L10n: A description of the "How can we help?" field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
 CONTENT_HELP_TEXT = _lazy('Please include as much detail as possible. Also, remember to follow our <a href="https://support.mozilla.org/kb/mozilla-support-rules-guidelines" target="_blank">rules and guidelines</a>.')
+# L10n: A label for a field, displayed when filing a Firefox-related question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
 FF_VERSION_LABEL = _lazy("Firefox version")
+# L10n: A label for a field, displayed when filing a Thunderbird-related question form (e.g., on https://support.mozilla.org/questions/new/thunderbird/form).
 TB_VERSION_LABEL = _lazy("Thunderbird version")
+# L10n: A placeholder for the "Thunderbird version" field, displayed when filing a Thunderbird-related question form (e.g., on https://support.mozilla.org/questions/new/thunderbird/form).
 TB_VERSION_PLACEHOLDER = _lazy("e.g., 140.5.0esr, 146.1.0 release or 147.0b4")
+# L10n: A label for a field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
 OS_LABEL = _lazy("Operating system")
-PLUGINS_LABEL = _lazy("Installed plugins")
-ADDON_LABEL = _lazy("Extension/plugin you are having trouble with")
-DEVICE_LABEL = _lazy("Mobile device")
+# L10n: A label for a field, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
 CATEGORY_LABEL = _lazy("Which topic best describes your question?")
+# L10n: A label for a checkbox, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form).
 NOTIFICATIONS_LABEL = _lazy("Email me when someone answers the thread")
 
+# L10n: A placeholder for the "Post a Reply" editor.
 REPLY_PLACEHOLDER = _lazy("Enter your reply here.")
+# L10n: A placeholder for the email field, displayed when subscribing to a question while not signed in.
 EMAIL_PLACEHOLDER = _lazy("Enter your email address here.")
 
 
@@ -120,6 +136,7 @@ def __init__(self, product=None, *args, **kwargs):
 
         for field in self.fields.values():
             if not field.required:
+                # L10n: A label suffix for optional fields, displayed when filing a question form (e.g., on https://support.mozilla.org/questions/new/firefox/form). The leading space must be preserved.
                 field.label_suffix = _lazy(" (optional):")
 
         for name, field in self.fields.items():
@@ -138,6 +155,7 @@ def clean_content(self):
         text_only = html.unescape(text_only).strip()
 
         if len(text_only) < 5:
+            # L10n: An error message displayed under the "How can we help?" field when filing a question form if the submitted value contains too few non-HTML symbols.
             raise forms.ValidationError(_("Question content cannot be empty."))
         return content
 
@@ -198,7 +216,8 @@ class NewQuestionForm(EditQuestionForm):
     category = forms.ModelChoiceField(
         label=CATEGORY_LABEL,
         queryset=Topic.objects.none(),
-        empty_label="Please select",
+        # L10n: A default option for dropdown menus (displayed when none of the actual options is selected).
+        empty_label=_lazy("Please select..."),
         required=True,
     )
 
@@ -296,6 +315,3 @@ def clean_email(self):
             return self.cleaned_data["email"]
         # Clear out the email for logged in users, we don't want to use it.
         return None
-
-
-bucket_choices = [(1, "1 day"), (7, "1 week"), (30, "1 month")]
diff --git a/kitsune/questions/jinja2/questions/edit_question.html b/kitsune/questions/jinja2/questions/edit_question.html
index 06c62792a1a..830fe9e2116 100644
--- a/kitsune/questions/jinja2/questions/edit_question.html
+++ b/kitsune/questions/jinja2/questions/edit_question.html
@@ -22,6 +22,7 @@
   <p>{{ _('When editing a question, uploading new images or deleting existing ones will happen instantly.') }}</p>
 {% endblock %}
 
+{# L10n: A button displayed when editing an existing question. #}
 {% block submit_button_value %}{{ _('Save Question') }}{% endblock %}
 
 {% block more_submit_buttons %}
diff --git a/kitsune/questions/jinja2/questions/includes/aaq_macros.html b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
index 937615eeb75..b09d7871bca 100644
--- a/kitsune/questions/jinja2/questions/includes/aaq_macros.html
+++ b/kitsune/questions/jinja2/questions/includes/aaq_macros.html
@@ -2,7 +2,9 @@
 {% from 'includes/common_macros.html' import featured_articles, scam_banner %}
 
 {% macro select_product(products) -%}
+  {# L10n: A header, displayed when asking a new question (on https://support.mozilla.org/questions/new and in Premium product question forms). #}
   <h1 class="sumo-page-heading">{{ _('Contact Support') }}</h1>
+  {# L10n: A subheader, displayed when asking a new question (on https://support.mozilla.org/questions/new). #}
   <h2 class="sumo-page-subheading">{{ _('Which product do you need help with?') }}</h2>
   <div class="sumo-page-section--inner">
     <div id="product-picker" class="sumo-card-grid stack-on-mobile">
@@ -30,6 +32,7 @@ <h3 class="card--title">
           </div>
         {% endfor %}
         <div class="card card--centered-button">
+          {# L10n: A button, displayed when asking a new question (on https://support.mozilla.org/questions/new). #}
           <a class="sumo-button primary-button button-lg" href="{{ url('questions.home') }}">{{ _('Browse All Product Forums')}}</a>
         </div>
       </div>
@@ -49,8 +52,10 @@ <h3 class="card--title">
         <span class="progress--link-inner">
           <span class="progress--dot"></span>
           {% if step > 1 and step < 4 %}
+            {# L10n: A label, displayed in a progress bar when asking a new question (when a product is selected, e.g., on https://support.mozilla.org/questions/new/firefox). #}
             <span class="progress--label">{{ _('Change Product') }}</span>
           {% else %}
+            {# L10n: A label, displayed in a progress bar when asking a new question (on https://support.mozilla.org/questions/new/). #}
             <span class="progress--label">{{ _('Select Product') }}</span>
           {% endif %}
         </span>
@@ -65,6 +70,7 @@ <h3 class="card--title">
         {% endif %}>
         <span class="progress--link-inner">
           <span class="progress--dot"></span>
+          {# L10n: A label, displayed in a progress bar when asking a new question (e.g., on https://support.mozilla.org/questions/new/). #}
           <span class="progress--label">{{ _('Explore Solutions') }}</span>
         </span>
       </a>
@@ -103,18 +109,23 @@ <h2 class="card--title has-bottom-margin">
     {% if aaq_context %}
       {% if request.user.is_authenticated %}
         {% if has_support %}
+          {# L10n: Text for the Ask a Question CTA widget (case: Premium products; the user is signed in). #}
           <p>{{ _('Still need help? Continue to contact our support team.') }}</p>
         {% else %}
+          {# L10n: Text for the Ask a Question CTA widget (case: Freemium products; the user is signed in). #}
           <p>{{ _('Still need help? Continue to ask your question on our forums.') }}</p>
         {% endif %}
      {% else %}
         {% if has_support %}
+          {# L10n: Text for the Ask a Question CTA widget (case: Premium products; the user is not signed in). #}
           <p>{{ _('Still need help? Sign in to contact our support team.') }}</p>
         {% else %}
+          {# L10n: Text for the Ask a Question CTA widget (case: Freemium products; the user is not signed in). #}
           <p>{{ _('Still need help? Sign in to ask your question on our forums.') }}</p>
         {% endif %}
       {% endif %}
     {% else %}
+      {# L10n: Text for the Ask a Question CTA widget (case: Ask-a-question workflow is not configured). #}
       <p>{{ _('Still need help? Continue to ask your question and get help.') }}</p>
     {% endif %}
 
@@ -134,6 +145,7 @@ <h2 class="card--title has-bottom-margin">
         "link_name": "{{ link_name }}",
         "link_detail": "{{ link_detail }}"
       }'>
+      {# L10n: A button. #}
       {{ _('Continue')}}
     </a>
     </div>
@@ -152,13 +164,16 @@ <h2 class="card--title has-bottom-margin">
 
     <div class="sumo-l-two-col sidebar-on-right align-center cols-on-medium">
       <div class="sumo-l-two-col--main home-search-section--content">
-        <img class="page-heading--logo" src="{{ product.image_alternate_url }}" alt="{{ product.title }} logo">
+        {# L10n: Alt text for a product logo. #}
+        <img class="page-heading--logo" src="{{ product.image_alternate_url }}" alt="{{ _('{product} logo')|f(product=product.title) }}">
         <h1 class="sumo-page-heading ">
-          <span class="product-title-text">{{ product.title }} {{ _('Solutions') }}</span>
+          {# L10n: A header, displayed when asking a new question with a product selected (e.g., on https://support.mozilla.org/questions/new/firefox). #}
+          <span class="product-title-text">{{ _('{product} Solutions')|f(product=product.title) }}</span>
         </h1>
         {{ search_box(settings, id='question-search-masthead', params=search_params) }}
 
         <p class="page-heading--intro-text">
+            {# L10n: Introduction, displayed when asking a new question with a product selected (e.g., on https://support.mozilla.org/questions/new/firefox). #}
             {{ _('Browse our self-help options first or continue to ask your question and get help.') }}
         </p>
       </div>
@@ -192,6 +207,7 @@ <h2 class="sumo-page-subheading">{{ _('Topics') }}</h2>
   <div>
     <div id="troubleshooting-button" class="sumo-button-wrap">
       <button class="sumo-button" id="share-data" type="button" aria-describedby="{{ field.help_id }}">
+        {# L10n: A button for sharing troubleshooting data when asking a new question (displayed, e,g., on https://support.mozilla.org/questions/new/firefox/form). #}
         {{ _('Share Data') }}
       </button>
     </div>
@@ -205,7 +221,7 @@ <h2 class="sumo-page-subheading">{{ _('Topics') }}</h2>
       {% endset %}
       {# L10n: Deprecated. Try these manual steps refers to https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox #}
       {% set deprecated_share_data_fallback_2 %}
-        {% trans %}
+        {% trans a_open='<a href="https://support.mozilla.org/kb/use-troubleshooting-information-page-fix-firefox" target="_blank">'|safe, a_close='</a>'|safe %}
           We can't automatically get your browser's troubleshooting data, please {{ a_open }}try these manual steps{{ a_close }}.
         {% endtrans %}
       {% endset %}
@@ -219,3 +235,20 @@ <h2 class="sumo-page-subheading">{{ _('Topics') }}</h2>
     </div>
   </div>
 {% endmacro %}
+
+{% macro helpful_tip() %}
+  <h3 class="sumo-card-heading">
+    {# L10n: Alt text for the helpful tip icon displayed when filing a new question form (e.g., on https://support.mozilla.org/questions/new/firefox/form). Source: https://assets-prod.sumo.prod.webservices.mozgcp.net/static/highlight.975d9eebb1f0b621.svg #}
+    <img class="card--icon-sm" src="{{ webpack_static('protocol/img/icons/highlight.svg') }}" alt="{{ _('Helpful Tip icon') }}" />
+    {# L10n: A header for the Helpful Tip card displayed when filing a new question form (e.g., on https://support.mozilla.org/questions/new/firefox/form). #}
+    {{ _('Helpful Tip!')}}
+  </h3>
+  {# L10n: Text for the Helpful Tip card displayed when filing a new question form (e.g., on https://support.mozilla.org/questions/new/firefox/form). #}
+  <p>
+    {% trans %}
+      Follow through. Sometimes, our volunteers would ask you for
+      more information or to test out certain scenarios. The sooner
+      you can do this, the sooner they would know how to fix it.
+    {% endtrans %}
+  </p>
+{% endmacro %}
diff --git a/kitsune/questions/jinja2/questions/includes/question_editing_frame.html b/kitsune/questions/jinja2/questions/includes/question_editing_frame.html
index 19a079c9f14..de0813699bc 100644
--- a/kitsune/questions/jinja2/questions/includes/question_editing_frame.html
+++ b/kitsune/questions/jinja2/questions/includes/question_editing_frame.html
@@ -8,7 +8,7 @@
 {% extends "questions/base.html" %}
 {% from "layout/errorlist.html" import errorlist %}
 {% from "includes/common_macros.html" import search_box, scam_banner, content_editor with context %}
-{% from "questions/includes/aaq_macros.html" import progress_bar %}
+{% from "questions/includes/aaq_macros.html" import helpful_tip, progress_bar %}
 {% from "questions/includes/aaq_macros.html" import troubleshooting_instructions with context %}
 {% from "upload/attachments.html" import attachments_form %}
 {% set scripts = ('questions', 'questions.geo',) %}
@@ -27,7 +27,8 @@
     {% endif %}
 
     {% block formwrap %}
-    <img class="page-heading--logo" src="{{ current_product.image_alternate_url }}" alt="{{ current_product.title }} logo" />
+    {# L10n: Alt text for a product logo. #}
+    <img class="page-heading--logo" src="{{ current_product.image_alternate_url }}" alt="{{ _('{product} logo')|f(product=current_product.title) }}" />
 
     {# TODO: hook this up to the backend when subproducts are in.
     <div class="mzp-c-menu-list subheading-dropdown">
@@ -48,20 +49,19 @@ <h3 class="mzp-c-menu-list-title sumo-card-heading back-to-product-list">
       <aside class="sumo-l-two-col--sidebar">
         {% if form and not has_ticketing_support %}
           <div class="card has-moz-headings is-in-sidebar is-callout-bg text-center large-only">
-              <img class="card--img" src="{{ webpack_static('sumo/img/Mozilla-Heads-Keith-Negley-180628__400.png') }}" alt="Illustration of community" />
+              {# L10n: Alt text for the illustration of community displayed when filing a new question form (e.g., on https://support.mozilla.org/questions/new/firefox/form). Source: https://assets-prod.sumo.prod.webservices.mozgcp.net/static/Mozilla-Heads-Keith-Negley-180628__400.99f12ceb616ae784.png #}
+              <img class="card--img" src="{{ webpack_static('sumo/img/Mozilla-Heads-Keith-Negley-180628__400.png') }}" alt="{{ _('Illustration of community') }}" />
               <div class="card--details">
+                {# L10n: A header for the Community card displayed when filing a new question form (e.g., on https://support.mozilla.org/questions/new/firefox/form). #}
                 <h3 class="card--title">{{ _('Our Community is here to help') }}</h3>
+                {# L10n: Text for the Community card displayed when filing a new question form (e.g., on https://support.mozilla.org/questions/new/firefox/form). #}
                 <p class="card--desc">{{ _('Kindness is at the heart of our community. Our volunteers are happy to share their time and Firefox knowledge with you.') }}</p>
                 <p><strong><a href="{{ url('landings.contribute') }}">{{ _('Learn More') }}</a></strong></p>
               </div>
           </div>
 
           <div class="large-only">
-            <h3 class="sumo-card-heading">
-              <img class="card--icon-sm" src="{{ webpack_static('protocol/img/icons/highlight.svg') }}" alt="Helpful Tip icon" />
-              {{ _('Helpful Tip!')}}
-            </h3>
-            <p>{{ _('Follow through. Sometimes, our volunteers would ask you for more information or to test out certain scenarios. The sooner you can do this, the sooner they would know how to fix it.')}}
+            {{ helpful_tip() }}
           </div>
         {% endif %}
       </aside>
@@ -79,6 +79,7 @@ <h1 class="sumo-page-heading">{% block headline %}{% endblock %}</h1>
 
               {% if not has_ticketing_support %}
                 <p class="sumo-page-intro">
+                  {# L10n: An introduction, displayed when filing a new question form (e.g., on https://support.mozilla.org/questions/new/firefox/form). #}
                   {% trans %}
                     Be nice. Our volunteers are Mozilla users just like you,
                     who take the time out of their day to help.
@@ -88,12 +89,14 @@ <h1 class="sumo-page-heading">{% block headline %}{% endblock %}</h1>
 
               <div class="info card shade-bg highlight mb">
               {% if is_loginless and not user.is_authenticated %}
+                {# L10n: An introduction, displayed when filing a new question form regarding sign-in troubles. To access it, try asking a question about any product while being not signed in and then click "I can't sign in to my Mozilla account". #}
                 {% trans %}
                   Can't sign in to your account and need help?
                   You've found the right place. Complete the form below
                   to contact our support staff.
                 {% endtrans %}
               {% else %}
+                {# L10n: An advice, displayed when filing a new question form (e.g., on https://support.mozilla.org/questions/new/firefox/form). #}
                 {% trans %}
                   Be descriptive.
                   Saying “playing video on YouTube is always choppy”
@@ -114,8 +117,11 @@ <h1 class="sumo-page-heading">{% block headline %}{% endblock %}</h1>
                     {% if field.name == 'ff_version' %}
                       <li class="system-details-info show">
                         <p>
+                          {# L10n: Text introducing the Firefox version and the Operating system fields when filing a new question form (e.g., on https://support.mozilla.org/questions/new/firefox/form). #}
                           {{ _("We've made some educated guesses about your current browser and operating system.") }}
+                          {# L10n: A link that shows the Firefox version and the Operating system fields when filing a new question form (e.g., on https://support.mozilla.org/questions/new/firefox/form). #}
                           <a href="#show-details" class="show">{{ _('Show details &raquo;')|safe }}</a>
+                          {# L10n: A link that hides the Firefox version and the Operating system fields when filing a new question form (e.g., on https://support.mozilla.org/questions/new/firefox/form). #}
                           <a href="#hide-details" class="hide hide-until-expanded">{{ _('Hide details &raquo;')|safe }}</a>
                         </p>
                       </li>
@@ -138,6 +144,7 @@ <h1 class="sumo-page-heading">{% block headline %}{% endblock %}</h1>
                     {% elif field.name == 'description' and is_loginless %}
                       <label for="{{ field.id_for_label }}">
                         <span class="fieldnote">
+                          {# L10n: Description for the Tell Us More field, displayed when filing a new question form regarding sign-in troubles. To access it, try asking a question about any product while being not signed in and then click "I can't sign in to my Mozilla account". #}
                           {{ _(
                           "Include details such as your account e-mail or specifics about"
                           " your sign-in issue to help us get you back into your account quicker."
@@ -174,21 +181,12 @@ <h1 class="sumo-page-heading">{% block headline %}{% endblock %}</h1>
               </ul>
 
               <div class="hide-on-large field">
-                <h3 class="sumo-card-heading">
-                  <img class="card--icon-sm" src="{{ webpack_static('protocol/img/icons/highlight.svg') }}" alt="Helpful Tip icon" />
-                  {{ _('Helpful Tip!')}}
-                </h3>
-                <p>
-                {% trans %}
-                  Follow through. Sometimes, our volunteers would ask you for
-                  more information or to test out certain scenarios. The sooner
-                  you can do this, the sooner they would know how to fix it.
-                {% endtrans %}
-                </p>
+                {{ helpful_tip() }}
               </div>
 
               <div class="sumo-button-wrap aaq-form-buttons reverse-on-desktop align-right">
-                <button type="submit" class="sumo-button primary-button" {% block submit_button_attrs %}{% endblock %}>{% block submit_button_value %}Save Question{% endblock %}</button>
+                {# L10n: A button displayed when editing an existing question. #}
+                <button type="submit" class="sumo-button primary-button" {% block submit_button_attrs %}{% endblock %}>{% block submit_button_value %}{{ _('Save Question') }}{% endblock %}</button>
                 {% block more_submit_buttons %}
                 <a class="sumo-button secondary-button push-right" href="{{ cancel_url }}" class="cancel">{{ _('Cancel') }}</a>
                 {% endblock %}
diff --git a/kitsune/questions/jinja2/questions/new_question.html b/kitsune/questions/jinja2/questions/new_question.html
index d11788b42ab..41b183780ca 100644
--- a/kitsune/questions/jinja2/questions/new_question.html
+++ b/kitsune/questions/jinja2/questions/new_question.html
@@ -33,6 +33,7 @@
 {% block major_detail_instructions %}
   <h2 class="sumo-page-heading">
     {% if has_ticketing_support %}
+      {# L10n: A header, displayed when asking a new question (on https://support.mozilla.org/questions/new and in Premium product question forms). #}
       {{ _('Contact Support') }}
     {% else %}
       {{ _('Ask your question') }}
diff --git a/kitsune/questions/jinja2/questions/question_details.html b/kitsune/questions/jinja2/questions/question_details.html
index 8b2f887e0d8..c6a719f3de4 100644
--- a/kitsune/questions/jinja2/questions/question_details.html
+++ b/kitsune/questions/jinja2/questions/question_details.html
@@ -509,19 +509,19 @@ <h3 class="sidebar-subheading sidebar-nav--heading-item is-accordion-heading">{{
                 <section id="more-system-details" class="mzp-u-modal-content text-body-md" title="{{ _('Additional System Details') }}" data-target="#show-more-details">
                   <h2 class="sumo-page-subheading">{{ _('Additional System Details') }}</h2>
                   {% if question.metadata.crash_id %}
-                  <h3 class="sumo-card-heading">{{ _('Crash ID') }}</h3>
+                  <h3 class="sumo-card-heading">{{ crash_id_label }}</h3>
                   <p>{{ question.metadata.crash_id }}</p>
                   {% endif %}
                   {% if question.metadata.frequency %}
-                  <h3 class="sumo-card-heading">{{ _('This happened') }}</h3>
+                  <h3 class="sumo-card-heading">{{ frequency_label }}</h3>
                   <p>{{ frequencies[question.metadata.frequency] }}</p>
                   {% endif %}
                   {% if question.metadata.started %}
-                  <h3 class="sumo-card-heading">{{ _('This started when...') }}</h3>
+                  <h3 class="sumo-card-heading">{{ started_label }}</h3>
                   <p>{{ question.metadata.started }}</p>
                   {% endif %}
                   {% if question.metadata.plugins %}
-                  <h3 class="sumo-card-heading">{{ _('Installed Plug-ins') }}</h3>
+                  <h3 class="sumo-card-heading">{{ plugins_label }}</h3>
                   <p><span class="plugins">
                     {{ question.metadata.plugins|wiki_to_html }}
                   </span></p>
diff --git a/kitsune/questions/views.py b/kitsune/questions/views.py
index 1c67456506b..77701fca85a 100644
--- a/kitsune/questions/views.py
+++ b/kitsune/questions/views.py
@@ -41,7 +41,11 @@
 from kitsune.questions.events import QuestionReplyEvent, QuestionSolvedEvent
 from kitsune.questions.feeds import AnswersFeed, QuestionsFeed, TaggedQuestionsFeed
 from kitsune.questions.forms import (
+    CRASH_ID_LABEL,
+    FREQUENCY_LABEL,
     FREQUENCY_CHOICES,
+    STARTED_LABEL,
+    PLUGINS_LABEL,
     AnswerForm,
     EditQuestionForm,
     NewQuestionForm,
@@ -1566,7 +1570,12 @@ def _answers_data(request, question_id, form=None, watch_form=None, answer_previ
             AnswersFeed().title(question),
         ),
     )
+
+    crash_id_label = CRASH_ID_LABEL
+    frequency_label = FREQUENCY_LABEL
     frequencies = dict(FREQUENCY_CHOICES)
+    started_label = STARTED_LABEL
+    plugins_label = PLUGINS_LABEL
 
     is_watching_question = request.user.is_authenticated and (
         QuestionReplyEvent.is_notifying(request.user, question)
diff --git a/kitsune/sumo/jinja2/includes/common_macros.html b/kitsune/sumo/jinja2/includes/common_macros.html
index 873878495e8..368926ebe59 100644
--- a/kitsune/sumo/jinja2/includes/common_macros.html
+++ b/kitsune/sumo/jinja2/includes/common_macros.html
@@ -673,6 +673,7 @@ <h4 class="mzp-c-menu-item-title">{{ _('Inbox') }}</h4>
 
 {% macro content_editor(field, mention_rules=false) %}
 {% if mention_rules %}
+  {# L10n: Text displayed above the content editor (particularly, when posting a question or a reply). Rules and guidelines refer to https://support.mozilla.org/kb/mozilla-support-rules-guidelines #}
   <div class="field-help-text">{% trans a_open='<a href="https://support.mozilla.org/kb/mozilla-support-rules-guidelines" target="_blank">'|safe, a_close='</a>'|safe %}
     Remember to follow our {{ a_open }}rules and guidelines{{ a_close }}.
   {% endtrans %}</div>
diff --git a/kitsune/sumo/static/sumo/js/form-wizard-configure-step.js b/kitsune/sumo/static/sumo/js/form-wizard-configure-step.js
index 8ddf77afbb3..ee18586f365 100644
--- a/kitsune/sumo/static/sumo/js/form-wizard-configure-step.js
+++ b/kitsune/sumo/static/sumo/js/form-wizard-configure-step.js
@@ -7,6 +7,8 @@ import configureStepStylesURL from "../scss/form-wizard-configure-step.styles.sc
 
 export class ConfigureStep extends BaseFormStep {
   get template() {
+    // L10n: A button.
+    const continueString = gettext("Continue");
     return `
       <template>
         <div class="configure-step-wrapper">
@@ -43,7 +45,7 @@ export class ConfigureStep extends BaseFormStep {
           </p>
 
           <p id="buttons">
-            <button id="next" class="mzp-c-button mzp-t-product" data-event-name="dmw_click" data-event-parameters='{"dmw_click_target": "configuration-next"}'>${gettext("Continue")}</button>
+            <button id="next" class="mzp-c-button mzp-t-product" data-event-name="dmw_click" data-event-parameters='{"dmw_click_target": "configuration-next"}'>${continueString}</button>
           </p>
         </div>
       </template>
diff --git a/kitsune/sumo/static/sumo/js/form-wizard-sign-in-step.js b/kitsune/sumo/static/sumo/js/form-wizard-sign-in-step.js
index b25ae6845ad..ce889e1895f 100644
--- a/kitsune/sumo/static/sumo/js/form-wizard-sign-in-step.js
+++ b/kitsune/sumo/static/sumo/js/form-wizard-sign-in-step.js
@@ -8,6 +8,8 @@ export class SignInStep extends BaseFormStep {
   #emailErrorEl = null;
 
   get template() {
+    // L10n: A button.
+    const continueString = gettext("Continue");
     return `
       <template>
         <div id="sign-in-step-root">
@@ -39,7 +41,7 @@ export class SignInStep extends BaseFormStep {
               <input id="email" name="email" type="email" required="true" placeholder="${gettext("user@example.com")}" pending-autofocus="" />
             </div>
 
-            <button id="continue" class="mzp-c-button mzp-t-product" type="submit" data-event-name="dmw_click">${gettext("Continue")}</button>
+            <button id="continue" class="mzp-c-button mzp-t-product" type="submit" data-event-name="dmw_click">${continueString}</button>
           </form>
 
           <p class="for-sign-up form-footer">
diff --git a/kitsune/users/jinja2/users/auth.html b/kitsune/users/jinja2/users/auth.html
index 88a99806034..8e4715fa1f8 100644
--- a/kitsune/users/jinja2/users/auth.html
+++ b/kitsune/users/jinja2/users/auth.html
@@ -34,6 +34,7 @@ <h1 class="sumo-page-subheading sumo-header-medium">{{ _('Continue with a Mozill
                 </p>
                 <div class="center-on-mobile">
                   <p class="login-button-wrap">
+                    {# L10n: A button. #}
                     <a rel="nofollow" href="{{ url('users.fxa_authentication_init') }}?next={{ next_url }}"
                       class="sumo-button primary-button button-lg button-full-width">{{ _('Continue') }}</a>
                   </p>
diff --git a/kitsune/wiki/jinja2/wiki/includes/document_macros.html b/kitsune/wiki/jinja2/wiki/includes/document_macros.html
index 3d9ee08e519..a048baa3b2a 100644
--- a/kitsune/wiki/jinja2/wiki/includes/document_macros.html
+++ b/kitsune/wiki/jinja2/wiki/includes/document_macros.html
@@ -477,7 +477,8 @@ <h3 class="card--title">
             "link_name": "in-article-aaq-banner.aaq-step-3",
             "link_detail": "{{ product_slug }}"
           }'>
-            {{ _('Contact Support') }}
+            {# L10n: A button in a CTA displayed at the end of some Mozilla accounts articles. #}
+            {{ pgettext('CTA button', 'Contact Support') }}
         </a>
       </div>
     </div>

From ddb600c2c885d5db3d8bcaec260180080be9578e Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Sat, 10 Jan 2026 14:30:41 +0100
Subject: [PATCH 12/13] Fix views.py

---
 kitsune/questions/views.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kitsune/questions/views.py b/kitsune/questions/views.py
index 77701fca85a..c8234581232 100644
--- a/kitsune/questions/views.py
+++ b/kitsune/questions/views.py
@@ -44,8 +44,8 @@
     CRASH_ID_LABEL,
     FREQUENCY_LABEL,
     FREQUENCY_CHOICES,
-    STARTED_LABEL,
     PLUGINS_LABEL,
+    STARTED_LABEL,
     AnswerForm,
     EditQuestionForm,
     NewQuestionForm,
@@ -1571,11 +1571,7 @@ def _answers_data(request, question_id, form=None, watch_form=None, answer_previ
         ),
     )
 
-    crash_id_label = CRASH_ID_LABEL
-    frequency_label = FREQUENCY_LABEL
     frequencies = dict(FREQUENCY_CHOICES)
-    started_label = STARTED_LABEL
-    plugins_label = PLUGINS_LABEL
 
     is_watching_question = request.user.is_authenticated and (
         QuestionReplyEvent.is_notifying(request.user, question)
@@ -1595,7 +1591,11 @@ def _answers_data(request, question_id, form=None, watch_form=None, answer_previ
         "answer_preview": answer_preview,
         "watch_form": watch_form or _init_watch_form(request, "reply"),
         "feeds": feed_urls,
+        "crash_id_label": CRASH_ID_LABEL,
+        "frequency_label": FREQUENCY_LABEL,
         "frequencies": frequencies,
+        "started_label": STARTED_LABEL,
+        "plugins_label": PLUGINS_LABEL,
         "is_watching_question": is_watching_question,
         "tags": tags,
         "tag_ids": {t.id for t in tags},

From 18fe1b00eaa26bd9d4e4e787dfcafe047e1c18b8 Mon Sep 17 00:00:00 2001
From: denyshon <denyshon@outlook.com>
Date: Sat, 10 Jan 2026 15:04:31 +0100
Subject: [PATCH 13/13] Fix linting

---
 kitsune/questions/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kitsune/questions/views.py b/kitsune/questions/views.py
index c8234581232..ac32f22cbd2 100644
--- a/kitsune/questions/views.py
+++ b/kitsune/questions/views.py
@@ -42,8 +42,8 @@
 from kitsune.questions.feeds import AnswersFeed, QuestionsFeed, TaggedQuestionsFeed
 from kitsune.questions.forms import (
     CRASH_ID_LABEL,
-    FREQUENCY_LABEL,
     FREQUENCY_CHOICES,
+    FREQUENCY_LABEL,
     PLUGINS_LABEL,
     STARTED_LABEL,
     AnswerForm,