diff --git a/modules/commerce/commerce_migrate_commerce.module b/modules/commerce/commerce_migrate_commerce.module
index f593934..cd33bbf 100644
--- a/modules/commerce/commerce_migrate_commerce.module
+++ b/modules/commerce/commerce_migrate_commerce.module
@@ -29,25 +29,23 @@ function commerce_migrate_commerce_migration_plugins_alter(array &$migrations) {
       if ((is_a($migration['class'], FieldMigration::class, TRUE))) {
         // Field storage.
         if (is_a($source, Field::class)) {
+          $migration['source']['plugin'] = 'd7_commerce_field';
+          $migration['process']['entity_type'] = _commerce_migrate_commerce_get_entity_type('commerce1_entity_type');
           $migration['migration_dependencies']['required'][] = 'd7_commerce_product_type';
           $migration['migration_dependencies']['required'][] = 'd7_commerce_product_variation_type';
-          $migration['process']['entity_type'] = _commerce_migrate_commerce_get_map();
-          $migration['process']['commerce_field_storage'] = [
-            'plugin' => 'commerce_field_storage_generate',
-            'source' => 'commerce_entity_type',
-          ];
         }
 
         // Field instance.
         if (is_a($source, FieldInstance::class)) {
+          $migration['process']['entity_type'] = _commerce_migrate_commerce_get_entity_type('commerce1_entity_type');
+          $migration['process']['entity_type'][0]['map']['commerce_customer_profile'] = 'skip';
           $migration['migration_dependencies']['required'][] = 'd7_commerce_product_type';
           $migration['migration_dependencies']['required'][] = 'd7_commerce_product_variation_type';
-          $migration['process']['entity_type'] = _commerce_migrate_commerce_get_map();
-          $migration['process']['entity_type'][0]['map']['commerce_customer_profile'] = 'skip';
         }
+
         // Field instance widget settings.
         if (is_a($source, FieldInstancePerFormDisplay::class)) {
-          $migration['process']['entity_type'] = _commerce_migrate_commerce_get_map();
+          $migration['process']['entity_type'] = _commerce_migrate_commerce_get_entity_type('commerce1_entity_type');
           $migration['process']['entity_type'][0]['map']['commerce_customer_profile'] = 'skip';
           $migration['process']['workaround'] = [
             [
@@ -70,7 +68,7 @@ function commerce_migrate_commerce_migration_plugins_alter(array &$migrations) {
 
         // Field formatter.
         if (is_a($source, FieldInstancePerViewMode::class)) {
-          $migration['process']['entity_type'] = _commerce_migrate_commerce_get_map();
+          $migration['process']['entity_type'] = _commerce_migrate_commerce_get_entity_type('commerce1_entity_type');
           $migration['process']['entity_type'][0]['map']['commerce_customer_profile'] = 'skip';
           $migration['process']['workaround'] = [
             [
@@ -86,6 +84,7 @@ function commerce_migrate_commerce_migration_plugins_alter(array &$migrations) {
                 'field_extractor' => 'skip',
                 'commerce_cart_add_to_cart_form' => 'skip',
                 'commerce_fancy_attributes_color' => 'skip',
+                'title_linked' => 'skip',
                 // Skipping this to avoid a fatal error that has something to do
                 // with dependencies.
                 'entity_reference_label' => 'skip',
@@ -102,7 +101,11 @@ function commerce_migrate_commerce_migration_plugins_alter(array &$migrations) {
 
       // View mode.
       if (is_a($source, ViewMode::class)) {
-        $migration['process']['targetEntityType'] = _commerce_migrate_commerce_get_map();
+        $migration['source']['plugin'] = 'd7_commerce_view_mode';
+        // Add map for the destination entity type.
+        // Use the source entity type here because the source plugin,
+        // 'd7_commerce_view_mode', will add rows for the product displays.
+        $migration['process']['targetEntityType'] = _commerce_migrate_commerce_get_entity_type('entity_type');
         $migration['process']['targetEntityType'][0]['map']['commerce_customer_profile'] = 'skip';
       }
     }
@@ -110,20 +113,26 @@ function commerce_migrate_commerce_migration_plugins_alter(array &$migrations) {
 }
 
 /**
- * Return the static map plugin configuration for entity type.
+ * Return the static map process plugin for determining the entity type.
+ *
+ * @param string $source
+ *   The source field name.
+ *
+ * @return array
+ *   A process plugin array.
  */
-function _commerce_migrate_commerce_get_map() {
+function _commerce_migrate_commerce_get_entity_type($source) {
   return ([
     [
       'plugin' => 'static_map',
-      'source' => 'entity_type',
+      'source' => $source,
       'bypass' => 'true',
       'map' => [
         // The entity product_display does not exist. It is set in the
         // MigratePrepareRow event to mark the row as a product display.
         'product_display' => 'commerce_product',
         'commerce_product' => 'commerce_product_variation',
-        'commerce_customer_profile' => 'profile',
+        'commerce_customer_profile' => 'skip',
         // Inline conditions are conditions added to the entity add/edit
         // form and those conditions are later mapped to rules
         // conditions when the rule is generated.
diff --git a/modules/commerce/src/EventSubscriber/MigratePrepareRow.php b/modules/commerce/src/EventSubscriber/MigratePrepareRow.php
index 162a84e..482a5cf 100644
--- a/modules/commerce/src/EventSubscriber/MigratePrepareRow.php
+++ b/modules/commerce/src/EventSubscriber/MigratePrepareRow.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\commerce_migrate_commerce\EventSubscriber;
 
-use Drupal\field\Plugin\migrate\source\d7\Field;
 use Drupal\field\Plugin\migrate\source\d7\FieldInstance;
 use Drupal\migrate_plus\Event\MigrateEvents;
 use Drupal\migrate_plus\Event\MigratePrepareRowEvent;
@@ -41,62 +40,14 @@ class MigratePrepareRow implements EventSubscriberInterface {
     $row = $event->getRow();
     $source_plugin = $migration->getSourcePlugin();
 
-    // Field source plugin.
-    if (is_a($source_plugin, Field::class)) {
-      // If the entity is 'node' the field may be for a product display, a non
-      // product display or both. If the bundles for the field are
-      // all product displays, then set the entity type to 'product_display'.
-      // If the bundles are both product display and node then make the
-      // 'additional' commerce field in the process pipeline. If the bundles
-      // are all for node types then make no change to the migration.
-      $this->productTypes = $this->getProductTypes($event);
-      if ($row->getSourceProperty('entity_type') == 'node') {
-        // Get the bundles for this field.
-        $instances = $row->getSourceProperty('instances');
-        $i = 0;
-        foreach ($instances as $instance) {
-          if (in_array($instance['bundle'], $this->productTypes)) {
-            $i++;
-          }
-        }
-        if ($i > 0) {
-          if ($i == count($instances)) {
-            // If all bundles for this field are product types, then change the
-            // entity type to 'product_display'. This non existent entity type
-            // will be changed by the entity_type static map configured in the
-            // migration_plugins_alter.
-            $row->setSourceProperty('entity_type', 'product_display');
-          }
-          else {
-            // This field is used on both nodes and product displays. Set
-            // commerce_entity_type so that field storage is created for the
-            // commerce_product as well as for the node. When
-            // commerce_entity_type is set the process plugin,
-            // commerce_field_storage_entity_generate will create the
-            // storage for the commerce entity.
-            $row->setSourceProperty('commerce_entity_type', 'commerce_product');
-          }
-        }
-      }
-    }
     if (is_a($source_plugin, FieldInstance::class)) {
-      // If the entity is 'node' the field may be for a product display, a non
-      // product display or both. For now, if the bundles for the field are
-      // all product displays, then set the entity type to 'product_display'.
-      // If the field exists on both product displays and non product display
-      // nodes only the node storage is created.
-      if ($this->productTypes == []) {
-        $this->productTypes = $this->getProductTypes($event);
-      }
-      if ($row->getSourceProperty('entity_type') == 'node') {
-        // Get the bundles for this field.
-        $bundle = $row->getSourceProperty('bundle');
-        if (in_array($bundle, $this->getProductTypes($event))) {
-          // If this is a field on a product display then change the entity type
-          // to 'product_display'. This non existent entity type will be changed
-          // by the entity_type static map configured in the
-          // migration_plugins_alter.
-          $row->setSourceProperty('entity_type', 'product_display');
+      // If this is node entity then set source property 'commerce1_entity_type'
+      // to indicate if this is a product display node or not.
+      $row->setSourceProperty('commerce1_entity_type', $row->getSourceProperty('entity_type'));
+      if ($row->getSourceProperty('entity_type') === 'node') {
+        if (in_array($row->getSourceProperty('bundle'), $this->getProductTypes($event))) {
+          $row->setSourceProperty('commerce1_entity_type', 'product_display');
+
         }
       }
     }
diff --git a/modules/commerce/src/Plugin/migrate/process/d7/CommerceFieldStorageGenerate.php b/modules/commerce/src/Plugin/migrate/process/d7/CommerceFieldStorageGenerate.php
deleted file mode 100644
index 1e80fe3..0000000
--- a/modules/commerce/src/Plugin/migrate/process/d7/CommerceFieldStorageGenerate.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Drupal\commerce_migrate_commerce\Plugin\migrate\process\d7;
-
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate\MigrateExecutableInterface;
-use Drupal\migrate\ProcessPluginBase;
-use Drupal\migrate\Row;
-
-/**
- * Create field storage.
- *
- * For use with d7_field, this plugin allows field storage to be created on
- * two entities while processing a row.
- *
- * @MigrateProcessPlugin(
- *   id = "commerce_field_storage_generate"
- * )
- */
-class CommerceFieldStorageGenerate extends ProcessPluginBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
-    if ($value) {
-      $field_name = $row->getSourceProperty('field_name');
-      $entity_type = $value;
-      $name = $entity_type . '.' . $field_name;
-      if (!FieldStorageConfig::load($name)) {
-        $field_storage_definition = [
-          'field_name' => $field_name,
-          'entity_type' => $entity_type,
-          // Get the transformed properties from the row.
-          'type' => $row->getDestinationProperty('type'),
-          'cardinality' => $row->getDestinationProperty('cardinality'),
-          'settings' => $row->getDestinationProperty('settings'),
-        ];
-        $storage = FieldStorageConfig::create($field_storage_definition);
-        $storage->save();
-      }
-    }
-  }
-
-}
diff --git a/modules/commerce/src/Plugin/migrate/source/d7/Field.php b/modules/commerce/src/Plugin/migrate/source/d7/Field.php
new file mode 100644
index 0000000..f8e657d
--- /dev/null
+++ b/modules/commerce/src/Plugin/migrate/source/d7/Field.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\source\d7;
+
+use Drupal\field\Plugin\migrate\source\d7\Field as CoreField;
+
+/**
+ * The view mode source class.
+ *
+ * Gets all the view modes taking into account that nodes can be product
+ * displays.
+ *
+ * @MigrateSource(
+ *   id = "d7_commerce_field",
+ *   source_module = "field"
+ * )
+ */
+class Field extends CoreField {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function initializeIterator() {
+    $results = $this->prepareQuery()->execute()->fetchAll();
+
+    // Gets a list of product display node types.
+    $query = $this->select('commerce_product_type', 'pt')
+      ->fields('pt', ['type']);
+    $product_node_types = $query->execute()->fetchCol();
+
+    $new_rows = [];
+    foreach ($results as $key => &$result) {
+      $result['commerce1_entity_type'] = $result['entity_type'];
+      if ($result['entity_type'] === 'node') {
+        $instances = $this->select('field_config_instance', 'fci')
+          ->fields('fci')
+          ->condition('field_name', $result['field_name'])
+          ->condition('entity_type', $result['entity_type'])
+          ->execute()
+          ->fetchAll();
+        $i = 0;
+        foreach ($instances as $instance) {
+          if (in_array($instance['bundle'], $product_node_types)) {
+            $i++;
+          }
+        }
+        if ($i > 0) {
+          if ($i == count($instances)) {
+            // If all bundles for this field are product types, then set the
+            // commerce1_entity_type to 'product_display'. This is used in the
+            // CommerceFieldEntityType process plugin to determine the
+            // destination entity type.
+            $result['commerce1_entity_type'] = 'product_display';
+          }
+          else {
+            // This field, such as the body field and title_field, is used on
+            // both nodes and product displays. Add a new row setting the source
+            // entity_type to 'product_display'. This is used in the
+            // CommerceFieldEntityType process plugin to determine the
+            // destination entity type.
+            $new_row = $result;
+            $new_row['commerce1_entity_type'] = 'product_display';
+            $new_row['entity_type'] = 'product_display';
+            $new_rows[] = $new_row;
+          }
+        }
+      }
+    }
+
+    foreach ($new_rows as $new_row) {
+      array_push($results, $new_row);
+    }
+    return new \ArrayIterator($results);
+  }
+
+}
diff --git a/modules/commerce/src/Plugin/migrate/source/d7/ViewMode.php b/modules/commerce/src/Plugin/migrate/source/d7/ViewMode.php
new file mode 100644
index 0000000..0c44e2b
--- /dev/null
+++ b/modules/commerce/src/Plugin/migrate/source/d7/ViewMode.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\source\d7;
+
+use Drupal\field\Plugin\migrate\source\d7\ViewMode as CoreViewMode;
+
+/**
+ * The view mode source class.
+ *
+ * Gets all the view modes taking into account that nodes can be product
+ * displays.
+ *
+ * @MigrateSource(
+ *   id = "d7_commerce_view_mode",
+ *   source_module = "field"
+ * )
+ */
+class ViewMode extends CoreViewMode {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function initializeIterator() {
+    $instances = parent::initializeIterator();
+
+    $rows = [];
+    foreach ($instances->getArrayCopy() as $instance) {
+      $data = unserialize($instance['data']);
+      $instance['commerce1_entity_type'] = $instance['entity_type'];
+      foreach (array_keys($data['display']) as $view_mode) {
+        $key = $instance['entity_type'] . '.' . $view_mode;
+        $rows[$key] = array_merge($instance, [
+          'view_mode' => $view_mode,
+        ]);
+        // If this is a node view mode, then it is also a product display view
+        // mode. Create a new row for product display.
+        if ($instance['entity_type'] === 'node') {
+          $new_row = $instance;
+          $key = 'product_display.' . $view_mode;
+          // The entity_type is a sourceId and this entity_type does not exist
+          // in the source database. By adding it here, it allows for the
+          // creation of two rows without using entity_generate which, when
+          // used, means that rollbacks will not work correctly because the
+          // generated entity is not in the map table.
+          $new_row['entity_type'] = 'product_display';
+          $new_row['commerce1_entity_type'] = 'product_display';
+          $rows[$key] = array_merge($new_row, [
+            'view_mode' => $view_mode,
+          ]);
+        }
+      }
+    }
+    return new \ArrayIterator($rows);
+  }
+
+}
diff --git a/modules/commerce/tests/src/Functional/d7/MigrateUpgradeCommerce1Test.php b/modules/commerce/tests/src/Functional/d7/MigrateUpgradeCommerce1Test.php
new file mode 100644
index 0000000..537e779
--- /dev/null
+++ b/modules/commerce/tests/src/Functional/d7/MigrateUpgradeCommerce1Test.php
@@ -0,0 +1,249 @@
+<?php
+
+namespace Drupal\Tests\commerce_migrate_commerce\Functional\d7;
+
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeTestBase;
+
+/**
+ * Tests Commerce 1 upgrade using the migrate UI.
+ *
+ * The test method is provided by the MigrateUpgradeTestBase class.
+ *
+ * @requires module migrate_plus
+ *
+ * @group commerce_migrate
+ * @group commerce_migrate_commerce_d7
+ */
+class MigrateUpgradeCommerce1Test extends MigrateUpgradeTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'block',
+    'block_content',
+    'comment',
+    'dblog',
+    'field',
+    'filter',
+    'node',
+    'path',
+    'search',
+    'shortcut',
+    'system',
+    'taxonomy',
+    'user',
+    'address',
+    'commerce',
+    'commerce_cart',
+    'commerce_log',
+    'commerce_order',
+    'commerce_payment',
+    'commerce_price',
+    'commerce_product',
+    'commerce_promotion',
+    'commerce_store',
+    'commerce_migrate',
+    'migrate',
+    'migrate_drupal',
+    'migrate_drupal_ui',
+    'address',
+    'datetime',
+    'entity_reference_revisions',
+    'file',
+    'image',
+    'link',
+    'options',
+    'telephone',
+    'text',
+    'entity',
+    'profile',
+    'inline_entity_form',
+    'state_machine',
+    'views',
+    'migrate_plus',
+    'commerce_migrate_commerce',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->loadFixture(drupal_get_path('module', 'commerce_migrate_commerce') . '/tests/fixtures/ck2.php');
+  }
+
+  /**
+   * Executes all steps of migrations upgrade.
+   */
+  public function testMigrateUpgrade() {
+    $connection_options = $this->sourceDatabase->getConnectionOptions();
+    $driver = $connection_options['driver'];
+    $connection_options['prefix'] = $connection_options['prefix']['default'];
+
+    // Use the driver connection form to get the correct options out of the
+    // database settings. This supports all of the databases we test against.
+    $drivers = drupal_get_database_types();
+    $form = $drivers[$driver]->getFormOptions($connection_options);
+    $connection_options = array_intersect_key($connection_options, $form + $form['advanced_options']);
+    $version = $this->getLegacyDrupalVersion($this->sourceDatabase);
+    $edit = [
+      $driver => $connection_options,
+      'source_private_file_path' => $this->getSourceBasePath(),
+      'version' => $version,
+    ];
+    if ($version == 6) {
+      $edit['d6_source_base_path'] = $this->getSourceBasePath();
+    }
+    else {
+      $edit['source_base_path'] = $this->getSourceBasePath();
+    }
+    if (count($drivers) !== 1) {
+      $edit['driver'] = $driver;
+    }
+    $edits = $this->translatePostValues($edit);
+
+    // Start the upgrade process.
+    $this->drupalGet('/upgrade');
+    $session = $this->assertSession();
+    $session->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.');
+
+    $this->drupalPostForm(NULL, [], t('Continue'));
+    $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
+    $session->fieldExists('mysql[host]');
+
+    $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
+    $session->statusCodeEquals(200);
+    $session->pageTextContains('Upgrade analysis report');
+
+    $this->drupalPostForm(NULL, [], t('Perform upgrade'));
+    $session->pageTextContains(t('Congratulations, you upgraded Drupal!'));
+
+    // Have to reset all the statics after migration to ensure entities are
+    // loadable.
+    $this->resetAll();
+
+    $expected_counts = $this->getEntityCounts();
+    foreach (array_keys(\Drupal::entityTypeManager()->getDefinitions()) as $entity_type) {
+      $real_count = \Drupal::entityQuery($entity_type)->count()->execute();
+      $expected_count = isset($expected_counts[$entity_type]) ? $expected_counts[$entity_type] : 0;
+      self::assertEquals($expected_count, $real_count, "Found $real_count $entity_type entities, expected $expected_count.");
+    }
+
+    $plugin_manager = \Drupal::service('plugin.manager.migration');
+    /** @var \Drupal\migrate\Plugin\Migration[] $all_migrations */
+    $all_migrations = $plugin_manager->createInstancesByTag('Drupal ' . $version);
+    foreach ($all_migrations as $migration) {
+      $id_map = $migration->getIdMap();
+      foreach ($id_map as $source_id => $map) {
+        // Convert $source_id into a keyless array so that
+        // \Drupal\migrate\Plugin\migrate\id_map\Sql::getSourceHash() works as
+        // expected.
+        $source_id_values = array_values(unserialize($source_id));
+        $row = $id_map->getRowBySource($source_id_values);
+        $destination = serialize($id_map->currentDestination());
+        $message = "Migration of $source_id to $destination as part of the {$migration->id()} migration. The source row status is " . $row['source_row_status'];
+        // A completed migration should have maps with
+        // MigrateIdMapInterface::STATUS_IGNORED or
+        // MigrateIdMapInterface::STATUS_IMPORTED.
+        if ($row['source_row_status'] == MigrateIdMapInterface::STATUS_FAILED || $row['source_row_status'] == MigrateIdMapInterface::STATUS_NEEDS_UPDATE) {
+          $this->fail($message);
+        }
+        else {
+          self::assertTrue($message);
+        }
+      }
+    }
+
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getSourceBasePath() {
+    return __DIR__ . '/files';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntityCounts() {
+    return [
+      'block' => 27,
+      'block_content' => 0,
+      'block_content_type' => 1,
+      'comment' => 0,
+      'comment_type' => 11,
+      'commerce_log' => 0,
+      'commerce_order' => 3,
+      'commerce_order_type' => 1,
+      'commerce_order_item' => 13,
+      'commerce_order_item_type' => 3,
+      'commerce_payment_gateway' => 0,
+      'commerce_payment_method' => 0,
+      'commerce_payment' => 0,
+      'commerce_currency' => 1,
+      'commerce_product_variation' => 84,
+      'commerce_product' => 20,
+      'commerce_product_type' => 7,
+      'commerce_product_variation_type' => 8,
+      'commerce_product_attribute' => 0,
+      'commerce_product_attribute_value' => 0,
+      'commerce_promotion_coupon' => 0,
+      'commerce_promotion' => 0,
+      'commerce_store' => 1,
+      'commerce_store_type' => 1,
+      'contact_form' => 2,
+      'contact_message' => 0,
+      'editor' => 2,
+      'field_storage_config' => 47,
+      'field_config' => 142,
+      'file' => 105,
+      'filter_format' => 6,
+      'image_style' => 3,
+      'migration_group' => 1,
+      'migration' => 0,
+      'node' => 37,
+      'node_type' => 11,
+      'profile' => 4,
+      'profile_type' => 1,
+      'rdf_mapping' => 5,
+      'search_page' => 2,
+      'shortcut' => 2,
+      'shortcut_set' => 1,
+      'action' => 25,
+      'menu' => 10,
+      'taxonomy_term' => 72,
+      'taxonomy_vocabulary' => 12,
+      'tour' => 1,
+      'user' => 3,
+      'user_role' => 3,
+      'menu_link_content' => 0,
+      'view' => 24,
+      'base_field_override' => 11,
+      'date_format' => 11,
+      'entity_form_display' => 48,
+      'entity_view_mode' => 31,
+      'entity_form_mode' => 2,
+      'entity_view_display' => 64,
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getAvailablePaths() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getMissingPaths() {
+    return [];
+  }
+
+}
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v1.jpg
new file mode 100644
index 0000000..88bf1d6
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v1p.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v1p.jpg
new file mode 100644
index 0000000..a4bd2ef
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v1p.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v2.jpg
new file mode 100644
index 0000000..6807ea4
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v2p.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v2p.jpg
new file mode 100644
index 0000000..2ff195e
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v2p.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v3.jpg
new file mode 100644
index 0000000..62734ca
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v3p.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v3p.jpg
new file mode 100644
index 0000000..b59ca3b
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-1v3p.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-2v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-2v2.jpg
new file mode 100644
index 0000000..a44e4f8
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-2v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-2v2b.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-2v2b.jpg
new file mode 100644
index 0000000..89ebc64
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/Sweatshirt-2v2b.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/collection-banner-to_carry.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/collection-banner-to_carry.jpg
new file mode 100644
index 0000000..72b5eb9
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/collection-banner-to_carry.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/collection-banner-to_drink_with.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/collection-banner-to_drink_with.jpg
new file mode 100644
index 0000000..4afd3b7
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/collection-banner-to_drink_with.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/collection-banner-to_geek_out.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/collection-banner-to_geek_out.jpg
new file mode 100644
index 0000000..32db952
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/collection-banner-to_geek_out.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/collection-banner-to_wear.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/collection-banner-to_wear.jpg
new file mode 100644
index 0000000..492ec17
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/collection-banner-to_wear.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/blog_post/cmt_commerce_customizable_products.png b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/blog_post/cmt_commerce_customizable_products.png
new file mode 100644
index 0000000..96fb145
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/blog_post/cmt_commerce_customizable_products.png differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/blog_post/social_logins.png b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/blog_post/social_logins.png
new file mode 100644
index 0000000..fa3b63a
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/blog_post/social_logins.png differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/brand/getting-thirsty.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/brand/getting-thirsty.jpg
new file mode 100644
index 0000000..9b953c5
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/brand/getting-thirsty.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/brand/go-green.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/brand/go-green.jpg
new file mode 100644
index 0000000..337d757
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/brand/go-green.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/slideshow/slideshow-1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/slideshow/slideshow-1.jpg
new file mode 100644
index 0000000..38bf4f3
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/slideshow/slideshow-1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/slideshow/slideshow-2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/slideshow/slideshow-2.jpg
new file mode 100644
index 0000000..528ec44
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/slideshow/slideshow-2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/slideshow/slideshow-3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/slideshow/slideshow-3.jpg
new file mode 100644
index 0000000..56f7b15
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/field/image/slideshow/slideshow-3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/flip-flop-2v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/flip-flop-2v1.jpg
new file mode 100644
index 0000000..f88d86a
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/flip-flop-2v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/flip-flop-2v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/flip-flop-2v2.jpg
new file mode 100644
index 0000000..4dde3ba
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/flip-flop-2v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/flip-flop-2v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/flip-flop-2v3.jpg
new file mode 100644
index 0000000..3e0dfe5
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/flip-flop-2v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat-2v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat-2v1.jpg
new file mode 100644
index 0000000..09d631b
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat-2v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat-2v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat-2v2.jpg
new file mode 100644
index 0000000..2143d73
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat-2v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat-2v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat-2v3.jpg
new file mode 100644
index 0000000..7a1094a
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat-2v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat1_v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat1_v1.jpg
new file mode 100644
index 0000000..19870f2
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat1_v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat1_v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat1_v2.jpg
new file mode 100644
index 0000000..25210ac
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat1_v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat1_v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat1_v3.jpg
new file mode 100644
index 0000000..611df7c
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/hat1_v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/iphone-case-1v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/iphone-case-1v1.jpg
new file mode 100644
index 0000000..9bbb318
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/iphone-case-1v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/iphone-case-1v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/iphone-case-1v2.jpg
new file mode 100644
index 0000000..e2cd331
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/iphone-case-1v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/iphone-case-1v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/iphone-case-1v3.jpg
new file mode 100644
index 0000000..9b95176
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/iphone-case-1v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/laptopbag1v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/laptopbag1v1.jpg
new file mode 100644
index 0000000..a4ee57c
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/laptopbag1v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/laptopbag1v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/laptopbag1v2.jpg
new file mode 100644
index 0000000..d6b2c43
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/laptopbag1v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/laptopbag1v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/laptopbag1v3.jpg
new file mode 100644
index 0000000..9e7b7ad
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/laptopbag1v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-4v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-4v1.jpg
new file mode 100644
index 0000000..6a798b1
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-4v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-4v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-4v2.jpg
new file mode 100644
index 0000000..a478977
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-4v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-4v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-4v3.jpg
new file mode 100644
index 0000000..44ca68f
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-4v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-1v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-1v1.jpg
new file mode 100644
index 0000000..1c46686
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-1v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-1v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-1v2.jpg
new file mode 100644
index 0000000..144bed7
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-1v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-1v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-1v3.jpg
new file mode 100644
index 0000000..af7491a
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-1v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v1.jpg
new file mode 100644
index 0000000..ec75de3
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v1b.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v1b.jpg
new file mode 100644
index 0000000..a871fc8
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v1b.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v1p.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v1p.jpg
new file mode 100644
index 0000000..db88850
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v1p.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v2.jpg
new file mode 100644
index 0000000..70330ad
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v2b.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v2b.jpg
new file mode 100644
index 0000000..08d7f23
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v2b.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v2p.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v2p.jpg
new file mode 100644
index 0000000..a4b07b2
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v2p.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v3.jpg
new file mode 100644
index 0000000..989eb43
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v3b.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v3b.jpg
new file mode 100644
index 0000000..09461aa
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v3b.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v3p.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v3p.jpg
new file mode 100644
index 0000000..c384767
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt-2v3p.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v1.jpg
new file mode 100644
index 0000000..099c965
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v1b.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v1b.jpg
new file mode 100644
index 0000000..7a01748
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v1b.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v1cr.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v1cr.jpg
new file mode 100644
index 0000000..d0ec1c4
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v1cr.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v2.jpg
new file mode 100644
index 0000000..21c3c2b
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v2b.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v2b.jpg
new file mode 100644
index 0000000..80f1996
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v2b.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v2cr.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v2cr.jpg
new file mode 100644
index 0000000..82d45a7
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v2cr.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v3.jpg
new file mode 100644
index 0000000..3d848c4
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v3b.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v3b.jpg
new file mode 100644
index 0000000..4cf09bf
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v3b.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v3cr.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v3cr.jpg
new file mode 100644
index 0000000..3a13358
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mens-shirt_3v3cr.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/messenger-1v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/messenger-1v1.jpg
new file mode 100644
index 0000000..5ca868d
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/messenger-1v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/messenger-1v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/messenger-1v2.jpg
new file mode 100644
index 0000000..58f119e
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/messenger-1v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/messenger-1v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/messenger-1v3.jpg
new file mode 100644
index 0000000..0c5ebda
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/messenger-1v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/messenger-1v4.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/messenger-1v4.jpg
new file mode 100644
index 0000000..9f7f592
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/messenger-1v4.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-1v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-1v1.jpg
new file mode 100644
index 0000000..d8414ea
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-1v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-1v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-1v2.jpg
new file mode 100644
index 0000000..54b14c5
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-1v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-1v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-1v3.jpg
new file mode 100644
index 0000000..64d89ad
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-1v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-2v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-2v1.jpg
new file mode 100644
index 0000000..c2511ca
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-2v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-2v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-2v2.jpg
new file mode 100644
index 0000000..cf7ca79
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-2v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-2v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-2v3.jpg
new file mode 100644
index 0000000..3de5c4c
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/mug-2v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/shoe2_v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/shoe2_v1.jpg
new file mode 100644
index 0000000..761d3da
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/shoe2_v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/shoe2_v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/shoe2_v2.jpg
new file mode 100644
index 0000000..2327de8
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/shoe2_v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/shoe2_v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/shoe2_v3.jpg
new file mode 100644
index 0000000..b1f86ba
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/shoe2_v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/sweatshirt-2v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/sweatshirt-2v1.jpg
new file mode 100644
index 0000000..6a84c75
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/sweatshirt-2v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/sweatshirt-2v1b.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/sweatshirt-2v1b.jpg
new file mode 100644
index 0000000..7ec7f0a
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/sweatshirt-2v1b.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/sweatshirt-2v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/sweatshirt-2v3.jpg
new file mode 100644
index 0000000..03f6b6e
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/sweatshirt-2v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/sweatshirt-2v3b.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/sweatshirt-2v3b.jpg
new file mode 100644
index 0000000..cc05f9a
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/sweatshirt-2v3b.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/tote-1v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/tote-1v1.jpg
new file mode 100644
index 0000000..c576cd4
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/tote-1v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/tote-1v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/tote-1v2.jpg
new file mode 100644
index 0000000..9a17b76
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/tote-1v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/tote-1v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/tote-1v3.jpg
new file mode 100644
index 0000000..9ab919b
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/tote-1v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/travel-mug-1v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/travel-mug-1v1.jpg
new file mode 100644
index 0000000..e4b84c3
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/travel-mug-1v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/travel-mug-1v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/travel-mug-1v2.jpg
new file mode 100644
index 0000000..8604763
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/travel-mug-1v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/travel-mug-1v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/travel-mug-1v3.jpg
new file mode 100644
index 0000000..9141827
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/travel-mug-1v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/usb-1v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/usb-1v1.jpg
new file mode 100644
index 0000000..6e39a7b
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/usb-1v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/usb-1v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/usb-1v2.jpg
new file mode 100644
index 0000000..a2bc737
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/usb-1v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/usb-1v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/usb-1v3.jpg
new file mode 100644
index 0000000..b280be2
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/usb-1v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/water-bottle-1v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/water-bottle-1v1.jpg
new file mode 100644
index 0000000..7a80148
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/water-bottle-1v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/water-bottle-1v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/water-bottle-1v2.jpg
new file mode 100644
index 0000000..6fa3034
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/water-bottle-1v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/water-bottle-1v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/water-bottle-1v3.jpg
new file mode 100644
index 0000000..617725e
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/water-bottle-1v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v1.jpg
new file mode 100644
index 0000000..03aa970
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v1g.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v1g.jpg
new file mode 100644
index 0000000..07ebdef
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v1g.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v1y.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v1y.jpg
new file mode 100644
index 0000000..681979c
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v1y.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v2.jpg
new file mode 100644
index 0000000..102189e
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v2g.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v2g.jpg
new file mode 100644
index 0000000..3cabaed
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v2g.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v2y.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v2y.jpg
new file mode 100644
index 0000000..e76ec62
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v2y.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v3.jpg
new file mode 100644
index 0000000..91d059b
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v3g.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v3g.jpg
new file mode 100644
index 0000000..d9bca97
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v3g.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v3y.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v3y.jpg
new file mode 100644
index 0000000..caa3528
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens-1v3y.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v1.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v1.jpg
new file mode 100644
index 0000000..6f9dd8e
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v1.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v1b.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v1b.jpg
new file mode 100644
index 0000000..a023f01
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v1b.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v1p.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v1p.jpg
new file mode 100644
index 0000000..7d882b1
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v1p.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v2.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v2.jpg
new file mode 100644
index 0000000..444c3a0
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v2.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v2b.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v2b.jpg
new file mode 100644
index 0000000..ed8f808
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v2b.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v2p.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v2p.jpg
new file mode 100644
index 0000000..e78db83
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v2p.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v3.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v3.jpg
new file mode 100644
index 0000000..a22e7f0
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v3.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v3b.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v3b.jpg
new file mode 100644
index 0000000..699cae8
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v3b.jpg differ
diff --git a/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v3p.jpg b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v3p.jpg
new file mode 100644
index 0000000..b35507b
Binary files /dev/null and b/modules/commerce/tests/src/Functional/d7/files/sites/default/files/womens2v3p.jpg differ
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/FieldFormatterSettingsTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/FieldFormatterSettingsTest.php
index 0f2fad9..abc5b5c 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/FieldFormatterSettingsTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/FieldFormatterSettingsTest.php
@@ -132,7 +132,7 @@ class FieldFormatterSettingsTest extends Commerce1TestBase {
     $this->assertEntity('commerce_order_item.default.default');
 
     $this->assertEntity('commerce_product.bags_cases.default');
-    $this->assertComponent('commerce_product.bags_cases.default', 'body', 'text_default', 'hidden', -4);
+    $this->assertComponent('commerce_product.bags_cases.default', 'body', 'text_default', 'hidden', 4);
     $this->assertComponent('commerce_product.bags_cases.default', 'variations', 'commerce_add_to_cart', 'above', 10);
     $this->assertEntity('commerce_product.default.default');
     $this->assertEntity('commerce_product.drinks.default');
@@ -195,6 +195,11 @@ class FieldFormatterSettingsTest extends Commerce1TestBase {
     // Tests node formatter settings.
     $this->assertEntity('taxonomy_term.category.default');
     $this->assertEntity('taxonomy_term.collection.default');
+
+    // Test there are no errors in the map table.
+    $migration = $this->getMigration('d7_field_formatter_settings');
+    $errors = $migration->getIdMap()->errorCount();
+    $this->assertSame(0, (int) $errors);
   }
 
 }
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/FieldInstanceTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/FieldInstanceTest.php
index c1fc520..3cb9984 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/FieldInstanceTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/FieldInstanceTest.php
@@ -132,7 +132,7 @@ class FieldInstanceTest extends Commerce1TestBase {
     $this->assertEntity('commerce_product.bags_cases.field_collection', 'Collection', 'entity_reference', FALSE, FALSE);
     $this->assertEntity('commerce_product.bags_cases.field_gender', 'Gender', 'entity_reference', FALSE, FALSE);
     $this->assertEntity('commerce_product.bags_cases.field_product', 'Product variations', 'entity_reference', TRUE, FALSE);
-    $this->assertEntity('commerce_product.bags_cases.title_field', 'Title', 'string', TRUE, FALSE);
+    $this->assertEntity('commerce_product.bags_cases.title_field', 'Title', 'text', TRUE, FALSE);
     $this->assertEntity('commerce_product.default.body', 'Body', 'text_with_summary', FALSE, TRUE);
     $this->assertEntity('commerce_product.default.stores', 'Stores', 'entity_reference', TRUE, FALSE);
     $this->assertEntity('commerce_product.default.variations', 'Variations', 'entity_reference', TRUE, FALSE);
@@ -144,7 +144,7 @@ class FieldInstanceTest extends Commerce1TestBase {
     $this->assertEntity('commerce_product.drinks.field_collection', 'Collection', 'entity_reference', FALSE, FALSE);
     $this->assertEntity('commerce_product.drinks.field_gender', 'Gender', 'entity_reference', FALSE, FALSE);
     $this->assertEntity('commerce_product.drinks.field_product', 'Product variations', 'entity_reference', TRUE, FALSE);
-    $this->assertEntity('commerce_product.drinks.title_field', 'Title', 'string', TRUE, FALSE);
+    $this->assertEntity('commerce_product.drinks.title_field', 'Title', 'text', TRUE, FALSE);
     $this->assertEntity('commerce_product.hats.body', 'Body', 'text_with_summary', FALSE, FALSE);
     $this->assertEntity('commerce_product.hats.stores', 'Stores', 'entity_reference', TRUE, FALSE);
     $this->assertEntity('commerce_product.hats.variations', 'Variations', 'entity_reference', TRUE, FALSE);
@@ -153,7 +153,7 @@ class FieldInstanceTest extends Commerce1TestBase {
     $this->assertEntity('commerce_product.hats.field_collection', 'Collection', 'entity_reference', FALSE, FALSE);
     $this->assertEntity('commerce_product.hats.field_gender', 'Gender', 'entity_reference', FALSE, FALSE);
     $this->assertEntity('commerce_product.hats.field_product', 'Product variations', 'entity_reference', TRUE, FALSE);
-    $this->assertEntity('commerce_product.hats.title_field', 'Title', 'string', TRUE, FALSE);
+    $this->assertEntity('commerce_product.hats.title_field', 'Title', 'text', TRUE, FALSE);
     $this->assertEntity('commerce_product.shoes.body', 'Body', 'text_with_summary', FALSE, FALSE);
     $this->assertEntity('commerce_product.shoes.stores', 'Stores', 'entity_reference', TRUE, FALSE);
     $this->assertEntity('commerce_product.shoes.variations', 'Variations', 'entity_reference', TRUE, FALSE);
@@ -162,7 +162,7 @@ class FieldInstanceTest extends Commerce1TestBase {
     $this->assertEntity('commerce_product.shoes.field_collection', 'Collection', 'entity_reference', FALSE, FALSE);
     $this->assertEntity('commerce_product.shoes.field_gender', 'Gender', 'entity_reference', FALSE, FALSE);
     $this->assertEntity('commerce_product.shoes.field_product', 'Product variations', 'entity_reference', TRUE, FALSE);
-    $this->assertEntity('commerce_product.shoes.title_field', 'Title', 'string', TRUE, FALSE);
+    $this->assertEntity('commerce_product.shoes.title_field', 'Title', 'text', TRUE, FALSE);
     $this->assertEntity('commerce_product.storage_devices.body', 'Body', 'text_with_summary', FALSE, FALSE);
     $this->assertEntity('commerce_product.storage_devices.stores', 'Stores', 'entity_reference', TRUE, FALSE);
     $this->assertEntity('commerce_product.storage_devices.variations', 'Variations', 'entity_reference', TRUE, FALSE);
@@ -171,7 +171,7 @@ class FieldInstanceTest extends Commerce1TestBase {
     $this->assertEntity('commerce_product.storage_devices.field_collection', 'Collection', 'entity_reference', FALSE, FALSE);
     $this->assertEntity('commerce_product.storage_devices.field_gender', 'Gender', 'entity_reference', FALSE, FALSE);
     $this->assertEntity('commerce_product.storage_devices.field_product', 'Product variations', 'entity_reference', TRUE, FALSE);
-    $this->assertEntity('commerce_product.storage_devices.title_field', 'Title', 'string', TRUE, FALSE);
+    $this->assertEntity('commerce_product.storage_devices.title_field', 'Title', 'text', TRUE, FALSE);
     $this->assertEntity('commerce_product.tops.body', 'Body', 'text_with_summary', FALSE, FALSE);
     $this->assertEntity('commerce_product.tops.stores', 'Stores', 'entity_reference', TRUE, FALSE);
     $this->assertEntity('commerce_product.tops.variations', 'Variations', 'entity_reference', TRUE, FALSE);
@@ -180,7 +180,7 @@ class FieldInstanceTest extends Commerce1TestBase {
     $this->assertEntity('commerce_product.tops.field_collection', 'Collection', 'entity_reference', FALSE, FALSE);
     $this->assertEntity('commerce_product.tops.field_gender', 'Gender', 'entity_reference', FALSE, FALSE);
     $this->assertEntity('commerce_product.tops.field_product', 'Product variations', 'entity_reference', TRUE, FALSE);
-    $this->assertEntity('commerce_product.tops.title_field', 'Title', 'string', TRUE, FALSE);
+    $this->assertEntity('commerce_product.tops.title_field', 'Title', 'text', TRUE, FALSE);
 
     // Commerce product variation field instances.
     $this->assertEntity('commerce_product_variation.bags_cases.title_field', 'Title', 'string', TRUE, TRUE);
@@ -213,6 +213,11 @@ class FieldInstanceTest extends Commerce1TestBase {
     $this->assertEntity('node.ad_push.field_image', 'Image', 'image', TRUE, FALSE);
     $this->assertLinkFields('node.ad_push.field_link', DRUPAL_DISABLED);
     $this->assertEntity('node.ad_push.title_field', 'Title', 'string', TRUE, FALSE);
+
+    // Test there are no errors in the map table.
+    $migration = $this->getMigration('d7_field_instance');
+    $errors = $migration->getIdMap()->errorCount();
+    $this->assertSame(0, (int) $errors);
   }
 
 }
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/FieldInstanceWidgetSettingsTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/FieldInstanceWidgetSettingsTest.php
index 21df56d..c6917e5 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/FieldInstanceWidgetSettingsTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/FieldInstanceWidgetSettingsTest.php
@@ -171,6 +171,11 @@ class FieldInstanceWidgetSettingsTest extends Commerce1TestBase {
     $this->assertEntity('taxonomy_term.category.default', 'taxonomy_term', 'category');
     $this->assertEntity('taxonomy_term.collection.default', 'taxonomy_term', 'collection');
     $this->assertEntity('taxonomy_term.color.default', 'taxonomy_term', 'color');
+
+    // Test there are no errors in the map table.
+    $migration = $this->getMigration('d7_field_instance_widget_settings');
+    $errors = $migration->getIdMap()->errorCount();
+    $this->assertSame(0, (int) $errors);
   }
 
 }
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/FieldTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/FieldTest.php
index f2cf624..721d090 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/FieldTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/FieldTest.php
@@ -77,6 +77,8 @@ class FieldTest extends Commerce1TestBase {
     $this->assertTrue($field instanceof FieldStorageConfigInterface);
     $field = FieldStorageConfig::load('commerce_product_variation.field_top_size');
     $this->assertTrue($field instanceof FieldStorageConfigInterface);
+    $field = FieldStorageConfig::load('commerce_product_variation.title_field');
+    $this->assertTrue($field instanceof FieldStorageConfigInterface);
     // The default price on product in D8 is a base field without a field
     // storage so migrating this could be skipped. However, the source product
     // may have additional price field so migrate them all.
@@ -129,6 +131,8 @@ class FieldTest extends Commerce1TestBase {
     $this->assertTrue($field instanceof FieldStorageConfigInterface);
     $field = FieldStorageConfig::load('node.field_tagline');
     $this->assertTrue($field instanceof FieldStorageConfigInterface);
+    $field = FieldStorageConfig::load('node.title_field');
+    $this->assertTrue($field instanceof FieldStorageConfigInterface);
 
     // Node only field storage should not be duplicated on commerce products.
     $field = FieldStorageConfig::load('commerce_product.field_blog_category');
@@ -144,14 +148,16 @@ class FieldTest extends Commerce1TestBase {
     $field = FieldStorageConfig::load('commerce_product.field_tagline');
     $this->assertFalse($field instanceof FieldStorageConfigInterface);
 
-    // Commerce address field storage.
-    $field = FieldStorageConfig::load('profile.commerce_customer_address');
-    $this->assertTrue($field instanceof FieldStorageConfigInterface);
-
     $field = FieldStorageConfig::load('taxonomy_term.field_image');
     $this->assertTrue($field instanceof FieldStorageConfigInterface);
     $field = FieldStorageConfig::load('taxonomy_term.field_category_color');
     $this->assertTrue($field instanceof FieldStorageConfigInterface);
+
+    // Test that a rerun of the migration does not cause errors.
+    $this->executeMigration('d7_field');
+    $migration = $this->getMigration('d7_field');
+    $errors = $migration->getIdMap()->errorCount();
+    $this->assertSame(0, (int) $errors);
   }
 
 }
diff --git a/modules/commerce/tests/src/Kernel/Migrate/d7/ViewModesTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/ViewModesTest.php
index 9b7dbf9..7465ec3 100644
--- a/modules/commerce/tests/src/Kernel/Migrate/d7/ViewModesTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/ViewModesTest.php
@@ -72,6 +72,11 @@ class MigrateViewModesTest extends Commerce1TestBase {
    * Tests migration of D7 view mode variables to D8 config entities.
    */
   public function testMigration() {
+    $this->assertEntity('commerce_product.full', 'Full', 'commerce_product');
+    $this->assertEntity('commerce_product.teaser', 'Teaser', 'commerce_product');
+    $this->assertEntity('commerce_product.product_list', 'product_list', 'commerce_product');
+    $this->assertEntity('commerce_product.product_in_cart', 'product_in_cart', 'commerce_product');
+
     $this->assertEntity('commerce_product_variation.add_to_cart_confirmation_view', 'add_to_cart_confirmation_view', 'commerce_product_variation');
     $this->assertEntity('commerce_product_variation.commerce_line_item_display', 'commerce_line_item_display', 'commerce_product_variation');
     $this->assertEntity('commerce_product_variation.full', 'Full', 'commerce_product_variation');
@@ -84,6 +89,11 @@ class MigrateViewModesTest extends Commerce1TestBase {
     $this->assertEntity('commerce_product_variation.node_teaser', 'node_teaser', 'commerce_product_variation');
     $this->assertEntity('commerce_product_variation.product_in_cart', 'product_in_cart', 'commerce_product_variation');
     $this->assertEntity('commerce_product_variation.add_to_cart_confirmation_view', 'add_to_cart_confirmation_view', 'commerce_product_variation');
+
+    // Test there are no errors in the map table.
+    $migration = $this->getMigration('d7_view_modes');
+    $errors = $migration->getIdMap()->errorCount();
+    $this->assertSame(0, (int) $errors);
   }
 
 }