.../src/Kernel/EntityEmbedFilterOverridesTest.php  | 53 +++++++---------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/tests/src/Kernel/EntityEmbedFilterOverridesTest.php b/tests/src/Kernel/EntityEmbedFilterOverridesTest.php
index 7f18992..be54418 100644
--- a/tests/src/Kernel/EntityEmbedFilterOverridesTest.php
+++ b/tests/src/Kernel/EntityEmbedFilterOverridesTest.php
@@ -107,11 +107,6 @@ class EntityEmbedFilterOverridesTest extends EntityEmbedFilterTestBase {
     ]);
     $file->save();
 
-    $this->createNode([
-      'type' => 'article',
-      'title' => 'Red-lipped batfish',
-    ]);
-
     $media = Media::create([
       'bundle' => 'image',
       'name' => 'Screaming hairy armadillo',
@@ -125,36 +120,25 @@ class EntityEmbedFilterOverridesTest extends EntityEmbedFilterTestBase {
     ]);
     $media->save();
 
-    $input = $this->createEmbedCode([
-      'alt' => 'alt 1',
-      'title' => 'title 1',
-      'data-embed-button' => 'test_media_entity_embed',
+    $base = [
       'data-entity-embed-display' => 'view_mode:media.full',
       'data-entity-embed-display-settings' => '',
       'data-entity-type' => 'media',
       'data-entity-uuid' => $media->uuid(),
-      'data-langcode' => 'en',
-    ]);
+    ];
+    $input = $this->createEmbedCode($base);
+    $input .= $this->createEmbedCode([
+      'alt' => 'alt 1',
+      'title' => 'title 1',
+    ] + $base);
     $input .= $this->createEmbedCode([
       'alt' => 'alt 2',
       'title' => 'title 2',
-      'data-embed-button' => 'test_media_entity_embed',
-      'data-entity-embed-display' => 'view_mode:media.full',
-      'data-entity-embed-display-settings' => '',
-      'data-entity-type' => 'media',
-      'data-entity-uuid' => $media->uuid(),
-      'data-langcode' => 'en',
-    ]);
+    ] + $base);
     $input .= $this->createEmbedCode([
       'alt' => 'alt 3',
       'title' => 'title 3',
-      'data-embed-button' => 'test_media_entity_embed',
-      'data-entity-embed-display' => 'view_mode:media.full',
-      'data-entity-embed-display-settings' => '',
-      'data-entity-type' => 'media',
-      'data-entity-uuid' => $media->uuid(),
-      'data-langcode' => 'en',
-    ]);
+    ] + $base);
 
     /** @var \Drupal\filter\FilterProcessResult $filter_result */
     $filter_result = $this->filter->process($input, 'en');
@@ -164,23 +148,20 @@ class EntityEmbedFilterOverridesTest extends EntityEmbedFilterTestBase {
     $dom = Html::load($output);
     $xpath = new \DOMXPath($dom);
 
-    $img1 = $xpath->query("//img[contains(@alt, 'alt 1')]")[0];
-    $this->assertNotEmpty($img1);
-    $this->assertHasAttributes($img1, [
+    $img_nodes = $xpath->query("//img");
+    $this->assertSame(4, $img_nodes->length);
+    $this->assertHasAttributes($img_nodes[0], [
+      'alt' => 'default alt',
+    ]);
+    $this->assertHasAttributes($img_nodes[1], [
       'alt' => 'alt 1',
       'title' => 'title 1',
     ]);
-
-    $img2 = $xpath->query("//img[contains(@alt, 'alt 2')]")[0];
-    $this->assertNotEmpty($img2);
-    $this->assertHasAttributes($img2, [
+    $this->assertHasAttributes($img_nodes[2], [
       'alt' => 'alt 2',
       'title' => 'title 2',
     ]);
-
-    $img3 = $xpath->query("//img[contains(@alt, 'alt 3')]")[0];
-    $this->assertNotEmpty($img3);
-    $this->assertHasAttributes($img3, [
+    $this->assertHasAttributes($img_nodes[3], [
       'alt' => 'alt 3',
       'title' => 'title 3',
     ]);