diff --git a/modules/ctools_block/ctools_block.info.yml b/modules/ctools_block/ctools_block.info.yml
index bac4256..444e609 100644
--- a/modules/ctools_block/ctools_block.info.yml
+++ b/modules/ctools_block/ctools_block.info.yml
@@ -4,3 +4,6 @@ description: 'Provides improvements to blocks that will one day be added to Drup
 package: Chaos tool suite
 version: 3.x
 core: 8.x
+dependencies:
+  - ctools
+  - block
diff --git a/modules/ctools_block/src/Tests/EntityFieldBlockTest.php b/modules/ctools_block/src/Tests/EntityFieldBlockTest.php
new file mode 100644
index 0000000..b51c11a
--- /dev/null
+++ b/modules/ctools_block/src/Tests/EntityFieldBlockTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\ctools_block\Tests\EntityFieldBlockTest.
+ */
+
+namespace Drupal\ctools_block\Tests;
+
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the entity field block.
+ *
+ * @group ctools_block
+ */
+class EntityFieldBlockTest extends WebTestBase {
+
+  public static $modules = array('ctools_block', 'ctools_block_field_test');
+
+  // Note: right now placing the body field appears to be broken :-(
+  function testBodyField() {
+    // @todo: place 'entity_field:node:body' block
+    // @todo: create a 'ctools_block_field_test' node
+    // @todo: visit the /node/XX page and verify it's displayed correctly
+    $this->assertTrue(FALSE);
+  }
+
+  function testImageField() {
+     // @todo: place 'entity_field:node:field_ctools_block_image' block
+    // @todo: create a 'ctools_block_field_test' node
+    // @todo: visit the /node/XX page and verify it's displayed correctly
+    $this->assertTrue(FALSE);
+  }
+
+  function testNodeBaseFields() {
+    // @todo: place some node base fields, etc
+    $this->assertTrue(FALSE);
+  }
+
+  function testRenderCache() {
+    // @todo: place one of the field blocks
+    // @todo: Create two 'ctools_block_field_test' nodes
+    // @todo: visit one and then then other - make sure the data changes
+    // @todo: edit one of the nodes - make sure the data changes
+    $this->assertTrue(FALSE);
+  }
+
+}
+
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
new file mode 100644
index 0000000..905df26
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.base_field_override.node.ctools_block_field_test.promote.yml
@@ -0,0 +1,21 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.ctools_block_field_test
+id: node.ctools_block_field_test.promote
+field_name: promote
+entity_type: node
+bundle: ctools_block_field_test
+label: 'Promoted to front page'
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean
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
new file mode 100644
index 0000000..66b1af3
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_form_display.node.ctools_block_field_test.default.yml
@@ -0,0 +1,69 @@
+langcode: en
+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
+id: node.ctools_block_field_test.default
+targetEntityType: node
+bundle: ctools_block_field_test
+mode: default
+content:
+  body:
+    type: text_textarea_with_summary
+    weight: 31
+    settings:
+      rows: 9
+      summary_rows: 3
+      placeholder: ''
+    third_party_settings: {  }
+  created:
+    type: datetime_timestamp
+    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
+    settings: {  }
+    third_party_settings: {  }
+  promote:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 15
+    third_party_settings: {  }
+  sticky:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 16
+    third_party_settings: {  }
+  title:
+    type: string_textfield
+    weight: -5
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 5
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden: {  }
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
new file mode 100644
index 0000000..74a0057
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.default.yml
@@ -0,0 +1,33 @@
+langcode: en
+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
+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: {  }
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
new file mode 100644
index 0000000..55d5da5
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.teaser.yml
@@ -0,0 +1,25 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.teaser
+    - field.field.node.ctools_block_field_test.body
+    - node.type.ctools_block_field_test
+  module:
+    - text
+    - user
+id: node.ctools_block_field_test.teaser
+targetEntityType: node
+bundle: ctools_block_field_test
+mode: teaser
+content:
+  body:
+    label: hidden
+    type: text_summary_or_trimmed
+    weight: 101
+    settings:
+      trim_length: 600
+    third_party_settings: {  }
+  links:
+    weight: 100
+hidden: {  }
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
new file mode 100644
index 0000000..99e7a81
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.body.yml
@@ -0,0 +1,21 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.body
+    - node.type.ctools_block_field_test
+  module:
+    - text
+id: node.ctools_block_field_test.body
+field_name: body
+entity_type: node
+bundle: ctools_block_field_test
+label: Body
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  display_summary: true
+field_type: text_with_summary
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
new file mode 100644
index 0000000..ad1909d
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.field_ctools_block_image.yml
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 0000000..4d8c78f
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.storage.node.field_ctools_block_image.yml
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 0000000..655c70f
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/node.type.ctools_block_field_test.yml
@@ -0,0 +1,16 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - menu_ui
+third_party_settings:
+  menu_ui:
+    available_menus: {  }
+    parent: ''
+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
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
new file mode 100644
index 0000000..723f4c5
--- /dev/null
+++ b/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml
@@ -0,0 +1,17 @@
+name: 'Chaos tools blocks test'
+type: module
+description: 'Support module for Chaos tools blocks tests.'
+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