diff --git a/tests/src/Functional/AmpFormatterTest.php b/tests/src/Functional/AmpFormatterTest.php
index 14d2035..278d21a 100644
--- a/tests/src/Functional/AmpFormatterTest.php
+++ b/tests/src/Functional/AmpFormatterTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\amp\Functional;
 use Drupal\Core\Url;
 use Drupal\node\Entity\Node;
 use Drupal\simpletest\ContentTypeCreationTrait;
+use Drupal\simpletest\TestFileCreationTrait;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -15,6 +16,7 @@ use Drupal\Tests\BrowserTestBase;
 class AmpFormatterTest extends BrowserTestBase {
 
   use ContentTypeCreationTrait;
+  use TestFileCreationTrait;
 
   /**
    * Modules to enable.
@@ -28,6 +30,7 @@ class AmpFormatterTest extends BrowserTestBase {
     'field_ui',
     'quickedit',
     'composer_manager',
+    'token',
   ];
 
   /**
@@ -79,7 +82,7 @@ class AmpFormatterTest extends BrowserTestBase {
     // Create a node to test AMP field formatters.
     $node = Node::create([
       'type' => 'article',
-      'title' => $this->randomMachineName(),
+      'title' => 'Hello AMP',
       'body' => 'AMP test body',
     ]);
     $node->save();
@@ -106,14 +109,14 @@ class AmpFormatterTest extends BrowserTestBase {
     $amp_node_url = $amp_node_url . "?amp";
     $this->drupalGet($node_url);
     $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('AMP test body');
+    $this->assertSession()->pageTextContains($node->body->value);
     $this->assertSession()->responseContains('data-quickedit-field-id="node/1/body/en/full"');
     $this->assertSession()->responseContains('link rel="amphtml" href="' . $amp_node_url . '"');
 
     // Check the metadata of the AMP display mode.
     $this->drupalGet($amp_node_url);
     $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('AMP test body');
+    $this->assertSession()->pageTextContains($node->body->value);
     $this->assertSession()->responseContains('data-quickedit-field-id="node/1/body/en/amp"');
     $this->assertSession()->responseContains('link rel="canonical" href="' . $node_url . '"');
 
@@ -128,9 +131,50 @@ class AmpFormatterTest extends BrowserTestBase {
     // Test the warnfix parameter.
     $this->drupalGet($amp_node_url . "&warnfix");
     $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('AMP test body');
+    $this->assertSession()->pageTextContains($node->body->value);
     $this->assertSession()->pageTextContains('AMP-HTML Validation Issues and Fixes');
     $this->assertSession()->pageTextContains('-------------------------------------');
     $this->assertSession()->pageTextContains('PASS');
+
+    // Configure AMP metadata.
+    $amp_metadata_add = Url::fromRoute('entity.amp_metadata.add_form')->toString();
+    $this->drupalGet($amp_metadata_add);
+    $this->assertSession()->statusCodeEquals(200);
+    // Create a new image.
+    $image = current($this->drupalGetTestFiles('image'));
+    $edit = [
+      "amp_organization_name" => 'Excellent AMP Organization',
+      "files[amp_organization_logo_fid_new]" => drupal_realpath($image->uri),
+      "amp_content_schema_type" => "NewsArticle",
+      // Check that a token works, too.
+      "amp_content_headline" => "[node:title]",
+      "amp_content_author" => "Every Author Name",
+      "amp_content_description" => "Every single description",
+      "amp_content_image" => drupal_realpath($image->uri),
+    ];
+    $this->submitForm($edit, t('Save'));
+
+    // Test for the AMP metadata.
+    $this->drupalGet($amp_node_url);
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->responseContains('"@context": "http://schema.org",');
+    $this->assertSession()->responseContains('"@type": "NewsArticle",');
+    $this->assertSession()->responseContains('"mainEntityOfPage": {');
+    $this->assertSession()->responseContains('"@type": "WebPage",');
+    $this->assertSession()->responseContains('"@id": "' . $node_url . '"');
+    $this->assertSession()->responseContains('"headline": "Hello AMP"');
+    $this->assertSession()->responseContains('"author": {');
+    $this->assertSession()->responseContains('"@type": "Person",');
+    $this->assertSession()->responseContains('"name": "Every Author Name"');
+    $this->assertSession()->responseContains('"description": "Every single description",');
+    $this->assertSession()->responseContains('"publisher": {');
+    $this->assertSession()->responseContains('"@type": "Organization",');
+    $this->assertSession()->responseContains('"name": "Excellent AMP Organization",');
+    $this->assertSession()->responseContains('"logo": {');
+    $this->assertSession()->responseContains('"@type": "ImageObject",');
+    $this->assertSession()->responseContains($image->filename);
+    $image_file = $this->container->get('image.factory')->get($image->uri);
+    $this->assertSession()->responseContains('"height": ' . $image_file->getHeight());
+    $this->assertSession()->responseContains('"width": ' . $image_file->getWidth());
   }
 }