diff --git a/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php b/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php
index fe481ea..c84cb44 100644
--- a/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php
+++ b/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php
@@ -87,20 +87,17 @@ protected function setUp() {
 
     // Create some test entities which link each other.
     $entity_storage= \Drupal::entityManager()->getStorage('entity_test');
-    $entity_0 = $entity_storage->create(array());
-    // @todo Add a value in order to avoid: "Column 'field_test_target_id'
-    // cannot be null".
-    //$entity_0->field_test->target_id = 1000;
-    $entity_0->save();
-    $this->entities[$entity_0->id()] = $entity_0;
+    $referenced_entity = $entity_storage->create(array());
+    $referenced_entity->save();
+    $this->entities[$referenced_entity->id()] = $referenced_entity;
 
     $entity = $entity_storage->create(array());
-    $entity->field_test->target_id = $entity_0->id();
+    $entity->field_test->target_id = $referenced_entity->id();
     $entity->save();
     $this->entities[$entity->id()] = $entity;
 
     $entity = $entity_storage->create(array('field_test' => $entity->id()));
-    $entity->field_test->target_id = $entity_0->id();
+    $entity->field_test->target_id = $referenced_entity->id();
     $entity->save();
     $this->entities[$entity->id()] = $entity;
   }
@@ -110,14 +107,14 @@ protected function setUp() {
    */
   public function testRelationship() {
     // Check just the generated views data.
-    $views_data_field_test = $this->container->get('views.views_data')->get('entity_test__field_test');
+    $views_data_field_test = Views::viewsData()->get('entity_test__field_test');
     $this->assertEqual($views_data_field_test['field_test']['relationship']['id'], 'standard');
     $this->assertEqual($views_data_field_test['field_test']['relationship']['base'], 'entity_test');
     $this->assertEqual($views_data_field_test['field_test']['relationship']['base field'], 'id');
     $this->assertEqual($views_data_field_test['field_test']['relationship']['relationship field'], 'field_test_target_id');
 
     // Check the backwards reference.
-    $views_data_entity_test = $this->container->get('views.views_data')->get('entity_test');
+    $views_data_entity_test = Views::viewsData()->get('entity_test');
     $this->assertEqual($views_data_entity_test['reverse_entity_test__field_test']['relationship']['id'], 'entity_reverse');
     $this->assertEqual($views_data_entity_test['reverse_entity_test__field_test']['relationship']['base'], 'entity_test');
     $this->assertEqual($views_data_entity_test['reverse_entity_test__field_test']['relationship']['base field'], 'id');
@@ -125,14 +122,14 @@ public function testRelationship() {
     $this->assertEqual($views_data_entity_test['reverse_entity_test__field_test']['relationship']['field field'], 'field_test_target_id');
 
 
-    // Check an actually test view.
+    // Check an actual test view.
     $view = Views::getView('test_entity_reference_view');
     $this->executeView($view, 'default');
     $view->initStyle();
 
     foreach (array_keys($view->result) as $index) {
       // Just check that the actual ID of the entity is the expected one.
-      $this->assertEqual($view->style_plugin->getField($index, 'id'), $this->entities[$index + 1]->id());
+      $this->assertEqual($view->style_plugin->getFieldValue($index, 'id'), $this->entities[$index + 1]->id());
       // Test the forward relationship.
       // The second and third entity refer to the first one.
       $this->assertEqual($view->style_plugin->getField($index, 'id_1'), $index == 0 ? 0 : 1);