diff --git a/amp.install b/amp.install
index 8465930..4aef3de 100644
--- a/amp.install
+++ b/amp.install
@@ -163,7 +163,7 @@ function amp_update_8005() {
         'targetEntityType' => 'node',
         'bundle' => $bundle
       );
-      if ($view_displays = \Drupal::entityManager()->getStorage('entity_view_display')->loadByProperties($properties)) {
+      if ($view_displays = \Drupal::entityTypeManager()->getStorage('entity_view_display')->loadByProperties($properties)) {
         foreach ($view_displays as $view_display) {
           if ($component = $view_display->getComponent($field_name)) {
             // Map old formatter settings to new ones.
@@ -202,7 +202,7 @@ function amp_update_8005() {
         'targetEntityType' => 'node',
         'bundle' => $bundle
       );
-      if ($view_displays = \Drupal::entityManager()->getStorage('entity_view_display')->loadByProperties($properties)) {
+      if ($view_displays = \Drupal::entityTypeManager()->getStorage('entity_view_display')->loadByProperties($properties)) {
         foreach ($view_displays as $view_display) {
           if ($component = $view_display->getComponent($field_name)) {
             // Map old formatter settings to new ones.
diff --git a/composer.json b/composer.json
index 08a0a9d..40c64f8 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,7 @@
     "lullabot/amp": "^1.0.0"
   },
   "require-dev": {
-    "drupal/amptheme": "^3.0"
+    "drupal/amptheme": "^3.0",
+    "phpunit/phpunit": "^4.8.35 || ^6.5"
   }
 }
diff --git a/modules/amp_adsense/tests/src/Functional/BasicTestCase.php b/modules/amp_adsense/tests/src/Functional/BasicTestCase.php
new file mode 100644
index 0000000..77437bf
--- /dev/null
+++ b/modules/amp_adsense/tests/src/Functional/BasicTestCase.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Drupal\Tests\amp_adsense\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Test basic functionality of AMP Adsense Module.
+ *
+ * @group amp_adsense
+ */
+class BasicTestCase extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'amp',
+    'amp_adsense',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    // Make sure to complete the normal setup steps first.
+    parent::setUp();
+
+    // Set the front page to "node".
+    \Drupal::configFactory()
+      ->getEditable('system.site')
+      ->set('page.front', '/node')
+      ->save(TRUE);
+  }
+
+  /**
+   * Make sure the site still works. For now just check the front page.
+   */
+  public function testTheSiteStillWorks() {
+    // Load the front page.
+    $this->drupalGet('<front>');
+
+    // Confirm that the site didn't throw a server error or something else.
+    $this->assertSession()->statusCodeEquals(200);
+
+    // Confirm that the front page contains the standard text.
+    $this->assertText('Welcome to Drupal');
+  }
+
+}
diff --git a/modules/amp_rdf/amp_rdf.module b/modules/amp_rdf/amp_rdf.module
index 3070dc4..17c9149 100644
--- a/modules/amp_rdf/amp_rdf.module
+++ b/modules/amp_rdf/amp_rdf.module
@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Core\Template\Attribute
+use Drupal\Core\Template\Attribute;
 
 /**
 * Implements hook_preprocess_html() for HTML document templates.
diff --git a/modules/amp_rdf/tests/src/Functional/BasicTestCase.php b/modules/amp_rdf/tests/src/Functional/BasicTestCase.php
new file mode 100644
index 0000000..897768d
--- /dev/null
+++ b/modules/amp_rdf/tests/src/Functional/BasicTestCase.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\Tests\amp_rdf\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Test basic functionality of AMP RDF Module.
+ *
+ * @group amp_rdf
+ */
+class BasicTestCase extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'rdf',
+    'amp',
+    'amp_rdf',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    // Make sure to complete the normal setup steps first.
+    parent::setUp();
+
+    // Set the front page to "node".
+    \Drupal::configFactory()
+      ->getEditable('system.site')
+      ->set('page.front', '/node')
+      ->save(TRUE);
+  }
+
+  /**
+   * Make sure the site still works. For now just check the front page.
+   */
+  public function testTheSiteStillWorks() {
+    // Load the front page.
+    $this->drupalGet('<front>');
+
+    // Confirm that the site didn't throw a server error or something else.
+    $this->assertSession()->statusCodeEquals(200);
+
+    // Confirm that the front page contains the standard text.
+    $this->assertText('Welcome to Drupal');
+  }
+
+}
diff --git a/modules/amp_toolbar/tests/src/Functional/BasicTestCase.php b/modules/amp_toolbar/tests/src/Functional/BasicTestCase.php
new file mode 100644
index 0000000..ccd3130
--- /dev/null
+++ b/modules/amp_toolbar/tests/src/Functional/BasicTestCase.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\Tests\amp_toolbar\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Test basic functionality of AMP Toolbar Module.
+ *
+ * @group amp_toolbar
+ */
+class BasicTestCase extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'toolbar',
+    'amp',
+    'amp_toolbar',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    // Make sure to complete the normal setup steps first.
+    parent::setUp();
+
+    // Set the front page to "node".
+    \Drupal::configFactory()
+      ->getEditable('system.site')
+      ->set('page.front', '/node')
+      ->save(TRUE);
+  }
+
+  /**
+   * Make sure the site still works. For now just check the front page.
+   */
+  public function testTheSiteStillWorks() {
+    // Load the front page.
+    $this->drupalGet('<front>');
+
+    // Confirm that the site didn't throw a server error or something else.
+    $this->assertSession()->statusCodeEquals(200);
+
+    // Confirm that the front page contains the standard text.
+    $this->assertText('Welcome to Drupal');
+  }
+
+}
diff --git a/tests/src/Functional/BasicTestCase.php b/tests/src/Functional/BasicTestCase.php
new file mode 100644
index 0000000..0a9ca4f
--- /dev/null
+++ b/tests/src/Functional/BasicTestCase.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Drupal\Tests\amp\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Test basic functionality of AMP module.
+ *
+ * @group amp
+ */
+class BasicTestCase extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'amp',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    // Make sure to complete the normal setup steps first.
+    parent::setUp();
+
+    // Set the front page to "node".
+    \Drupal::configFactory()
+      ->getEditable('system.site')
+      ->set('page.front', '/node')
+      ->save(TRUE);
+  }
+
+  /**
+   * Make sure the site still works. For now just check the front page.
+   */
+  public function testTheSiteStillWorks() {
+    // Load the front page.
+    $this->drupalGet('<front>');
+
+    // Confirm that the site didn't throw a server error or something else.
+    $this->assertSession()->statusCodeEquals(200);
+
+    // Confirm that the front page contains the standard text.
+    $this->assertText('Welcome to Drupal');
+  }
+
+}