src/Tests/BigPipePlaceholderTestCases.php                 | 4 ++--
 src/Tests/BigPipeTest.php                                 | 4 ++--
 tests/modules/big_pipe_test/src/BigPipeTestController.php | 6 +++---
 tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Tests/BigPipePlaceholderTestCases.php b/src/Tests/BigPipePlaceholderTestCases.php
index 6459631..3fd503c 100644
--- a/src/Tests/BigPipePlaceholderTestCases.php
+++ b/src/Tests/BigPipePlaceholderTestCases.php
@@ -260,7 +260,7 @@ class BigPipePlaceholderTestCases {
     $current_time->embeddedHtmlResponse = '<time datetime=1991-03-14"></time>';
 
 
-    // 6. Edge case: #lazy_builder that throws an exception.
+    // 6. Exception: #lazy_builder that throws an exception.
     $exception = new BigPipePlaceholderTestCase(
       [
         '#lazy_builder' => ['\Drupal\big_pipe_test\BigPipeTestController::exception', ['llamas', 'suck']],
@@ -306,7 +306,7 @@ class BigPipePlaceholderTestCases {
       'html_attribute_value_subset' => $csrf_token,
       'edge_case__invalid_html' => $hello,
       'edge_case__html_non_lazy_builder' => $current_time,
-      'edge_case__html_exception' => $exception,
+      'exception__lazy_builder' => $exception,
     ];
   }
 
diff --git a/src/Tests/BigPipeTest.php b/src/Tests/BigPipeTest.php
index dc84ca0..bc7b133 100644
--- a/src/Tests/BigPipeTest.php
+++ b/src/Tests/BigPipeTest.php
@@ -162,7 +162,7 @@ class BigPipeTest extends WebTestBase {
     $this->assertBigPipePlaceholders([
       $cases['html']->bigPipePlaceholderId                             => Json::encode($cases['html']->embeddedAjaxResponseCommands),
       $cases['edge_case__html_non_lazy_builder']->bigPipePlaceholderId => Json::encode($cases['edge_case__html_non_lazy_builder']->embeddedAjaxResponseCommands),
-      $cases['edge_case__html_exception']->bigPipePlaceholderId        => NULL,
+      $cases['exception__lazy_builder']->bigPipePlaceholderId          => NULL,
     ]);
 
     $this->pass('Verifying BigPipe assets are present…', 'Debug');
@@ -217,7 +217,7 @@ class BigPipeTest extends WebTestBase {
       $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholder       => $cases['html_attribute_value_subset']->embeddedHtmlResponse,
       $cases['html']->bigPipeNoJsPlaceholder                              => $cases['html']->embeddedHtmlResponse,
       $cases['edge_case__html_non_lazy_builder']->bigPipeNoJsPlaceholder  => $cases['edge_case__html_non_lazy_builder']->embeddedHtmlResponse,
-      $cases['edge_case__html_exception']->bigPipePlaceholderId           => NULL,
+      $cases['exception__lazy_builder']->bigPipePlaceholderId             => NULL,
     ]);
 
     $this->pass('Verifying there are no BigPipe placeholders & replacements…', 'Debug');
diff --git a/tests/modules/big_pipe_test/src/BigPipeTestController.php b/tests/modules/big_pipe_test/src/BigPipeTestController.php
index 6200929..a619c9a 100644
--- a/tests/modules/big_pipe_test/src/BigPipeTestController.php
+++ b/tests/modules/big_pipe_test/src/BigPipeTestController.php
@@ -34,8 +34,8 @@ class BigPipeTestController {
     // 5. Edge case: non-#lazy_builder placeholder.
     $build['edge_case__html_non_lazy_builder'] = $cases['edge_case__html_non_lazy_builder']->renderArray;
 
-    // 6. Edge case: #lazy_builder that throws an exception.
-    $build['edge_case__html_exception'] = $cases['edge_case__html_exception']->renderArray;
+    // 6. Exception: #lazy_builder that throws an exception.
+    $build['exception__lazy_builder'] = $cases['exception__lazy_builder']->renderArray;
 
     return $build;
   }
@@ -43,7 +43,7 @@ class BigPipeTestController {
   /**
    * @return array
    */
-  public function nope() {
+  public static function nope() {
     return ['#markup' => '<p>Nope.</p>'];
   }
 
diff --git a/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php b/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
index 04e0257..9765eb9 100644
--- a/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
+++ b/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
@@ -75,7 +75,7 @@ class BigPipeStrategyTest extends UnitTestCase {
       $cases['html_attribute_value_subset']->placeholder      => $cases['html_attribute_value_subset']->placeholderRenderArray,
       $cases['edge_case__invalid_html']->placeholder          => $cases['edge_case__invalid_html']->placeholderRenderArray,
       $cases['edge_case__html_non_lazy_builder']->placeholder => $cases['edge_case__html_non_lazy_builder']->placeholderRenderArray,
-      $cases['edge_case__html_exception']->placeholder        => $cases['edge_case__html_exception']->placeholderRenderArray,
+      $cases['exception__lazy_builder']->placeholder          => $cases['exception__lazy_builder']->placeholderRenderArray,
     ];
 
     return [
@@ -91,7 +91,7 @@ class BigPipeStrategyTest extends UnitTestCase {
         $cases['html_attribute_value_subset']->placeholder      => $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholderRenderArray,
         $cases['edge_case__invalid_html']->placeholder          => $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholderRenderArray,
         $cases['edge_case__html_non_lazy_builder']->placeholder => $cases['edge_case__html_non_lazy_builder']->bigPipePlaceholderRenderArray,
-        $cases['edge_case__html_exception']->placeholder        => $cases['edge_case__html_exception']->bigPipePlaceholderRenderArray,
+        $cases['exception__lazy_builder']->placeholder          => $cases['exception__lazy_builder']->bigPipePlaceholderRenderArray,
       ]],
       '_no_big_pipe absent, session, no-JS cookie present: no-JS BigPipe placeholder used for HTML placeholders' => [$placeholders, FALSE, TRUE, TRUE, [
         $cases['html']->placeholder                             => $cases['html']->bigPipeNoJsPlaceholderRenderArray,
@@ -99,7 +99,7 @@ class BigPipeStrategyTest extends UnitTestCase {
         $cases['html_attribute_value_subset']->placeholder      => $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholderRenderArray,
         $cases['edge_case__invalid_html']->placeholder          => $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholderRenderArray,
         $cases['edge_case__html_non_lazy_builder']->placeholder => $cases['edge_case__html_non_lazy_builder']->bigPipeNoJsPlaceholderRenderArray,
-        $cases['edge_case__html_exception']->placeholder        => $cases['edge_case__html_exception']->bigPipeNoJsPlaceholderRenderArray,
+        $cases['exception__lazy_builder']->placeholder          => $cases['exception__lazy_builder']->bigPipeNoJsPlaceholderRenderArray,
       ]],
     ];
   }