diff --git a/src/Tests/MonitoringUITest.php b/src/Tests/MonitoringUITest.php
index 0b2eaaa..ff7972f 100644
--- a/src/Tests/MonitoringUITest.php
+++ b/src/Tests/MonitoringUITest.php
@@ -16,7 +16,7 @@ use Drupal\monitoring\Entity\SensorConfig;
  */
 class MonitoringUITest extends MonitoringTestBase {
 
-  public static $modules = array('dblog', 'node', 'views');
+  public static $modules = array('dblog', 'node', 'views', 'file');
 
   /**
    * {@inheritdoc}
@@ -95,32 +95,48 @@ class MonitoringUITest extends MonitoringTestBase {
 
     $this->assertFieldByName('status', TRUE);
 
+    // Test creation of Node entity aggregator sensor.
     $this->drupalPostForm(NULL, array(
-      'label' => 'UI created Sensor',
+      'label' => 'Node Entity Aggregator sensor',
       'id' => 'ui_test_sensor',
       'plugin_id' => 'entity_aggregator',
     ), t('Select sensor'));
 
     $this->assertText('Sensor plugin settings');
     $this->drupalPostForm(NULL, array('settings[entity_type]' => 'node'), t('Add another condition'));
-    $this->drupalPostForm(NULL, array(
-      'description' => 'Sensor created to test UI',
-      'value_label' => 'Test Value',
-      'caching_time' => 100,
-      'settings[aggregation][time_interval_value]' => 86400,
-      'settings[entity_type]' => 'node',
-      'conditions[0][field]' => 'type',
-      'conditions[0][value]' => 'article',
-      'conditions[1][field]' => 'sticky',
-      'conditions[1][value]' => '0',
-    ), t('Save'));
 
-    $this->assertText(SafeMarkup::format('Sensor @label saved.', array('@label' => 'UI created Sensor')));
+    // Get every available field for entity type node.
+    $node_fields = \Drupal::entityManager()->getBaseFieldDefinitions('node');
+
+    $edit = array();
+    $edit['description'] = 'Sensor created to test UI';
+    $edit['value_label'] = 'Test Value';
+    $edit['caching_time'] = 100;
+    $edit['settings[aggregation][time_interval_value]'] = 86400;
+    $edit['settings[entity_type]'] = 'node';
+    $edit['conditions[0][field]'] = 'type';
+    $edit['conditions[0][value]'] = 'article';
+    $edit['conditions[1][field]'] = 'sticky';
+    $edit['conditions[1][value]'] = '0';
+    $i = 2;
+    foreach ($node_fields as $field) {
+      $this->drupalPostForm(NULL, array('settings[entity_type]' => 'node'), t('Add another field'));
+      $edit['settings[verbose_fields][' . $i++ . ']'] = $field->getName();
+    }
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+
+    $this->assertText(SafeMarkup::format('Sensor @label saved.', array('@label' => 'Node Entity Aggregator sensor')));
 
     // Test details page by clicking the link in confirmation message.
-    $this->assertLink(t('UI created Sensor'));
-    $this->clickLink(t('UI created Sensor'));
+    $this->assertLink(t('Node Entity Aggregator sensor'));
+    $this->clickLink(t('Node Entity Aggregator sensor'));
     $this->assertText('Result');
+    $this->assertText('nid');
+    $this->assertText('label');
+    $this->assertText('langcode');
+    $this->assertText('title');
+    $this->assertText('status');
+    $this->assertText('sticky');
 
     $this->drupalGet('admin/config/system/monitoring/sensors/ui_test_sensor');
     $this->assertFieldByName('caching_time', 100);
@@ -128,11 +144,57 @@ class MonitoringUITest extends MonitoringTestBase {
     $this->assertFieldByName('conditions[0][value]', 'article');
     $this->assertFieldByName('conditions[1][field]', 'sticky');
     $this->assertFieldByName('conditions[1][value]', '0');
+    $i = 2;
+    foreach ($node_fields as $field) {
+      $this->assertFieldByName('settings[verbose_fields][' . $i++ . ']', $field->getName());
+    }
+
+    $this->drupalGet('admin/config/system/monitoring/sensors/add');
+
+    // Test creation of File entity aggregator sensor.
+    $this->drupalPostForm(NULL, array(
+      'label' => 'File Entity Aggregator sensor',
+      'id' => 'file_test_sensor',
+      'plugin_id' => 'entity_aggregator',
+    ), t('Select sensor'));
+
+    $this->assertText('Sensor plugin settings');
+    $this->drupalPostForm(NULL, array('settings[entity_type]' => 'file'), t('Add another condition'));
+
+    // Get every available field for entity type file.
+    $file_fields = \Drupal::entityManager()->getBaseFieldDefinitions('file');
+
+    $edit = array();
+    $i = 2;
+    foreach ($file_fields as $field) {
+      $this->drupalPostForm(NULL, array('settings[entity_type]' => 'node'), t('Add another field'));
+      $edit['settings[verbose_fields][' . $i++ . ']'] = $field->getName();
+    }
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+
+    $this->assertText(SafeMarkup::format('Sensor @label saved.', array('@label' => 'File Entity Aggregator sensor')));
+
+    // Test details page by clicking the link in confirmation message.
+    $this->assertLink(t('File Entity Aggregator sensor'));
+    $this->clickLink(t('File Entity Aggregator sensor'));
+    $this->assertText('Result');
+    $this->assertText('label');
+    $this->assertText('uuid');
+    $this->assertText('filename');
+    $this->assertText('filesize');
+    $this->assertText('uri');
+    $this->assertText('created');
+
+    $this->drupalGet('admin/config/system/monitoring/sensors/file_test_sensor');
+    $i = 2;
+    foreach ($file_fields as $field) {
+      $this->assertFieldByName('settings[verbose_fields][' . $i++ . ']', $field->getName());
+    }
 
     $this->drupalGet('admin/config/system/monitoring/sensors/ui_test_sensor/delete');
     $this->assertText('This action cannot be undone.');
     $this->drupalPostForm(NULL, array(), t('Delete'));
-    $this->assertText('Sensor UI created Sensor has been deleted.');
+    $this->assertText('Node Entity Aggregator sensor has been deleted.');
 
     $this->drupalPostForm('admin/config/system/monitoring/sensors/add', array(
       'label' => 'UI created Sensor config',