diff --git a/.travis.yml b/.travis.yml
index 53ee986..91af7b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -117,7 +117,7 @@ script:
   # Run the Coder sniffer.
   - phpcs --report=full --standard=Drupal ./modules/$MODULE_NAME
   # Run the Simpletests.
-#  - php ./core/scripts/run-tests.sh --php `which php` --concurrency 12 --url $SIMPLETEST_BASE_URL --verbose --color --types "Simpletest" "$MODULE_TEST_GROUP"
+#  - php ./core/scripts/run-tests.sh --php `which php` --concurrency 12 --url $SIMPLETEST_BASE_URL --color --types "Simpletest" "$MODULE_TEST_GROUP"
   # Run the PHPUnit tests.
 #  - ./vendor/phpunit/phpunit/phpunit -c ./core/phpunit.xml.dist --testsuite=unit --group=$MODULE_TEST_GROUP
   - ./vendor/phpunit/phpunit/phpunit -c ./core/phpunit.xml.dist --testsuite=kernel --group=$MODULE_TEST_GROUP
diff --git a/dynamic_entity_reference.install b/dynamic_entity_reference.install
deleted file mode 100644
index 9e02758..0000000
--- a/dynamic_entity_reference.install
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/**
- * @file
- * Update functions for the dynamic_entity_reference module.
- */
-
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\Sql\SqlContentEntityStorageException;
-use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
-
-/**
- * Changes target_id column to string and creates target_id_int.
- *
- * This is immensely complicated because
- * \Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema::updateDedicatedTableSchema()
- * throws a
- * \Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException
- * when there is a column change even if the change is doable without problem --
- * like this update here which changes the int target_id column to string. So
- * this routine needs to find all target_id columns and cast them manually.
- * After that,
- * \Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema::saveFieldSchemaData()
- * is protected so the field storage schema needs to be saved into the key-value
- * storage. On top of this, shared tables store the field definition objects in
- * yet another key-value storage which also needs to be manually kept
- * up-to-date.
- *
- * Finally
- * \Drupal\dynamic_entity_reference\EventSubscriber\FieldStorageSubscriber::handleEntityType()
- * is called to add the triggers.
- *
- */
-function dynamic_entity_reference_update_8001() {
-  /** @var \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager */
-  $schema = \Drupal::database()->schema();
-  $entity_field_manager = \Drupal::service('entity_field.manager');
-  $entity_type_manager = \Drupal::entityTypeManager();
-  // The key-value collection for tracking installed storage schema.
-  $entity_storage_schema_sql = \Drupal::keyValue('entity.storage_schema.sql');
-  $entity_definitions_installed = \Drupal::keyValue('entity.definitions.installed');
-  // DER field storage subscriber service to create integer column and add
-  // triggers for target_id column.
-  /** @var \Drupal\dynamic_entity_reference\EventSubscriber\FieldStorageSubscriber $service */
-  $service = \Drupal::service('dynamic_entity_reference.entity_type_subscriber');
-  // Only update dynamic_entity_reference fields.
-  foreach ($entity_field_manager->getFieldMapByFieldType('dynamic_entity_reference') as $entity_type_id => $map) {
-    $entity_type = $entity_type_manager->getDefinition($entity_type_id);
-    $entity_storage = $entity_type_manager->getStorage($entity_type_id);
-    // Only SQL storage based entities are supported.
-    if ($entity_storage instanceof SqlEntityStorageInterface) {
-      $field_storage_definitions = $entity_field_manager->getFieldStorageDefinitions($entity_type_id);
-      /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
-      $table_mapping = $entity_storage->getTableMapping($field_storage_definitions);
-      $field_storage_definition = FALSE;
-      // Only need field storage definitions of dynamic_entity_reference fields.
-      /** @var \Drupal\Core\Field\FieldStorageDefinitionInterface $field_storage_definition */
-      foreach (array_intersect_key($field_storage_definitions, $map) as $field_storage_definition) {
-        $field_name = $field_storage_definition->getName();
-        try {
-          $table = $table_mapping->getFieldTableName($field_name);
-          $column = $table_mapping->getFieldColumnName($field_storage_definition, 'target_id');
-        }
-        catch (SqlContentEntityStorageException $e) {
-          // Custom storage? Broken site? No matter what, if there is no table
-          // or column, there's little we can do.
-          continue;
-        }
-        $dedicated = $table_mapping->requiresDedicatedTableStorage($field_storage_definition);
-        $spec = [
-          'description' => 'The ID of the target entity.',
-          'type' => 'varchar_ascii',
-          'length' => 255,
-          'not null' => $dedicated,
-        ];
-        // Name of the column is not changed only specifications are changed.
-        $schema->changeField($table, $column, $column, $spec);
-        // For the sake of completeness change the target type to ASCII as well.
-        $type_spec = [
-          'description' => 'The Entity Type ID of the target entity.',
-          'type' => 'varchar_ascii',
-          'length' => EntityTypeInterface::BUNDLE_MAX_LENGTH,
-          'not null' => $dedicated,
-        ];
-        $type_column = $table_mapping->getFieldColumnName($field_storage_definition, 'target_type');
-        $schema->changeField($table, $type_column, $type_column, $type_spec);
-        $revision_table = NULL;
-        if ($entity_type->isRevisionable() && $field_storage_definition->isRevisionable()) {
-          if ($table_mapping->requiresDedicatedTableStorage($field_storage_definition)) {
-            $revision_table = $table_mapping->getDedicatedRevisionTableName($field_storage_definition);
-          }
-          elseif ($table_mapping->allowsSharedTableStorage($field_storage_definition)) {
-            $revision_table = $entity_type->getRevisionDataTable() ?: $entity_type->getRevisionTable();
-          }
-          $schema->changeField($revision_table, $column, $column, $spec);
-          $schema->changeField($revision_table, $type_column, $type_column, $type_spec);
-        }
-        // Update the installed storage schema for this field as well.
-        $key = "$entity_type_id.field_schema_data.$field_name";
-        if ($field_schema_data = $entity_storage_schema_sql->get($key)) {
-          $field_schema_data[$table]['fields'][$column] = $spec;
-          $field_schema_data[$table]['fields'][$type_column] = $type_spec;
-          $entity_storage_schema_sql->set($key, $field_schema_data);
-          if ($revision_table) {
-            $field_schema_data[$revision_table]['fields'][$column] = $spec;
-            $field_schema_data[$revision_table]['fields'][$type_column] = $type_spec;
-            $entity_storage_schema_sql->set($key, $field_schema_data);
-          }
-        }
-        if ($table_mapping->allowsSharedTableStorage($field_storage_definition)) {
-          $key = "$entity_type_id.field_storage_definitions";
-          if ($definitions = $entity_definitions_installed->get($key)) {
-            $definitions[$field_name] = $field_storage_definition;
-            $entity_definitions_installed->set($key, $definitions);
-          }
-        }
-      }
-      if ($field_storage_definition) {
-        // Add the integer columns after converting all original columns to
-        // string.
-        $service->handleEntityType($entity_type_id);
-      }
-    }
-  }
-
-}
diff --git a/dynamic_entity_reference.services.yml b/dynamic_entity_reference.services.yml
index d00969a..153fff9 100644
--- a/dynamic_entity_reference.services.yml
+++ b/dynamic_entity_reference.services.yml
@@ -2,22 +2,3 @@ services:
   plugin.manager.dynamic_entity_reference_selection:
     class: Drupal\dynamic_entity_reference\SelectionPluginManager
     parent: plugin.manager.entity_reference_selection
-  dynamic_entity_reference.entity_type_subscriber:
-    class: Drupal\dynamic_entity_reference\EventSubscriber\FieldStorageSubscriber
-    arguments: ['@entity_type.manager', '@entity_field.manager', '@dynamic_entity_reference.storage.create_column', '@database']
-    tags:
-      - { name: event_subscriber }
-  dynamic_entity_reference.storage.create_column:
-    class: Drupal\dynamic_entity_reference\Storage\IntColumnHandler
-    tags:
-      - { name: backend_overridable }
-    arguments: ['@database']
-  mysql.dynamic_entity_reference.storage.create_column:
-    class: Drupal\dynamic_entity_reference\Storage\IntColumnHandlerMySQL
-    arguments: ['@database']
-  pgsql.dynamic_entity_reference.storage.create_column:
-    class: Drupal\dynamic_entity_reference\Storage\IntColumnHandlerPostgreSQL
-    arguments: ['@database']
-  sqlite.dynamic_entity_reference.storage.create_column:
-    class: Drupal\dynamic_entity_reference\Storage\IntColumnHandlerSQLite
-    arguments: ['@database']
diff --git a/dynamic_entity_reference.views.inc b/dynamic_entity_reference.views.inc
index d429d26..84eda05 100644
--- a/dynamic_entity_reference.views.inc
+++ b/dynamic_entity_reference.views.inc
@@ -52,7 +52,7 @@ function dynamic_entity_reference_field_views_data(FieldStorageConfigInterface $
           'base' => $target_base_table,
           'entity type' => $target_entity_type_id,
           'base field' => $target_entity_type->getKey('id'),
-          'relationship field' => $field_name . '_target_id_int',
+          'relationship field' => $field_name . '_target_id',
           // Entity reference field only has one target type whereas dynamic
           // entity reference field can have multiple target types that is why
           // an extra join condition on target types is needed.
@@ -84,7 +84,7 @@ function dynamic_entity_reference_field_views_data(FieldStorageConfigInterface $
           'base field' => $entity_type->getKey('id'),
           'field_name' => $field_name,
           'field table' => $table_mapping->getDedicatedDataTableName($field_storage),
-          'field field' => $field_name . '_target_id_int',
+          'field field' => $field_name . '_target_id',
           // Entity reference field only has one target type whereas dynamic
           // entity reference field can have multiple target types that is why
           // an extra join condition on target types is needed.
@@ -151,7 +151,7 @@ function dynamic_entity_reference_views_data() {
     foreach ($fields as $field) {
       $field_name = $field->getName();
       $columns = $table_mapping->getColumnNames($field_name);
-      $column_id = $columns['target_id'] . '_int';
+      $column_id = $columns['target_id'];
       $column_type = $columns['target_type'];
 
       // Unlimited (-1) or > 1 store field data in a dedicated table.
diff --git a/src/EventSubscriber/FieldStorageSubscriber.php b/src/EventSubscriber/FieldStorageSubscriber.php
deleted file mode 100644
index d09023e..0000000
--- a/src/EventSubscriber/FieldStorageSubscriber.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-namespace Drupal\dynamic_entity_reference\EventSubscriber;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\Core\Entity\EntityTypeEvent;
-use Drupal\Core\Entity\EntityTypeEvents;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\Sql\SqlContentEntityStorageException;
-use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
-use Drupal\Core\Field\FieldStorageDefinitionEvent;
-use Drupal\Core\Field\FieldStorageDefinitionEvents;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\dynamic_entity_reference\Storage\IntColumnHandlerInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * Hands off field storage events to the integer column handler.
- */
-class FieldStorageSubscriber implements EventSubscriberInterface {
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The database specific handler creating the _int column.
-   *
-   * @var \Drupal\dynamic_entity_reference\Storage\IntColumnHandler
-   */
-  protected $intColumnHandler;
-
-  /**
-   * The entity field manager.
-   *
-   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
-   */
-  protected $entityFieldManager;
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $connection;
-
-  /**
-   * FieldStorageSubscriber constructor.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
-   *   The entity field manager.
-   * @param \Drupal\dynamic_entity_reference\Storage\IntColumnHandlerInterface $int_column_handler
-   *   The integer column handler.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, IntColumnHandlerInterface $int_column_handler, Connection $connection) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->entityFieldManager = $entity_field_manager;
-    $this->intColumnHandler = $int_column_handler;
-    $this->connection = $connection;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    // When enabling a module implementing an entity type,
-    // EntityTypeEvents::CREATE fires and FieldStorageDefinitionEvents::CREATE
-    // does not. On the other hand, when adding a field
-    // to an existing entity type, EntityTypeEvents::UPDATE does not fire but
-    // FieldStorageDefinitionEvents::CREATE does. This is true for saving a
-    // FieldStorageConfig object or enabling a module implementing
-    // hook_entity_base_field_info().
-    $events[FieldStorageDefinitionEvents::CREATE][] = ['onFieldStorage', 100];
-    $events[EntityTypeEvents::CREATE][] = ['onEntityType', 100];
-    return $events;
-  }
-
-  /**
-   * Handle a field storage event.
-   *
-   * @param \Drupal\Core\Field\FieldStorageDefinitionEvent $event
-   *   The event to process.
-   */
-  public function onFieldStorage(FieldStorageDefinitionEvent $event) {
-    $definition = $event->getFieldStorageDefinition();
-    $this->handleEntityType($definition->getTargetEntityTypeId(), $definition);
-  }
-
-  /**
-   * Handle an entity type event.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeEvent $event
-   *   The event to process.
-   */
-  public function onEntityType(EntityTypeEvent $event) {
-    $this->handleEntityType($event->getEntityType()->id());
-  }
-
-  /**
-   * Adds integer columns and relevant triggers for an entity type.
-   *
-   * Every dyanmic_entity_reference field belonging to an entity type will get
-   * an integer column pair and a trigger which calculates the integer value if
-   * the target_id looks like a number. This makes it possible to store a
-   * string for entities which have string IDs and yet JOIN and ORDER on
-   * integers when that's desired.
-   *
-   * @param string $entity_type_id
-   *   The entity type ID.
-   * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_storage_definition
-   *   The field storage definition. It is only necessary to pass this if this
-   *   a FieldStorageConfig object during presave and as such the definition is
-   *   not yet available to the entity field manager.
-   */
-  public function handleEntityType($entity_type_id, FieldStorageDefinitionInterface $field_storage_definition = NULL) {
-    $storage = $this->entityTypeManager->getStorage($entity_type_id);
-    $der_fields = $this->entityFieldManager->getFieldMapByFieldType('dynamic_entity_reference');
-    if ($field_storage_definition) {
-      $der_fields[$entity_type_id][$field_storage_definition->getName()] = TRUE;
-    }
-    $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
-    $tables = [];
-    // If we know which field is being created / updated check whether it is
-    // DER.
-    if ($storage instanceof SqlEntityStorageInterface && !empty($der_fields[$entity_type_id])) {
-      $storage_definitions = $this->entityFieldManager->getFieldStorageDefinitions($entity_type_id);
-      if ($field_storage_definition) {
-        $storage_definitions[$field_storage_definition->getName()] = $field_storage_definition;
-      }
-      /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $mapping */
-      $mapping = $storage->getTableMapping($storage_definitions);
-      foreach (array_keys($der_fields[$entity_type_id]) as $field_name) {
-        try {
-          $table = $mapping->getFieldTableName($field_name);
-          $column = $mapping->getFieldColumnName($storage_definitions[$field_name], 'target_id');
-        }
-        catch (SqlContentEntityStorageException $e) {
-          // Custom storage? Broken site? No matter what, if there is no table
-          // or column, there's little we can do.
-          continue;
-        }
-        $tables[$table][] = $column;
-        if ($entity_type->isRevisionable() && ($storage_definitions[$field_name]->isRevisionable())) {
-          try {
-            if ($mapping->requiresDedicatedTableStorage($storage_definitions[$field_name])) {
-              $tables[$mapping->getDedicatedRevisionTableName($storage_definitions[$field_name])][] = $column;
-            }
-            elseif ($mapping->allowsSharedTableStorage($storage_definitions[$field_name])) {
-              $revision_table = $entity_type->getRevisionDataTable() ?: $entity_type->getRevisionTable();
-              $tables[$revision_table][] = $column;
-              $tables[$revision_table] = array_unique($tables[$revision_table]);
-            }
-          }
-          catch (SqlContentEntityStorageException $e) {
-            // Nothing to do if the revision table doesn't exist.
-          }
-        }
-      }
-      $new = [];
-      foreach ($tables as $table => $columns) {
-        $new[$table] = $this->intColumnHandler->create($table, $columns);
-      }
-      foreach (array_filter($new) as $table => $columns) {
-        // reset($columns) is one of the new int columns. The trigger will fill
-        // in the right value for it.
-        $this->connection->update($table)->fields([reset($columns) => 0])->execute();
-      }
-    }
-  }
-
-}
diff --git a/src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php b/src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php
index 775d420..a34eaa8 100644
--- a/src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php
+++ b/src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php
@@ -73,7 +73,7 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
    * {@inheritdoc}
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
-    $properties['target_id'] = DataReferenceTargetDefinition::create('string')
+    $properties['target_id'] = DataReferenceTargetDefinition::create('integer')
       ->setLabel(t('Entity ID'))
       ->setSetting('unsigned', TRUE)
       ->setRequired(TRUE);
@@ -99,12 +99,12 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
     $columns = [
       'target_id' => [
         'description' => 'The ID of the target entity.',
-        'type' => 'varchar_ascii',
-        'length' => 255,
+        'type' => 'int',
+        'unsigned' => TRUE,
       ],
       'target_type' => [
         'description' => 'The Entity Type ID of the target entity.',
-        'type' => 'varchar_ascii',
+        'type' => 'varchar',
         'length' => EntityTypeInterface::BUNDLE_MAX_LENGTH,
       ],
     ];
@@ -517,6 +517,9 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
     $labels = \Drupal::service('entity_type.repository')->getEntityTypeLabels(TRUE);
     $options = array_keys($labels[(string) t('Content', [], ['context' => 'Entity type group'])]);
 
+    // Add configuration entities.
+    $options = array_merge($options, array_keys($labels[(string) t('Configuration', [], ['context' => 'Entity type group'])]));
+
     if (!empty($settings['exclude_entity_types'])) {
       return array_diff($options, $settings['entity_type_ids'] ?: []);
     }
diff --git a/src/Storage/IntColumnHandler.php b/src/Storage/IntColumnHandler.php
deleted file mode 100644
index 925ce34..0000000
--- a/src/Storage/IntColumnHandler.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-namespace Drupal\dynamic_entity_reference\Storage;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Database\Schema;
-
-/**
- * Per database implementation of denormalizing into integer columns.
- */
-abstract class IntColumnHandler implements IntColumnHandlerInterface {
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $connection;
-
-  /**
-   * IntColumnHandler constructor.
-   *
-   * @param \Drupal\Core\Database\Connection $connection
-   *   The database connection.
-   */
-  public function __construct(Connection $connection) {
-    $this->connection = $connection;
-  }
-
-  /**
-   * Checks whether all columns exist.
-   *
-   * @param \Drupal\Core\Database\Schema $schema
-   *   The database Schema object for this connection.
-   * @param string $table
-   *   The name of the table in drupal (no prefixing).
-   * @param string[] $columns
-   *   The names of the columns.
-   *
-   * @return bool
-   *   TRUE if all the given columns exists, otherwise FALSE.
-   */
-  public static function allColumnsExist(Schema $schema, $table, array $columns) {
-    foreach ($columns as $column) {
-      // When a new module adds more than one new basefields in
-      // hook_entity_base_field_info() then the entity system will report those
-      // but they won't exist yet in the database. It's enough to fire when
-      // called for the last one.
-      if (!$schema->fieldExists($table, $column)) {
-        return FALSE;
-      }
-    }
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function create($table, array $columns) {
-    $schema = $this->connection->schema();
-    // The integer column specification.
-    $spec = [
-      'type' => 'int',
-      'unsigned' => TRUE,
-      'not null' => FALSE,
-    ];
-    // Before MySQL 5.7.2, there cannot be multiple triggers for a given table
-    // that have the same trigger event and action time so set all involved
-    // columns in one go. See
-    // https://dev.mysql.com/doc/refman/5.7/en/trigger-syntax.html for more.
-    // In SQLite, it's cheaper to run one query instead on per column.
-    $body = [];
-    $new = [];
-    if (!static::allColumnsExist($schema, $table, $columns)) {
-      return [];
-    }
-    foreach ($columns as $column) {
-      $column_int = $column . '_int';
-      // Make sure the integer columns exist.
-      if (!$schema->fieldExists($table, $column_int)) {
-        $new[] = $column_int;
-        $schema->addField($table, $column_int, $spec);
-      }
-      // This is the heart of this function: before an UPDATE/INSERT, set the
-      // value of the integer column to the integer value of the string column.
-      $body[] = $this->createBody($column_int, $column);
-    }
-    if ($new) {
-      $body = implode(', ', $body);
-      $prefixed_name = $this->connection->prefixTables('{' . $table . '}');
-      foreach (['update', 'insert'] as $op) {
-        $trigger = $prefixed_name . '_der_' . $op;
-        if (strlen($trigger) > 64) {
-          $trigger = substr($trigger, 0, 56) . substr(hash('sha256', $trigger), 0, 8);
-        }
-        $this->connection->query("DROP TRIGGER IF EXISTS $trigger");
-        if ($body) {
-          $this->createTrigger($trigger, $op, $prefixed_name, $body);
-        }
-      }
-    }
-    return $new;
-  }
-
-  /**
-   * Creates the body of the trigger.
-   *
-   * Creates a part of the statement to set the value of the integer column to
-   * the integer value of the string column.
-   *
-   * @param string $column_int
-   *   The name of the target_id_int column.
-   * @param string $column
-   *   The name of the target_id column.
-   */
-  abstract protected function createBody($column_int, $column);
-
-  /**
-   * Actually creates the trigger.
-   *
-   * @param string $trigger
-   *   The name of the trigger.
-   * @param string $op
-   *   Either UPDATE or INSERT.
-   * @param string $prefixed_name
-   *   The already prefixed table table.
-   * @param string $body
-   *   The body of the trigger.
-   */
-  abstract protected function createTrigger($trigger, $op, $prefixed_name, $body);
-
-  /**
-   * Removes the trigger.
-   *
-   * @param string $table
-   *   Name of the table.
-   * @param string $column
-   *   Name of the column.
-   *
-   * @TODO not sure whether we want to bother with deleting.
-   */
-  public function delete($table, $column) {
-
-  }
-
-}
diff --git a/src/Storage/IntColumnHandlerInterface.php b/src/Storage/IntColumnHandlerInterface.php
deleted file mode 100644
index c91db36..0000000
--- a/src/Storage/IntColumnHandlerInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Drupal\dynamic_entity_reference\Storage;
-
-/**
- * The interface for IntColumnHandler.
- */
-interface IntColumnHandlerInterface {
-
-  /**
-   * Creates the _int columns and the triggers for them.
-   *
-   * @param string $table
-   *   The non-prefix table to operate on.
-   * @param array $columns
-   *   The DER target_id columns.
-   *
-   * @return array
-   *   The list of new target_id_int columns.
-   */
-  public function create($table, array $columns);
-
-}
diff --git a/src/Storage/IntColumnHandlerMySQL.php b/src/Storage/IntColumnHandlerMySQL.php
deleted file mode 100644
index 1ad145b..0000000
--- a/src/Storage/IntColumnHandlerMySQL.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\dynamic_entity_reference\Storage;
-
-/**
- * MySQL implementation of denormalizing into integer columns.
- */
-class IntColumnHandlerMySQL extends IntColumnHandler {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createBody($column_int, $column) {
-    return "NEW.$column_int = IF(NEW.$column REGEXP '^[0-9]+$', CAST(NEW.$column AS UNSIGNED), NULL)";
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createTrigger($trigger, $op, $prefixed_name, $body) {
-    $this->connection->query("CREATE TRIGGER $trigger BEFORE $op ON $prefixed_name FOR EACH ROW SET $body");
-  }
-
-}
diff --git a/src/Storage/IntColumnHandlerPostgreSQL.php b/src/Storage/IntColumnHandlerPostgreSQL.php
deleted file mode 100644
index 6d36521..0000000
--- a/src/Storage/IntColumnHandlerPostgreSQL.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-namespace Drupal\dynamic_entity_reference\Storage;
-
-use Drupal\Core\Database\Connection;
-
-/**
- * PostgreSQL implementation of denormalizing into integer columns.
- */
-class IntColumnHandlerPostgreSQL implements IntColumnHandlerInterface {
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $connection;
-
-  /**
-   * IntColumnHandlerPostgreSQL constructor.
-   *
-   * @param \Drupal\Core\Database\Connection $connection
-   *   The database connection.
-   */
-  public function __construct(Connection $connection) {
-    $this->connection = $connection;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function create($table, array $columns) {
-    $schema = $this->connection->schema();
-    if (!IntColumnHandler::allColumnsExist($schema, $table, $columns)) {
-      return [];
-    }
-    // The integer column specification.
-    $spec = [
-      'type' => 'int',
-      'unsigned' => TRUE,
-      'not null' => FALSE,
-    ];
-    $new = [];
-    foreach ($columns as $column) {
-      $column_int = $column . '_int';
-      // Make sure the integer columns exist.
-      if (!$schema->fieldExists($table, $column_int)) {
-        $this->createTriggerFunction($table, $column, $column_int);
-        $this->createTrigger($table, $column, $column_int);
-        $schema->addField($table, $column_int, $spec);
-        $new[] = $column_int;
-      }
-    }
-    return $new;
-  }
-
-  /**
-   * Creates the actual table function.
-   *
-   * @param string $table
-   *   The name of the table.
-   * @param string $column
-   *   The name of the target_id column.
-   * @param string $column_int
-   *   The name of the target_id_int column.
-   */
-  protected function createTriggerFunction($table, $column, $column_int) {
-    $function_name = $this->getFunctionName($table, $column_int);
-    $query = "CREATE OR REPLACE FUNCTION $function_name() RETURNS trigger AS $$
-      BEGIN
-        NEW.$column_int = (CASE WHEN NEW.$column ~ '^[0-9]+$' THEN NEW.$column ELSE NULL END)::integer";
-    if (strpos($query, ';') !== FALSE) {
-      throw new \InvalidArgumentException('; is not supported in SQL strings. Use only one statement at a time.');
-    }
-    $this->connection->query("$query; RETURN NEW; END; $$ LANGUAGE plpgsql IMMUTABLE RETURNS NULL ON NULL INPUT", [], ['allow_delimiter_in_query' => TRUE]);
-  }
-
-  /**
-   * Creates the trigger.
-   *
-   * @param string $table
-   *   The name of the table.
-   * @param string $column
-   *   The name of the target_id column.
-   * @param string $column_int
-   *   The name of the target_id_int column.
-   */
-  protected function createTrigger($table, $column, $column_int) {
-    $function_name = $this->getFunctionName($table, $column_int);
-    $prefixed_table = $this->getPrefixedTable($table);
-    // It is much easier to just drop and recreate than figuring it out whether
-    // it exists.
-    $this->connection->query("DROP TRIGGER IF EXISTS $column_int ON $prefixed_table");
-    $this->connection->query("
-      CREATE TRIGGER $column_int
-        BEFORE INSERT OR UPDATE
-        ON $prefixed_table
-        FOR EACH ROW
-        EXECUTE PROCEDURE $function_name();
-    ");
-  }
-
-  /**
-   * Returns an appropriate plpgsql function name.
-   *
-   * @param string $table
-   *   The name of the table.
-   * @param string $column_int
-   *   The name of the target_id_int column.
-   *
-   * @return string
-   *   The plpgsql function name.
-   */
-  protected function getFunctionName($table, $column_int) {
-    return implode('_', [$this->getPrefixedTable($table), $column_int]);
-  }
-
-  /**
-   * Gets the prefxied table name.
-   *
-   * @param string $table
-   *   The name of the table.
-   *
-   * @return string
-   *   The prefixed table name.
-   */
-  protected function getPrefixedTable($table) {
-    return $this->connection->prefixTables('{' . $table . '}');
-  }
-
-}
diff --git a/src/Storage/IntColumnHandlerSQLite.php b/src/Storage/IntColumnHandlerSQLite.php
deleted file mode 100644
index 5d047c8..0000000
--- a/src/Storage/IntColumnHandlerSQLite.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\dynamic_entity_reference\Storage;
-
-/**
- * SQLite implementation of denormalizing into integer columns.
- */
-class IntColumnHandlerSQLite extends IntColumnHandler {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createBody($column_int, $column) {
-    return "$column_int = CAST($column AS INTEGER)";
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createTrigger($trigger, $op, $prefixed_name, $body) {
-    $parts = explode('.', $prefixed_name);
-    // Simpletest for example prefixes with a database name but SQLite does
-    // not support referencing databases in the body of the trigger (even if it
-    // is the same database the triggering table is in).
-    $table_name = array_pop($parts);
-    $query = "
-        CREATE TRIGGER $trigger AFTER $op ON $prefixed_name
-        FOR EACH ROW
-        BEGIN
-          UPDATE $table_name SET $body WHERE ROWID=NEW.ROWID";
-    // SQLite requires a ; in the query which requires bypassing Drupal's built
-    // in single statement only protection. Although this method is not
-    // supposed to be called by user submitted data.
-    if (strpos($query, ';') !== FALSE) {
-      throw new \InvalidArgumentException('; is not supported in SQL strings. Use only one statement at a time.');
-    }
-    $this->connection->query("$query; END", [], ['allow_delimiter_in_query' => TRUE]);
-  }
-
-}
diff --git a/src/Tests/Update/DerRevUpdateTest.php b/src/Tests/Update/DerRevUpdateTest.php
deleted file mode 100644
index 9b4d0dd..0000000
--- a/src/Tests/Update/DerRevUpdateTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-namespace Drupal\dynamic_entity_reference\Tests\Update;
-
-use Drupal\entity_test\Entity\EntityTestMulRev;
-use Drupal\entity_test\Entity\EntityTestRev;
-use Drupal\entity_test\Entity\EntityTestStringId;
-use Drupal\system\Tests\Update\UpdatePathTestBase;
-
-/**
- * Tests the revisionable DER fields update path.
- *
- * @group dynamic_entity_reference
- */
-class DerRevUpdateTest extends UpdatePathTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $installProfile = 'testing';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setDatabaseDumpFiles() {
-    // This dump is created using 8.x-1.x branch of dynamic_entity_reference
-    // after installing testing profile and running update_test_8001.php script.
-    $this->databaseDumpFiles = [
-      __DIR__ . '/../../../tests/fixtures/update/der_rev_dump.php.gz',
-    ];
-  }
-
-  /**
-   * Test that target_id is converted to string and target_id_int is created.
-   *
-   * @see dynamic_entity_reference_update_8001()
-   */
-  public function testUpdate8001() {
-    $connection = \Drupal::database();
-    $this->runUpdates();
-    // The db dump contain two entity_test_rev entities referencing one
-    // entity_test_rev entity and one entity_test_mulrev entity.
-    // Check the basefields value on entity table columns.
-    $this->assertEqual([NULL, 1, 1], $connection->query('SELECT dynamic_references__target_id FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, 1, 1], $connection->query('SELECT dynamic_references__target_id_int FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol());
-    // Check the both columns of the other basefield.
-    $this->assertEqual([NULL, 1, 1], $connection->query('SELECT der__target_id FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, 1, 1], $connection->query('SELECT der__target_id_int FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol());
-    // The db dump contain two entity_test_mulrev entities referencing one
-    // entity_test_rev entity and one entity_test_mulrev entity.
-    // Check the basefields value on entity data table columns.
-    $this->assertEqual([NULL, 1, 1], $connection->query('SELECT dynamic_references__target_id FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, 1, 1], $connection->query('SELECT dynamic_references__target_id_int FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol());
-    // Check the both columns of the other basefield.
-    $this->assertEqual([NULL, 1, 1], $connection->query('SELECT der__target_id FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, 1, 1], $connection->query('SELECT der__target_id_int FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol());
-
-    // Check the basefields value on entity revision table columns.
-    $this->assertEqual([NULL, 1, 1, 1, 1, 1, 1, 1, 1], $connection->query('SELECT dynamic_references__target_id FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, 1, 1, 1, 1, 1, 1, 1, 1], $connection->query('SELECT dynamic_references__target_id_int FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol());
-    // Check the both columns of the other basefield.
-    $this->assertEqual([NULL, NULL, NULL, 1, 1, NULL, NULL, 1, 1], $connection->query('SELECT der__target_id FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, NULL, NULL, 1, 1, NULL, NULL, 1, 1], $connection->query('SELECT der__target_id_int FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol());
-    // Check the basefields value on entity revision data table columns.
-    $this->assertEqual([NULL, 1, 1, 1, 1, 1, 1, 1, 1], $connection->query('SELECT dynamic_references__target_id FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, 1, 1, 1, 1, 1, 1, 1, 1], $connection->query('SELECT dynamic_references__target_id_int FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol());
-    // Check the both columns of the other basefield.
-    $this->assertEqual([NULL, NULL, NULL, 1, 1, NULL, NULL, 1, 1], $connection->query('SELECT der__target_id FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, NULL, NULL, 1, 1, NULL, NULL, 1, 1], $connection->query('SELECT der__target_id_int FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol());
-
-    // String id entity can be referenced now.
-    $referenced_entity = EntityTestStringId::create([
-      'id' => 'test',
-    ]);
-    $referenced_entity->save();
-    $entity = EntityTestRev::load(3);
-    $entity->dynamic_references[0] = $entity->der[0] = $referenced_entity;
-    $entity->setNewRevision(TRUE);
-    $entity->save();
-    $entity = EntityTestMulRev::load(3);
-    $entity->dynamic_references[0] = $entity->der[0] = $referenced_entity;
-    $entity->setNewRevision(TRUE);
-    $entity->save();
-    // Check the basefields value on entity table columns.
-    $this->assertEqual([NULL, 1, 'test'], $connection->query('SELECT dynamic_references__target_id FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, 1, 0], $connection->query('SELECT dynamic_references__target_id_int FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol());
-    // Check the both columns of the other basefield.
-    $this->assertEqual([NULL, 1, 'test'], $connection->query('SELECT der__target_id FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, 1, 0], $connection->query('SELECT der__target_id_int FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol());
-    // The db dump contain two entity_test_mulrev entities referencing one
-    // entity_test_rev entity and one entity_test_mulrev entity.
-    // Check the basefields value on entity data table columns.
-    $this->assertEqual([NULL, 1, 'test'], $connection->query('SELECT dynamic_references__target_id FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, 1, 0], $connection->query('SELECT dynamic_references__target_id_int FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol());
-    // Check the both columns of the other basefield.
-    $this->assertEqual([NULL, 1, 'test'], $connection->query('SELECT der__target_id FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, 1, 0], $connection->query('SELECT der__target_id_int FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol());
-
-    // Check the basefields value on entity revision table columns.
-    $this->assertEqual([NULL, 1, 1, 1, 1, 1, 1, 1, 1, 'test'], $connection->query('SELECT dynamic_references__target_id FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, 1, 1, 1, 1, 1, 1, 1, 1, 0], $connection->query('SELECT dynamic_references__target_id_int FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol());
-    // Check the both columns of the other basefield.
-    $this->assertEqual([NULL, NULL, NULL, 1, 1, NULL, NULL, 1, 1, 'test'], $connection->query('SELECT der__target_id FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, NULL, NULL, 1, 1, NULL, NULL, 1, 1, 0], $connection->query('SELECT der__target_id_int FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol());
-    // Check the basefields value on entity revision data table columns.
-    $this->assertEqual([NULL, 1, 1, 1, 1, 1, 1, 1, 1, 'test'], $connection->query('SELECT dynamic_references__target_id FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, 1, 1, 1, 1, 1, 1, 1, 1, 0], $connection->query('SELECT dynamic_references__target_id_int FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol());
-    // Check the both columns of the other basefield.
-    $this->assertEqual([NULL, NULL, NULL, 1, 1, NULL, NULL, 1, 1, 'test'], $connection->query('SELECT der__target_id FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol());
-    $this->assertEqual([NULL, NULL, NULL, 1, 1, NULL, NULL, 1, 1, 0], $connection->query('SELECT der__target_id_int FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol());
-  }
-
-}
diff --git a/src/Tests/Update/DerUpdateTest.php b/src/Tests/Update/DerUpdateTest.php
deleted file mode 100644
index 7ab1e6d..0000000
--- a/src/Tests/Update/DerUpdateTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Drupal\dynamic_entity_reference\Tests\Update;
-
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\entity_test\Entity\EntityTestMul;
-use Drupal\entity_test\Entity\EntityTestStringId;
-use Drupal\system\Tests\Update\UpdatePathTestBase;
-
-/**
- * Tests DER update path.
- *
- * @group dynamic_entity_reference
- */
-class DerUpdateTest extends UpdatePathTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $installProfile = 'testing';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setDatabaseDumpFiles() {
-    // This dump is created using 8.x-1.x branch of dynamic_entity_reference
-    // after installing testing profile and running update_test_8001.php script.
-    $this->databaseDumpFiles = [
-      __DIR__ . '/../../../tests/fixtures/update/der_dump.php.gz',
-    ];
-  }
-
-  /**
-   * Test that target_id is converted to string and target_id_int is created.
-   *
-   * @see dynamic_entity_reference_update_8001()
-   */
-  public function testUpdate8001() {
-    $connection = \Drupal::database();
-    if ($connection->driver() == 'mysql') {
-      // This might force an 1071 Specified key was too long; max key length
-      // is 767 bytes error if innodb_large_prefix is ON so test it.
-      $connection->query('ALTER TABLE {entity_test__field_test} ROW_FORMAT=compact');
-    }
-    $this->runUpdates();
-    // The db dump contain two entity_test entities referencing one entity_test
-    // entity and one entity_test_mul entity.
-    // Check the basefields value on entity table columns.
-    $this->assertEqual([NULL, 1, 1], $connection->query('SELECT dynamic_references__target_id FROM {entity_test} ORDER BY id')->fetchCol());
-    $this->assertEqual([NULL, 1, 1], $connection->query('SELECT dynamic_references__target_id_int FROM {entity_test} ORDER BY id')->fetchCol());
-    // Check the both columns of configurable fields values.
-    $this->assertEqual([1, 1, 1, 1], $connection->query('SELECT field_test_target_id FROM {entity_test__field_test} ORDER BY entity_id, delta')->fetchCol());
-    $this->assertEqual([1, 1, 1, 1], $connection->query('SELECT field_test_target_id_int FROM {entity_test__field_test} ORDER BY entity_id, delta')->fetchCol());
-    // The db dump contain two entity_test entities referencing one entity_test
-    // entity and one entity_test_mul entity.
-    // Check the basefields values on entity data table columns.
-    $this->assertEqual([NULL, 1, 1], $connection->query('SELECT dynamic_references__target_id FROM {entity_test_mul_property_data} ORDER BY id')->fetchCol());
-    $this->assertEqual([NULL, 1, 1], $connection->query('SELECT dynamic_references__target_id_int FROM {entity_test_mul_property_data} ORDER BY id')->fetchCol());
-    // Check the both columns of configurable fields values.
-    $this->assertEqual([1, 1, 1, 1], $connection->query('SELECT field_test_mul_target_id FROM {entity_test_mul__field_test_mul} ORDER BY entity_id, delta')->fetchCol());
-    $this->assertEqual([1, 1, 1, 1], $connection->query('SELECT field_test_mul_target_id_int FROM {entity_test_mul__field_test_mul} ORDER BY entity_id, delta')->fetchCol());
-
-    // String id entity can be referenced now.
-    $referenced_entity = EntityTestStringId::create([
-      'id' => 'test',
-    ]);
-    $referenced_entity->save();
-    $entity = EntityTest::load(3);
-    $entity->field_test[] = $referenced_entity;
-    $entity->save();
-    // Check the values in both columns.
-    $this->assertEqual([1, 1, 1, 1, 0], $connection->query('SELECT field_test_target_id_int FROM {entity_test__field_test} ORDER BY entity_id, delta')->fetchCol());
-    $this->assertEqual([1, 1, 1, 1, 'test'], $connection->query('SELECT field_test_target_id FROM {entity_test__field_test} ORDER BY entity_id, delta')->fetchCol());
-    $entity = EntityTestMul::load(3);
-    $entity->field_test_mul[] = $referenced_entity;
-    $entity->save();
-    // Check the values in both columns.
-    $this->assertEqual([1, 1, 1, 1, 0], $connection->query('SELECT field_test_mul_target_id_int FROM {entity_test_mul__field_test_mul} ORDER BY entity_id, delta')->fetchCol());
-    $this->assertEqual([1, 1, 1, 1, 'test'], $connection->query('SELECT field_test_mul_target_id FROM {entity_test_mul__field_test_mul} ORDER BY entity_id, delta')->fetchCol());
-
-    // Create some test entities which link each other.
-    $referenced_entity = EntityTest::load(1);
-    $referenced_entity_mul = EntityTestMul::load(1);
-    // Create test entity without any reference.
-    $entity = EntityTest::create();
-    $entity->save();
-    // Create test data table entity without any reference.
-    $entity = EntityTestMul::create();
-    $entity->save();
-    // Create test entity with all kind of references.
-    $entity = EntityTest::create();
-    $entity->field_test[] = $referenced_entity;
-    $entity->field_test[] = $referenced_entity_mul;
-    $entity->dynamic_references[] = $referenced_entity_mul;
-    $entity->save();
-    // Create test data table entity with all kind of references.
-    $entity = EntityTestMul::create();
-    $entity->field_test_mul[] = $referenced_entity;
-    $entity->field_test_mul[] = $referenced_entity_mul;
-    $entity->dynamic_references[] = $referenced_entity;
-    $entity->save();
-    // Check the basefields value on entity table columns.
-    $this->assertEqual([NULL, 1, 1, NULL, 1], $connection->query('SELECT dynamic_references__target_id FROM {entity_test} ORDER BY id')->fetchCol());
-    $this->assertEqual([NULL, 1, 1, NULL, 1], $connection->query('SELECT dynamic_references__target_id_int FROM {entity_test} ORDER BY id')->fetchCol());
-    // Check the both columns of configurable fields values.
-    $this->assertEqual([1, 1, 1, 1, 0, 1, 1], $connection->query('SELECT field_test_target_id_int FROM {entity_test__field_test} ORDER BY entity_id, delta')->fetchCol());
-    $this->assertEqual([1, 1, 1, 1, 'test', 1, 1], $connection->query('SELECT field_test_target_id FROM {entity_test__field_test} ORDER BY entity_id, delta')->fetchCol());
-    // Check the basefields values on entity data table columns.
-    $this->assertEqual([NULL, 1, 1, NULL, 1], $connection->query('SELECT dynamic_references__target_id FROM {entity_test_mul_property_data} ORDER BY id')->fetchCol());
-    $this->assertEqual([NULL, 1, 1, NULL, 1], $connection->query('SELECT dynamic_references__target_id_int FROM {entity_test_mul_property_data} ORDER BY id')->fetchCol());
-    // Check the both columns of configurable fields values.
-    $this->assertEqual([1, 1, 1, 1, 0, 1, 1], $connection->query('SELECT field_test_mul_target_id_int FROM {entity_test_mul__field_test_mul} ORDER BY entity_id, delta')->fetchCol());
-    $this->assertEqual([1, 1, 1, 1, 'test', 1, 1], $connection->query('SELECT field_test_mul_target_id FROM {entity_test_mul__field_test_mul} ORDER BY entity_id, delta')->fetchCol());
-  }
-
-}
diff --git a/tests/fixtures/update/der_dump.php.gz b/tests/fixtures/update/der_dump.php.gz
deleted file mode 100644
index 491c483..0000000
Binary files a/tests/fixtures/update/der_dump.php.gz and /dev/null differ
diff --git a/tests/fixtures/update/der_rev_dump.php.gz b/tests/fixtures/update/der_rev_dump.php.gz
deleted file mode 100644
index 6cdd868..0000000
Binary files a/tests/fixtures/update/der_rev_dump.php.gz and /dev/null differ
diff --git a/tests/fixtures/update/update_rev_test_8001.php b/tests/fixtures/update/update_rev_test_8001.php
deleted file mode 100755
index 52aeaea..0000000
--- a/tests/fixtures/update/update_rev_test_8001.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains database additions for testing the upgrade path 8001.
- *
- * This script is run from drupal root after installing the testing profile of
- * Drupal 8.2.x on 8.x-1.x branch of dynamic_entity_reference. For more details
- * see https://www.drupal.org/node/2555027#comment-11307815.
- */
-
-use Drupal\entity_test\Entity\EntityTestMulRev;
-use Drupal\entity_test\Entity\EntityTestRev;
-
-\Drupal::state()->set('dynamic_entity_reference_entity_test_entities', [
-  'entity_test_rev',
-  'entity_test_mulrev',
-  'entity_test_string_id',
-]);
-\Drupal::state()->set('dynamic_entity_reference_entity_test_with_two_base_fields', TRUE);
-\Drupal::state()->set('dynamic_entity_reference_entity_test_cardinality', 1);
-\Drupal::state()->set('dynamic_entity_reference_entity_test_revisionable', TRUE);
-\Drupal::service('module_installer')->install(['dynamic_entity_reference_entity_test']);
-
-// Create some test entities which link each other.
-$referenced_entity = EntityTestRev::create();
-$referenced_entity->save();
-$referenced_entity_mul = EntityTestMulRev::create();
-$referenced_entity_mul->save();
-
-$entity = EntityTestRev::create();
-$entity->dynamic_references[0] = $referenced_entity;
-$entity->setNewRevision(TRUE);
-$entity->save();
-$entity->dynamic_references[0] = $referenced_entity_mul;
-$entity->setNewRevision(TRUE);
-$entity->save();
-$entity->der[0] = $referenced_entity;
-$entity->setNewRevision(TRUE);
-$entity->save();
-$entity->der[0] = $referenced_entity_mul;
-$entity->setNewRevision(TRUE);
-$entity->save();
-
-$entity = EntityTestRev::create();
-$entity->dynamic_references[0] = $referenced_entity_mul;
-$entity->setNewRevision(TRUE);
-$entity->save();
-$entity->dynamic_references[0] = $referenced_entity;
-$entity->setNewRevision(TRUE);
-$entity->save();
-$entity->der[0] = $referenced_entity_mul;
-$entity->setNewRevision(TRUE);
-$entity->save();
-$entity->der[0] = $referenced_entity;
-$entity->setNewRevision(TRUE);
-$entity->save();
-
-$entity = EntityTestMulRev::create();
-$entity->dynamic_references[0] = $referenced_entity;
-$entity->setNewRevision(TRUE);
-$entity->save();
-$entity->dynamic_references[0] = $referenced_entity_mul;
-$entity->setNewRevision(TRUE);
-$entity->save();
-$entity->der[0] = $referenced_entity;
-$entity->setNewRevision(TRUE);
-$entity->save();
-$entity->der[0] = $referenced_entity_mul;
-$entity->setNewRevision(TRUE);
-$entity->save();
-
-$entity = EntityTestMulRev::create();
-$entity->dynamic_references[0] = $referenced_entity_mul;
-$entity->setNewRevision(TRUE);
-$entity->save();
-$entity->dynamic_references[0] = $referenced_entity;
-$entity->setNewRevision(TRUE);
-$entity->save();
-$entity->der[0] = $referenced_entity_mul;
-$entity->setNewRevision(TRUE);
-$entity->save();
-$entity->der[0] = $referenced_entity;
-$entity->setNewRevision(TRUE);
-$entity->save();
diff --git a/tests/fixtures/update/update_test_8001.php b/tests/fixtures/update/update_test_8001.php
deleted file mode 100755
index 6541354..0000000
--- a/tests/fixtures/update/update_test_8001.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains database additions for testing the upgrade path 8001.
- *
- * This script is run from drupal root after installing the testing profile of
- * Drupal 8.2.x on 8.x-1.x branch of dynamic_entity_reference. For more details
- * see https://www.drupal.org/node/2555027#comment-11307815.
- */
-
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\entity_test\Entity\EntityTestMul;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-
-\Drupal::service('module_installer')->install([
-  'dynamic_entity_reference_entity_test',
-]);
-
-$field_storage = FieldStorageConfig::create([
-  'entity_type' => 'entity_test',
-  'field_name' => 'field_test',
-  'type' => 'dynamic_entity_reference',
-  'settings' => [
-    'exclude_entity_types' => FALSE,
-    'entity_type_ids' => [
-      'entity_test',
-      'entity_test_mul',
-      'entity_test_string_id',
-    ],
-  ],
-  'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-]);
-$field_storage->save();
-
-$field = FieldConfig::create([
-  'entity_type' => 'entity_test',
-  'field_name' => 'field_test',
-  'bundle' => 'entity_test',
-  'settings' => [
-    'entity_test' => [
-      'handler' => "default:entity_test",
-      'handler_settings' => [
-        'target_bundles' => [
-          'entity_test' => 'entity_test',
-        ],
-      ],
-    ],
-    'entity_test_mul' => [
-      'handler' => "default:entity_test_mul",
-      'handler_settings' => [
-        'target_bundles' => [
-          'entity_test_mul' => 'entity_test_mul',
-        ],
-      ],
-    ],
-    'entity_test_string_id' => [
-      'handler' => "default:entity_test_string_id",
-      'handler_settings' => [
-        'target_bundles' => [
-          'entity_test_string_id' => 'entity_test_string_id',
-        ],
-      ],
-    ],
-  ],
-]);
-$field->save();
-
-$field_storage = FieldStorageConfig::create([
-  'entity_type' => 'entity_test_mul',
-  'field_name' => 'field_test_mul',
-  'type' => 'dynamic_entity_reference',
-  'settings' => [
-    'exclude_entity_types' => FALSE,
-    'entity_type_ids' => [
-      'entity_test',
-      'entity_test_mul',
-      'entity_test_string_id',
-    ],
-  ],
-  'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-]);
-$field_storage->save();
-
-$field = FieldConfig::create([
-  'entity_type' => 'entity_test_mul',
-  'field_name' => 'field_test_mul',
-  'bundle' => 'entity_test_mul',
-  'settings' => [
-    'entity_test' => [
-      'handler' => "default:entity_test",
-      'handler_settings' => [
-        'target_bundles' => [
-          'entity_test' => 'entity_test',
-        ],
-      ],
-    ],
-    'entity_test_mul' => [
-      'handler' => "default:entity_test_mul",
-      'handler_settings' => [
-        'target_bundles' => [
-          'entity_test_mul' => 'entity_test_mul',
-        ],
-      ],
-    ],
-    'entity_test_string_id' => [
-      'handler' => "default:entity_test_string_id",
-      'handler_settings' => [
-        'target_bundles' => [
-          'entity_test_string_id' => 'entity_test_string_id',
-        ],
-      ],
-    ],
-  ],
-]);
-$field->save();
-
-
-// Create some test entities which link each other.
-$referenced_entity = EntityTest::create();
-$referenced_entity->save();
-$referenced_entity_mul = EntityTestMul::create();
-$referenced_entity_mul->save();
-
-$entity = EntityTest::create();
-$entity->field_test[] = $referenced_entity;
-$entity->field_test[] = $referenced_entity_mul;
-$entity->dynamic_references[] = $referenced_entity;
-$entity->save();
-
-$entity = EntityTest::create();
-$entity->field_test[] = $referenced_entity;
-$entity->field_test[] = $referenced_entity_mul;
-$entity->dynamic_references[] = $referenced_entity_mul;
-$entity->save();
-
-
-$entity = EntityTestMul::create();
-$entity->field_test_mul[] = $referenced_entity;
-$entity->field_test_mul[] = $referenced_entity_mul;
-$entity->dynamic_references[] = $referenced_entity;
-$entity->save();
-
-$entity = EntityTestMul::create();
-$entity->field_test_mul[] = $referenced_entity;
-$entity->field_test_mul[] = $referenced_entity_mul;
-$entity->dynamic_references[] = $referenced_entity_mul;
-$entity->save();
diff --git a/tests/modules/dynamic_entity_reference_entity_test/dynamic_entity_reference_entity_test.module b/tests/modules/dynamic_entity_reference_entity_test/dynamic_entity_reference_entity_test.module
index cf80cbe..bf8c54c 100644
--- a/tests/modules/dynamic_entity_reference_entity_test/dynamic_entity_reference_entity_test.module
+++ b/tests/modules/dynamic_entity_reference_entity_test/dynamic_entity_reference_entity_test.module
@@ -181,7 +181,7 @@ function dynamic_entity_reference_entity_test_views_data() {
             'extra' => [
               [
                 'left_field' => 'langcode',
-                'field' => 'langcode',
+                'field' => 'langcode'
               ],
             ],
           ],
diff --git a/tests/src/Kernel/DynamicEntityReferenceBaseFieldRevisionTest.php b/tests/src/Kernel/DynamicEntityReferenceBaseFieldRevisionTest.php
index 3e0cfe3..bd54184 100644
--- a/tests/src/Kernel/DynamicEntityReferenceBaseFieldRevisionTest.php
+++ b/tests/src/Kernel/DynamicEntityReferenceBaseFieldRevisionTest.php
@@ -256,22 +256,6 @@ class DynamicEntityReferenceBaseFieldRevisionTest extends EntityKernelTestBase {
     $this->assertEquals($entity->der[0]->entity->id(), $referenced_entity_mul->id());
     $this->assertEquals($entity->der[0]->entity->uuid(), $referenced_entity_mul->uuid());
 
-    // Check the data in DB columns.
-    $database = $this->container
-      ->get('database');
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_rev}')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_rev}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_rev}')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_rev}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_mulrev_property_data}')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_mulrev_property_data}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_mulrev_property_data}')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_mulrev_property_data}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-
     $entity = $this->container
       ->get('entity_type.manager')
       ->getStorage($this->referencedEntityType)
@@ -298,20 +282,6 @@ class DynamicEntityReferenceBaseFieldRevisionTest extends EntityKernelTestBase {
     $this->assertEquals($entity->der[0]->entity->getName(), $referenced_entity->getName());
     $this->assertEquals($entity->der[0]->entity->id(), $referenced_entity->id());
     $this->assertEquals($entity->der[0]->entity->uuid(), $referenced_entity->uuid());
-
-    // Check the data in DB columns.
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_rev}')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_rev}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_rev}')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_rev}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_mulrev_property_data}')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_mulrev_property_data}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_mulrev_property_data}')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_mulrev_property_data}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
   }
 
   /**
@@ -473,7 +443,7 @@ class DynamicEntityReferenceBaseFieldRevisionTest extends EntityKernelTestBase {
   }
 
   /**
-   * Tests the multiple revisionable basefields.
+   * Tests the multiple non-revisionable basefields.
    */
   public function testRevisionableMultipleEntityReference() {
     \Drupal::state()->set('dynamic_entity_reference_entity_test_entities', [$this->entityType, $this->referencedEntityType]);
@@ -523,40 +493,6 @@ class DynamicEntityReferenceBaseFieldRevisionTest extends EntityKernelTestBase {
     $this->assertEquals($entity->der[0]->entity->id(), $referenced_entity_mul->id());
     $this->assertEquals($entity->der[0]->entity->uuid(), $referenced_entity_mul->uuid());
 
-    // Check the data in DB columns.
-    $database = $this->container
-      ->get('database');
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    // Save a new revision.
-    $entity->dynamic_references[0] = $referenced_entity_mul;
-    $entity->der[0] = $referenced_entity;
-    $entity->setNewRevision(TRUE);
-    $entity->save();
-    // Check the data in DB columns.
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-
     $entity = $this->container
       ->get('entity_type.manager')
       ->getStorage($this->referencedEntityType)
@@ -583,38 +519,6 @@ class DynamicEntityReferenceBaseFieldRevisionTest extends EntityKernelTestBase {
     $this->assertEquals($entity->der[0]->entity->getName(), $referenced_entity->getName());
     $this->assertEquals($entity->der[0]->entity->id(), $referenced_entity->id());
     $this->assertEquals($entity->der[0]->entity->uuid(), $referenced_entity->uuid());
-
-    // Check the data in DB columns.
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_rev} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_mulrev_property_data} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    // Save a new revision.
-    $entity->dynamic_references[0] = $referenced_entity;
-    $entity->der[0] = $referenced_entity_mul;
-    $entity->setNewRevision(TRUE);
-    $entity->save();
-    // Check the data in DB columns.
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_rev_revision} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_mulrev_property_revision} ORDER BY id, revision_id')->fetchCol();
-    $this->assertSame($int_column, $str_column);
   }
 
 }
diff --git a/tests/src/Kernel/DynamicEntityReferenceBaseFieldTest.php b/tests/src/Kernel/DynamicEntityReferenceBaseFieldTest.php
index 3bdc488..ed4e8df 100644
--- a/tests/src/Kernel/DynamicEntityReferenceBaseFieldTest.php
+++ b/tests/src/Kernel/DynamicEntityReferenceBaseFieldTest.php
@@ -243,22 +243,6 @@ class DynamicEntityReferenceBaseFieldTest extends EntityKernelTestBase {
     $this->assertEquals($entity->der[0]->entity->id(), $referenced_entity_mul->id());
     $this->assertEquals($entity->der[0]->entity->uuid(), $referenced_entity_mul->uuid());
 
-    // Check the data in DB columns.
-    $database = $this->container
-      ->get('database');
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test}')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test}')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_mul_property_data}')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_mul_property_data}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_mul_property_data}')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_mul_property_data}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-
     $entity = EntityTestMul::create();
     $entity->der[] = $referenced_entity;
     $entity->dynamic_references[] = $referenced_entity_mul;
@@ -282,20 +266,6 @@ class DynamicEntityReferenceBaseFieldTest extends EntityKernelTestBase {
     $this->assertEquals($entity->der[0]->entity->getName(), $referenced_entity->getName());
     $this->assertEquals($entity->der[0]->entity->id(), $referenced_entity->id());
     $this->assertEquals($entity->der[0]->entity->uuid(), $referenced_entity->uuid());
-
-    // Check the data in DB columns.
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test}')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test}')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT dynamic_references__target_id_int FROM {entity_test_mul_property_data}')->fetchCol();
-    $str_column = $database->query('SELECT dynamic_references__target_id FROM {entity_test_mul_property_data}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
-    $int_column = $database->query('SELECT der__target_id_int FROM {entity_test_mul_property_data}')->fetchCol();
-    $str_column = $database->query('SELECT der__target_id FROM {entity_test_mul_property_data}')->fetchCol();
-    $this->assertSame($int_column, $str_column);
   }
 
 }
diff --git a/tests/src/Kernel/DynamicEntityReferenceFieldRevisionTest.php b/tests/src/Kernel/DynamicEntityReferenceFieldRevisionTest.php
deleted file mode 100644
index f7c5164..0000000
--- a/tests/src/Kernel/DynamicEntityReferenceFieldRevisionTest.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-namespace Drupal\Tests\dynamic_entity_reference\Kernel;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
-
-/**
- * Tests for the dynamic entity reference field for revisionable entities.
- *
- * @group dynamic_entity_reference
- */
-class DynamicEntityReferenceFieldRevisionTest extends EntityKernelTestBase {
-  use SchemaCheckTestTrait;
-
-  /**
-   * The entity type used in this test.
-   *
-   * @var string
-   */
-  protected $entityType = 'entity_test_rev';
-
-  /**
-   * The entity type that is being referenced.
-   *
-   * @var string
-   */
-  protected $referencedEntityType = 'entity_test';
-
-  /**
-   * The bundle used in this test.
-   *
-   * @var string
-   */
-  protected $bundle = 'entity_test_rev';
-
-  /**
-   * The name of the field used in this test.
-   *
-   * @var string
-   */
-  protected $fieldName = 'field_test';
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = ['dynamic_entity_reference'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema($this->entityType);
-
-    // Create a field.
-    FieldStorageConfig::create([
-      'field_name' => $this->fieldName,
-      'type' => 'dynamic_entity_reference',
-      'entity_type' => $this->entityType,
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-      'settings' => [
-        'exclude_entity_types' => FALSE,
-        'entity_type_ids' => [
-          $this->referencedEntityType,
-        ],
-      ],
-    ])->save();
-
-    FieldConfig::create([
-      'field_name' => $this->fieldName,
-      'entity_type' => $this->entityType,
-      'bundle' => $this->bundle,
-      'label' => 'Field test',
-      'settings' => [],
-    ])->save();
-
-  }
-
-  /**
-   * Tests referencing entities for revisionable entities.
-   */
-  public function testReferenceForRevisionableEntities() {
-    $field_name = $this->fieldName;
-    $referenced_entity_1 = EntityTest::create();
-    $referenced_entity_2 = EntityTest::create();
-    $referenced_entity_1->save();
-    $referenced_entity_2->save();
-    $storage = $this->container->get('entity_type.manager')
-      ->getStorage($this->entityType);
-    /** @var \Drupal\entity_test\Entity\EntityTestRev $entity */
-    $entity = $storage->create(['type' => $this->bundle]);
-    // Set the field value.
-    $entity->{$field_name}->setValue([
-      [
-        'target_id' => $referenced_entity_1->id(),
-        'target_type' => $referenced_entity_1->getEntityTypeId(),
-      ],
-    ]);
-    $entity->save();
-    $entity_old = $storage->loadUnchanged($entity->id());
-    $revision_id_1 = $entity->getRevisionId();
-    $entity->setNewRevision(TRUE);
-    // Set the field value.
-    $entity->{$field_name}->setValue([
-      [
-        'target_id' => $referenced_entity_2->id(),
-        'target_type' => $referenced_entity_2->getEntityTypeId(),
-      ],
-    ]);
-    $entity->save();
-    $revision_id_2 = $entity->getRevisionId();
-    $entity_new = $storage->loadUnchanged($entity->id());
-    $this->assertNotEquals($revision_id_1, $revision_id_2);
-    $this->assertEquals($entity_old->id(), $entity_new->id());
-    $this->assertEquals($entity_old->{$field_name}->target_id, $referenced_entity_1->id());
-    $this->assertEquals($entity_new->{$field_name}->target_id, $referenced_entity_2->id());
-    $storage->resetCache();
-    $revision_1 = $storage->loadRevision($revision_id_1);
-    $revision_2 = $storage->loadRevision($revision_id_2);
-    $this->assertEquals($revision_1->{$field_name}->target_id, $referenced_entity_1->id());
-    $this->assertEquals($revision_2->{$field_name}->target_id, $referenced_entity_2->id());
-    $database = $this->container->get('database');
-    $this->assertEquals([2], $database->query('SELECT field_test_target_id FROM {entity_test_rev__field_test} ORDER BY entity_id, revision_id, delta')->fetchCol());
-    $this->assertEquals([2], $database->query('SELECT field_test_target_id_int FROM {entity_test_rev__field_test} ORDER BY entity_id, revision_id, delta')->fetchCol());
-    $this->assertEquals([1, 2], $database->query('SELECT field_test_target_id FROM {entity_test_rev_revision__field_test} ORDER BY entity_id, revision_id, delta')->fetchCol());
-    $this->assertEquals([1, 2], $database->query('SELECT field_test_target_id_int FROM {entity_test_rev_revision__field_test} ORDER BY entity_id, revision_id, delta')->fetchCol());
-  }
-
-}
diff --git a/tests/src/Kernel/DynamicEntityReferenceFieldTest.php b/tests/src/Kernel/DynamicEntityReferenceFieldTest.php
index 1d48e1e..528196b 100644
--- a/tests/src/Kernel/DynamicEntityReferenceFieldTest.php
+++ b/tests/src/Kernel/DynamicEntityReferenceFieldTest.php
@@ -4,7 +4,6 @@ namespace Drupal\Tests\dynamic_entity_reference\Kernel;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\entity_test\Entity\EntityTestStringId;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
@@ -228,190 +227,29 @@ class DynamicEntityReferenceFieldTest extends EntityKernelTestBase {
   }
 
   /**
-   * Tests referencing entities with string IDs.
+   * Test config entity reference.
    */
-  public function testReferencedEntitiesStringId() {
-    $field_name = 'entity_reference_string_id';
-    $this->installEntitySchema('entity_test_string_id');
-
-    // Create a field.
-    FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'type' => 'dynamic_entity_reference',
-      'entity_type' => $this->entityType,
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-      'settings' => [
-        'exclude_entity_types' => FALSE,
-        'entity_type_ids' => [
-          'entity_test_string_id',
-        ],
-      ],
-    ])->save();
-
-    FieldConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => $this->entityType,
-      'bundle' => $this->bundle,
-      'label' => 'Field test',
-      'settings' => [
-        'entity_test_string_id' => [
-          'handler' => "default:entity_test_string_id",
-          'handler_settings' => [
-            'target_bundles' => [
-              'entity_test_string_id' => 'entity_test_string_id',
-            ],
-          ],
-        ],
-      ],
-    ])->save();
-    // Create the parent entity.
-    $entity = $this->container->get('entity_type.manager')
-      ->getStorage($this->entityType)
-      ->create(['type' => $this->bundle]);
-
-    // Create the default target entity.
-    $target_entity = EntityTestStringId::create([
-      'id' => $this->randomString(),
-      'type' => 'entity_test_string_id',
-    ]);
-    $target_entity->save();
-
-    // Set the field value.
-    $entity->{$field_name}->setValue([
-      [
-        'target_id' => $target_entity->id(),
-        'target_type' => $target_entity->getEntityTypeId(),
-      ],
-    ]);
-
-    // Load the target entities using
-    // DynamicEntityReferenceFieldItemList::referencedEntities().
-    $entities = $entity->{$field_name}->referencedEntities();
-    $this->assertEquals($entities[0]->id(), $target_entity->id());
-
-    // Test that a string ID works as a default value and the field's config
-    // schema is correct.
-    $field = FieldConfig::loadByName($this->entityType, $this->bundle, $field_name);
-    $field->setDefaultValue([
-      [
-        'target_id' => $target_entity->id(),
-        'target_type' => $target_entity->getEntityTypeId(),
-      ],
-    ]);
-    $field->save();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'field.field.' . $field->id(), $field->toArray());
-
-    // Test that the default value works.
-    $entity = $this->container->get('entity_type.manager')
-      ->getStorage($this->entityType)
-      ->create(['type' => $this->bundle]);
-    $entities = $entity->{$field_name}->referencedEntities();
-    $this->assertEquals($entities[0]->id(), $target_entity->id());
-  }
-
-  /**
-   * Tests referencing entities with string and int IDs.
-   */
-  public function testReferencedEntitiesMixId() {
-    $field_name = 'entity_reference_mix_id';
-    $this->installEntitySchema('entity_test_string_id');
-
-    // Create a field.
-    FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'type' => 'dynamic_entity_reference',
-      'entity_type' => $this->entityType,
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-      'settings' => [
-        'exclude_entity_types' => FALSE,
-        'entity_type_ids' => [
-          $this->referencedEntityType,
-          'entity_test_string_id',
-        ],
-      ],
-    ])->save();
-
-    FieldConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => $this->entityType,
-      'bundle' => $this->bundle,
-      'label' => 'Field test',
-      'settings' => [
-        'entity_test_string_id' => [
-          'handler' => "default:entity_test_string_id",
-          'handler_settings' => [
-            'target_bundles' => [
-              'entity_test_string_id' => 'entity_test_string_id',
-            ],
-          ],
-        ],
-        $this->referencedEntityType => [
-          'handler' => 'default:' . $this->referencedEntityType,
-          'handler_settings' => [
-            'target_bundles' => [
-              $this->bundle => $this->bundle,
-            ],
-          ],
-        ],
-      ],
-    ])->save();
-    // Create the parent entity.
-    $entity = $this->container->get('entity_type.manager')
-      ->getStorage($this->entityType)
-      ->create(['type' => $this->bundle]);
-
-    // Create the default target entity.
-    $target_entity = EntityTestStringId::create([
-      'id' => $this->randomString(),
-      'type' => 'entity_test_string_id',
-    ]);
-    $target_entity->save();
+  public function testConfigEntities() {
+    // Update field storage to allow config entity references.
+    $storage = $this->container->get('entity_type.manager')->getStorage('field_storage_config')->load($this->entityType . '.' . $this->fieldName);
+    $entity_types = [
+      $this->entityType,
+      'field_config',
+    ];
+    $storage->setSetting('entity_type_ids', $entity_types);
+    $storage->save();
+
+    // Reference a field configuration (a config entity).
     $referenced_entity = $this->container->get('entity_type.manager')
-      ->getStorage($this->referencedEntityType)
-      ->create(['type' => $this->bundle]);
-    $referenced_entity->save();
-
-    // Set the field value.
-    $entity->{$field_name}->setValue([
-      [
-        'target_id' => $target_entity->id(),
-        'target_type' => $target_entity->getEntityTypeId(),
-      ],
-      [
-        'target_id' => $referenced_entity->id(),
-        'target_type' => $referenced_entity->getEntityTypeId(),
-      ],
-    ]);
-
-    // Load the target entities using
-    // DynamicEntityReferenceFieldItemList::referencedEntities().
-    $entities = $entity->{$field_name}->referencedEntities();
-    $this->assertEquals($entities[0]->id(), $target_entity->id());
-    $this->assertEquals($entities[1]->id(), $referenced_entity->id());
-
-    // Test that a string ID works as a default value and the field's config
-    // schema is correct.
-    $field = FieldConfig::loadByName($this->entityType, $this->bundle, $field_name);
-    $field->setDefaultValue([
-      [
-        'target_id' => $target_entity->id(),
-        'target_type' => $target_entity->getEntityTypeId(),
-      ],
-      [
-        'target_id' => $referenced_entity->id(),
-        'target_type' => $referenced_entity->getEntityTypeId(),
-      ],
-    ]);
-    $field->save();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'field.field.' . $field->id(), $field->toArray());
-
-    // Test that the default value works.
+      ->getStorage('field_config')
+      ->load($this->entityType . '.' . $this->bundle . '.' . $this->fieldName);
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
       ->create(['type' => $this->bundle]);
-    $entities = $entity->{$field_name}->referencedEntities();
-    $this->assertEquals($entities[0]->id(), $target_entity->id());
-    $this->assertEquals($entities[1]->id(), $referenced_entity->id());
+    $entity->{$this->fieldName}->target_type = $referenced_entity->getEntityTypeId();
+    $entity->{$this->fieldName}->target_id = $referenced_entity->id();
+    $violations = $entity->{$this->fieldName}->validate();
+    $this->assertEquals($violations->count(), 0, 'Validation passes.');
   }
 
 }
diff --git a/tests/src/Kernel/Views/DynamicEntityReferenceBaseFieldRelationshipTest.php b/tests/src/Kernel/Views/DynamicEntityReferenceBaseFieldRelationshipTest.php
index ac9b3b2..a272a08 100644
--- a/tests/src/Kernel/Views/DynamicEntityReferenceBaseFieldRelationshipTest.php
+++ b/tests/src/Kernel/Views/DynamicEntityReferenceBaseFieldRelationshipTest.php
@@ -99,7 +99,7 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['base'], 'entity_test');
     $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['entity type'], 'entity_test');
     $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['base field'], 'id');
-    $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['relationship field'], 'dynamic_references__target_id_int');
+    $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['relationship field'], 'dynamic_references__target_id');
     $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['extra'][0]['left_field'], 'dynamic_references__target_type');
     $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['extra'][0]['value'], 'entity_test');
     // Check views data for test entity - data table referenced from
@@ -108,14 +108,14 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['base'], 'entity_test_mul_property_data');
     $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['entity type'], 'entity_test_mul');
     $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['base field'], 'id');
-    $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['relationship field'], 'dynamic_references__target_id_int');
+    $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['relationship field'], 'dynamic_references__target_id');
     $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['extra'][0]['left_field'], 'dynamic_references__target_type');
     $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['extra'][0]['value'], 'entity_test_mul');
     // Check the backwards reference for test entity using dynamic_references.
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['id'], 'standard');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['base'], 'entity_test');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['entity type'], 'entity_test');
-    $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['base field'], 'dynamic_references__target_id_int');
+    $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['base field'], 'dynamic_references__target_id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['field'], 'id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['extra'][0]['field'], 'dynamic_references__target_type');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['extra'][0]['value'], 'entity_test');
@@ -124,7 +124,7 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__dynamic_references']['relationship']['id'], 'standard');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__dynamic_references']['relationship']['base'], 'entity_test_mul_property_data');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__dynamic_references']['relationship']['entity type'], 'entity_test_mul');
-    $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__dynamic_references']['relationship']['base field'], 'dynamic_references__target_id_int');
+    $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__dynamic_references']['relationship']['base field'], 'dynamic_references__target_id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__dynamic_references']['relationship']['field'], 'id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__dynamic_references']['relationship']['extra'][0]['field'], 'dynamic_references__target_type');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__dynamic_references']['relationship']['extra'][0]['value'], 'entity_test');
@@ -137,7 +137,7 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['base'], 'entity_test');
     $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['entity type'], 'entity_test');
     $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['base field'], 'id');
-    $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['relationship field'], 'dynamic_references__target_id_int');
+    $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['relationship field'], 'dynamic_references__target_id');
     $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['extra'][0]['left_field'], 'dynamic_references__target_type');
     $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['extra'][0]['value'], 'entity_test');
     // Check views data for test entity - data table referenced from
@@ -146,14 +146,14 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['base'], 'entity_test_mul_property_data');
     $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['entity type'], 'entity_test_mul');
     $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['base field'], 'id');
-    $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['relationship field'], 'dynamic_references__target_id_int');
+    $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['relationship field'], 'dynamic_references__target_id');
     $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['extra'][0]['left_field'], 'dynamic_references__target_type');
     $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['extra'][0]['value'], 'entity_test_mul');
     // Check the backwards reference for test entity using dynamic_references.
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test__dynamic_references']['relationship']['id'], 'standard');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test__dynamic_references']['relationship']['base'], 'entity_test');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test__dynamic_references']['relationship']['entity type'], 'entity_test');
-    $this->assertEquals($views_data_entity_test_mul['reverse__entity_test__dynamic_references']['relationship']['base field'], 'dynamic_references__target_id_int');
+    $this->assertEquals($views_data_entity_test_mul['reverse__entity_test__dynamic_references']['relationship']['base field'], 'dynamic_references__target_id');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test__dynamic_references']['relationship']['field'], 'id');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test__dynamic_references']['relationship']['extra'][0]['field'], 'dynamic_references__target_type');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test__dynamic_references']['relationship']['extra'][0]['value'], 'entity_test_mul');
@@ -162,7 +162,7 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['id'], 'standard');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['base'], 'entity_test_mul_property_data');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['entity type'], 'entity_test_mul');
-    $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['base field'], 'dynamic_references__target_id_int');
+    $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['base field'], 'dynamic_references__target_id');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['field'], 'id');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['extra'][0]['field'], 'dynamic_references__target_type');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['extra'][0]['value'], 'entity_test_mul');
@@ -428,7 +428,7 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['base'], 'entity_test');
     $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['entity type'], 'entity_test');
     $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['base field'], 'id');
-    $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['relationship field'], 'dynamic_references_target_id_int');
+    $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['relationship field'], 'dynamic_references_target_id');
     $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['extra'][0]['left_field'], 'dynamic_references_target_type');
     $this->assertEquals($views_data_entity_test['entity_test__dynamic_references']['relationship']['extra'][0]['value'], 'entity_test');
     // Check views data for test entity - data table referenced from
@@ -437,7 +437,7 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['base'], 'entity_test_mul_property_data');
     $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['entity type'], 'entity_test_mul');
     $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['base field'], 'id');
-    $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['relationship field'], 'dynamic_references_target_id_int');
+    $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['relationship field'], 'dynamic_references_target_id');
     $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['extra'][0]['left_field'], 'dynamic_references_target_type');
     $this->assertEquals($views_data_entity_test['entity_test_mul__dynamic_references']['relationship']['extra'][0]['value'], 'entity_test_mul');
 
@@ -451,7 +451,7 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['base field'], 'id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['field_name'], 'dynamic_references');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['field table'], 'entity_test__dynamic_references');
-    $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['field field'], 'dynamic_references_target_id_int');
+    $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['field field'], 'dynamic_references_target_id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['join_extra'][0]['field'], 'dynamic_references_target_type');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['join_extra'][0]['value'], 'entity_test');
 
@@ -466,7 +466,7 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['base field'], 'id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['field_name'], 'dynamic_references');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['field table'], 'entity_test__dynamic_references');
-    $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['field field'], 'dynamic_references_target_id_int');
+    $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['field field'], 'dynamic_references_target_id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['join_extra'][0]['field'], 'dynamic_references_target_type');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__dynamic_references']['relationship']['join_extra'][0]['value'], 'entity_test_mul');
 
@@ -478,7 +478,7 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['base'], 'entity_test');
     $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['entity type'], 'entity_test');
     $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['base field'], 'id');
-    $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['relationship field'], 'dynamic_references_target_id_int');
+    $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['relationship field'], 'dynamic_references_target_id');
     $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['extra'][0]['left_field'], 'dynamic_references_target_type');
     $this->assertEquals($views_data_entity_test_mul['entity_test__dynamic_references']['relationship']['extra'][0]['value'], 'entity_test');
     // Check views data for test entity - data table referenced from
@@ -487,7 +487,7 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['base'], 'entity_test_mul_property_data');
     $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['entity type'], 'entity_test_mul');
     $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['base field'], 'id');
-    $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['relationship field'], 'dynamic_references_target_id_int');
+    $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['relationship field'], 'dynamic_references_target_id');
     $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['extra'][0]['left_field'], 'dynamic_references_target_type');
     $this->assertEquals($views_data_entity_test_mul['entity_test_mul__dynamic_references']['relationship']['extra'][0]['value'], 'entity_test_mul');
 
@@ -501,7 +501,7 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['base field'], 'id');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['field_name'], 'dynamic_references');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['field table'], 'entity_test_mul__dynamic_references');
-    $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['field field'], 'dynamic_references_target_id_int');
+    $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['field field'], 'dynamic_references_target_id');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['join_extra'][0]['field'], 'dynamic_references_target_type');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['join_extra'][0]['value'], 'entity_test');
 
@@ -516,7 +516,7 @@ class DynamicEntityReferenceBaseFieldRelationshipTest extends ViewsKernelTestBas
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['base field'], 'id');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['field_name'], 'dynamic_references');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['field table'], 'entity_test_mul__dynamic_references');
-    $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['field field'], 'dynamic_references_target_id_int');
+    $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['field field'], 'dynamic_references_target_id');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['join_extra'][0]['field'], 'dynamic_references_target_type');
     $this->assertEquals($views_data_entity_test_mul['reverse__entity_test_mul__dynamic_references']['relationship']['join_extra'][0]['value'], 'entity_test_mul');
 
diff --git a/tests/src/Kernel/Views/DynamicEntityReferenceRelationshipTest.php b/tests/src/Kernel/Views/DynamicEntityReferenceRelationshipTest.php
index 36e4ed7..9202025 100644
--- a/tests/src/Kernel/Views/DynamicEntityReferenceRelationshipTest.php
+++ b/tests/src/Kernel/Views/DynamicEntityReferenceRelationshipTest.php
@@ -146,7 +146,7 @@ class DynamicEntityReferenceRelationshipTest extends ViewsKernelTestBase {
     $this->assertEquals($views_data_field_test['entity_test__field_test']['relationship']['base'], 'entity_test');
     $this->assertEquals($views_data_field_test['entity_test__field_test']['relationship']['entity type'], 'entity_test');
     $this->assertEquals($views_data_field_test['entity_test__field_test']['relationship']['base field'], 'id');
-    $this->assertEquals($views_data_field_test['entity_test__field_test']['relationship']['relationship field'], 'field_test_target_id_int');
+    $this->assertEquals($views_data_field_test['entity_test__field_test']['relationship']['relationship field'], 'field_test_target_id');
     $this->assertEquals($views_data_field_test['entity_test__field_test']['relationship']['extra'][0]['left_field'], 'field_test_target_type');
     $this->assertEquals($views_data_field_test['entity_test__field_test']['relationship']['extra'][0]['value'], 'entity_test');
 
@@ -155,7 +155,7 @@ class DynamicEntityReferenceRelationshipTest extends ViewsKernelTestBase {
     $this->assertEquals($views_data_field_test['entity_test_mul__field_test']['relationship']['base'], 'entity_test_mul_property_data');
     $this->assertEquals($views_data_field_test['entity_test_mul__field_test']['relationship']['entity type'], 'entity_test_mul');
     $this->assertEquals($views_data_field_test['entity_test_mul__field_test']['relationship']['base field'], 'id');
-    $this->assertEquals($views_data_field_test['entity_test_mul__field_test']['relationship']['relationship field'], 'field_test_target_id_int');
+    $this->assertEquals($views_data_field_test['entity_test_mul__field_test']['relationship']['relationship field'], 'field_test_target_id');
     $this->assertEquals($views_data_field_test['entity_test_mul__field_test']['relationship']['extra'][0]['left_field'], 'field_test_target_type');
     $this->assertEquals($views_data_field_test['entity_test_mul__field_test']['relationship']['extra'][0]['value'], 'entity_test_mul');
 
@@ -165,7 +165,7 @@ class DynamicEntityReferenceRelationshipTest extends ViewsKernelTestBase {
     $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['base'], 'entity_test');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['base field'], 'id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['field table'], 'entity_test__field_test');
-    $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['field field'], 'field_test_target_id_int');
+    $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['field field'], 'field_test_target_id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['join_extra'][0]['field'], 'field_test_target_type');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['join_extra'][0]['value'], 'entity_test');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['join_extra'][1]['field'], 'deleted');
@@ -179,7 +179,7 @@ class DynamicEntityReferenceRelationshipTest extends ViewsKernelTestBase {
     $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['base'], 'entity_test');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['base field'], 'id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['field table'], 'entity_test__field_test');
-    $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['field field'], 'field_test_target_id_int');
+    $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['field field'], 'field_test_target_id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['join_extra'][0]['field'], 'field_test_target_type');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['join_extra'][0]['value'], 'entity_test_mul');
     $this->assertEquals($views_data_entity_test['reverse__entity_test__field_test']['relationship']['join_extra'][1]['field'], 'deleted');
@@ -259,7 +259,7 @@ class DynamicEntityReferenceRelationshipTest extends ViewsKernelTestBase {
     $this->assertEquals($views_data_field_test['entity_test__field_test_mul']['relationship']['base'], 'entity_test');
     $this->assertEquals($views_data_field_test['entity_test__field_test_mul']['relationship']['entity type'], 'entity_test');
     $this->assertEquals($views_data_field_test['entity_test__field_test_mul']['relationship']['base field'], 'id');
-    $this->assertEquals($views_data_field_test['entity_test__field_test_mul']['relationship']['relationship field'], 'field_test_mul_target_id_int');
+    $this->assertEquals($views_data_field_test['entity_test__field_test_mul']['relationship']['relationship field'], 'field_test_mul_target_id');
     $this->assertEquals($views_data_field_test['entity_test__field_test_mul']['relationship']['extra'][0]['left_field'], 'field_test_mul_target_type');
     $this->assertEquals($views_data_field_test['entity_test__field_test_mul']['relationship']['extra'][0]['value'], 'entity_test');
 
@@ -269,7 +269,7 @@ class DynamicEntityReferenceRelationshipTest extends ViewsKernelTestBase {
     $this->assertEquals($views_data_field_test['entity_test_mul__field_test_mul']['relationship']['base'], 'entity_test_mul_property_data');
     $this->assertEquals($views_data_field_test['entity_test_mul__field_test_mul']['relationship']['entity type'], 'entity_test_mul');
     $this->assertEquals($views_data_field_test['entity_test_mul__field_test_mul']['relationship']['base field'], 'id');
-    $this->assertEquals($views_data_field_test['entity_test_mul__field_test_mul']['relationship']['relationship field'], 'field_test_mul_target_id_int');
+    $this->assertEquals($views_data_field_test['entity_test_mul__field_test_mul']['relationship']['relationship field'], 'field_test_mul_target_id');
     $this->assertEquals($views_data_field_test['entity_test_mul__field_test_mul']['relationship']['extra'][0]['left_field'], 'field_test_mul_target_type');
     $this->assertEquals($views_data_field_test['entity_test_mul__field_test_mul']['relationship']['extra'][0]['value'], 'entity_test_mul');
 
@@ -279,7 +279,7 @@ class DynamicEntityReferenceRelationshipTest extends ViewsKernelTestBase {
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['base'], 'entity_test_mul_property_data');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['base field'], 'id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['field table'], 'entity_test_mul__field_test_mul');
-    $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['field field'], 'field_test_mul_target_id_int');
+    $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['field field'], 'field_test_mul_target_id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['join_extra'][0]['field'], 'field_test_mul_target_type');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['join_extra'][0]['value'], 'entity_test');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['join_extra'][1]['field'], 'deleted');
@@ -293,7 +293,7 @@ class DynamicEntityReferenceRelationshipTest extends ViewsKernelTestBase {
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['base'], 'entity_test_mul_property_data');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['base field'], 'id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['field table'], 'entity_test_mul__field_test_mul');
-    $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['field field'], 'field_test_mul_target_id_int');
+    $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['field field'], 'field_test_mul_target_id');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['join_extra'][0]['field'], 'field_test_mul_target_type');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['join_extra'][0]['value'], 'entity_test_mul');
     $this->assertEquals($views_data_entity_test['reverse__entity_test_mul__field_test_mul']['relationship']['join_extra'][1]['field'], 'deleted');