diff --git a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
index b7c40e4..2ff6a45 100644
--- a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
@@ -50,7 +50,7 @@ public function testFieldUrl() {
     $this->assertEqual('John', $view->field['name']->advanced_render($view->result[0]));
 
     // Make the url a link.
-    $view->delete();
+    $view->destroy();
     $view = $this->getBasicView();
 
     $view->display['default']->handler->overrideOption('fields', array(
diff --git a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
index 1d5b035..306e896 100644
--- a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
@@ -35,8 +35,7 @@ function setUp() {
 
   protected function getBasicView() {
     $view = parent::getBasicView();
-    $fields = $view->display['default']->handler->options['fields'];
-    $view->display['default']->display_options['fields']['job'] = array(
+    $view->display['default']->handler->options['fields']['job'] = array(
       'id' => 'job',
       'table' => 'views_test',
       'field' => 'job',
diff --git a/lib/Drupal/views/Tests/Plugin/AccessTest.php b/lib/Drupal/views/Tests/Plugin/AccessTest.php
index 7c199aa..e7f9cca 100644
--- a/lib/Drupal/views/Tests/Plugin/AccessTest.php
+++ b/lib/Drupal/views/Tests/Plugin/AccessTest.php
@@ -97,13 +97,13 @@ function testStaticAccessPlugin() {
 
     // FALSE comes from hook_menu caching.
     $expected_hook_menu = array(
-      'views_test_data_data_test_static_access_callback', array(FALSE)
+      'views_test_data_test_static_access_callback', array(FALSE)
     );
     $hook_menu = $view->executeHookMenu('page_1');
     $this->assertEqual($expected_hook_menu, $hook_menu['test_access_static']['access arguments'][0]);
 
     $expected_hook_menu = array(
-      'views_test_test_static_access_callback', array(TRUE)
+      'views_test_data_test_static_access_callback', array(TRUE)
     );
     $this->assertTrue(views_access($expected_hook_menu));
   }
diff --git a/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php b/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
index 063af8d..27b8338 100644
--- a/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
+++ b/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
@@ -45,8 +45,8 @@ function testArgumentValidateNumeric() {
 
   function view_test_argument_validate_php($string) {
     $code = 'return $argument == \''. $string .'\';';
-    $this->createViewFromConfig('test_view_argument_validate_numeric');
-    $view->display_handler->display->display_options['arguments']['null']['validate_options']['code'] = $code;
+    $view = $this->createViewFromConfig('test_view_argument_validate_numeric');
+    $view->display['default']->handler->options['arguments']['null']['validate_options']['code'] = $code;
 
     return $view;
   }
diff --git a/lib/Drupal/views/Tests/User/ArgumentValidateTest.php b/lib/Drupal/views/Tests/User/ArgumentValidateTest.php
index 49549d5..9ccd6d4 100644
--- a/lib/Drupal/views/Tests/User/ArgumentValidateTest.php
+++ b/lib/Drupal/views/Tests/User/ArgumentValidateTest.php
@@ -85,7 +85,7 @@ function testArgumentValidateUserEither() {
   }
 
   function view_argument_validate_user($argtype) {
-    $view = $this->createViewFromConfig('');
+    $view = $this->createViewFromConfig('test_view_argument_validate_user');
     $view->display_handler->display->display_options['arguments']['null']['validate_options']['type'] = $argtype;
 
     return $view;