diff --git a/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Content/EventsCest.php b/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Content/EventsCest.php
index 10506444f..8288aa733 100644
--- a/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Content/EventsCest.php
+++ b/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Content/EventsCest.php
@@ -23,7 +23,8 @@ public function __construct() {
   /**
    * Mini calendar display.
    *
-   * @group mini-calendar
+   * @group events
+   * @group mini_calendar
    */
   public function testMiniCalendar(FunctionalTester $I) {
     $events = [];
diff --git a/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Content/StanfordNewsCest.php b/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Content/StanfordNewsCest.php
index 83d18a0bf..b8d5b6491 100644
--- a/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Content/StanfordNewsCest.php
+++ b/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Content/StanfordNewsCest.php
@@ -4,6 +4,9 @@
 
 /**
  * Test the news functionality.
+ *
+ * @group content
+ * @group news
  */
 class StanfordNewsCest {
 
diff --git a/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Contrib/ExtLinkCest.php b/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Contrib/ExtLinkCest.php
index e7942d3cf..ce4e0c2f3 100644
--- a/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Contrib/ExtLinkCest.php
+++ b/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Contrib/ExtLinkCest.php
@@ -6,6 +6,7 @@
 /**
  * Test the external link module functionality.
  *
+ * @group contrib
  * @group ext_links
  */
 class ExtLinkCest {
@@ -60,15 +61,6 @@ public function testExtLink(FunctionalTester $I) {
     $I->amOnPage('/admin/config/system/basic-site-settings');
     $I->uncheckOption('Hide External Link Icons');
 
-    $I->click('Site Contacts');
-    $I->waitForText('Site Owner Contact Email');
-    $I->fillField('Site Owner Contact Email (value 1)', $this->faker->email);
-    $I->fillField('Primary Site Manager Email (value 1)', $this->faker->email);
-    $I->fillField('Accessibility Contact Email (value 1)', $this->faker->email);
-    $I->selectOption('.js-form-item-su-site-org-0-target-id select.simpler-select', $org_term->id());
-    $I->click('Save');
-    $I->canSee('Site Settings has been', '.messages-list');
-
     $I->amOnPage('/admin/config/system/local-footer');
     $I->checkOption('#edit-su-footer-enabled-value');
     $I->click('#edit-group-primary-links summary');
@@ -93,13 +85,10 @@ public function testExtLink(FunctionalTester $I) {
 
     // Validate email links.
     $I->amOnPage('/');
-    $I->waitForElementVisible('a.mailto svg.mailto');
-    $I->canSeeNumberOfElements('a.mailto svg.mailto', 3);
 
     // External Links in the page-content region.
     $I->canSeeNumberOfElements('#page-content a.su-link--external svg.su-link--external', 1);
     // External links in the local footer.
     $I->canSeeNumberOfElements('.su-local-footer__cell2 a.su-link--external svg.su-link--external', 4);
   }
-
 }
diff --git a/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Navigation/NavigationDropDownsCest.php b/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Navigation/NavigationDropDownsCest.php
index b8db24a38..1db309d5d 100644
--- a/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Navigation/NavigationDropDownsCest.php
+++ b/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Navigation/NavigationDropDownsCest.php
@@ -57,15 +57,6 @@ public function testDropdownMenus(FunctionalTester $I) {
     $I->amOnPage('/admin/config/system/basic-site-settings');
     $I->uncheckOption('Use Drop Down Menus');
 
-    $I->click('Site Contacts');
-    $I->waitForText('Site Owner Contact Email');
-    $I->fillField('Site Owner Contact Email (value 1)', $this->faker->email);
-    $I->fillField('Primary Site Manager Email (value 1)', $this->faker->email);
-    $I->fillField('Accessibility Contact Email (value 1)', $this->faker->email);
-    $I->selectOption('.js-form-item-su-site-org-0-target-id select.simpler-select', $org_term->id());
-    $I->click('Save');
-    $I->canSee('Site Settings has been', '.messages-list');
-
     $I->amOnPage('/');
     $I->cantSeeElement('button', ['class' => 'su-nav-toggle']);
 
diff --git a/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Paragraphs/EntityReferenceCest.php b/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Paragraphs/EntityReferenceCest.php
index e34010e4e..85d331cb3 100644
--- a/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Paragraphs/EntityReferenceCest.php
+++ b/docroot/profiles/sdss/sdss_profile/tests/codeception/functional/Paragraphs/EntityReferenceCest.php
@@ -4,6 +4,8 @@
 
 /**
  * Class EntityReferenceCest.
+ *
+ * @group paragraphs
  */
 class EntityReferenceCest {