diff --git a/src/Tests/ExampleContentTrait.php b/src/Tests/ExampleContentTrait.php
index 96ff7f8..817c8a4 100644
--- a/src/Tests/ExampleContentTrait.php
+++ b/src/Tests/ExampleContentTrait.php
@@ -13,7 +13,7 @@ trait ExampleContentTrait {
   /**
    * The generated test entities, keyed by ID.
    *
-   * @var \Drupal\entity_test\Entity\EntityTest[]
+   * @var \Drupal\entity_test\Entity\EntityTestMulRevChanged[]
    */
   protected $entities = array();
 
@@ -21,8 +21,8 @@ trait ExampleContentTrait {
    * Sets up the necessary bundles on the test entity type.
    */
   protected function setUpExampleStructure() {
-    entity_test_create_bundle('item');
-    entity_test_create_bundle('article');
+    entity_test_create_bundle('item', NULL, 'entity_test_mulrev_changed');
+    entity_test_create_bundle('article', NULL, 'entity_test_mulrev_changed');
   }
 
   /**
@@ -66,7 +66,7 @@ trait ExampleContentTrait {
       'category' => 'article_category',
       'width' => '2.0',
     ));
-    $count = \Drupal::entityQuery('entity_test')->count()->execute();
+    $count = \Drupal::entityQuery('entity_test_mulrev_changed')->count()->execute();
     $this->assertEqual($count, 5, "$count items inserted.");
   }
 
@@ -78,11 +78,11 @@ trait ExampleContentTrait {
    * @param array $values
    *   The entity's property values.
    *
-   * @return \Drupal\entity_test\Entity\EntityTest
+   * @return \Drupal\entity_test\Entity\EntityTestMulRevChanged
    *   The created entity.
    */
   protected function addTestEntity($id, array $values) {
-    $storage = \Drupal::entityTypeManager()->getStorage('entity_test');
+    $storage = \Drupal::entityTypeManager()->getStorage('entity_test_mulrev_changed');
     $values['id'] = $id;
     $this->entities[$id] = $storage->create($values);
     $this->entities[$id]->save();
@@ -115,7 +115,7 @@ trait ExampleContentTrait {
    */
   protected function getItemIds(array $entity_ids) {
     $translate_ids = function ($entity_id) {
-      return Utility::createCombinedId('entity:entity_test', $entity_id . ':en');
+      return Utility::createCombinedId('entity:entity_test_mulrev_changed', $entity_id . ':en');
     };
     return array_map($translate_ids, $entity_ids);
   }
diff --git a/src/Tests/ViewsTest.php b/src/Tests/ViewsTest.php
index 7723206..fae68b1 100644
--- a/src/Tests/ViewsTest.php
+++ b/src/Tests/ViewsTest.php
@@ -206,7 +206,7 @@ class ViewsTest extends WebTestBase {
     // 1: datasource
     // 2: type (not = true)
     // 3: keywords (break_phrase = true)
-    $this->checkResults(array(), array(4, 5), 'Search with arguments', 'entity:entity_test/item/grape');
+    $this->checkResults(array(), array(4, 5), 'Search with arguments', 'entity:entity_test_mulrev_changed/item/grape');
 
     // "Type" doesn't have "break_phrase" enabled, so the second argument won't
     // have any effect.
@@ -220,7 +220,7 @@ class ViewsTest extends WebTestBase {
       'keywords[value]' => 'melon',
       'keywords_op' => '>=',
     );
-    $this->checkResults($query, array(2, 5), 'Search with arguments and filters', 'entity:entity_test/all/orange');
+    $this->checkResults($query, array(2, 5), 'Search with arguments and filters', 'entity:entity_test_mulrev_changed/all/orange');
 
     // Make sure there was a display plugin created for this view.
     $displays = \Drupal::getContainer()->get('plugin.manager.search_api.display')->getInstances();
@@ -312,7 +312,7 @@ class ViewsTest extends WebTestBase {
     // Add the "User ID" relationship.
     $this->clickLink($this->t('Add relationships'));
     $edit = array(
-      'name[search_api_datasource_database_search_index_entity_entity_test.user_id]' => 'search_api_datasource_database_search_index_entity_entity_test.user_id',
+      'name[search_api_datasource_database_search_index_entity_entity_test_mulrev_changed.user_id]' => 'search_api_datasource_database_search_index_entity_entity_test_mulrev_changed.user_id',
     );
     $this->drupalPostForm(NULL, $edit, $this->t('Add and configure relationships'));
     $this->drupalPostForm(NULL, array(), $this->t('Apply'));
@@ -320,7 +320,7 @@ class ViewsTest extends WebTestBase {
     // Add new fields. First check that the listing seems correct.
     $this->clickLink($this->t('Add fields'));
     $this->assertResponse(200);
-    $this->assertText($this->t('Test entity datasource'));
+    $this->assertText($this->t('Test entity - revisions and data table datasource'));
     $this->assertText($this->t('Authored on'));
     $this->assertText($this->t('Body (indexed field)'));
     $this->assertText($this->t('Index Test index'));
@@ -337,12 +337,12 @@ class ViewsTest extends WebTestBase {
     // Then add some fields.
     $fields = array(
       'views.counter',
-      'search_api_datasource_database_search_index_entity_entity_test.id',
+      'search_api_datasource_database_search_index_entity_entity_test_mulrev_changed.id',
       'search_api_index_database_search_index.search_api_datasource',
-      'search_api_datasource_database_search_index_entity_entity_test.body',
+      'search_api_datasource_database_search_index_entity_entity_test_mulrev_changed.body',
       'search_api_index_database_search_index.category',
       'search_api_index_database_search_index.keywords',
-      'search_api_datasource_database_search_index_entity_entity_test.user_id',
+      'search_api_datasource_database_search_index_entity_entity_test_mulrev_changed.user_id',
       'search_api_entity_user.name',
       'search_api_entity_user.roles',
     );
@@ -416,7 +416,7 @@ class ViewsTest extends WebTestBase {
           }
         }
         else {
-          $data = array('entity:entity_test');
+          $data = array('entity:entity_test_mulrev_changed');
         }
         $prefix = "#$id [$field] ";
         $text = $prefix . implode("|$prefix", $data);
diff --git a/tests/search_api_test_db/config/install/search_api.index.database_search_index.yml b/tests/search_api_test_db/config/install/search_api.index.database_search_index.yml
index eaa60d6..a2a7e32 100644
--- a/tests/search_api_test_db/config/install/search_api.index.database_search_index.yml
+++ b/tests/search_api_test_db/config/install/search_api.index.database_search_index.yml
@@ -6,43 +6,43 @@ field_settings:
   id:
     label: ID
     type: integer
-    datasource_id: 'entity:entity_test'
+    datasource_id: 'entity:entity_test_mulrev_changed'
     property_path: id
   name:
     label: Name
     type: text
-    datasource_id: 'entity:entity_test'
+    datasource_id: 'entity:entity_test_mulrev_changed'
     property_path: name
     boost: 5.0
   created:
     label: Authored on
     type: date
-    datasource_id: 'entity:entity_test'
+    datasource_id: 'entity:entity_test_mulrev_changed'
     property_path: created
   body:
     label: Body
     type: text
-    datasource_id: 'entity:entity_test'
+    datasource_id: 'entity:entity_test_mulrev_changed'
     property_path: body
   type:
     label: Type
     type: string
-    datasource_id: 'entity:entity_test'
+    datasource_id: 'entity:entity_test_mulrev_changed'
     property_path: type
   keywords:
     label: Keywords
     type: string
-    datasource_id: 'entity:entity_test'
+    datasource_id: 'entity:entity_test_mulrev_changed'
     property_path: keywords
   category:
     label: Category
     type: string
-    datasource_id: 'entity:entity_test'
+    datasource_id: 'entity:entity_test_mulrev_changed'
     property_path: category
   width:
     label: Width
     type: decimal
-    datasource_id: 'entity:entity_test'
+    datasource_id: 'entity:entity_test_mulrev_changed'
     property_path: width
 processor_settings:
   add_url:
@@ -65,8 +65,8 @@ options:
   cron_limit: -1
   index_directly: false
 datasource_settings:
-  'entity:entity_test':
-    plugin_id: 'entity:entity_test'
+  'entity:entity_test_mulrev_changed':
+    plugin_id: 'entity:entity_test_mulrev_changed'
     settings: {  }
 tracker_settings:
   'default':
@@ -77,18 +77,18 @@ status: true
 langcode: en
 dependencies:
   config:
-    - field.field.entity_test.article.body
-    - field.field.entity_test.article.keywords
-    - field.field.entity_test.article.category
-    - field.field.entity_test.article.width
-    - field.field.entity_test.item.body
-    - field.field.entity_test.item.keywords
-    - field.field.entity_test.item.category
-    - field.field.entity_test.item.width
-    - field.storage.entity_test.body
-    - field.storage.entity_test.keywords
-    - field.storage.entity_test.category
-    - field.storage.entity_test.width
+    - field.field.entity_test_mulrev_changed.article.body
+    - field.field.entity_test_mulrev_changed.article.keywords
+    - field.field.entity_test_mulrev_changed.article.category
+    - field.field.entity_test_mulrev_changed.article.width
+    - field.field.entity_test_mulrev_changed.item.body
+    - field.field.entity_test_mulrev_changed.item.keywords
+    - field.field.entity_test_mulrev_changed.item.category
+    - field.field.entity_test_mulrev_changed.item.width
+    - field.storage.entity_test_mulrev_changed.body
+    - field.storage.entity_test_mulrev_changed.keywords
+    - field.storage.entity_test_mulrev_changed.category
+    - field.storage.entity_test_mulrev_changed.width
     - search_api.server.database_search_server
   module:
     - entity_test
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test.article.body.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test.article.body.yml
deleted file mode 100644
index 25582e5..0000000
--- a/tests/search_api_test_example_content/config/install/field.field.entity_test.article.body.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-id: entity_test.article.body
-status: true
-langcode: en
-field_name: body
-entity_type: entity_test
-bundle: article
-label: Body
-description: ''
-required: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  display_summary: true
-dependencies:
-  config:
-    - field.storage.entity_test.body
-field_type: text_with_summary
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test.article.category.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test.article.category.yml
deleted file mode 100644
index 3c5a0d4..0000000
--- a/tests/search_api_test_example_content/config/install/field.field.entity_test.article.category.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: entity_test.article.category
-status: true
-langcode: en
-field_name: category
-entity_type: entity_test
-bundle: article
-label: Category
-description: ''
-required: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-dependencies:
-  config:
-    - field.storage.entity_test.category
-field_type: string
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test.article.keywords.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test.article.keywords.yml
deleted file mode 100644
index b30be25..0000000
--- a/tests/search_api_test_example_content/config/install/field.field.entity_test.article.keywords.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: entity_test.article.keywords
-status: true
-langcode: en
-field_name: keywords
-entity_type: entity_test
-bundle: article
-label: Keywords
-description: ''
-required: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-dependencies:
-  config:
-    - field.storage.entity_test.keywords
-field_type: string
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test.article.width.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test.article.width.yml
deleted file mode 100644
index 10a5218..0000000
--- a/tests/search_api_test_example_content/config/install/field.field.entity_test.article.width.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-id: entity_test.article.width
-status: true
-langcode: en
-field_name: width
-entity_type: entity_test
-bundle: article
-label: Width
-description: ''
-required: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: !!float 0
-  max: null
-  prefix: ''
-  suffix: ''
-dependencies:
-  config:
-    - field.storage.entity_test.width
-field_type: float
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test.item.body.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test.item.body.yml
deleted file mode 100644
index b09f967..0000000
--- a/tests/search_api_test_example_content/config/install/field.field.entity_test.item.body.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-id: entity_test.item.body
-status: true
-langcode: en
-field_name: body
-entity_type: entity_test
-bundle: item
-label: Body
-description: ''
-required: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  display_summary: true
-dependencies:
-  config:
-    - field.storage.entity_test.body
-field_type: text_with_summary
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test.item.category.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test.item.category.yml
deleted file mode 100644
index a5cd261..0000000
--- a/tests/search_api_test_example_content/config/install/field.field.entity_test.item.category.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: entity_test.item.category
-status: true
-langcode: en
-field_name: category
-entity_type: entity_test
-bundle: item
-label: Category
-description: ''
-required: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-dependencies:
-  config:
-    - field.storage.entity_test.category
-field_type: string
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test.item.keywords.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test.item.keywords.yml
deleted file mode 100644
index c8b4943..0000000
--- a/tests/search_api_test_example_content/config/install/field.field.entity_test.item.keywords.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: entity_test.item.keywords
-status: true
-langcode: en
-field_name: keywords
-entity_type: entity_test
-bundle: item
-label: Keywords
-description: ''
-required: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-dependencies:
-  config:
-    - field.storage.entity_test.keywords
-field_type: string
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test.item.width.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test.item.width.yml
deleted file mode 100644
index 9eef474..0000000
--- a/tests/search_api_test_example_content/config/install/field.field.entity_test.item.width.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-id: entity_test.item.width
-status: true
-langcode: en
-field_name: width
-entity_type: entity_test
-bundle: item
-label: Width
-description: ''
-required: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: !!float 0
-  max: null
-  prefix: ''
-  suffix: ''
-dependencies:
-  config:
-    - field.storage.entity_test.width
-field_type: float
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.article.body.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.article.body.yml
new file mode 100644
index 0000000..595a130
--- /dev/null
+++ b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.article.body.yml
@@ -0,0 +1,17 @@
+id: entity_test_mulrev_changed.article.body
+status: true
+langcode: en
+field_name: body
+entity_type: entity_test_mulrev_changed
+bundle: article
+label: Body
+description: ''
+required: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  display_summary: true
+dependencies:
+  config:
+    - field.storage.entity_test_mulrev_changed.body
+field_type: text_with_summary
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.article.category.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.article.category.yml
new file mode 100644
index 0000000..7b649f7
--- /dev/null
+++ b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.article.category.yml
@@ -0,0 +1,16 @@
+id: entity_test_mulrev_changed.article.category
+status: true
+langcode: en
+field_name: category
+entity_type: entity_test_mulrev_changed
+bundle: article
+label: Category
+description: ''
+required: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+dependencies:
+  config:
+    - field.storage.entity_test_mulrev_changed.category
+field_type: string
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.article.keywords.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.article.keywords.yml
new file mode 100644
index 0000000..f11dc75
--- /dev/null
+++ b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.article.keywords.yml
@@ -0,0 +1,16 @@
+id: entity_test_mulrev_changed.article.keywords
+status: true
+langcode: en
+field_name: keywords
+entity_type: entity_test_mulrev_changed
+bundle: article
+label: Keywords
+description: ''
+required: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+dependencies:
+  config:
+    - field.storage.entity_test_mulrev_changed.keywords
+field_type: string
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.article.width.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.article.width.yml
new file mode 100644
index 0000000..4453937
--- /dev/null
+++ b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.article.width.yml
@@ -0,0 +1,20 @@
+id: entity_test_mulrev_changed.article.width
+status: true
+langcode: en
+field_name: width
+entity_type: entity_test_mulrev_changed
+bundle: article
+label: Width
+description: ''
+required: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  min: !!float 0
+  max: null
+  prefix: ''
+  suffix: ''
+dependencies:
+  config:
+    - field.storage.entity_test_mulrev_changed.width
+field_type: float
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.item.body.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.item.body.yml
new file mode 100644
index 0000000..6b5fc9d
--- /dev/null
+++ b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.item.body.yml
@@ -0,0 +1,17 @@
+id: entity_test_mulrev_changed.item.body
+status: true
+langcode: en
+field_name: body
+entity_type: entity_test_mulrev_changed
+bundle: item
+label: Body
+description: ''
+required: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  display_summary: true
+dependencies:
+  config:
+    - field.storage.entity_test_mulrev_changed.body
+field_type: text_with_summary
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.item.category.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.item.category.yml
new file mode 100644
index 0000000..6322278
--- /dev/null
+++ b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.item.category.yml
@@ -0,0 +1,16 @@
+id: entity_test_mulrev_changed.item.category
+status: true
+langcode: en
+field_name: category
+entity_type: entity_test_mulrev_changed
+bundle: item
+label: Category
+description: ''
+required: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+dependencies:
+  config:
+    - field.storage.entity_test_mulrev_changed.category
+field_type: string
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.item.keywords.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.item.keywords.yml
new file mode 100644
index 0000000..ee70031
--- /dev/null
+++ b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.item.keywords.yml
@@ -0,0 +1,16 @@
+id: entity_test_mulrev_changed.item.keywords
+status: true
+langcode: en
+field_name: keywords
+entity_type: entity_test_mulrev_changed
+bundle: item
+label: Keywords
+description: ''
+required: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+dependencies:
+  config:
+    - field.storage.entity_test_mulrev_changed.keywords
+field_type: string
diff --git a/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.item.width.yml b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.item.width.yml
new file mode 100644
index 0000000..7b7de11
--- /dev/null
+++ b/tests/search_api_test_example_content/config/install/field.field.entity_test_mulrev_changed.item.width.yml
@@ -0,0 +1,20 @@
+id: entity_test_mulrev_changed.item.width
+status: true
+langcode: en
+field_name: width
+entity_type: entity_test_mulrev_changed
+bundle: item
+label: Width
+description: ''
+required: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  min: !!float 0
+  max: null
+  prefix: ''
+  suffix: ''
+dependencies:
+  config:
+    - field.storage.entity_test_mulrev_changed.width
+field_type: float
diff --git a/tests/search_api_test_example_content/config/install/field.storage.entity_test.body.yml b/tests/search_api_test_example_content/config/install/field.storage.entity_test.body.yml
deleted file mode 100644
index 6661873..0000000
--- a/tests/search_api_test_example_content/config/install/field.storage.entity_test.body.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: entity_test.body
-status: true
-langcode: en
-field_name: body
-entity_type: entity_test
-type: text_with_summary
-settings: {  }
-module: text
-locked: false
-cardinality: 1
-translatable: false
-indexes: {  }
-dependencies:
-  module:
-    - entity_test
-    - text
diff --git a/tests/search_api_test_example_content/config/install/field.storage.entity_test.category.yml b/tests/search_api_test_example_content/config/install/field.storage.entity_test.category.yml
deleted file mode 100644
index d736aa4..0000000
--- a/tests/search_api_test_example_content/config/install/field.storage.entity_test.category.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: entity_test.category
-status: true
-langcode: en
-field_name: category
-entity_type: entity_test
-type: string
-settings:
-  max_length: 255
-module: Core
-locked: false
-cardinality: 1
-translatable: false
-indexes: {  }
-dependencies:
-  module:
-    - entity_test
diff --git a/tests/search_api_test_example_content/config/install/field.storage.entity_test.keywords.yml b/tests/search_api_test_example_content/config/install/field.storage.entity_test.keywords.yml
deleted file mode 100644
index dd4b3dd..0000000
--- a/tests/search_api_test_example_content/config/install/field.storage.entity_test.keywords.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: entity_test.keywords
-status: true
-langcode: en
-field_name: keywords
-entity_type: entity_test
-type: string
-settings:
-  max_length: 255
-module: Core
-locked: false
-cardinality: -1
-translatable: false
-indexes: {  }
-dependencies:
-  module:
-    - entity_test
diff --git a/tests/search_api_test_example_content/config/install/field.storage.entity_test.width.yml b/tests/search_api_test_example_content/config/install/field.storage.entity_test.width.yml
deleted file mode 100644
index 35496f8..0000000
--- a/tests/search_api_test_example_content/config/install/field.storage.entity_test.width.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-id: entity_test.width
-status: true
-langcode: en
-field_name: width
-entity_type: entity_test
-type: float
-settings: {  }
-module: Core
-locked: false
-cardinality: 1
-translatable: false
-indexes: {  }
-dependencies:
-  module:
-    - entity_test
diff --git a/tests/search_api_test_example_content/config/install/field.storage.entity_test_mulrev_changed.body.yml b/tests/search_api_test_example_content/config/install/field.storage.entity_test_mulrev_changed.body.yml
new file mode 100644
index 0000000..a03a334
--- /dev/null
+++ b/tests/search_api_test_example_content/config/install/field.storage.entity_test_mulrev_changed.body.yml
@@ -0,0 +1,16 @@
+id: entity_test_mulrev_changed.body
+status: true
+langcode: en
+field_name: body
+entity_type: entity_test_mulrev_changed
+type: text_with_summary
+settings: {  }
+module: text
+locked: false
+cardinality: 1
+translatable: false
+indexes: {  }
+dependencies:
+  module:
+    - entity_test
+    - text
diff --git a/tests/search_api_test_example_content/config/install/field.storage.entity_test_mulrev_changed.category.yml b/tests/search_api_test_example_content/config/install/field.storage.entity_test_mulrev_changed.category.yml
new file mode 100644
index 0000000..98e32df
--- /dev/null
+++ b/tests/search_api_test_example_content/config/install/field.storage.entity_test_mulrev_changed.category.yml
@@ -0,0 +1,16 @@
+id: entity_test_mulrev_changed.category
+status: true
+langcode: en
+field_name: category
+entity_type: entity_test_mulrev_changed
+type: string
+settings:
+  max_length: 255
+module: Core
+locked: false
+cardinality: 1
+translatable: false
+indexes: {  }
+dependencies:
+  module:
+    - entity_test
diff --git a/tests/search_api_test_example_content/config/install/field.storage.entity_test_mulrev_changed.keywords.yml b/tests/search_api_test_example_content/config/install/field.storage.entity_test_mulrev_changed.keywords.yml
new file mode 100644
index 0000000..ae0fdcf
--- /dev/null
+++ b/tests/search_api_test_example_content/config/install/field.storage.entity_test_mulrev_changed.keywords.yml
@@ -0,0 +1,16 @@
+id: entity_test_mulrev_changed.keywords
+status: true
+langcode: en
+field_name: keywords
+entity_type: entity_test_mulrev_changed
+type: string
+settings:
+  max_length: 255
+module: Core
+locked: false
+cardinality: -1
+translatable: false
+indexes: {  }
+dependencies:
+  module:
+    - entity_test
diff --git a/tests/search_api_test_example_content/config/install/field.storage.entity_test_mulrev_changed.width.yml b/tests/search_api_test_example_content/config/install/field.storage.entity_test_mulrev_changed.width.yml
new file mode 100644
index 0000000..18f0b7a
--- /dev/null
+++ b/tests/search_api_test_example_content/config/install/field.storage.entity_test_mulrev_changed.width.yml
@@ -0,0 +1,15 @@
+id: entity_test_mulrev_changed.width
+status: true
+langcode: en
+field_name: width
+entity_type: entity_test_mulrev_changed
+type: float
+settings: {  }
+module: Core
+locked: false
+cardinality: 1
+translatable: false
+indexes: {  }
+dependencies:
+  module:
+    - entity_test
diff --git a/tests/search_api_test_extraction/config/install/field.field.entity_test.article.links.yml b/tests/search_api_test_extraction/config/install/field.field.entity_test.article.links.yml
index c80d3ed..3abf0de 100644
--- a/tests/search_api_test_extraction/config/install/field.field.entity_test.article.links.yml
+++ b/tests/search_api_test_extraction/config/install/field.field.entity_test.article.links.yml
@@ -2,10 +2,10 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.entity_test.links
-id: entity_test.article.links
+    - field.storage.entity_test_mulrev_changed.links
+id: entity_test_mulrev_changed.article.links
 field_name: links
-entity_type: entity_test
+entity_type: entity_test_mulrev_changed
 bundle: article
 label: Links
 description: 'Links to other test entities'
@@ -14,7 +14,7 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:entity_test'
+  handler: 'default:entity_test_mulrev_changed'
   handler_settings:
     target_bundles:
       article: article
diff --git a/tests/search_api_test_extraction/config/install/field.storage.entity_test.links.yml b/tests/search_api_test_extraction/config/install/field.storage.entity_test.links.yml
index 102d843..f3e5368 100644
--- a/tests/search_api_test_extraction/config/install/field.storage.entity_test.links.yml
+++ b/tests/search_api_test_extraction/config/install/field.storage.entity_test.links.yml
@@ -2,13 +2,13 @@ langcode: en
 status: true
 dependencies:
   module:
-    - entity_test
-id: entity_test.links
+    - entity_test_mulrev_changed
+id: entity_test_mulrev_changed.links
 field_name: links
-entity_type: entity_test
+entity_type: entity_test_mulrev_changed
 type: entity_reference
 settings:
-  target_type: entity_test
+  target_type: entity_test_mulrev_changed
 module: core
 locked: false
 cardinality: -1
diff --git a/tests/search_api_test_views/config/install/views.view.search_api_test_view.yml b/tests/search_api_test_views/config/install/views.view.search_api_test_view.yml
index 650edb9..cee9c6e 100644
--- a/tests/search_api_test_views/config/install/views.view.search_api_test_view.yml
+++ b/tests/search_api_test_views/config/install/views.view.search_api_test_view.yml
@@ -59,7 +59,7 @@ display:
         type: search_api
         options:
           view_modes:
-            'entity:entity_test':
+            'entity:entity_test_mulrev_changed':
               article: default
               page: default
       filters:
diff --git a/tests/src/Kernel/BackendTestBase.php b/tests/src/Kernel/BackendTestBase.php
index b882a0b..7951896 100644
--- a/tests/src/Kernel/BackendTestBase.php
+++ b/tests/src/Kernel/BackendTestBase.php
@@ -59,7 +59,7 @@ abstract class BackendTestBase extends KernelTestBase {
     $this->installSchema('search_api', array('search_api_item', 'search_api_task'));
     $this->installSchema('system', array('router'));
     $this->installSchema('user', array('users_data'));
-    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('entity_test_mulrev_changed');
     $this->installConfig('search_api_test_example_content');
 
     // Set the tracking page size so tracking will work properly.
@@ -170,7 +170,7 @@ abstract class BackendTestBase extends KernelTestBase {
     $index = $this->getIndex();
     $this->assertTrue((bool) $index, 'The index was successfully created.');
 
-    $this->assertEquals(array("entity:entity_test"), $index->getDatasourceIds(), 'Datasources are set correctly.');
+    $this->assertEquals(array("entity:entity_test_mulrev_changed"), $index->getDatasourceIds(), 'Datasources are set correctly.');
     $this->assertEquals('default', $index->getTrackerId(), 'Tracker is set correctly.');
 
     $this->assertEquals(5, $index->getTrackerInstance()->getTotalItemsCount(), 'Correct item count.');
@@ -260,7 +260,7 @@ abstract class BackendTestBase extends KernelTestBase {
     $id = reset($ids);
     $this->assertEquals($id, key($results->getResultItems()));
     $this->assertEquals($id, $results->getResultItems()[$id]->getId());
-    $this->assertEquals('entity:entity_test', $results->getResultItems()[$id]->getDatasourceId());
+    $this->assertEquals('entity:entity_test_mulrev_changed', $results->getResultItems()[$id]->getDatasourceId());
 
     $results = $this->buildSearch('test foo')->sort('id', QueryInterface::SORT_ASC)->execute();
     $this->assertEquals(3, $results->getResultCount(), 'Search for »test foo« returned correct number of results.');
@@ -838,13 +838,13 @@ abstract class BackendTestBase extends KernelTestBase {
     // Create a "prices" field on the test entity type.
     FieldStorageConfig::create(array(
       'field_name' => 'prices',
-      'entity_type' => 'entity_test',
+      'entity_type' => 'entity_test_mulrev_changed',
       'type' => 'decimal',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
     ))->save();
     FieldConfig::create(array(
       'field_name' => 'prices',
-      'entity_type' => 'entity_test',
+      'entity_type' => 'entity_test_mulrev_changed',
       'bundle' => 'item',
       'label' => 'Prices',
     ))->save();
@@ -1031,8 +1031,8 @@ abstract class BackendTestBase extends KernelTestBase {
       'status' => TRUE,
       'server' => $this->serverId,
       'datasource_settings' => array(
-        'entity:entity_test' => array(
-          'plugin_id' => 'entity:entity_test',
+        'entity:entity_test_mulrev_changed' => array(
+          'plugin_id' => 'entity:entity_test_mulrev_changed',
           'settings' => array(),
         ),
       ),
@@ -1118,7 +1118,7 @@ abstract class BackendTestBase extends KernelTestBase {
     $field_info = array(
       'label' => $property_name,
       'type' => $type,
-      'datasource_id' => 'entity:entity_test',
+      'datasource_id' => 'entity:entity_test_mulrev_changed',
       'property_path' => $property_name,
     );
     $field = Utility::createField($index, $property_name, $field_info);
diff --git a/tests/src/Kernel/CliTest.php b/tests/src/Kernel/CliTest.php
index 4fe1166..857c3d9 100644
--- a/tests/src/Kernel/CliTest.php
+++ b/tests/src/Kernel/CliTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\search_api\Kernel;
 
-use Drupal\entity_test\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTestMulRevChanged;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\search_api\Entity\Index;
 use Drupal\search_api\Entity\Server;
@@ -41,7 +41,7 @@ class CliTest extends KernelTestBase {
     parent::setUp();
 
     $this->installSchema('search_api', array('search_api_item', 'search_api_task'));
-    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('entity_test_mulrev_changed');
 
     // Create a test server.
     $this->server = Server::create(array(
@@ -70,17 +70,17 @@ class CliTest extends KernelTestBase {
    * Tests tracking of items when saving an index through the CLI.
    */
   public function testItemTracking() {
-    EntityTest::create(array(
+    EntityTestMulRevChanged::create(array(
       'name' => 'foo bar baz föö smile' . json_decode('"\u1F601"'),
       'body' => 'test test case Case casE',
-      'type' => 'entity_test',
+      'type' => 'entity_test_mulrev_changed',
       'keywords' => array('Orange', 'orange', 'örange', 'Orange'),
       'category' => 'item_category',
     ))->save();
-    EntityTest::create(array(
+    EntityTestMulRevChanged::create(array(
       'name' => 'foo bar baz föö smile',
       'body' => 'test test case Case casE',
-      'type' => 'entity_test',
+      'type' => 'entity_test_mulrev_changed',
       'keywords' => array('strawberry', 'llama'),
       'category' => 'item_category',
     ))->save();
@@ -92,8 +92,8 @@ class CliTest extends KernelTestBase {
       'id' => 'index',
       'status' => 1,
       'datasource_settings' => array(
-        'entity:entity_test' => array(
-          'plugin_id' => 'entity:entity_test',
+        'entity:entity_test_mulrev_changed' => array(
+          'plugin_id' => 'entity:entity_test_mulrev_changed',
           'settings' => array(),
         ),
       ),
@@ -114,14 +114,14 @@ class CliTest extends KernelTestBase {
     $this->assertEquals(2, $total_items, 'The 2 items are tracked.');
     $this->assertEquals(0, $indexed_items, 'No items are indexed');
 
-    EntityTest::create(array(
+    EntityTestMulRevChanged::create(array(
       'name' => 'foo bar baz föö smile',
       'body' => 'test test case Case casE',
       'type' => 'item',
       'keywords' => array('strawberry', 'llama'),
       'category' => 'item_category',
     ))->save();
-    EntityTest::create(array(
+    EntityTestMulRevChanged::create(array(
       'name' => 'foo bar baz föö smile',
       'body' => 'test test case Case casE',
       'type' => 'item',
diff --git a/tests/src/Kernel/CustomDataTypesTest.php b/tests/src/Kernel/CustomDataTypesTest.php
index 31360e1..ce46827 100644
--- a/tests/src/Kernel/CustomDataTypesTest.php
+++ b/tests/src/Kernel/CustomDataTypesTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\search_api\Kernel;
 
-use Drupal\entity_test\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTestMulRevChanged;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\search_api\Entity\Index;
 use Drupal\search_api\Entity\Server;
@@ -49,7 +49,7 @@ class CustomDataTypesTest extends KernelTestBase {
   /**
    * An array of test entities.
    *
-   * @var \Drupal\entity_test\Entity\EntityTest[]
+   * @var \Drupal\entity_test\Entity\EntityTestMulRevChanged[]
    */
   protected $entities;
 
@@ -62,7 +62,7 @@ class CustomDataTypesTest extends KernelTestBase {
     $this->installSchema('search_api', array('search_api_item', 'search_api_task'));
     $this->installSchema('system', array('router'));
     $this->installSchema('user', array('users_data'));
-    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('entity_test_mulrev_changed');
 
     // Do not use a batch for tracking the initial items after creating an
     // index when running the tests via the GUI. Otherwise, it seems Drupal's
@@ -80,14 +80,14 @@ class CustomDataTypesTest extends KernelTestBase {
     $this->installConfig(array('search_api_test_db'));
 
     // Create test entities.
-    $this->entities[1] = EntityTest::create(array(
+    $this->entities[1] = EntityTestMulRevChanged::create(array(
       'name' => 'foo bar baz föö smile' . json_decode('"\u1F601"'),
       'body' => 'test test case Case casE',
       'type' => 'item',
       'keywords' => array('Orange', 'orange', 'örange', 'Orange'),
       'category' => 'item_category',
     ));
-    $this->entities[2] = EntityTest::create(array(
+    $this->entities[2] = EntityTestMulRevChanged::create(array(
       'name' => 'foo bar baz föö smile',
       'body' => 'test test case Case casE',
       'type' => 'item',
@@ -123,8 +123,8 @@ class CustomDataTypesTest extends KernelTestBase {
     $original_value = $this->entities[1]->get('name')->getValue()[0]['value'];
     $original_type = $this->index->getField('name')->getType();
 
-    $item = $this->index->loadItem('entity:entity_test/1:en');
-    $item = Utility::createItemFromObject($this->index, $item, 'entity:entity_test/1:en');
+    $item = $this->index->loadItem('entity:entity_test_mulrev_changed/1:en');
+    $item = Utility::createItemFromObject($this->index, $item, 'entity:entity_test_mulrev_changed/1:en');
 
     $name_field = $item->getField('name');
     $processed_value = $name_field->getValues()[0];
diff --git a/tests/src/Kernel/DatasourceTaskTest.php b/tests/src/Kernel/DatasourceTaskTest.php
index f7d2073..f9f545f 100644
--- a/tests/src/Kernel/DatasourceTaskTest.php
+++ b/tests/src/Kernel/DatasourceTaskTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\search_api\Kernel;
 
-use Drupal\entity_test\Entity\EntityTestMul;
+use Drupal\entity_test\Entity\EntityTestMulRevChanged;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\search_api\Entity\Index;
@@ -33,7 +33,7 @@ class DatasourceTaskTest extends KernelTestBase {
    *
    * @var string
    */
-  protected $testEntityTypeId = 'entity_test_mul';
+  protected $testEntityTypeId = 'entity_test_mulrev_changed';
 
   /**
    * The search server used for testing.
@@ -79,7 +79,7 @@ class DatasourceTaskTest extends KernelTestBase {
 
     $this->installSchema('search_api', array('search_api_item', 'search_api_task'));
     $this->installSchema('system', array('sequences'));
-    $this->installEntitySchema('entity_test_mul');
+    $this->installEntitySchema('entity_test_mulrev_changed');
 
     $this->taskManager = $this->container->get('search_api.task_manager');
 
@@ -140,9 +140,9 @@ class DatasourceTaskTest extends KernelTestBase {
   public function testItemTranslations() {
     // Test retrieving language and translations when no translations are
     // available.
-    /** @var \Drupal\entity_test\Entity\EntityTestMul $entity_1 */
+    /** @var \Drupal\entity_test\Entity\EntityTestMulRevChanged $entity_1 */
     $uid = $this->container->get('current_user')->id();
-    $entity_1 = EntityTestMul::create(array(
+    $entity_1 = EntityTestMulRevChanged::create(array(
       'id' => 1,
       'name' => 'test 1',
       'user_id' => $uid,
@@ -153,8 +153,8 @@ class DatasourceTaskTest extends KernelTestBase {
     $entity_1->addTranslation('l1')->save();
     $entity_1->addTranslation('l2')->save();
 
-    /** @var \Drupal\entity_test\Entity\EntityTestMul $entity_2 */
-    $entity_2 = EntityTestMul::create(array(
+    /** @var \Drupal\entity_test\Entity\EntityTestMulRevChanged $entity_2 */
+    $entity_2 = EntityTestMulRevChanged::create(array(
       'id' => 2,
       'name' => 'test 2',
       'user_id' => $uid,
diff --git a/tests/src/Kernel/FieldValuesExtractionTest.php b/tests/src/Kernel/FieldValuesExtractionTest.php
index f832c85..b8e5f2b 100644
--- a/tests/src/Kernel/FieldValuesExtractionTest.php
+++ b/tests/src/Kernel/FieldValuesExtractionTest.php
@@ -45,9 +45,9 @@ class FieldValuesExtractionTest extends KernelTestBase {
   public function setUp() {
     parent::setUp();
 
-    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('entity_test_mulrev_changed');
     $this->installConfig(array('search_api_test_extraction'));
-    $entity_storage = \Drupal::entityTypeManager()->getStorage('entity_test');
+    $entity_storage = \Drupal::entityTypeManager()->getStorage('entity_test_mulrev_changed');
 
     $this->entities[0] = $entity_storage->create(array(
       'type' => 'article',
diff --git a/tests/src/Kernel/IndexChangesTest.php b/tests/src/Kernel/IndexChangesTest.php
index 4d03e73..87a02e8 100644
--- a/tests/src/Kernel/IndexChangesTest.php
+++ b/tests/src/Kernel/IndexChangesTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\search_api\Kernel;
 
-use Drupal\entity_test\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTestMulRevChanged;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\search_api\Entity\Index;
 use Drupal\search_api\Entity\Server;
@@ -50,7 +50,7 @@ class IndexChangesTest extends KernelTestBase {
    *
    * @var string
    */
-  protected $testEntityTypeId = 'entity_test';
+  protected $testEntityTypeId = 'entity_test_mulrev_changed';
 
   /**
    * The task manager to use for the tests.
@@ -69,7 +69,7 @@ class IndexChangesTest extends KernelTestBase {
       'search_api_item',
       'search_api_task',
     ));
-    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('entity_test_mulrev_changed');
     $this->installEntitySchema('user');
 
     $this->taskManager = $this->container->get('search_api.task_manager');
@@ -86,7 +86,7 @@ class IndexChangesTest extends KernelTestBase {
       'langcode' => 'en',
     ))->save();
 
-    EntityTest::create(array(
+    EntityTestMulRevChanged::create(array(
       'id' => 1,
       'name' => 'test 1',
     ))->save();
@@ -116,8 +116,8 @@ class IndexChangesTest extends KernelTestBase {
           'plugin_id' => 'entity:user',
           'settings' => array(),
         ),
-        'entity:entity_test' => array(
-          'plugin_id' => 'entity:entity_test',
+        'entity:entity_test_mulrev_changed' => array(
+          'plugin_id' => 'entity:entity_test_mulrev_changed',
           'settings' => array(),
         ),
       ),
@@ -148,13 +148,13 @@ class IndexChangesTest extends KernelTestBase {
     $this->assertEquals($expected, $tracker->getRemainingItems());
 
     /** @var \Drupal\search_api\Datasource\DatasourceInterface $datasource */
-    $datasource = $this->index->createPlugin('datasource', 'entity:entity_test');
+    $datasource = $this->index->createPlugin('datasource', 'entity:entity_test_mulrev_changed');
     $this->index->addDatasource($datasource)->save();
 
     $this->taskManager->executeAllTasks();
 
     $expected = array(
-      Utility::createCombinedId('entity:entity_test', '1:en'),
+      Utility::createCombinedId('entity:entity_test_mulrev_changed', '1:en'),
       Utility::createCombinedId('entity:user', '1:en'),
     );
     $remaining_items = $tracker->getRemainingItems();
@@ -166,14 +166,14 @@ class IndexChangesTest extends KernelTestBase {
       'name' => 'someone',
       'langcode' => 'en',
     ))->save();
-    EntityTest::create(array(
+    EntityTestMulRevChanged::create(array(
       'id' => 2,
       'name' => 'test 2',
     ))->save();
 
     $expected = array(
-      Utility::createCombinedId('entity:entity_test', '1:en'),
-      Utility::createCombinedId('entity:entity_test', '2:en'),
+      Utility::createCombinedId('entity:entity_test_mulrev_changed', '1:en'),
+      Utility::createCombinedId('entity:entity_test_mulrev_changed', '2:en'),
       Utility::createCombinedId('entity:user', '1:en'),
       Utility::createCombinedId('entity:user', '2:en'),
     );
@@ -201,7 +201,7 @@ class IndexChangesTest extends KernelTestBase {
     $tracker = $this->index->getTrackerInstance();
 
     $expected = array(
-      Utility::createCombinedId('entity:entity_test', '1:en'),
+      Utility::createCombinedId('entity:entity_test_mulrev_changed', '1:en'),
       Utility::createCombinedId('entity:user', '1:en'),
     );
     $remaining_items = $tracker->getRemainingItems();
@@ -218,7 +218,7 @@ class IndexChangesTest extends KernelTestBase {
     $this->assertEquals($expected, $indexed_items);
     $this->assertEquals(0, $tracker->getRemainingItemsCount());
 
-    $this->index->removeDatasource('entity:entity_test')->save();
+    $this->index->removeDatasource('entity:entity_test_mulrev_changed')->save();
 
     $this->assertEquals(1, $tracker->getTotalItemsCount());
 
@@ -235,7 +235,7 @@ class IndexChangesTest extends KernelTestBase {
       'name' => 'someone',
       'langcode' => 'en',
     ))->save();
-    EntityTest::create(array(
+    EntityTestMulRevChanged::create(array(
       'id' => 2,
       'name' => 'test 2',
     ))->save();
diff --git a/tests/src/Kernel/IndexImportTest.php b/tests/src/Kernel/IndexImportTest.php
index 7955470..62b4278 100644
--- a/tests/src/Kernel/IndexImportTest.php
+++ b/tests/src/Kernel/IndexImportTest.php
@@ -44,7 +44,7 @@ class IndexImportTest extends KernelTestBase {
     $this->installSchema('search_api', array('search_api_item', 'search_api_task'));
     $this->installSchema('system', array('router'));
     $this->installSchema('user', array('users_data'));
-    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('entity_test_mulrev_changed');
 
     // Do not use a batch for tracking the initial items after creating an
     // index when running the tests via the GUI. Otherwise, it seems Drupal's
diff --git a/tests/src/Kernel/LanguageKernelTest.php b/tests/src/Kernel/LanguageKernelTest.php
index 8f7eac7..cbec49a 100644
--- a/tests/src/Kernel/LanguageKernelTest.php
+++ b/tests/src/Kernel/LanguageKernelTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\search_api\Kernel;
 
 use Drupal\Component\Render\FormattableMarkup;
-use Drupal\entity_test\Entity\EntityTestMul;
+use Drupal\entity_test\Entity\EntityTestMulRevChanged;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\search_api\Entity\Index;
@@ -22,7 +22,7 @@ class LanguageKernelTest extends KernelTestBase {
    *
    * @var string
    */
-  protected $testEntityTypeId = 'entity_test_mul';
+  protected $testEntityTypeId = 'entity_test_mulrev_changed';
 
   /**
    * The search server used for testing.
@@ -69,7 +69,7 @@ class LanguageKernelTest extends KernelTestBase {
     \Drupal::state()->set('entity_test.translation', TRUE);
 
     $this->installSchema('search_api', array('search_api_item', 'search_api_task'));
-    $this->installEntitySchema('entity_test_mul');
+    $this->installEntitySchema('entity_test_mulrev_changed');
 
     // Create the default languages.
     $this->installConfig(array('language'));
@@ -136,8 +136,8 @@ class LanguageKernelTest extends KernelTestBase {
   public function testItemTranslations() {
     // Test retrieving language and translations when no translations are
     // available.
-    /** @var \Drupal\entity_test\Entity\EntityTestMul $entity_1 */
-    $entity_1 = EntityTestMul::create(array(
+    /** @var \Drupal\entity_test\Entity\EntityTestMulRevChanged $entity_1 */
+    $entity_1 = EntityTestMulRevChanged::create(array(
       'id' => 1,
       'name' => 'test 1',
       'user_id' => $this->container->get('current_user')->id(),
@@ -146,8 +146,8 @@ class LanguageKernelTest extends KernelTestBase {
     $this->assertEquals('en', $entity_1->language()->getId(), new FormattableMarkup('%entity_type: Entity language set to site default.', array('%entity_type' => $this->testEntityTypeId)));
     $this->assertFalse($entity_1->getTranslationLanguages(FALSE), new FormattableMarkup('%entity_type: No translations are available', array('%entity_type' => $this->testEntityTypeId)));
 
-    /** @var \Drupal\entity_test\Entity\EntityTestMul $entity_2 */
-    $entity_2 = EntityTestMul::create(array(
+    /** @var \Drupal\entity_test\Entity\EntityTestMulRevChanged $entity_2 */
+    $entity_2 = EntityTestMulRevChanged::create(array(
       'id' => 2,
       'name' => 'test 2',
       'user_id' => $this->container->get('current_user')->id(),
diff --git a/tests/src/Kernel/QueryTest.php b/tests/src/Kernel/QueryTest.php
index d20f8fd..0559349 100644
--- a/tests/src/Kernel/QueryTest.php
+++ b/tests/src/Kernel/QueryTest.php
@@ -45,7 +45,7 @@ class QueryTest extends KernelTestBase {
     parent::setUp();
 
     $this->installSchema('search_api', array('search_api_item', 'search_api_task'));
-    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('entity_test_mulrev_changed');
 
     // Set tracking page size so tracking will work properly.
     \Drupal::configFactory()