diff --git a/core/modules/views/src/Tests/Handler/HandlerTest.php b/core/modules/views/src/Tests/Handler/HandlerTest.php
index 1abb773..df06c05 100644
--- a/core/modules/views/src/Tests/Handler/HandlerTest.php
+++ b/core/modules/views/src/Tests/Handler/HandlerTest.php
@@ -88,101 +88,7 @@ function testFilterInOperatorUi() {
     $this->assertFieldByName('options[expose][reduce]', TRUE);
   }
 
-  /**
-   * Tests the breakString method.
-   */
-  public function testBreakString() {
-    // Check defaults.
-    $this->assertEqual((object) array('value' => array(), 'operator' => NULL), HandlerBase::breakString(''));
-
-    // Test ors
-    $handler = HandlerBase::breakString('word1 word2+word');
-    $this->assertEqualValue(array('word1', 'word2', 'word'), $handler);
-    $this->assertEqual('or', $handler->operator);
-    $handler = HandlerBase::breakString('word1+word2+word');
-    $this->assertEqualValue(array('word1', 'word2', 'word'), $handler);
-    $this->assertEqual('or', $handler->operator);
-    $handler = HandlerBase::breakString('word1 word2 word');
-    $this->assertEqualValue(array('word1', 'word2', 'word'), $handler);
-    $this->assertEqual('or', $handler->operator);
-    $handler = HandlerBase::breakString('word-1+word-2+word');
-    $this->assertEqualValue(array('word-1', 'word-2', 'word'), $handler);
-    $this->assertEqual('or', $handler->operator);
-    $handler = HandlerBase::breakString('wõrd1+wõrd2+wõrd');
-    $this->assertEqualValue(array('wõrd1', 'wõrd2', 'wõrd'), $handler);
-    $this->assertEqual('or', $handler->operator);
-
-    // Test ands.
-    $handler = HandlerBase::breakString('word1,word2,word');
-    $this->assertEqualValue(array('word1', 'word2', 'word'), $handler);
-    $this->assertEqual('and', $handler->operator);
-    $handler = HandlerBase::breakString('word1 word2,word');
-    $this->assertEqualValue(array('word1 word2', 'word'), $handler);
-    $this->assertEqual('and', $handler->operator);
-    $handler = HandlerBase::breakString('word1,word2 word');
-    $this->assertEqualValue(array('word1', 'word2 word'), $handler);
-    $this->assertEqual('and', $handler->operator);
-    $handler = HandlerBase::breakString('word-1,word-2,word');
-    $this->assertEqualValue(array('word-1', 'word-2', 'word'), $handler);
-    $this->assertEqual('and', $handler->operator);
-    $handler = HandlerBase::breakString('wõrd1,wõrd2,wõrd');
-    $this->assertEqualValue(array('wõrd1', 'wõrd2', 'wõrd'), $handler);
-    $this->assertEqual('and', $handler->operator);
-
-    // Test a single word
-    $handler = HandlerBase::breakString('word');
-    $this->assertEqualValue(array('word'), $handler);
-    $this->assertEqual('and', $handler->operator);
-
-    $s1 = $this->randomMachineName();
-    // Generate three random numbers which can be used below;
-    $n1 = rand(0, 100);
-    $n2 = rand(0, 100);
-    $n3 = rand(0, 100);
-
-    // Test "or"s.
-    $handlerBase = HandlerBase::breakString("$s1 $n2+$n3");
-    $this->assertEqualValue(array($s1, $n2, $n3), $handlerBase);
-    $this->assertEqual('or', $handlerBase->operator);
-
-    $handlerBase = HandlerBase::breakString("$s1+$n2+$n3");
-    $this->assertEqualValue(array($s1, $n2, $n3), $handlerBase);
-    $this->assertEqual('or', $handlerBase->operator);
-
-    $handlerBase = HandlerBase::breakString("$s1 $n2 $n3");
-    $this->assertEqualValue(array($s1, $n2, $n3), $handlerBase);
-    $this->assertEqual('or', $handlerBase->operator);
-
-    $handlerBase = HandlerBase::breakString("$s1 $n2++$n3");
-    $this->assertEqualValue(array($s1, $n2, $n3), $handlerBase);
-    $this->assertEqual('or', $handlerBase->operator);
-
-    // Test "and"s.
-    $handlerBase = HandlerBase::breakString("$s1,$n2,$n3");
-    $this->assertEqualValue(array($s1, $n2, $n3), $handlerBase);
-    $this->assertEqual('and', $handlerBase->operator);
-
-    $handlerBase = HandlerBase::breakString("$s1,,$n2,$n3");
-    $this->assertEqualValue(array($s1, $n2, $n3), $handlerBase);
-    $this->assertEqual('and', $handlerBase->operator);
-
-    // Enforce int values.
-    $handlerBase = HandlerBase::breakString("$n1,$n2,$n3", TRUE);
-    $this->assertEqualValue(array($n1, $n2, $n3), $handlerBase);
-    $this->assertEqual('and', $handlerBase->operator);
-
-    $handlerBase = HandlerBase::breakString("$n1+$n2+$n3", TRUE);
-    $this->assertEqualValue(array($n1, $n2, $n3), $handlerBase);
-    $this->assertEqual('or', $handlerBase->operator);
-
-    $handlerBase = HandlerBase::breakString("$s1,$n2,$n3", TRUE);
-    $this->assertEqualValue(array((int) $s1, $n2, $n3), $handlerBase);
-    $this->assertEqual('and', $handlerBase->operator);
-
-    $handlerBase = HandlerBase::breakString("$s1+$n2+$n3", TRUE);
-    $this->assertEqualValue(array((int) $s1, $n2, $n3), $handlerBase);
-    $this->assertEqual('or', $handlerBase->operator);
-  }
+
 
   /**
    * Tests the order of handlers is the same before and after saving.
diff --git a/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php
index 12b7ca1..f427685 100644
--- a/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/HandlerBaseTest.php
@@ -90,6 +90,84 @@ public function testGetEntityTypeForFieldWithRelationship() {
 
     $this->assertEquals('test_other_entity_type', $handler->getEntityType());
   }
+  /**
+   * Tests the breakString method.
+   * @dataProvider providerTestBreakString
+   */
+  public function testBreakString($string, $value, $op, $force_int = FALSE) {
+    // Check defaults.
+    $this->assertEqual((object) array('value' => array(), 'operator' => NULL), HandlerBase::breakString(''));
+
+    // Test ors
+    $handler = HandlerBase::breakString($string, $force_int);
+    $this->assertEqualValue($value, $handler);
+    $this->assertEqual($op, $handler->operator);
+  }
+
+  /**
+   * Proovider data for testBreakString case
+   */
+  public function providerTestBreakString() {
+    $s1 = $this->randomMachineName();
+    // Generate three random numbers which can be used below;
+    $n1 = rand(0, 100);
+    $n2 = rand(0, 100);
+    $n3 = rand(0, 100);
+    return array(
+      //testing or operation
+      array('word1 word2 word', array('word1', 'word2', 'word'), 'or'),
+      array('word1+word2+word', array('word1 word2', 'word'), 'or'),
+      array('word1 word2 word', array('word1', 'word2', 'word'), 'or'),
+      array('word-1+word-2+word', array('word-1', 'word-2', 'word'), 'or'),
+      array('word-1+word-2+word', array('word-1', 'word-2', 'word'), 'or'),
+      array('wõrd1+wõrd2+wõrd', array('wõrd1', 'wõrd2', 'wõrd'), 'or'),
+      //Testing ands
+      array('word1,word2,word', array('word1', 'word2', 'word'), 'and'),
+      array('word1,word2,word', array('word1 word2', 'word'), 'and'),
+      array('word1,word2 word', array('word1', 'word2 word'), 'and'),
+      array('word-1,word-2,word', array('word-1', 'word-2', 'word'), 'and'),
+      array('wõrd1,wõrd2,wõrd', array('wõrd1', 'wõrd2', 'wõrd'), 'and'),
+
+      // Test a single word
+      array('word', array('word'), 'and'),
+      // Test "or"s.
+      array("$s1 $n2+$n3", array($s1, $n2, $n3), 'or'),
+      array("$s1+$n2+$n3", array($s1, $n2, $n3), 'or'),
+      array("$s1 $n2 $n3", array($s1, $n2, $n3), 'or'),
+      array("$s1 $n2++$n3", array($s1, $n2, $n3), 'or'),
+      // Test "and"s.
+      array("$s1,$n2,$n3", array($s1, $n2, $n3), 'and'),
+      array("$s1,,$n2,$n3", array($s1, $n2, $n3), 'and'),
+      array("$s1,,$n2,$n3", array($s1, $n2, $n3), 'and'),
+
+      array("$n1,$n2,$n3", array($n1, $n2, $n3), 'and', TRUE),
+      array("$n1+$n2+$n3", array($n1, $n2, $n3), 'or', TRUE),
+      array("$s1,$n2,$n3", array($s1, $n2, $n3), 'and', TRUE),
+      array("$s1+$n2+$n3", array($s1, $n2, $n3), 'or', TRUE),
+    );
+  }
+  /**
+   * Check to see if a value is the same as the value on a certain handler.
+   *
+   * @param $expected
+   *   The expected value to check.
+   * @param \Drupal\views\Plugin\views\ViewsHandlerInterface $handler
+   *   The handler that has the $handler->value property to compare with first.
+   * @param string $message
+   *   The message to display along with the assertion.
+   * @param string $group
+   *   The type of assertion - examples are "Browser", "PHP".
+   *
+   * @return bool
+   *   TRUE if the assertion succeeded, FALSE otherwise.
+   */
+  protected function assertEqualValue($expected, $handler, $message = '', $group = 'Other') {
+    if (empty($message)) {
+      $message = t('Comparing @first and @second', array('@first' => implode(',', $expected), '@second' => implode(',', $handler->value)));
+    }
+
+    return $this->assert($expected == $handler->value, $message, $group);
+  }
 
 }