diff --git a/src/Tests/ExampleContentTrait.php b/src/Tests/ExampleContentTrait.php
index 5bb93f4..293ea2a 100644
--- a/src/Tests/ExampleContentTrait.php
+++ b/src/Tests/ExampleContentTrait.php
@@ -94,4 +94,32 @@ trait ExampleContentTrait {
     return $index->indexItems();
   }
 
+  /**
+   * Add a facet trough the UI.
+   *
+   * @param string $name
+   *   The facet name.
+   * @param string $id
+   *   The facet id.
+   * @param string $field
+   *   The facet field.
+   */
+  protected function createFacet($name, $id, $field = 'type') {
+    $facet_add_page = 'admin/config/search/facets/add-facet';
+
+    $this->drupalGet($facet_add_page);
+
+    $form_values = [
+      'id' => $id,
+      'status' => 1,
+      'url_alias' => $id,
+      'name' => $name,
+      'facet_source_id' => 'search_api_views:search_api_test_view:page_1',
+      'facet_source_configs[search_api_views:search_api_test_view:page_1][field_identifier]' => $field,
+    ];
+    $this->drupalPostForm(NULL, ['facet_source_id' => 'search_api_views:search_api_test_view:page_1'], $this->t('Configure facet source'));
+    $this->drupalPostForm(NULL, $form_values, $this->t('Save'));
+  }
+
+
 }
diff --git a/src/Tests/FacetHelperTrait.php b/src/Tests/FacetHelperTrait.php
deleted file mode 100644
index ec822c0..0000000
--- a/src/Tests/FacetHelperTrait.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\facets\Tests\FacetHelperTrait.
- */
-
-namespace Drupal\facets\Tests;
-
-/**
- * Contains helpers to create data that can be used by tests.
- */
-trait FacetHelperTrait {
-
-  /**
-   * The generated test entities, keyed by ID.
-   *
-   * @var \Drupal\entity_test\Entity\EntityTest[]
-   */
-  protected $entities = array();
-
-  /**
-   * Sets up the necessary bundles on the test entity type.
-   *
-   * @param string $name
-   *   The facet name.
-   * @param string $id
-   *   The facet id.
-   * @param string $field
-   *   The facet field.
-   */
-  protected function addFacet($name, $id, $field = 'type') {
-    $facet_add_page = 'admin/config/search/facets/add-facet';
-
-    $this->drupalGet($facet_add_page);
-
-    $form_values = [
-      'id' => $id,
-      'status' => 1,
-      'url_alias' => $id,
-      'name' => $name,
-      'facet_source_id' => 'search_api_views:search_api_test_view:page_1',
-      'facet_source_configs[search_api_views:search_api_test_view:page_1][field_identifier]' => $field,
-    ];
-    $this->drupalPostForm(NULL, ['facet_source_id' => 'search_api_views:search_api_test_view:page_1'], $this->t('Configure facet source'));
-    $this->drupalPostForm(NULL, $form_values, $this->t('Save'));
-  }
-
-}
diff --git a/src/Tests/ProcessorIntegrationTest.php b/src/Tests/ProcessorIntegrationTest.php
index 460cbcd..7e97611 100644
--- a/src/Tests/ProcessorIntegrationTest.php
+++ b/src/Tests/ProcessorIntegrationTest.php
@@ -17,8 +17,6 @@ use Drupal\facets\Tests\WebTestBase as FacetWebTestBase;
  */
 class ProcessorIntegrationTest extends FacetWebTestBase {
 
-  use FacetHelperTrait;
-
   /**
    * The block entities used by this test.
    *
@@ -43,17 +41,9 @@ class ProcessorIntegrationTest extends FacetWebTestBase {
 
     $this->setUpExampleStructure();
     $this->insertExampleContent();
-    $this->assertEqual(
-      $this->indexItems($this->indexId),
-      5,
-      '5 items were indexed.'
-    );
+    $this->assertEqual($this->indexItems($this->indexId), 5, '5 items were indexed.');
     $this->insertExampleContent();
-    $this->assertEqual(
-      $this->indexItems($this->indexId),
-      5,
-      '5 items were indexed.'
-    );
+    $this->assertEqual($this->indexItems($this->indexId), 5, '5 items were indexed.');
 
     // Make absolutely sure the ::$blocks variable doesn't pass information
     // along between tests.
@@ -67,7 +57,7 @@ class ProcessorIntegrationTest extends FacetWebTestBase {
     $facet_name = "Guanaco";
     $facet_id = "guanaco";
 
-    $this->addFacet($facet_name, $facet_id);
+    $this->createFacet($facet_name, $facet_id);
 
     // Go to the processors form and check that the count limit processor is not
     // checked.
@@ -125,7 +115,7 @@ class ProcessorIntegrationTest extends FacetWebTestBase {
     $facet_id = "vicuna";
     $this->editForm = 'admin/config/search/facets/' . $facet_id . '/display';
 
-    $this->addFacet($facet_name, $facet_id, 'keywords');
+    $this->createFacet($facet_name, $facet_id, 'keywords');
     $this->createFacetBlock($facet_id);
 
     $this->drupalGet('search-api-test-fulltext');