diff --git a/UPDATE.md b/UPDATE.md
index 92e1ffe1e..8fbe590e4 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -54,6 +54,32 @@ use. For example, if you are currently running Beta 1 and are trying to update
 to Beta 3, you will need to follow the instructions for updating from Beta 1 to
 Beta 2, then from Beta 2 to Beta 3, in that order.
 
+## 2.1.5 to 2.1.6
+This version of Lightning adds the ability to choose an image style, alt text,
+and other settings each time you embed an image in a WYSIWYG editor, rather
+that needing to rely on view modes. To enable this functionality:
+
+1. As always, visit ```update.php``` or run ```drush updatedb``` to perform
+   database updates.
+1. Clear all caches.
+1. Under *Configuration > Content Authoring > Text formats and editors*,
+   configure the **Rich Text** filter format. Under "Filter settings", open the
+   tab labeled "Limit allowed HTML tags and correct faulty HTML".
+1. In the "Allowed HTML tags" text field, you should see a tag like
+   `<drupal-entity data-*>`. Change it to `<drupal-entity data-* alt title>`.
+1. Save the filter format.
+1. Under *Configuration > Content Authoring > Text editor embed buttons*,  edit
+   the "Media browser" embed button.
+1. Under "Allowed Entity Embed Display plugins", ensure that the "Media Image"
+   checkbox is checked.
+1. Save the embed button.
+1. If you would like to allow authors to choose how embedded media should be
+   displayed, go to *Configuration > System > Lightning > Media*, ensure that
+   the box labeled "Allow users to choose how to display embedded media" is
+   checked, then submit the form. If the box is not checked, Lightning will
+   automatically choose a preferred display method (the recommended, default
+   behavior).
+
 ## 2.1.4 to 2.1.5
 There are no manual update steps for this version.
 
diff --git a/lightning.install b/lightning.install
index 2e0df1a76..4906e59a8 100644
--- a/lightning.install
+++ b/lightning.install
@@ -7,6 +7,7 @@
 
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\field\Entity\FieldConfig;
+use Drupal\lightning_core\ConfigHelper as Config;
 use Drupal\user\Entity\User;
 use Drupal\user\RoleInterface;
 
@@ -457,7 +458,8 @@ function lightning_update_8001() {
   // Install the body field on the basic block_content type.
   $field = FieldConfig::load('block_content.basic.body');
   if (empty($field)) {
-    lightning_core_create_config('field_config', 'block_content.basic.body', 'lightning');
+    $config = Config::forModule('lightning');
+    $config->getEntity('field_config', 'block_content.basic.body')->save();
 
     $display = EntityViewDisplay::load('block_content.basic.default');
     if ($display) {
@@ -471,7 +473,7 @@ function lightning_update_8001() {
       ])->save();
     }
     else {
-      lightning_core_create_config('entity_view_display', 'block_content.basic.default', 'lightning');
+      $config->getEntity('entity_view_display', 'block_content.basic.default')->save();
     }
   }
 
diff --git a/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.install b/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.install
index e1a50129e..5975fbb0c 100644
--- a/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.install
+++ b/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.install
@@ -5,9 +5,11 @@
  * Contains installation and update routines for Lightning Dev.
  */
 
+use Drupal\embed\Entity\EmbedButton;
 use Drupal\entity_browser\Entity\EntityBrowser;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\filter\Entity\FilterFormat;
 use Drupal\lightning_core\ConfigHelper as Config;
 use Drupal\media_entity\Entity\MediaBundle;
 use Drupal\scheduled_updates\Entity\ScheduledUpdateType;
@@ -192,3 +194,20 @@ function lightning_dev_update_8005() {
   $display['display_options']['filters']['bundle']['expose']['argument'] = 'bundle';
   $view->save();
 }
+
+/**
+ * Executes manual updates for Lightning 2.1.5 --> 2.1.6.
+ */
+function lightning_dev_update_8006() {
+  \Drupal::service('plugin.manager.embed.type')->clearCachedDefinitions();
+
+  $button = EmbedButton::load('media_browser');
+  $settings = $button->getTypeSettings();
+  $settings['display_plugins'][] = 'media_image';
+  $button->set('type_settings', $settings)->save();
+
+  $format = FilterFormat::load('rich_text');
+  $configuration = $format->filters('filter_html')->getConfiguration();
+  $configuration['settings']['allowed_html'] = str_replace('<drupal-entity data-*>', '<drupal-entity data-* title alt>', $configuration['settings']['allowed_html']);
+  $format->setFilterConfig('filter_html', $configuration)->save();
+}
diff --git a/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.install b/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.install
index 5b29b7c9f..607e4511d 100644
--- a/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.install
+++ b/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.install
@@ -81,21 +81,6 @@ function lightning_test_install() {
       ],
       'region' => 'content',
     ])
-    ->setComponent('field_z_image', [
-      'type' => 'entity_browser_entity_reference',
-      'settings' => [
-        'entity_browser' => 'media_browser',
-        'field_widget_display' => 'rendered_entity',
-        'field_widget_edit' => TRUE,
-        'field_widget_remove' => TRUE,
-        'selection_mode' => EntityBrowserElement::SELECTION_MODE_APPEND,
-        'field_widget_display_settings' => [
-          'view_mode' => 'embedded',
-        ],
-        'open' => TRUE,
-      ],
-      'region' => 'content',
-    ])
     ->save();
 
   $display = entity_get_form_display('media', 'video', 'default');
@@ -144,9 +129,4 @@ function lightning_test_uninstall() {
     }
   }
   $state->delete('_fields');
-
-  \Drupal::entityTypeManager()
-    ->getStorage('media_bundle')
-    ->load('z_image')
-    ->delete();
 }
diff --git a/modules/lightning_features/lightning_core/src/ConfigHelper.php b/modules/lightning_features/lightning_core/src/ConfigHelper.php
index b1edd0819..84dd6d444 100644
--- a/modules/lightning_features/lightning_core/src/ConfigHelper.php
+++ b/modules/lightning_features/lightning_core/src/ConfigHelper.php
@@ -128,7 +128,7 @@ public function delete($id) {
       if (Unicode::strpos($id, $prefix) === 0) {
         $entity = $this->getEntity(
           $entity_type,
-          Unicode::substr($id, Unicode::strlen($prefix) + 1)
+          Unicode::substr($id, Unicode::strlen($prefix))
         );
         return $entity->delete();
       }
diff --git a/modules/lightning_features/lightning_media/config/install/embed.button.media_browser.yml b/modules/lightning_features/lightning_media/config/install/embed.button.media_browser.yml
index d28da8f3b..c389e0b70 100644
--- a/modules/lightning_features/lightning_media/config/install/embed.button.media_browser.yml
+++ b/modules/lightning_features/lightning_media/config/install/embed.button.media_browser.yml
@@ -12,6 +12,7 @@ type_settings:
   bundles: {  }
   display_plugins:
     - 'entity_reference:entity_reference_entity_view'
+    - media_image
   entity_browser: media_browser
   entity_browser_settings:
     display_review: false
diff --git a/modules/lightning_features/lightning_media/config/install/filter.format.rich_text.yml b/modules/lightning_features/lightning_media/config/install/filter.format.rich_text.yml
index 4155bb9a2..98581f9f5 100644
--- a/modules/lightning_features/lightning_media/config/install/filter.format.rich_text.yml
+++ b/modules/lightning_features/lightning_media/config/install/filter.format.rich_text.yml
@@ -4,8 +4,6 @@ dependencies:
   module:
     - editor
     - entity_embed
-_core:
-  default_config_hash: ba3RWDN1-BRYH1z2GlIchbXVWirdh7mDbsjSmbCmbIw
 name: 'Rich Text'
 format: rich_text
 weight: 1
@@ -46,7 +44,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <s> <sup> <sub> <img src alt data-entity-type data-entity-uuid data-align data-caption> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <p> <br> <h1> <pre> <drupal-entity data-*>'
+      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <s> <sup> <sub> <img src alt data-entity-type data-entity-uuid data-align data-caption> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <p> <br> <h1> <pre> <drupal-entity data-* title alt>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_autop:
diff --git a/modules/lightning_features/lightning_media/config/install/lightning_media.settings.yml b/modules/lightning_features/lightning_media/config/install/lightning_media.settings.yml
new file mode 100644
index 000000000..4d58dc282
--- /dev/null
+++ b/modules/lightning_features/lightning_media/config/install/lightning_media.settings.yml
@@ -0,0 +1,2 @@
+entity_embed:
+  choose_display: false
diff --git a/modules/lightning_features/lightning_media/config/schema/lightning_media.schema.yml b/modules/lightning_features/lightning_media/config/schema/lightning_media.schema.yml
index 159d7782c..26663921b 100644
--- a/modules/lightning_features/lightning_media/config/schema/lightning_media.schema.yml
+++ b/modules/lightning_features/lightning_media/config/schema/lightning_media.schema.yml
@@ -1,3 +1,15 @@
+lightning_media.settings:
+  type: config_object
+  label: 'Lightning Media settings'
+  mapping:
+    entity_embed:
+      type: mapping
+      label: 'Entity Embed settings'
+      mapping:
+        choose_display:
+          type: boolean
+          label: 'Allow user to choose display plugin for embedded media'
+
 entity_browser.browser.widget.embed_code:
   type: mapping
   label: 'Embed code widget settings'
diff --git a/modules/lightning_features/lightning_media/lightning_media.install b/modules/lightning_features/lightning_media/lightning_media.install
index 147a8e4d4..98172709a 100644
--- a/modules/lightning_features/lightning_media/lightning_media.install
+++ b/modules/lightning_features/lightning_media/lightning_media.install
@@ -264,15 +264,25 @@ function lightning_media_update_8015() {
     ->save();
 }
 
+/**
+ * Creates the lightning_media.settings config object.
+ */
+function lightning_media_update_8016() {
+  Config::forModule('lightning_media')
+    ->get('lightning_media.settings')
+    // The default value of this setting changes the behavior of the Entity
+    // Embed dialog. Rather than break an existing workflow, change the new
+    // configuration to preserve the old behavior.
+    ->set('entity_embed.choose_display', TRUE)
+    ->save();
+}
+
 /**
  * Implements hook_update_dependencies().
  */
 function lightning_media_update_dependencies() {
   return [
     'lightning_media' => [
-      8004 => [
-        'lightning' => 8002,
-      ],
       // 8012 adds the field_media_in_library filter to the Entity Browser
       // display of the media view, which is created by 8008.
       8012 => [
diff --git a/modules/lightning_features/lightning_media/lightning_media.links.task.yml b/modules/lightning_features/lightning_media/lightning_media.links.task.yml
new file mode 100644
index 000000000..445a757bb
--- /dev/null
+++ b/modules/lightning_features/lightning_media/lightning_media.links.task.yml
@@ -0,0 +1,4 @@
+lightning_media.settings:
+  route_name: lightning_media.settings
+  title: 'Media'
+  base_route: lightning_core.settings
diff --git a/modules/lightning_features/lightning_media/lightning_media.routing.yml b/modules/lightning_features/lightning_media/lightning_media.routing.yml
new file mode 100644
index 000000000..429ecab84
--- /dev/null
+++ b/modules/lightning_features/lightning_media/lightning_media.routing.yml
@@ -0,0 +1,7 @@
+lightning_media.settings:
+  path: '/admin/config/system/lightning/media'
+  defaults:
+    _title: Lightning
+    _form: '\Drupal\lightning_media\Form\SettingsForm'
+  requirements:
+    _is_administrator: 'true'
diff --git a/modules/lightning_features/lightning_media/lightning_media.services.yml b/modules/lightning_features/lightning_media/lightning_media.services.yml
index 0ebcb4ab6..97f85b40c 100644
--- a/modules/lightning_features/lightning_media/lightning_media.services.yml
+++ b/modules/lightning_features/lightning_media/lightning_media.services.yml
@@ -3,3 +3,9 @@ services:
     class: '\Drupal\lightning_media\MediaHelper'
     arguments:
       - '@entity_type.manager'
+
+  lightning_media.route_subscriber:
+    class: '\Drupal\lightning_media\Routing\RouteSubscriber'
+    tags:
+      -
+        name: event_subscriber
diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_image/lightning_media_image.module b/modules/lightning_features/lightning_media/modules/lightning_media_image/lightning_media_image.module
index bbb395c06..4edd9bce4 100644
--- a/modules/lightning_features/lightning_media/modules/lightning_media_image/lightning_media_image.module
+++ b/modules/lightning_features/lightning_media/modules/lightning_media_image/lightning_media_image.module
@@ -38,6 +38,11 @@ function lightning_media_image_modules_installed(array $modules) {
 function lightning_media_image_media_entity_type_info_alter(array &$types) {
   $types['image']['input_match']['field_types'] = ['image'];
   Override::pluginClass($types['image'], Image::class);
+
+  // When a media item that uses the Image plugin is embedded in a text editor,
+  // prefer the media_image display plugin.
+  // @see \Drupal\lightning_media\Form\EntityEmbedDialog::buildEmbedStep()
+  $types['image']['entity_embed_display'] = 'media_image';
 }
 
 /**
diff --git a/modules/lightning_features/lightning_media/src/Form/EntityEmbedDialog.php b/modules/lightning_features/lightning_media/src/Form/EntityEmbedDialog.php
new file mode 100644
index 000000000..67eaa8edb
--- /dev/null
+++ b/modules/lightning_features/lightning_media/src/Form/EntityEmbedDialog.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Drupal\lightning_media\Form;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\entity_embed\Form\EntityEmbedDialog as BaseEntityEmbedDialog;
+use Drupal\media_entity\MediaInterface;
+
+class EntityEmbedDialog extends BaseEntityEmbedDialog {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildEmbedStep(array $form, FormStateInterface $form_state) {
+    $entity = $form_state->get('entity');
+    $element = $form_state->get('entity_element');
+    $input = $form_state->getUserInput();
+
+    // If we're working with an existing embed, $input['editor_object'] will be
+    // set, in which case we don't want to change anything (see ::buildForm()).
+    // Otherwise, if the entity being embedded is a media item, see if its type
+    // plugin has a preference regarding which display plugin to use.
+    if (empty($input['editor_object']) && $entity instanceof MediaInterface) {
+      $plugin_definition = $entity->getType()->getPluginDefinition();
+
+      if (isset($plugin_definition['entity_embed_display'])) {
+        $element['data-entity-embed-display'] = $plugin_definition['entity_embed_display'];
+        $form_state->set('entity_element', $element);
+      }
+    }
+
+    $form = parent::buildEmbedStep($form, $form_state);
+
+    // If the user can choose the display plugin, allow Lightning Media's
+    // settings to override that access.
+    $element = &$form['attributes']['data-entity-embed-display'];
+    if ($element['#access']) {
+      $element['#access'] = $this->config('lightning_media.settings')->get('entity_embed.choose_display');
+    }
+    return $form;
+  }
+
+}
diff --git a/modules/lightning_features/lightning_media/src/Form/SettingsForm.php b/modules/lightning_features/lightning_media/src/Form/SettingsForm.php
new file mode 100644
index 000000000..c5d712892
--- /dev/null
+++ b/modules/lightning_features/lightning_media/src/Form/SettingsForm.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Drupal\lightning_media\Form;
+
+use Drupal\Core\Form\ConfigFormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * The settings form for controlling Lightning Media's behavior.
+ */
+class SettingsForm extends ConfigFormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEditableConfigNames() {
+    return ['lightning_media.settings'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'lightning_media_settings_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['choose_display'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Allow users to choose how to display embedded media'),
+      '#default_value' => $this->config('lightning_media.settings')->get('entity_embed.choose_display'),
+    ];
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $this->config('lightning_media.settings')
+      ->set('entity_embed.choose_display', (bool) $form_state->getValue('choose_display'))
+      ->save();
+
+    parent::submitForm($form, $form_state);
+  }
+
+}
diff --git a/modules/lightning_features/lightning_media/src/Plugin/entity_embed/EntityEmbedDisplay/MediaImage.php b/modules/lightning_features/lightning_media/src/Plugin/entity_embed/EntityEmbedDisplay/MediaImage.php
new file mode 100644
index 000000000..651df479f
--- /dev/null
+++ b/modules/lightning_features/lightning_media/src/Plugin/entity_embed/EntityEmbedDisplay/MediaImage.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Drupal\lightning_media\Plugin\entity_embed\EntityEmbedDisplay;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\entity_embed\Plugin\entity_embed\EntityEmbedDisplay\ImageFieldFormatter;
+use Drupal\image\Plugin\Field\FieldType\ImageItem;
+use Drupal\lightning_media\MediaHelper;
+
+/**
+ * Renders a media item's image via the image formatter.
+ *
+ * If the embedded media item has an image field as its source field, that image
+ * is rendered through the image formatter. Otherwise, the media item's
+ * thumbnail is used.
+ *
+ * @EntityEmbedDisplay(
+ *   id = "media_image",
+ *   label = @Translation("Media Image"),
+ *   entity_types = {"media"},
+ *   field_type = "image",
+ *   provider = "image"
+ * )
+ */
+class MediaImage extends ImageFieldFormatter {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldFormatterId() {
+    return 'image';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+    $form = parent::buildConfigurationForm($form, $form_state);
+
+    // Don't allow linking directly to the content.
+    unset($form['image_link']['#options']['content']);
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getAttributeValues() {
+    $field = $this->getItem();
+    $label = $field->getEntity()->label();
+
+    // Try to default to the alt and title attributes set on the field item, but
+    // fall back to the entity label for both.
+    return parent::getAttributeValues() + [
+      'alt' =>
+        $field->alt ?: $label,
+      'title' =>
+        $field->title ?: $label,
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function isValidImage() {
+    // This display plugin works for any media entity. And media items always
+    // have at least a thumbnail. So, we can bypass this access gate.
+    return AccessResult::allowed();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldDefinition() {
+    // The parent method will set the target_type to the entity type being
+    // embedded, but we are actually rendering an image (i.e., a file entity).
+    return parent::getFieldDefinition()->setSetting('target_type', 'file');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldValue() {
+    $value = parent::getFieldValue();
+
+    $value['target_id'] = $this->getItem()->target_id;
+
+    return $value;
+  }
+
+  /**
+   * Returns the image field item to use for the embedded entity.
+   *
+   * @return \Drupal\image\Plugin\Field\FieldType\ImageItem
+   *   The image field item.
+   */
+  protected function getItem() {
+    /** @var \Drupal\media_entity\MediaInterface $entity */
+    $entity = $this->getEntityFromContext();
+
+    $item = MediaHelper::getSourceField($entity)->first();
+
+    return $item instanceof ImageItem ? $item : $entity->get('thumbnail')->first();
+  }
+
+}
diff --git a/modules/lightning_features/lightning_media/src/Routing/RouteSubscriber.php b/modules/lightning_features/lightning_media/src/Routing/RouteSubscriber.php
new file mode 100644
index 000000000..97bd83cd0
--- /dev/null
+++ b/modules/lightning_features/lightning_media/src/Routing/RouteSubscriber.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Drupal\lightning_media\Routing;
+
+use Drupal\Core\Routing\RouteSubscriberBase;
+use Drupal\lightning_media\Form\EntityEmbedDialog;
+use Symfony\Component\Routing\RouteCollection;
+
+class RouteSubscriber extends RouteSubscriberBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function alterRoutes(RouteCollection $collection) {
+    $collection
+      ->get('entity_embed.dialog')
+      ->setDefault('_form', EntityEmbedDialog::class);
+  }
+
+}
diff --git a/modules/upload_bundles_test b/modules/upload_bundles_test
new file mode 120000
index 000000000..89a851568
--- /dev/null
+++ b/modules/upload_bundles_test
@@ -0,0 +1 @@
+../tests/modules/upload_bundles_test
\ No newline at end of file
diff --git a/src/LightningExtension/Context/TestModuleContext.behat.inc b/src/LightningExtension/Context/TestModuleContext.behat.inc
new file mode 100644
index 000000000..98da50e30
--- /dev/null
+++ b/src/LightningExtension/Context/TestModuleContext.behat.inc
@@ -0,0 +1,72 @@
+<?php
+
+namespace Acquia\LightningExtension\Context;
+
+use Behat\Behat\Hook\Scope\AfterScenarioScope;
+use Behat\Behat\Hook\Scope\BeforeScenarioScope;
+use Behat\Behat\Hook\Scope\ScenarioScope;
+use Drupal\DrupalExtension\Context\DrupalSubContextBase;
+
+/**
+ * Allows test modules to be installed during a scenario and uninstalled after.
+ */
+class TestModuleContext extends DrupalSubContextBase {
+
+  /**
+   * Determines the test modules to install during the scenario.
+   *
+   * @param ScenarioScope $scope
+   *   The current scenario scope.
+   *
+   * @return string[]
+   *   The test modules to install.
+   */
+  protected function getModules(ScenarioScope $scope) {
+    $modules = [];
+
+    $tags = array_merge(
+      $scope->getFeature()->getTags(),
+      $scope->getScenario()->getTags()
+    );
+    foreach ($tags as $tag) {
+      if (strpos($tag, 'with-module:') === 0) {
+        $modules[] = substr($tag, 12);
+      }
+    }
+    return array_unique($modules);
+  }
+
+  /**
+   * Installs test modules for this scenario.
+   *
+   * @param BeforeScenarioScope $scope
+   *   The scenario scope.
+   *
+   * @BeforeScenario
+   */
+  public function install(BeforeScenarioScope $scope) {
+    $modules = $this->getModules($scope);
+
+    if ($modules) {
+      $this->getDriver()->bootstrap();
+      \Drupal::service('module_installer')->install($modules);
+    }
+  }
+
+  /**
+   * Uninstalls any test modules installed for the scenario.
+   *
+   * @param AfterScenarioScope $scope
+   *   The scenario scope.
+   *
+   * @AfterScenario
+   */
+  public function uninstall(AfterScenarioScope $scope) {
+    $modules = $this->getModules($scope);
+
+    if ($modules) {
+      \Drupal::service('module_installer')->uninstall($modules);
+    }
+  }
+
+}
diff --git a/src/LightningExtension/Context/UtilityContext.behat.inc b/src/LightningExtension/Context/UtilityContext.behat.inc
index 8fc8e79d8..425314ed8 100644
--- a/src/LightningExtension/Context/UtilityContext.behat.inc
+++ b/src/LightningExtension/Context/UtilityContext.behat.inc
@@ -7,6 +7,8 @@ use Behat\Mink\Element\ElementInterface;
 use Behat\Mink\Exception\ExpectationException;
 use Drupal\Component\Utility\Random;
 use Drupal\DrupalExtension\Context\DrupalSubContextBase;
+use Drupal\file\Entity\File;
+use Drupal\media_entity\Entity\Media;
 use WebDriver\Exception\NoAlertOpenError;
 
 /**
@@ -20,39 +22,12 @@ class UtilityContext extends DrupalSubContextBase {
    * @param string $field
    *   The field locator.
    *
-   * @Then I should not see a :field field
+   * @Then I should not see a(n) :field field
    */
   public function assertFieldNotExists($field) {
     $this->assertSession()->fieldNotExists($field);
   }
 
-  /**
-   * Asserts that a certain number of elements match a CSS selector.
-   *
-   * @param string $selector
-   *   The selector.
-   * @param int $count
-   *   The number of elements expected to match the selector.
-   *
-   * @throws ExpectationException
-   *   If the number of elements that match the selector is not the expected
-   *   number.
-   *
-   * @Then :count element(s) should match :selector
-   */
-  public function assertSelectorMatch($selector, $count) {
-    $session = $this->getSession();
-
-    $result = count($session->getPage()->findAll('css', $selector));
-
-    if ($result != $count) {
-      throw new ExpectationException(
-        '"' . $selector . '" matched ' . $result . ' element(s), expected ' . $count . '.',
-        $session->getDriver()
-      );
-    }
-  }
-
   /**
    * Asserts that a minimum number of elements match a CSS selector.
    *
@@ -79,19 +54,6 @@ class UtilityContext extends DrupalSubContextBase {
     }
   }
 
-  /**
-   * Asserts that no elements match a CSS selector.
-   *
-   * @param string $selector
-   *   The selector.
-   *
-   * @Then no elements should match :selector
-   * @Then nothing should match :selector
-   */
-  public function assertSelectorMatchNothing($selector) {
-    $this->assertSelectorMatch($selector, 0);
-  }
-
   /**
    * Asserts than an element is empty.
    *
@@ -156,34 +118,78 @@ class UtilityContext extends DrupalSubContextBase {
    *
    * @param int $count
    *   (optional) How many to generate. Defaults to 1.
+   * @param string $name
+   *   (optional) The label of the media item wrapping the image. Defaults to
+   *   a random string.
+   * @param string $alt
+   *   (optional) The alt text for the image.
    *
    * @Given a random image
+   * @Given a random image named :name
+   * @Given a random image with alt text :alt
+   * @Given a random image named :name with alt text :alt
    * @Given :count random images
    */
-  public function generateRandomImages($count = 1) {
+  public function generateRandomImages($count = 1, $name = NULL, $alt = NULL) {
     $random = new Random();
-    $entity_type_manager = \Drupal::entityTypeManager();
 
     for ($i = 0; $i < $count; $i++) {
       $uri = $random->image(uniqid('public://random_') . '.png', '240x240', '640x480');
 
-      /** @var \Drupal\file\FileInterface $file */
-      $file = $entity_type_manager->getStorage('file')->create(['uri' => $uri]);
+      $file = File::create([
+        'uri' => $uri,
+      ]);
       $file->setMimeType('image/png');
       $file->setTemporary();
       $file->save();
 
-      $media = $entity_type_manager->getStorage('media')->create([
+      $media = Media::create([
         'bundle' => 'image',
-        'name' => $random->name(32),
+        'name' => $name ?: $random->name(32),
         'status' => TRUE,
         'image' => $file->id(),
         'field_media_in_library' => TRUE,
       ]);
+      if ($alt) {
+        $media->image->alt = $alt;
+      }
       $media->save();
     }
   }
 
+  /**
+   * Generates random document media assets.
+   *
+   * @param int $count
+   *   (optional) How many to generate. Defaults to 1.
+   *
+   * @Given a random document
+   * @Given :count random documents
+   */
+  public function generateRandomDocument($count = 1) {
+    $random = new Random();
+
+    for ($i = 0; $i < $count; $i++) {
+      $uri = uniqid('public://random_') . '.txt';
+      file_put_contents($uri, $random->paragraphs(2));
+
+      $file = File::create([
+        'uri' => $uri,
+      ]);
+      $file->setMimeType('text/plain');
+      $file->setTemporary();
+      $file->save();
+
+      Media::create([
+        'bundle' => 'document',
+        'name' => $random->name(32),
+        'status' => TRUE,
+        'image' => $file->id(),
+        'field_media_in_library' => TRUE,
+      ])->save();
+    }
+  }
+
   /**
    * Accepts any currently open alert box(es), then optionally runs a callback.
    *
diff --git a/tests/config/embed.button.media_browser.yml b/tests/config/embed.button.media_browser.yml
index eb943a768..4d693fef0 100644
--- a/tests/config/embed.button.media_browser.yml
+++ b/tests/config/embed.button.media_browser.yml
@@ -3,6 +3,7 @@ status: true
 dependencies:
   module:
     - entity_embed
+    - image
     - media_entity
 label: 'Media browser'
 id: media_browser
@@ -12,6 +13,7 @@ type_settings:
   bundles: {  }
   display_plugins:
     - 'entity_reference:entity_reference_entity_view'
+    - media_image
     - 'view_mode:media.embedded'
   entity_browser: media_browser
   entity_browser_settings:
diff --git a/tests/config/filter.format.rich_text.yml b/tests/config/filter.format.rich_text.yml
index 638c5efac..161263aff 100644
--- a/tests/config/filter.format.rich_text.yml
+++ b/tests/config/filter.format.rich_text.yml
@@ -43,7 +43,7 @@ filters:
     provider: filter
     status: true
     weight: -50
-    settings: { allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <s> <sup> <sub> <img src alt data-entity-type data-entity-uuid data-align data-caption> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <p> <br> <h1> <pre> <drupal-entity data-*>', filter_html_help: true, filter_html_nofollow: false }
+    settings: { allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <s> <sup> <sub> <img src alt data-entity-type data-entity-uuid data-align data-caption> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <p> <br> <h1> <pre> <drupal-entity data-* title alt>', filter_html_help: true, filter_html_nofollow: false }
   filter_autop:
     id: filter_autop
     provider: filter
diff --git a/tests/config/lightning_media.settings.yml b/tests/config/lightning_media.settings.yml
new file mode 100644
index 000000000..4d58dc282
--- /dev/null
+++ b/tests/config/lightning_media.settings.yml
@@ -0,0 +1,2 @@
+entity_embed:
+  choose_display: false
diff --git a/tests/features/bootstrap/lightning.behat.inc b/tests/features/bootstrap/lightning.behat.inc
index ef15d60bd..133efddeb 100644
--- a/tests/features/bootstrap/lightning.behat.inc
+++ b/tests/features/bootstrap/lightning.behat.inc
@@ -18,28 +18,6 @@ use Drupal\DrupalExtension\Context\DrupalSubContextBase;
  */
 class LightningSubContext extends DrupalSubContextBase {
 
-  /**
-   * Installs the Lightning Test module before a @test_module scenario.
-   *
-   * @BeforeScenario @test_module
-   */
-  public function installTestModule() {
-    $driver = $this->getDriver();
-    if ($driver->isBootstrapped() === FALSE) {
-      $driver->bootstrap();
-    }
-    \Drupal::service('module_installer')->install(['lightning_test']);
-  }
-
-  /**
-   * Uninstalls the Lighting Test module after a @test_module scenario.
-   *
-   * @AfterScenario @test_module
-   */
-  public function uninstallTestModule() {
-    \Drupal::service('module_installer')->uninstall(['lightning_test']);
-  }
-
   /**
    * The Mink context.
    *
@@ -399,7 +377,7 @@ class LightningSubContext extends DrupalSubContextBase {
    * @param string $locator
    *   The field ID, name, label, or value.
    *
-   * @Then I should see a :locator field
+   * @Then I should see a(n) :locator field
    */
   public function assertFieldExists($locator) {
     $this->assertSession()->fieldExists($locator);
diff --git a/tests/features/media/browser.feature b/tests/features/media/browser.feature
index 451c23e63..b6f047e72 100644
--- a/tests/features/media/browser.feature
+++ b/tests/features/media/browser.feature
@@ -43,11 +43,11 @@ Feature: An entity browser for media assets
     And I wait for AJAX to finish
     And I select item 1 in the media browser
     And I select item 2 in the media browser
-    Then 1 element should match "[data-selectable].selected"
+    Then I should see a "[data-selectable].selected" element
     # No choices are ever disabled in a single-cardinality entity browser.
-    And nothing should match "[data-selectable].disabled"
+    And I should see 0 "[data-selectable].disabled" elements
 
-  @test_module @93e7dcf1
+  @with-module:lightning_test @93e7dcf1
   Scenario: Using the media browser for a new media reference field
     Given I am logged in as a user with the administrator role
     And I visit "/admin/structure/types/manage/page/fields/add-field"
diff --git a/tests/features/media/browser_embed_code.feature b/tests/features/media/browser_embed_code.feature
index cec5be747..bab722623 100644
--- a/tests/features/media/browser_embed_code.feature
+++ b/tests/features/media/browser_embed_code.feature
@@ -1,7 +1,7 @@
 @lightning @media @api @javascript @errors
 Feature: Creating media assets from within the media browser using embed codes
 
-  @video @twitter @instagram @test_module @2c43f38c
+  @video @twitter @instagram @with-module:lightning_test @2c43f38c
   Scenario Outline: Creating media assets from within the media browser using embed codes
     Given I am logged in as a user with the media_creator role
     When I visit "/entity-browser/iframe/media_browser"
diff --git a/tests/features/media/browser_upload.feature b/tests/features/media/browser_upload.feature
index d85c553af..36a73de05 100644
--- a/tests/features/media/browser_upload.feature
+++ b/tests/features/media/browser_upload.feature
@@ -1,7 +1,7 @@
 @lightning @media @api @javascript @errors
 Feature: Uploading media assets through the media browser
 
-  @image @document @test_module @1f81e59b
+  @image @document @with-module:lightning_test @1f81e59b
   Scenario Outline: Uploading a file from within the media browser
     Given I am logged in as a user with the media_creator role
     When I visit "/entity-browser/iframe/media_browser"
@@ -24,7 +24,7 @@ Feature: Uploading media assets through the media browser
     And I press "Place"
     Then I should see the error message "You must upload a file."
 
-  @image @test_module @2f72f4a4
+  @image @with-module:lightning_test @2f72f4a4
   Scenario: The upload widget validates file size
     Given I am logged in as a user with the media_creator,page_creator roles
     When I visit "/node/add/page"
@@ -55,7 +55,7 @@ Feature: Uploading media assets through the media browser
     And I wait for AJAX to finish
     Then the "#entity" element should be empty
 
-  @test_module @ced013a5
+  @with-module:upload_bundles_test @ced013a5
   Scenario: The upload widget should respect media bundles allowed by the field
     Given I am logged in as a user with the "page_creator,media_creator,media_manager" roles
     When I visit "/node/add/page"
diff --git a/tests/features/media/embed_code.feature b/tests/features/media/embed_code.feature
index 6e5682acd..00d1b9989 100644
--- a/tests/features/media/embed_code.feature
+++ b/tests/features/media/embed_code.feature
@@ -36,7 +36,7 @@ Feature: Media assets based on embed codes
       | instagram | https://www.instagram.com/p/lV3WqOoNDD                 |
       | video     | https://www.youtube.com/watch?v=ktCgVopf7D0            |
 
-  @video @test_module @javascript @c74eadd0
+  @video @with-module:lightning_test @javascript @c74eadd0
   Scenario: Clearing an image field on a media item
     Given I am logged in as a user with the media_creator role
     When I visit "/media/add/video"
diff --git a/tests/features/media/entity_embed.feature b/tests/features/media/entity_embed.feature
new file mode 100644
index 000000000..af3364a7d
--- /dev/null
+++ b/tests/features/media/entity_embed.feature
@@ -0,0 +1,92 @@
+@lightning @api @media @javascript
+Feature: Embedding entities in a WYSIWYG editor
+
+  @0b5444c1
+  Scenario: Embedded images use the Media Image display plugin by default
+    Given I am logged in as a user with the page_creator,media_creator roles
+    And a random image named "Foobar" with alt text "I am the greetest"
+    When I visit "/node/add/page"
+    And I open the media browser
+    And I select item 1
+    And I submit the entity browser
+    Then I should see a "form.entity-embed-dialog" element
+    And I should see an "Image style" field
+    # Assert that the default alt text is whatever is in the media item.
+    And the "Alternate text" field should contain "I am the greetest"
+    # There are two "Title" fields on the page once we reach this assertion --
+    # the node title, and the image's title attribute. We need to specify the
+    # actual name of the field or Mink will get confused.
+    And the "attributes[title]" field should contain "Foobar"
+    And I queue the latest media entity for deletion
+
+  @d44b6a50
+  Scenario: The document media type uses the Embedded display plugin by default
+    Given I am logged in as a user with the page_creator,media_creator roles
+    And a random document
+    When I visit "/node/add/page"
+    And I open the media browser
+    And I select item 1
+    And I submit the entity browser
+    Then I should see a "form.entity-embed-dialog" element
+    And I should not see an "Image style" field
+    And I should not see an "Alternate text" field
+    # There are two "Title" fields on the page once we reach this assertion --
+    # the node title, and the image's title attribute. We need to specify the
+    # actual name of the field or Mink will get confused.
+    And I should not see an "attributes[title]" field
+    And I queue the latest media entity for deletion
+
+  @917d6aa6
+  Scenario Outline: Embed code-based media types use the Embedded display plugin by default
+    Given I am logged in as a user with the page_creator,media_creator roles
+    And <bundle> media from embed code:
+      """
+      <embed_code>
+      """
+    When I visit "/node/add/page"
+    And I open the media browser
+    And I select item 1
+    And I submit the entity browser
+    Then I should see a "form.entity-embed-dialog" element
+    And I should not see an "Image style" field
+    And I should not see an "Alternate text" field
+    # There are two "Title" fields on the page once we reach this assertion --
+    # the node title, and the image's title attribute. We need to specify the
+    # actual name of the field or Mink will get confused.
+    And I should not see an "attributes[title]" field
+
+    Examples:
+      | bundle    | embed_code                                                   |
+      | video     | https://www.youtube.com/watch?v=N2_HkWs7OM0                  |
+      | video     | https://vimeo.com/14782834                                   |
+      | tweet     | https://twitter.com/djphenaproxima/status/879739227617079296 |
+      | instagram | https://www.instagram.com/p/lV3WqOoNDD                       |
+
+  @cd742161
+  Scenario: Embedding an image with embed-specific alt text and image style
+    Given I am logged in as a user with the page_creator,media_creator roles
+    And a random image
+    And page content:
+      | type | title  | path    |
+      | page | Foobar | /foobar |
+    When I visit "/foobar"
+    And I click "Edit"
+    And I open the media browser
+    And I select item 1
+    And I submit the entity browser
+    And I select "medium" from "Image style"
+    And I enter "Behold my image of randomness" for "Alternate text"
+    # There are two "Title" fields on the page at this point -- the node title,
+    # and the image's title attribute. We need to specify the actual name of
+    # the field or Mink will get confused.
+    And I enter "Ye gods!" for "attributes[title]"
+    # We can't simply use the "I press Embed" step, because Drupal's dialog box
+    # implementation wraps the text of the buttons in <span> tags, which trips
+    # that step up.
+    And I click the "body > .ui-dialog .ui-dialog-buttonpane button.button--primary" element
+    And I wait for AJAX to finish
+    And I enter "Foobar" for "Title"
+    And I press "Save"
+    Then the response should contain "Behold my image of randomness"
+    And the response should contain "Ye gods!"
+    And I queue the latest media entity for deletion
diff --git a/tests/features/media/image_browser.feature b/tests/features/media/image_browser.feature
index f77b67966..ae2bd175e 100644
--- a/tests/features/media/image_browser.feature
+++ b/tests/features/media/image_browser.feature
@@ -1,4 +1,4 @@
-@lightning @media @image @api @javascript @errors @test_module
+@lightning @media @image @api @javascript @errors @with-module:lightning_test
 Feature: An entity browser for image fields
 
   @10a21ffe
@@ -38,4 +38,4 @@ Feature: An entity browser for image fields
     And I submit the entity browser
     And I open the "Unlimited Images" image browser
     And I select item 4
-    Then nothing should match "[data-selectable].disabled"
+    Then I should see 0 "[data-selectable].disabled" elements
diff --git a/modules/lightning_features/lightning_core/modules/lightning_test/config/install/field.field.media.z_image.image.yml b/tests/modules/upload_bundles_test/config/install/field.field.media.z_image.image.yml
similarity index 100%
rename from modules/lightning_features/lightning_core/modules/lightning_test/config/install/field.field.media.z_image.image.yml
rename to tests/modules/upload_bundles_test/config/install/field.field.media.z_image.image.yml
diff --git a/modules/lightning_features/lightning_core/modules/lightning_test/config/install/field.field.node.page.field_z_image.yml b/tests/modules/upload_bundles_test/config/install/field.field.node.page.field_z_image.yml
similarity index 100%
rename from modules/lightning_features/lightning_core/modules/lightning_test/config/install/field.field.node.page.field_z_image.yml
rename to tests/modules/upload_bundles_test/config/install/field.field.node.page.field_z_image.yml
diff --git a/modules/lightning_features/lightning_core/modules/lightning_test/config/install/field.storage.node.field_z_image.yml b/tests/modules/upload_bundles_test/config/install/field.storage.node.field_z_image.yml
similarity index 100%
rename from modules/lightning_features/lightning_core/modules/lightning_test/config/install/field.storage.node.field_z_image.yml
rename to tests/modules/upload_bundles_test/config/install/field.storage.node.field_z_image.yml
diff --git a/modules/lightning_features/lightning_core/modules/lightning_test/config/install/media_entity.bundle.z_image.yml b/tests/modules/upload_bundles_test/config/install/media_entity.bundle.z_image.yml
similarity index 100%
rename from modules/lightning_features/lightning_core/modules/lightning_test/config/install/media_entity.bundle.z_image.yml
rename to tests/modules/upload_bundles_test/config/install/media_entity.bundle.z_image.yml
diff --git a/tests/modules/upload_bundles_test/upload_bundles_test.info.yml b/tests/modules/upload_bundles_test/upload_bundles_test.info.yml
new file mode 100644
index 000000000..1c3532c70
--- /dev/null
+++ b/tests/modules/upload_bundles_test/upload_bundles_test.info.yml
@@ -0,0 +1,8 @@
+name: 'ced013a5'
+core: 8.x
+type: module
+package: Lightning
+hidden: true
+dependencies:
+  - lightning_media_image
+  - lightning_page
diff --git a/tests/modules/upload_bundles_test/upload_bundles_test.install b/tests/modules/upload_bundles_test/upload_bundles_test.install
new file mode 100644
index 000000000..69f1a1d6e
--- /dev/null
+++ b/tests/modules/upload_bundles_test/upload_bundles_test.install
@@ -0,0 +1,42 @@
+<?php
+
+use Drupal\entity_browser\Element\EntityBrowserElement;
+use Drupal\lightning_core\ConfigHelper as Config;
+
+/**
+ * Implements hook_install().
+ */
+function upload_bundles_test_install() {
+  entity_get_form_display('node', 'page', 'default')
+    ->setComponent('field_z_image', [
+      'type' => 'entity_browser_entity_reference',
+      'settings' => [
+        'entity_browser' => 'media_browser',
+        'field_widget_display' => 'rendered_entity',
+        'field_widget_edit' => TRUE,
+        'field_widget_remove' => TRUE,
+        'selection_mode' => EntityBrowserElement::SELECTION_MODE_APPEND,
+        'field_widget_display_settings' => [
+          'view_mode' => 'embedded',
+        ],
+        'open' => TRUE,
+      ],
+      'region' => 'content',
+    ])
+    ->save();
+}
+
+/**
+ * Implements hook_uninstall().
+ */
+function upload_bundles_test_uninstall() {
+  entity_get_form_display('node', 'page', 'default')
+    ->removeComponent('field_z_image')
+    ->save();
+
+  $storage = \Drupal::entityTypeManager()->getStorage('media');
+  $junk = $storage->loadByProperties(['bundle' => 'z_image']);
+  $storage->delete($junk);
+
+  Config::forModule('upload_bundles_test')->deleteAll();
+}
diff --git a/tests/src/Functional/ConfigIntegrityTest.php b/tests/src/Functional/ConfigIntegrityTest.php
index 0ce94df24..b88228ee9 100644
--- a/tests/src/Functional/ConfigIntegrityTest.php
+++ b/tests/src/Functional/ConfigIntegrityTest.php
@@ -19,6 +19,8 @@ class ConfigIntegrityTest extends BrowserTestBase {
   protected $profile = 'lightning';
 
   public function testConfig() {
+    $assert = $this->assertSession();
+
     // lightning_core_update_8002() marks a couple of core view modes as
     // internal.
     $view_modes = EntityViewMode::loadMultiple(['node.rss', 'node.search_index']);
@@ -37,6 +39,45 @@ public function testConfig() {
     // All users should be able to view media items.
     $this->assertContains('view media', Role::load('anonymous')->getPermissions());
     $this->assertContains('view media', Role::load('authenticated')->getPermissions());
+
+    $account = $this->drupalCreateUser();
+    $this->drupalLogin($account);
+
+    $this->assertForbidden('/admin/config/system/lightning');
+    $this->assertForbidden('/admin/config/system/lightning/layout');
+    $this->assertForbidden('/admin/config/system/lightning/media');
+
+    $this->drupalLogout();
+    $account = $this->drupalCreateUser([], NULL, TRUE);
+    $this->drupalLogin($account);
+
+    $this->assertAllowed('/admin/config/system/lightning');
+    $assert->linkByHrefExists('/admin/config/system/lightning/layout');
+    $assert->linkByHrefExists('/admin/config/system/lightning/media');
+    $this->assertAllowed('/admin/config/system/lightning/layout');
+    $this->assertAllowed('/admin/config/system/lightning/media');
+  }
+
+  /**
+   * Asserts that the current user can access a Drupal route.
+   *
+   * @param string $path
+   *   The route path to visit.
+   */
+  protected function assertAllowed($path) {
+    $this->drupalGet($path);
+    $this->assertSession()->statusCodeEquals(200);
+  }
+
+  /**
+   * Asserts that the current user cannot access a Drupal route.
+   *
+   * @param string $path
+   *   The route path to visit.
+   */
+  protected function assertForbidden($path) {
+    $this->drupalGet($path);
+    $this->assertSession()->statusCodeEquals(403);
   }
 
 }