diff --git a/modules/localgov_review_date/tests/src/Functional/AdminSettingsTest.php b/modules/localgov_review_date/tests/src/Functional/AdminSettingsTest.php
index b8d41a9..0200449 100644
--- a/modules/localgov_review_date/tests/src/Functional/AdminSettingsTest.php
+++ b/modules/localgov_review_date/tests/src/Functional/AdminSettingsTest.php
@@ -3,8 +3,8 @@
 namespace Drupal\Tests\localgov_review_date\Functional;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\scheduled_transitions\Form\ScheduledTransitionsSettingsForm;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\scheduled_transitions\Form\ScheduledTransitionsSettingsForm;
 use Drupal\workflows\Entity\Workflow;
 
 /**
diff --git a/modules/localgov_review_date/tests/src/Functional/ArchiveNodeTest.php b/modules/localgov_review_date/tests/src/Functional/ArchiveNodeTest.php
index 919eaf1..9fc3548 100644
--- a/modules/localgov_review_date/tests/src/Functional/ArchiveNodeTest.php
+++ b/modules/localgov_review_date/tests/src/Functional/ArchiveNodeTest.php
@@ -3,8 +3,8 @@
 namespace Drupal\Tests\localgov_review_date\Functional;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\scheduled_transitions\Form\ScheduledTransitionsSettingsForm;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\scheduled_transitions\Form\ScheduledTransitionsSettingsForm;
 use Drupal\workflows\Entity\Workflow;
 
 /**
diff --git a/modules/localgov_review_date/tests/src/Functional/NodeFormTest.php b/modules/localgov_review_date/tests/src/Functional/NodeFormTest.php
index 1593ff3..4dc5f3e 100644
--- a/modules/localgov_review_date/tests/src/Functional/NodeFormTest.php
+++ b/modules/localgov_review_date/tests/src/Functional/NodeFormTest.php
@@ -2,9 +2,9 @@
 
 namespace Drupal\Tests\localgov_review_date\Functional;
 
+use Drupal\Tests\BrowserTestBase;
 use Drupal\localgov_review_date\Entity\ReviewDate;
 use Drupal\scheduled_transitions\Entity\ScheduledTransition;
-use Drupal\Tests\BrowserTestBase;
 use Drupal\workflows\Entity\Workflow;
 
 /**
diff --git a/modules/localgov_review_date/tests/src/Functional/NodeTranslationTest.php b/modules/localgov_review_date/tests/src/Functional/NodeTranslationTest.php
index 98921eb..f844a82 100644
--- a/modules/localgov_review_date/tests/src/Functional/NodeTranslationTest.php
+++ b/modules/localgov_review_date/tests/src/Functional/NodeTranslationTest.php
@@ -3,9 +3,9 @@
 namespace Drupal\Tests\localgov_review_date\Functional;
 
 use Drupal\Core\Cache\Cache;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\localgov_review_date\Entity\ReviewDate;
 use Drupal\scheduled_transitions\Form\ScheduledTransitionsSettingsForm;
-use Drupal\Tests\BrowserTestBase;
 use Drupal\workflows\Entity\Workflow;
 
 /**
diff --git a/modules/localgov_review_date/tests/src/Functional/RoleAccessTest.php b/modules/localgov_review_date/tests/src/Functional/RoleAccessTest.php
index d625fa2..61203ec 100644
--- a/modules/localgov_review_date/tests/src/Functional/RoleAccessTest.php
+++ b/modules/localgov_review_date/tests/src/Functional/RoleAccessTest.php
@@ -2,10 +2,10 @@
 
 namespace Drupal\Tests\localgov_review_date\Functional;
 
-use Drupal\localgov_roles\RolesHelper;
-use Drupal\node\NodeInterface;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\Tests\node\Traits\NodeCreationTrait;
+use Drupal\localgov_roles\RolesHelper;
+use Drupal\node\NodeInterface;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
diff --git a/modules/localgov_review_date/tests/src/Kernel/ReviewDateEntityTest.php b/modules/localgov_review_date/tests/src/Kernel/ReviewDateEntityTest.php
index 383c90c..d57770a 100644
--- a/modules/localgov_review_date/tests/src/Kernel/ReviewDateEntityTest.php
+++ b/modules/localgov_review_date/tests/src/Kernel/ReviewDateEntityTest.php
@@ -4,11 +4,11 @@
 
 use Drupal\Core\Cache\Cache;
 use Drupal\KernelTests\KernelTestBase;
+use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
+use Drupal\Tests\node\Traits\NodeCreationTrait;
 use Drupal\localgov_review_date\Entity\ReviewDate;
 use Drupal\scheduled_transitions\Entity\ScheduledTransition;
 use Drupal\scheduled_transitions\Form\ScheduledTransitionsSettingsForm;
-use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
-use Drupal\Tests\node\Traits\NodeCreationTrait;
 use Drupal\workflows\Entity\Workflow;
 
 /**
diff --git a/modules/localgov_workflows_notifications/src/Plugin/EmailBuilder/WorkflowNotificationEmailBuilder.php b/modules/localgov_workflows_notifications/src/Plugin/EmailBuilder/WorkflowNotificationEmailBuilder.php
index 89a9fc0..708864c 100644
--- a/modules/localgov_workflows_notifications/src/Plugin/EmailBuilder/WorkflowNotificationEmailBuilder.php
+++ b/modules/localgov_workflows_notifications/src/Plugin/EmailBuilder/WorkflowNotificationEmailBuilder.php
@@ -32,7 +32,7 @@ class WorkflowNotificationEmailBuilder extends EmailBuilderBase {
    * @param \Drupal\Core\Entity\ContentEntityInterface[] $entities
    *   Entities to notify about.
    */
-  public function createParams(EmailInterface $email, LocalgovServiceContactInterface $service_contact = NULL, array $entities = []): void {
+  public function createParams(EmailInterface $email, ?LocalgovServiceContactInterface $service_contact = NULL, array $entities = []): void {
 
     $email->setParam('entities', $entities);
     $email->setParam('service_contact', $service_contact);
diff --git a/modules/localgov_workflows_notifications/tests/src/Functional/ServiceContactWidgetTest.php b/modules/localgov_workflows_notifications/tests/src/Functional/ServiceContactWidgetTest.php
index 3b7eb58..c950476 100644
--- a/modules/localgov_workflows_notifications/tests/src/Functional/ServiceContactWidgetTest.php
+++ b/modules/localgov_workflows_notifications/tests/src/Functional/ServiceContactWidgetTest.php
@@ -2,9 +2,9 @@
 
 namespace Drupal\Tests\localgov_workflows_notifications\Functional;
 
+use Drupal\Tests\BrowserTestBase;
 use Drupal\localgov_workflows_notifications\Entity\LocalgovServiceContact;
 use Drupal\node\Entity\Node;
-use Drupal\Tests\BrowserTestBase;
 
 /**
  * Test service contact widget.
diff --git a/modules/localgov_workflows_notifications/tests/src/Functional/WorkflowNotificationSettingsTest.php b/modules/localgov_workflows_notifications/tests/src/Functional/WorkflowNotificationSettingsTest.php
index 5451059..6d1f362 100644
--- a/modules/localgov_workflows_notifications/tests/src/Functional/WorkflowNotificationSettingsTest.php
+++ b/modules/localgov_workflows_notifications/tests/src/Functional/WorkflowNotificationSettingsTest.php
@@ -3,8 +3,8 @@
 namespace Drupal\Tests\localgov_workflows_notifications\Functional;
 
 use Drupal\Core\State\StateInterface;
-use Drupal\localgov_workflows_notifications\NotificationTimerInterface;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\localgov_workflows_notifications\NotificationTimerInterface;
 
 /**
  * Test settings form.
diff --git a/modules/localgov_workflows_notifications/tests/src/Kernel/ReviewNotificationCronHookTest.php b/modules/localgov_workflows_notifications/tests/src/Kernel/ReviewNotificationCronHookTest.php
index c18fd8d..72bf94e 100644
--- a/modules/localgov_workflows_notifications/tests/src/Kernel/ReviewNotificationCronHookTest.php
+++ b/modules/localgov_workflows_notifications/tests/src/Kernel/ReviewNotificationCronHookTest.php
@@ -4,12 +4,12 @@
 
 use Drupal\Core\Queue\QueueInterface;
 use Drupal\KernelTests\KernelTestBase;
+use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
+use Drupal\Tests\node\Traits\NodeCreationTrait;
 use Drupal\localgov_workflows_notifications\Entity\LocalgovServiceContact;
 use Drupal\localgov_workflows_notifications\NotificationTimerInterface;
 use Drupal\localgov_workflows_notifications\Plugin\QueueWorker\EmailNotificationQueueWorker;
 use Drupal\node\Entity\Node;
-use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
-use Drupal\Tests\node\Traits\NodeCreationTrait;
 
 /**
  * Test the cron hook queuing review notifications.
diff --git a/modules/localgov_workflows_notifications/tests/src/Kernel/ReviewNotificationEmailTest.php b/modules/localgov_workflows_notifications/tests/src/Kernel/ReviewNotificationEmailTest.php
index 808549a..efb9841 100644
--- a/modules/localgov_workflows_notifications/tests/src/Kernel/ReviewNotificationEmailTest.php
+++ b/modules/localgov_workflows_notifications/tests/src/Kernel/ReviewNotificationEmailTest.php
@@ -4,11 +4,11 @@
 
 use Drupal\Core\Queue\QueueInterface;
 use Drupal\KernelTests\KernelTestBase;
+use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
+use Drupal\Tests\node\Traits\NodeCreationTrait;
 use Drupal\localgov_workflows_notifications\Entity\LocalgovServiceContact;
 use Drupal\localgov_workflows_notifications\Plugin\QueueWorker\EmailNotificationQueueWorker;
 use Drupal\symfony_mailer_test\MailerTestTrait;
-use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
-use Drupal\Tests\node\Traits\NodeCreationTrait;
 
 /**
  * Test the review notification email.
diff --git a/modules/localgov_workflows_notifications/tests/src/Kernel/WorkflowNotificationTest.php b/modules/localgov_workflows_notifications/tests/src/Kernel/WorkflowNotificationTest.php
index 9aab9c6..d79da9b 100644
--- a/modules/localgov_workflows_notifications/tests/src/Kernel/WorkflowNotificationTest.php
+++ b/modules/localgov_workflows_notifications/tests/src/Kernel/WorkflowNotificationTest.php
@@ -4,11 +4,11 @@
 
 use Drupal\Core\Queue\QueueInterface;
 use Drupal\KernelTests\KernelTestBase;
+use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
+use Drupal\Tests\node\Traits\NodeCreationTrait;
 use Drupal\localgov_workflows_notifications\Entity\LocalgovServiceContact;
 use Drupal\localgov_workflows_notifications\Plugin\QueueWorker\EmailNotificationQueueWorker;
 use Drupal\localgov_workflows_notifications\WorkflowNotification;
-use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
-use Drupal\Tests\node\Traits\NodeCreationTrait;
 
 /**
  * Test the workflow notification service.
diff --git a/tests/src/Functional/ApprovalsDashboardTest.php b/tests/src/Functional/ApprovalsDashboardTest.php
index 644bcb8..393d640 100644
--- a/tests/src/Functional/ApprovalsDashboardTest.php
+++ b/tests/src/Functional/ApprovalsDashboardTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\localgov_workflows\Functional;
 
-use Drupal\localgov_roles\RolesHelper;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\localgov_roles\RolesHelper;
 use Drupal\workflows\Entity\Workflow;
 
 /**
diff --git a/tests/src/Functional/WorkflowsAccessTest.php b/tests/src/Functional/WorkflowsAccessTest.php
index 1d752e7..43678b6 100644
--- a/tests/src/Functional/WorkflowsAccessTest.php
+++ b/tests/src/Functional/WorkflowsAccessTest.php
@@ -2,9 +2,9 @@
 
 namespace Drupal\Tests\localgov_workflows\Functional;
 
+use Drupal\Tests\BrowserTestBase;
 use Drupal\localgov_roles\RolesHelper;
 use Drupal\node\NodeInterface;
-use Drupal\Tests\BrowserTestBase;
 use Drupal\workflows\Entity\Workflow;
 
 /**
diff --git a/tests/src/Kernel/WorkflowsScheduledTransitionsTest.php b/tests/src/Kernel/WorkflowsScheduledTransitionsTest.php
index f10b1b3..bc053b3 100644
--- a/tests/src/Kernel/WorkflowsScheduledTransitionsTest.php
+++ b/tests/src/Kernel/WorkflowsScheduledTransitionsTest.php
@@ -3,9 +3,9 @@
 namespace Drupal\Tests\localgov_workflows\Kernel;
 
 use Drupal\KernelTests\KernelTestBase;
-use Drupal\scheduled_transitions\Entity\ScheduledTransition;
 use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
 use Drupal\Tests\node\Traits\NodeCreationTrait;
+use Drupal\scheduled_transitions\Entity\ScheduledTransition;
 use Drupal\workflows\Entity\Workflow;
 
 /**