diff --git a/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.field.node.article.field_content_reference.yml b/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.field.node.article.field_content_reference.yml
index 044eef3..0dd9875 100644
--- a/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.field.node.article.field_content_reference.yml
+++ b/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.field.node.article.field_content_reference.yml
@@ -10,7 +10,7 @@ id: node.article.field_content_reference
 field_name: field_content_reference
 entity_type: node
 bundle: article
-label: 'Content reference'
+label: 'Article reference'
 description: ''
 required: false
 translatable: false
diff --git a/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.field.node.article.field_shark_reference.yml b/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.field.node.article.field_shark_reference.yml
new file mode 100644
index 0000000..3e257ef
--- /dev/null
+++ b/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.field.node.article.field_shark_reference.yml
@@ -0,0 +1,29 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - entity_browser_test
+  config:
+    - field.storage.node.field_shark_reference
+    - node.type.article
+    - node.type.shark
+id: node.article.field_shark_reference
+field_name: field_shark_reference
+entity_type: node
+bundle: article
+label: 'Shark reference'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:node'
+  handler_settings:
+    target_bundles:
+      shark: shark
+    sort:
+      field: _none
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference
diff --git a/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.field.node.jet.field_content_reference.yml b/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.field.node.jet.field_content_reference.yml
new file mode 100644
index 0000000..5259809
--- /dev/null
+++ b/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.field.node.jet.field_content_reference.yml
@@ -0,0 +1,29 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - entity_browser_test
+  config:
+    - field.storage.node.field_content_reference
+    - node.type.jet
+    - node.type.shark
+id: node.jet.field_content_reference
+field_name: field_content_reference
+entity_type: node
+bundle: jet
+label: 'Article reference'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:node'
+  handler_settings:
+    target_bundles:
+      article: article
+    sort:
+      field: _none
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference
diff --git a/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.storage.node.field_shark_reference.yml b/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.storage.node.field_shark_reference.yml
new file mode 100644
index 0000000..31b39a3
--- /dev/null
+++ b/modules/entity_form/tests/modules/entity_browser_entity_form_test/config/install/field.storage.node.field_shark_reference.yml
@@ -0,0 +1,18 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+id: node.field_shark_reference
+field_name: field_shark_reference
+entity_type: node
+type: entity_reference
+settings:
+  target_type: node
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/entity_form/tests/src/FunctionalJavascript/InlineEntityFormFieldWidgetDisplayTest.php b/modules/entity_form/tests/src/FunctionalJavascript/InlineEntityFormFieldWidgetDisplayTest.php
index 36a1ce3..749a189 100644
--- a/modules/entity_form/tests/src/FunctionalJavascript/InlineEntityFormFieldWidgetDisplayTest.php
+++ b/modules/entity_form/tests/src/FunctionalJavascript/InlineEntityFormFieldWidgetDisplayTest.php
@@ -42,7 +42,8 @@ class InlineEntityFormFieldWidgetDisplayTest extends WebDriverTestBase {
    */
   protected static $userPermissions = [
     'access content',
-    'create foo content',
+    'create jet content',
+    'create shark content',
     'bypass node access',
     'access entity_browser_test_entity_form entity browser pages',
   ];
@@ -53,35 +54,11 @@ class InlineEntityFormFieldWidgetDisplayTest extends WebDriverTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType([
-      'type' => 'foo',
-      'name' => 'Foo',
-    ]);
-
-    FieldStorageConfig::create([
-      'field_name' => 'field_reference',
-      'type' => 'entity_reference',
-      'entity_type' => 'node',
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-      'settings' => [
-        'target_type' => 'node',
-      ],
-    ])->save();
-
-    FieldConfig::create([
-      'field_name' => 'field_reference',
-      'entity_type' => 'node',
-      'bundle' => 'foo',
-      'label' => 'Reference',
-      'settings' => [],
-    ])->save();
-
     /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display */
     $form_display = $this->container->get('entity_type.manager')
       ->getStorage('entity_form_display')
-      ->load('node.foo.default');
-
-    $form_display->setComponent('field_reference', [
+      ->load('node.jet.default');
+    $form_display->setComponent('field_content_reference', [
       'type' => 'entity_browser_entity_reference',
       'settings' => [
         'entity_browser' => 'entity_browser_test_entity_form',
@@ -96,9 +73,8 @@ class InlineEntityFormFieldWidgetDisplayTest extends WebDriverTestBase {
     /** @var \Drupal\Core\Entity\Display\EntityDisplayInterface $display */
     $display = $this->container->get('entity_type.manager')
       ->getStorage('entity_view_display')
-      ->load('node.foo.default');
-
-    $display->setComponent('field_reference', [
+      ->load('node.jet.default');
+    $display->setComponent('field_content_reference', [
       'settings' => [
         'link' => TRUE,
       ],
@@ -114,7 +90,7 @@ class InlineEntityFormFieldWidgetDisplayTest extends WebDriverTestBase {
    * Testing of inline entity form field widget.
    */
   public function testInlineEntityFormWidget() {
-    $this->drupalGet('node/add/foo');
+    $this->drupalGet('node/add/jet');
     $page = $this->getSession()->getPage();
 
     // Fill form and create new entity inside entity browser.
@@ -131,9 +107,10 @@ class InlineEntityFormFieldWidgetDisplayTest extends WebDriverTestBase {
 
     // Check that form for inner entity exists and that field is filled.
     $this->assertSession()
-      ->fieldValueEquals('field_reference[current][items][0][display][title][0][value]', 'Trees and people used to be good friends');
+      ->fieldValueEquals('field_content_reference[current][items][0][display][title][0][value]', 'Trees and people used to be good friends');
     $page->pressButton('Save');
 
+    $this->getSession()->getCurrentUrl();
     // Check view display for entity.
     $this->drupalGet('/node/2');
     $this->assertSession()
@@ -142,7 +119,7 @@ class InlineEntityFormFieldWidgetDisplayTest extends WebDriverTestBase {
     // Edit entity with changing value in inline form and check that value is
     // correct after entity is saved.
     $this->drupalGet('/node/2/edit');
-    $page->fillField('field_reference[current][items][0][display][title][0][value]', 'Trees and people used to be good friends [Tatsuo Kusakabe]');
+    $page->fillField('field_content_reference[current][items][0][display][title][0][value]', 'Trees and people used to be good friends [Tatsuo Kusakabe]');
     $page->pressButton('Save');
 
     $this->assertSession()