diff --git a/modules/ctools_block/src/Tests/EntityFieldBlockTest.php b/modules/ctools_block/src/Tests/EntityFieldBlockTest.php
index 73e3a59..729dc20 100644
--- a/modules/ctools_block/src/Tests/EntityFieldBlockTest.php
+++ b/modules/ctools_block/src/Tests/EntityFieldBlockTest.php
@@ -23,7 +23,7 @@ class EntityFieldBlockTest extends WebTestBase {
   public static $modules = ['ctools_block', 'ctools_block_field_test'];
 
   /**
-   * @todo.
+   * Tests using the node body field in a block.
    */
   public function testBodyField() {
     $block = $this->drupalPlaceBlock('entity_field:node:body', [
@@ -37,48 +37,31 @@ class EntityFieldBlockTest extends WebTestBase {
     $node = $this->drupalCreateNode(['type' => 'ctools_block_field_test']);
     $this->drupalGet('node/' . $node->id());
     $this->assertText($block->label());
+    $this->assertText($node->body->value);
   }
 
   /**
-   * @todo.
+   * Tests using the node uid base field in a block.
    */
-  public function testImageField() {
-    $block = $this->drupalPlaceBlock('entity_field:node:field_ctools_block_image', [
-      'formatter' => [
-        'type' => 'image',
-      ],
-      'context_mapping' => [
-        'entity' => '@node.node_route_context:node',
-      ],
-    ]);
-    $node = $this->drupalCreateNode(['type' => 'ctools_block_field_test']);
-    $this->drupalGet('node/' . $node->id());
-    $this->assertText($block->label());
-  }
-
   public function testNodeBaseFields() {
-    $block = $this->drupalPlaceBlock('entity_field:node:uid', [
+    $block = $this->drupalPlaceBlock('entity_field:node:title', [
       'formatter' => [
-        'type' => 'entity',
+        'type' => 'string',
       ],
       'context_mapping' => [
         'entity' => '@node.node_route_context:node',
       ],
     ]);
-    $node = $this->drupalCreateNode(['type' => 'ctools_block_field_test']);
+    $node = $this->drupalCreateNode(['type' => 'ctools_block_field_test', 'uid' => 1]);
     $this->drupalGet('node/' . $node->id());
     $this->assertText($block->label());
+    $this->assertText($node->getTitle());
   }
 
   /**
-   * @todo.
+   * Tests that we are setting the render cache metadata correctly.
    */
   public function testRenderCache() {
-    /** @var \Drupal\Core\Entity\Entity\EntityViewDisplay $view */
-    EntityViewDisplay::load('node.ctools_block_field_test.default')
-      ->removeComponent('body')
-      ->save();
-
     $this->drupalPlaceBlock('entity_field:node:body', [
       'formatter' => [
         'type' => 'text_default',
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.base_field_override.node.ctools_block_field_test.promote.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.base_field_override.node.ctools_block_field_test.promote.yml
index 905df26..6b1a610 100644
--- a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.base_field_override.node.ctools_block_field_test.promote.yml
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.base_field_override.node.ctools_block_field_test.promote.yml
@@ -3,6 +3,8 @@ status: true
 dependencies:
   config:
     - node.type.ctools_block_field_test
+_core:
+  default_config_hash: hoRuk0InNhhRVGnhQ9hzifTXVz432i9hvPe-tVstUbc
 id: node.ctools_block_field_test.promote
 field_name: promote
 entity_type: node
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_form_display.node.ctools_block_field_test.default.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_form_display.node.ctools_block_field_test.default.yml
index 66b1af3..acfaaef 100644
--- a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_form_display.node.ctools_block_field_test.default.yml
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_form_display.node.ctools_block_field_test.default.yml
@@ -3,12 +3,12 @@ status: true
 dependencies:
   config:
     - field.field.node.ctools_block_field_test.body
-    - field.field.node.ctools_block_field_test.field_ctools_block_image
     - node.type.ctools_block_field_test
   module:
-    - image
     - path
     - text
+_core:
+  default_config_hash: xpDeWNLzjX4dDB9YyBlO9y9FR4vHwMv0GKsuqDYy0Bc
 id: node.ctools_block_field_test.default
 targetEntityType: node
 bundle: ctools_block_field_test
@@ -27,13 +27,6 @@ content:
     weight: 10
     settings: {  }
     third_party_settings: {  }
-  field_ctools_block_image:
-    weight: 32
-    settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-    third_party_settings: {  }
-    type: image_image
   path:
     type: path
     weight: 30
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.default.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.default.yml
index 74a0057..3844350 100644
--- a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.default.yml
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.default.yml
@@ -3,31 +3,16 @@ status: true
 dependencies:
   config:
     - field.field.node.ctools_block_field_test.body
-    - field.field.node.ctools_block_field_test.field_ctools_block_image
     - node.type.ctools_block_field_test
   module:
-    - image
-    - text
     - user
+_core:
+  default_config_hash: clNnyw6fhh5SwIme5I_3zjbLv-PMfpY-JXofVAC3CV8
 id: node.ctools_block_field_test.default
 targetEntityType: node
 bundle: ctools_block_field_test
 mode: default
-content:
-  body:
-    label: hidden
-    type: text_default
-    weight: 101
-    settings: {  }
-    third_party_settings: {  }
-  field_ctools_block_image:
-    weight: 102
-    label: above
-    settings:
-      image_style: ''
-      image_link: ''
-    third_party_settings: {  }
-    type: image
-  links:
-    weight: 100
-hidden: {  }
+content: {  }
+hidden:
+  body: true
+  links: true
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.teaser.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.teaser.yml
index 55d5da5..8b55c0b 100644
--- a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.teaser.yml
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.teaser.yml
@@ -8,6 +8,8 @@ dependencies:
   module:
     - text
     - user
+_core:
+  default_config_hash: gQV5baI7pCIOBUtLkbJ1c2WJwM8CdlKiKOtLLIWnfy0
 id: node.ctools_block_field_test.teaser
 targetEntityType: node
 bundle: ctools_block_field_test
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.body.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.body.yml
index 99e7a81..42853da 100644
--- a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.body.yml
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.body.yml
@@ -6,6 +6,8 @@ dependencies:
     - node.type.ctools_block_field_test
   module:
     - text
+_core:
+  default_config_hash: fzUnwtwftRsgKExjpF6XdMqbUzP16ytkjQniBZl1Hqg
 id: node.ctools_block_field_test.body
 field_name: body
 entity_type: node
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.field_ctools_block_image.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.field_ctools_block_image.yml
deleted file mode 100644
index ad1909d..0000000
--- a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.field_ctools_block_image.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_ctools_block_image
-    - node.type.ctools_block_field_test
-  module:
-    - image
-id: node.ctools_block_field_test.field_ctools_block_image
-field_name: field_ctools_block_image
-entity_type: node
-bundle: ctools_block_field_test
-label: Image
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: true
-  alt_field_required: true
-  title_field: false
-  title_field_required: false
-  default_image:
-    uuid: ''
-    alt: ''
-    title: ''
-    width: null
-    height: null
-  handler: 'default:file'
-  handler_settings: {  }
-field_type: image
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.storage.node.field_ctools_block_image.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.storage.node.field_ctools_block_image.yml
deleted file mode 100644
index 4d8c78f..0000000
--- a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.storage.node.field_ctools_block_image.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - image
-    - node
-id: node.field_ctools_block_image
-field_name: field_ctools_block_image
-entity_type: node
-type: image
-settings:
-  uri_scheme: public
-  default_image:
-    uuid: ''
-    alt: ''
-    title: ''
-    width: null
-    height: null
-  target_type: file
-  display_field: false
-  display_default: false
-module: image
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/node.type.ctools_block_field_test.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/node.type.ctools_block_field_test.yml
index 655c70f..caf9cff 100644
--- a/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/node.type.ctools_block_field_test.yml
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/node.type.ctools_block_field_test.yml
@@ -7,10 +7,12 @@ third_party_settings:
   menu_ui:
     available_menus: {  }
     parent: ''
+_core:
+  default_config_hash: hjC271ZF6B5XYgF6-F5Ak73sJiZWJRmSLsgk8S7Vo-8
 name: 'CTools block field test'
 type: ctools_block_field_test
 description: 'A content type used for the ctools_block field tests.'
 help: ''
 new_revision: false
 preview_mode: 0
-display_submitted: true
+display_submitted: false
diff --git a/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml b/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml
index 723f4c5..b8ebd39 100644
--- a/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml
@@ -5,13 +5,9 @@ core: 8.x
 package: Testing
 version: 8.0.1
 dependencies:
-  - ctools_block_field_test
-  - image
   - menu_ui
   - node
   - path
   - text
   - user
-features:
-  required:
-    - field.storage.node.field_ctools_block_image
+features: true