diff --git a/includes/handlers.inc b/includes/handlers.inc
index ebdec34..ddfab3c 100644
--- a/includes/handlers.inc
+++ b/includes/handlers.inc
@@ -6,8 +6,6 @@
  */
 
 use Drupal\Core\Database\Database;
-use Drupal\views\View;
-use Drupal\views\Plugin\views\join\JoinPluginBase;
 use Drupal\views\Plugin\Type\ViewsPluginManager;
 use Drupal\Component\Plugin\Exception\PluginException;
 
diff --git a/lib/Drupal/views/Tests/Comment/ArgumentUserUIDTest.php b/lib/Drupal/views/Tests/Comment/ArgumentUserUIDTest.php
index 83aa6d9..bae6b1b 100644
--- a/lib/Drupal/views/Tests/Comment/ArgumentUserUIDTest.php
+++ b/lib/Drupal/views/Tests/Comment/ArgumentUserUIDTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\Comment;
 
-use Drupal\views\View;
-
 /**
  * Tests the argument_comment_user_uid handler.
  */
diff --git a/lib/Drupal/views/Tests/Comment/CommentTestBase.php b/lib/Drupal/views/Tests/Comment/CommentTestBase.php
index 71a4c22..42c8bc2 100644
--- a/lib/Drupal/views/Tests/Comment/CommentTestBase.php
+++ b/lib/Drupal/views/Tests/Comment/CommentTestBase.php
@@ -8,7 +8,6 @@
 namespace Drupal\views\Tests\Comment;
 
 use Drupal\views\Tests\ViewTestBase;
-use Drupal\views\View;
 
 /**
  * Tests the argument_comment_user_uid handler.
diff --git a/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php b/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php
index e3bea5f..5995240 100644
--- a/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php
+++ b/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\Comment;
 
-use Drupal\views\View;
-
 /**
  * Tests the filter_comment_user_uid handler.
  *
diff --git a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
index cd4acf7..a551025 100644
--- a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
+++ b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\Field;
 
-use Drupal\views\View;
-
 /**
  * Tests the field_field handler.
  * @TODO
diff --git a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
index 169c779..860189b 100644
--- a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use Drupal\views\View;
-
 /**
  * Tests the core Drupal\views\Plugin\views\argument\String handler.
  */
diff --git a/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
index 440757b..44b6909 100644
--- a/lib/Drupal/views/Tests/Handler/FilterDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\Handler;
 
-use Drupal\views\View;
-
 /**
  * Tests the core Drupal\views\Plugin\views\filter\Date handler.
  */
@@ -76,7 +74,6 @@ function testOffset() {
     $view->destroy();
   }
 
-
   /**
    * Tests the filter operator between/not between.
    */
@@ -166,8 +163,7 @@ function views_test_between() {
   }
 
   function views_test_offset() {
-    $view = $this->views_test_between();
-    return $view;
+    return $this->createViewFromConfig('test_filter_date_between');
   }
 
 }
diff --git a/lib/Drupal/views/Tests/Plugin/AccessTest.php b/lib/Drupal/views/Tests/Plugin/AccessTest.php
index 663c8b8..7c199aa 100644
--- a/lib/Drupal/views/Tests/Plugin/AccessTest.php
+++ b/lib/Drupal/views/Tests/Plugin/AccessTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\Plugin;
 
-use Drupal\views\View;
-
 /**
  * Basic test for pluggable access.
  */
@@ -99,7 +97,7 @@ function testStaticAccessPlugin() {
 
     // FALSE comes from hook_menu caching.
     $expected_hook_menu = array(
-      'views_test_test_static_access_callback', array(FALSE)
+      'views_test_data_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]);
@@ -133,13 +131,13 @@ function testDynamicAccessPlugin() {
 
     // FALSE comes from hook_menu caching.
     $expected_hook_menu = array(
-      'views_test_test_dynamic_access_callback', array(FALSE, 1, 2)
+      'views_test_data_test_dynamic_access_callback', array(FALSE, 1, 2)
     );
     $hook_menu = $view->executeHookMenu('page_1');
     $this->assertEqual($expected_hook_menu, $hook_menu['test_access_dynamic']['access arguments'][0]);
 
     $expected_hook_menu = array(
-      'views_test_test_dynamic_access_callback', array(TRUE, 1, 2)
+      'views_test_data_test_dynamic_access_callback', array(TRUE, 1, 2)
     );
     $this->assertTrue(views_access($expected_hook_menu, $argument1, $argument2));
   }
diff --git a/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php b/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
index 9b09c8a..8cf7e1d 100644
--- a/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
+++ b/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\Plugin;
 
-use Drupal\views\View;
-
 /**
  * Basic test for pluggable argument default.
  */
diff --git a/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php b/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
index ce72c74..063af8d 100644
--- a/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
+++ b/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\Plugin;
 
-use Drupal\views\View;
-
 /**
  * Tests Views argument validators.
  */
diff --git a/lib/Drupal/views/Tests/Plugin/DisplayTest.php b/lib/Drupal/views/Tests/Plugin/DisplayTest.php
index dd802c8..b6cc950 100644
--- a/lib/Drupal/views/Tests/Plugin/DisplayTest.php
+++ b/lib/Drupal/views/Tests/Plugin/DisplayTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\Plugin;
 
-use Drupal\views\View;
-
 /**
  * Tests the basic display plugin.
  */
diff --git a/lib/Drupal/views/Tests/Plugin/PagerTest.php b/lib/Drupal/views/Tests/Plugin/PagerTest.php
index d581b6e..2c45df1 100644
--- a/lib/Drupal/views/Tests/Plugin/PagerTest.php
+++ b/lib/Drupal/views/Tests/Plugin/PagerTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\Plugin;
 
-use Drupal\views\View;
-
 /**
  * Tests the pluggable pager system.
  */
@@ -351,7 +349,6 @@ function testPagerApi() {
     $rand_number = rand(6, 11);
     $view->pager->set_current_page($rand_number);
     $this->assertEqual($view->getCurrentPage(), $rand_number, 'Make sure get_current_page uses the settings of set_current_page.');
-
   }
 
 }
diff --git a/lib/Drupal/views/Tests/Plugin/PluginTestBase.php b/lib/Drupal/views/Tests/Plugin/PluginTestBase.php
index 2f03fe6..048690e 100644
--- a/lib/Drupal/views/Tests/Plugin/PluginTestBase.php
+++ b/lib/Drupal/views/Tests/Plugin/PluginTestBase.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests\Plugin;
 
-use Drupal\views\View;
 use Drupal\views\Tests\ViewTestBase;
 
 /**
diff --git a/lib/Drupal/views/Tests/QueryGroupByTest.php b/lib/Drupal/views/Tests/QueryGroupByTest.php
index e9e6b0f..a4c2e78 100644
--- a/lib/Drupal/views/Tests/QueryGroupByTest.php
+++ b/lib/Drupal/views/Tests/QueryGroupByTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use Drupal\views\View;
-
 /**
  * Tests aggregate functionality of views, for example count.
  */
@@ -20,7 +18,6 @@ public static function getInfo() {
       'description' => 'Tests aggregate functionality of views, for example count.',
       'group' => 'Views',
     );
-
   }
 
   /**
diff --git a/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php b/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php
index 5350077..4e8797d 100644
--- a/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php
+++ b/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php
@@ -8,7 +8,6 @@
 namespace Drupal\views\Tests\Taxonomy;
 
 use Drupal\views\Tests\ViewTestBase;
-use Drupal\views\View;
 
 /**
  * Tests the node_term_data relationship handler.
diff --git a/lib/Drupal/views/Tests/TranslatableTest.php b/lib/Drupal/views/Tests/TranslatableTest.php
index 4207df1..dce76fd 100644
--- a/lib/Drupal/views/Tests/TranslatableTest.php
+++ b/lib/Drupal/views/Tests/TranslatableTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use Drupal\views\View;
-
 /**
  * Tests Views pluggable translations.
  */
diff --git a/lib/Drupal/views/Tests/UpgradeTestCase.php b/lib/Drupal/views/Tests/UpgradeTestCase.php
index ff22e9e..ca55ac3 100644
--- a/lib/Drupal/views/Tests/UpgradeTestCase.php
+++ b/lib/Drupal/views/Tests/UpgradeTestCase.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use Drupal\views\View;
-
 /**
  * Tests the upgrade path of all conversions.
  *
diff --git a/lib/Drupal/views/Tests/User/ArgumentDefaultTest.php b/lib/Drupal/views/Tests/User/ArgumentDefaultTest.php
index 5767c5e..1065d2b 100644
--- a/lib/Drupal/views/Tests/User/ArgumentDefaultTest.php
+++ b/lib/Drupal/views/Tests/User/ArgumentDefaultTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\User;
 
-use Drupal\views\View;
-
 /**
  * Tests views user argument default plugin.
  */
diff --git a/lib/Drupal/views/Tests/User/ArgumentValidateTest.php b/lib/Drupal/views/Tests/User/ArgumentValidateTest.php
index 4e9abe2..49549d5 100644
--- a/lib/Drupal/views/Tests/User/ArgumentValidateTest.php
+++ b/lib/Drupal/views/Tests/User/ArgumentValidateTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\User;
 
-use Drupal\views\View;
-
 /**
  * Tests views user argument argument handler.
  */
diff --git a/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php b/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
index 67dafbf..e0c6690 100644
--- a/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
+++ b/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\User;
 
-use Drupal\views\View;
-
 /**
  * Tests the field username handler.
  *
diff --git a/lib/Drupal/views/Tests/User/UserTest.php b/lib/Drupal/views/Tests/User/UserTest.php
index 4d1cb09..3afc0ee 100644
--- a/lib/Drupal/views/Tests/User/UserTest.php
+++ b/lib/Drupal/views/Tests/User/UserTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\User;
 
-use Drupal\views\View;
-
 /**
  * Tests basic user module integration into views.
  */
diff --git a/lib/Drupal/views/Tests/ViewTest.php b/lib/Drupal/views/Tests/ViewTest.php
index b9da92c..f45ebfa 100644
--- a/lib/Drupal/views/Tests/ViewTest.php
+++ b/lib/Drupal/views/Tests/ViewTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use Drupal\views\View;
-
 /**
  * Views class tests.
  */
diff --git a/lib/Drupal/views/Tests/ViewTestBase.php b/lib/Drupal/views/Tests/ViewTestBase.php
index 7bcf3fb..b9cf517 100644
--- a/lib/Drupal/views/Tests/ViewTestBase.php
+++ b/lib/Drupal/views/Tests/ViewTestBase.php
@@ -6,8 +6,6 @@
 
 namespace Drupal\views\Tests;
 use Drupal\simpletest\WebTestBase;
-use Drupal\views\View;
-use Symfony\Component\Yaml\Yaml;
 
 /**
  * Abstract class for views testing.
@@ -396,10 +394,8 @@ protected function getBasicView() {
    *   A View instance.
    */
   protected function createViewFromConfig($view_name) {
-    $path = drupal_get_path('module', 'views') . '/tests/default_views/';
-    $file = "views.view.$view_name.yml";
-    $yaml = file_get_contents($path . $file);
-    $data = Yaml::parse($yaml);
+    module_enable(array('views_test_config'));
+    $data = config("views.view.$view_name")->get();
 
     $view = entity_create('view', $data);
     $view->initDisplay();
diff --git a/tests/default_views/views.view.test_access_none.yml b/tests/views_test_config/config/views.view.test_access_none.yml
similarity index 94%
rename from tests/default_views/views.view.test_access_none.yml
rename to tests/views_test_config/config/views.view.test_access_none.yml
index 5c732fa..1ed0796 100644
--- a/tests/default_views/views.view.test_access_none.yml
+++ b/tests/views_test_config/config/views.view.test_access_none.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -20,6 +20,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_access_none
 tag: ''
diff --git a/tests/default_views/views.view.test_access_perm.yml b/tests/views_test_config/config/views.view.test_access_perm.yml
similarity index 95%
rename from tests/default_views/views.view.test_access_perm.yml
rename to tests/views_test_config/config/views.view.test_access_perm.yml
index 059b716..f67edb1 100644
--- a/tests/default_views/views.view.test_access_perm.yml
+++ b/tests/views_test_config/config/views.view.test_access_perm.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -21,6 +21,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_access_perm
 tag: ''
diff --git a/tests/default_views/views.view.test_access_role.yml b/tests/views_test_config/config/views.view.test_access_role.yml
similarity index 94%
rename from tests/default_views/views.view.test_access_role.yml
rename to tests/views_test_config/config/views.view.test_access_role.yml
index 78be90b..c2da0f5 100644
--- a/tests/default_views/views.view.test_access_role.yml
+++ b/tests/views_test_config/config/views.view.test_access_role.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -20,6 +20,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_access_role
 tag: ''
diff --git a/tests/default_views/views.view.test_access_static.yml b/tests/views_test_config/config/views.view.test_access_static.yml
similarity index 96%
rename from tests/default_views/views.view.test_access_static.yml
rename to tests/views_test_config/config/views.view.test_access_static.yml
index 23755fd..d32bb76 100644
--- a/tests/default_views/views.view.test_access_static.yml
+++ b/tests/views_test_config/config/views.view.test_access_static.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -27,6 +27,6 @@ display:
         display_title: Page
         id: page_1
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_access_static
 tag: ''
diff --git a/tests/default_views/views.view.test_aggregate_count.yml b/tests/views_test_config/config/views.view.test_aggregate_count.yml
similarity index 100%
rename from tests/default_views/views.view.test_aggregate_count.yml
rename to tests/views_test_config/config/views.view.test_aggregate_count.yml
diff --git a/tests/default_views/views.view.test_argument_default_fixed.yml b/tests/views_test_config/config/views.view.test_argument_default_fixed.yml
similarity index 98%
rename from tests/default_views/views.view.test_argument_default_fixed.yml
rename to tests/views_test_config/config/views.view.test_argument_default_fixed.yml
index 953a69f..a59a923 100644
--- a/tests/default_views/views.view.test_argument_default_fixed.yml
+++ b/tests/views_test_config/config/views.view.test_argument_default_fixed.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -49,6 +49,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_argument_default_fixed
 tag: ''
diff --git a/tests/default_views/views.view.test_comment_user_uid.yml b/tests/views_test_config/config/views.view.test_comment_user_uid.yml
similarity index 100%
rename from tests/default_views/views.view.test_comment_user_uid.yml
rename to tests/views_test_config/config/views.view.test_comment_user_uid.yml
diff --git a/tests/default_views/views.view.test_destroy.yml b/tests/views_test_config/config/views.view.test_destroy.yml
similarity index 99%
rename from tests/default_views/views.view.test_destroy.yml
rename to tests/views_test_config/config/views.view.test_destroy.yml
index 7d07be0..5531420 100644
--- a/tests/default_views/views.view.test_destroy.yml
+++ b/tests/views_test_config/config/views.view.test_destroy.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
diff --git a/tests/default_views/views.view.test_filter_date_between.yml b/tests/views_test_config/config/views.view.test_filter_date_between.yml
similarity index 100%
copy from tests/default_views/views.view.test_filter_date_between.yml
copy to tests/views_test_config/config/views.view.test_filter_date_between.yml
diff --git a/tests/default_views/views.view.test_filter_group_override.yml b/tests/views_test_config/config/views.view.test_filter_group_override.yml
similarity index 100%
rename from tests/default_views/views.view.test_filter_group_override.yml
rename to tests/views_test_config/config/views.view.test_filter_group_override.yml
diff --git a/tests/default_views/views.view.test_filter_groups.yml b/tests/views_test_config/config/views.view.test_filter_groups.yml
similarity index 100%
rename from tests/default_views/views.view.test_filter_groups.yml
rename to tests/views_test_config/config/views.view.test_filter_groups.yml
diff --git a/tests/default_views/views.view.test_glossary.yml b/tests/views_test_config/config/views.view.test_glossary.yml
similarity index 100%
rename from tests/default_views/views.view.test_glossary.yml
rename to tests/views_test_config/config/views.view.test_glossary.yml
diff --git a/tests/default_views/views.view.test_group_by_count.yml b/tests/views_test_config/config/views.view.test_group_by_count.yml
similarity index 98%
rename from tests/default_views/views.view.test_group_by_count.yml
rename to tests/views_test_config/config/views.view.test_group_by_count.yml
index d855591..3ad53dc 100644
--- a/tests/default_views/views.view.test_group_by_count.yml
+++ b/tests/views_test_config/config/views.view.test_group_by_count.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -53,6 +53,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_group_by_count
 tag: ''
diff --git a/tests/default_views/views.view.test_group_by_in_filters.yml b/tests/views_test_config/config/views.view.test_group_by_in_filters.yml
similarity index 97%
rename from tests/default_views/views.view.test_group_by_in_filters.yml
rename to tests/views_test_config/config/views.view.test_group_by_in_filters.yml
index 33a19cc..b32133f 100644
--- a/tests/default_views/views.view.test_group_by_in_filters.yml
+++ b/tests/views_test_config/config/views.view.test_group_by_in_filters.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -46,6 +46,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_group_by_in_filters
 tag: ''
diff --git a/tests/default_views/views.view.test_pager_full.yml b/tests/views_test_config/config/views.view.test_pager_full.yml
similarity index 95%
rename from tests/default_views/views.view.test_pager_full.yml
rename to tests/views_test_config/config/views.view.test_pager_full.yml
index ce6dfc0..32c1093 100644
--- a/tests/default_views/views.view.test_pager_full.yml
+++ b/tests/views_test_config/config/views.view.test_pager_full.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -24,6 +24,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_pager_full
 tag: ''
diff --git a/tests/default_views/views.view.test_pager_none.yml b/tests/views_test_config/config/views.view.test_pager_none.yml
similarity index 94%
rename from tests/default_views/views.view.test_pager_none.yml
rename to tests/views_test_config/config/views.view.test_pager_none.yml
index 36ce780..6826816 100644
--- a/tests/default_views/views.view.test_pager_none.yml
+++ b/tests/views_test_config/config/views.view.test_pager_none.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -20,6 +20,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_pager_none
 tag: ''
diff --git a/tests/default_views/views.view.test_pager_some.yml b/tests/views_test_config/config/views.view.test_pager_some.yml
similarity index 95%
rename from tests/default_views/views.view.test_pager_some.yml
rename to tests/views_test_config/config/views.view.test_pager_some.yml
index 231b299..ac44377 100644
--- a/tests/default_views/views.view.test_pager_some.yml
+++ b/tests/views_test_config/config/views.view.test_pager_some.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -23,6 +23,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_pager_some
 tag: ''
diff --git a/tests/default_views/views.view.test_plugin_argument_default_current_user.yml b/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml
similarity index 98%
rename from tests/default_views/views.view.test_plugin_argument_default_current_user.yml
rename to tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml
index c070647..302b4a8 100644
--- a/tests/default_views/views.view.test_plugin_argument_default_current_user.yml
+++ b/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -49,6 +49,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_plugin_argument_default_current_user
 tag: ''
diff --git a/tests/default_views/views.view.test_store_pager_settings.yml b/tests/views_test_config/config/views.view.test_store_pager_settings.yml
similarity index 94%
rename from tests/default_views/views.view.test_store_pager_settings.yml
rename to tests/views_test_config/config/views.view.test_store_pager_settings.yml
index 1a6ff34..d7f9b33 100644
--- a/tests/default_views/views.view.test_store_pager_settings.yml
+++ b/tests/views_test_config/config/views.view.test_store_pager_settings.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -20,6 +20,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_store_pager_settings
 tag: ''
diff --git a/tests/default_views/views.view.test_taxonomy_node_term_data.yml b/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml
similarity index 100%
rename from tests/default_views/views.view.test_taxonomy_node_term_data.yml
rename to tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml
diff --git a/tests/default_views/views.view.test_user_relationship.yml b/tests/views_test_config/config/views.view.test_user_relationship.yml
similarity index 100%
rename from tests/default_views/views.view.test_user_relationship.yml
rename to tests/views_test_config/config/views.view.test_user_relationship.yml
diff --git a/tests/default_views/views.view.test_view.yml b/tests/views_test_config/config/views.view.test_view.yml
similarity index 96%
rename from tests/default_views/views.view.test_view.yml
rename to tests/views_test_config/config/views.view.test_view.yml
index 64b000e..6cc54df 100644
--- a/tests/default_views/views.view.test_view.yml
+++ b/tests/views_test_config/config/views.view.test_view.yml
@@ -1,6 +1,6 @@
 api_version: {  }
 base_table: views_test
-core: {  }
+core: '8'
 description: {  }
 disabled: {  }
 display:
@@ -43,6 +43,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_view
-tag: {  }
+tag: ''
diff --git a/tests/default_views/views.view.test_view_argument_validate_numeric.yml b/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml
similarity index 96%
rename from tests/default_views/views.view.test_view_argument_validate_numeric.yml
rename to tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml
index 57eb6a9..477cc22 100644
--- a/tests/default_views/views.view.test_view_argument_validate_numeric.yml
+++ b/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -30,6 +30,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_view_argument_validate_numeric
 tag: ''
diff --git a/tests/default_views/views.view.test_view_argument_validate_user.yml b/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml
similarity index 96%
rename from tests/default_views/views.view.test_view_argument_validate_user.yml
rename to tests/views_test_config/config/views.view.test_view_argument_validate_user.yml
index 3175dd7..fecba82 100644
--- a/tests/default_views/views.view.test_view_argument_validate_user.yml
+++ b/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -30,6 +30,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_view_argument_validate_user
 tag: ''
diff --git a/tests/default_views/views.view.test_view_delete.yml b/tests/views_test_config/config/views.view.test_view_delete.yml
similarity index 100%
rename from tests/default_views/views.view.test_view_delete.yml
rename to tests/views_test_config/config/views.view.test_view_delete.yml
diff --git a/tests/default_views/views.view.test_filter_date_between.yml b/tests/views_test_config/config/views.view.test_view_fieldapi.yml
similarity index 72%
rename from tests/default_views/views.view.test_filter_date_between.yml
rename to tests/views_test_config/config/views.view.test_view_fieldapi.yml
index a2afce1..d82dab1 100644
--- a/tests/default_views/views.view.test_filter_date_between.yml
+++ b/tests/views_test_config/config/views.view.test_view_fieldapi.yml
@@ -7,7 +7,12 @@ display:
     default:
         display_options:
             access:
-                type: none
+                type: perm
+            fields:
+                nid:
+                    field: nid
+                    id: nid
+                    table: node
             cache:
                 type: none
             exposed_form:
@@ -17,16 +22,9 @@ display:
                     field: nid
                     id: nid
                     table: node
-            filters:
-                created:
-                    field: created
-                    id: created
-                    table: node
             pager:
                 type: full
             query:
-                options:
-                    query_comment: '0'
                 type: views_query
             row_plugin: fields
             style_plugin: default
@@ -34,6 +32,7 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: ''
-name: test_filter_date_between
-tag: ''
+human_name: test_view_fieldapi
+name: test_view_fieldapi
+tag: default
+
diff --git a/tests/default_views/views.view.test_view_pager_full_zero_items_per_page.yml b/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml
similarity index 97%
rename from tests/default_views/views.view.test_view_pager_full_zero_items_per_page.yml
rename to tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml
index e5571cc..a8149c8 100644
--- a/tests/default_views/views.view.test_view_pager_full_zero_items_per_page.yml
+++ b/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -40,6 +40,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_view_pager_full_zero_items_per_page
 tag: ''
diff --git a/tests/default_views/views.view.test_view_unpack_translatable.yml b/tests/views_test_config/config/views.view.test_view_unpack_translatable.yml
similarity index 98%
rename from tests/default_views/views.view.test_view_unpack_translatable.yml
rename to tests/views_test_config/config/views.view.test_view_unpack_translatable.yml
index b240ecf..1c38165 100644
--- a/tests/default_views/views.view.test_view_unpack_translatable.yml
+++ b/tests/views_test_config/config/views.view.test_view_unpack_translatable.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -75,6 +75,6 @@ display:
         display_title: Master1
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_view_unpack_translatable
 tag: ''
diff --git a/tests/default_views/views.view.test_views_handler_field_user_name.yml b/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml
similarity index 100%
rename from tests/default_views/views.view.test_views_handler_field_user_name.yml
rename to tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml
diff --git a/tests/default_views/views.view.test_views_move_to_field.yml b/tests/views_test_config/config/views.view.test_views_move_to_field.yml
similarity index 93%
rename from tests/default_views/views.view.test_views_move_to_field.yml
rename to tests/views_test_config/config/views.view.test_views_move_to_field.yml
index dddaa82..6d8509a 100644
--- a/tests/default_views/views.view.test_views_move_to_field.yml
+++ b/tests/views_test_config/config/views.view.test_views_move_to_field.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: views_test
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -15,6 +15,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_views_move_to_field
 tag: ''
diff --git a/tests/default_views/views.view.test_views_move_to_handler.yml b/tests/views_test_config/config/views.view.test_views_move_to_handler.yml
similarity index 95%
rename from tests/default_views/views.view.test_views_move_to_handler.yml
rename to tests/views_test_config/config/views.view.test_views_move_to_handler.yml
index 7d2fd7c..b33937e 100644
--- a/tests/default_views/views.view.test_views_move_to_handler.yml
+++ b/tests/views_test_config/config/views.view.test_views_move_to_handler.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: views_test
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -20,6 +20,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_views_move_to_handler
 tag: ''
diff --git a/tests/default_views/views.view.test_views_move_to_table.yml b/tests/views_test_config/config/views.view.test_views_move_to_table.yml
similarity index 93%
rename from tests/default_views/views.view.test_views_move_to_table.yml
rename to tests/views_test_config/config/views.view.test_views_move_to_table.yml
index e114850..2a2637a 100644
--- a/tests/default_views/views.view.test_views_move_to_table.yml
+++ b/tests/views_test_config/config/views.view.test_views_move_to_table.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: views_old_table
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
@@ -15,6 +15,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_views_move_to_table
 tag: ''
diff --git a/tests/views_test_config/views_test_config.info b/tests/views_test_config/views_test_config.info
new file mode 100644
index 0000000..4edbb1f
--- /dev/null
+++ b/tests/views_test_config/views_test_config.info
@@ -0,0 +1,3 @@
+name = Views Test Config
+description = Provides default views for tests.
+core = 8.x
diff --git a/tests/views_test_config/views_test_config.module b/tests/views_test_config/views_test_config.module
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/tests/views_test_config/views_test_config.module
@@ -0,0 +1 @@
+<?php
diff --git a/tests/views_test/config/views.view.test_argument_default_current_user.yml b/tests/views_test_data/config/views.view.test_argument_default_current_user.yml
similarity index 98%
rename from tests/views_test/config/views.view.test_argument_default_current_user.yml
rename to tests/views_test_data/config/views.view.test_argument_default_current_user.yml
index 9e589ee..6ab4fa4 100644
--- a/tests/views_test/config/views.view.test_argument_default_current_user.yml
+++ b/tests/views_test_data/config/views.view.test_argument_default_current_user.yml
@@ -46,6 +46,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_argument_default_current_user
 tag: ''
diff --git a/tests/views_test/config/views.view.test_exposed_admin_ui.yml b/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml
similarity index 98%
rename from tests/views_test/config/views.view.test_exposed_admin_ui.yml
rename to tests/views_test_data/config/views.view.test_exposed_admin_ui.yml
index 22bb89f..3ec858e 100644
--- a/tests/views_test/config/views.view.test_exposed_admin_ui.yml
+++ b/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml
@@ -46,6 +46,6 @@ display:
         display_title: Page
         id: page_1
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_exposed_admin_ui
 tag: ''
diff --git a/tests/views_test/config/views.view.test_filter_in_operator_ui.yml b/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml
similarity index 98%
rename from tests/views_test/config/views.view.test_filter_in_operator_ui.yml
rename to tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml
index 99140dc..cb20dbf 100644
--- a/tests/views_test/config/views.view.test_filter_in_operator_ui.yml
+++ b/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml
@@ -32,6 +32,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_filter_in_operator_ui
 tag: ''
diff --git a/tests/views_test/config/views.view.test_page_display.yml b/tests/views_test_data/config/views.view.test_page_display.yml
similarity index 96%
rename from tests/views_test/config/views.view.test_page_display.yml
rename to tests/views_test_data/config/views.view.test_page_display.yml
index d80c27e..dfd68ff 100644
--- a/tests/views_test/config/views.view.test_page_display.yml
+++ b/tests/views_test_data/config/views.view.test_page_display.yml
@@ -28,6 +28,6 @@ display:
         display_title: Page
         id: page_2
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_page_display
-tag: ''
\ No newline at end of file
+tag: ''
diff --git a/tests/views_test/config/views.view.test_rename_reset_button.yml b/tests/views_test_data/config/views.view.test_rename_reset_button.yml
similarity index 100%
rename from tests/views_test/config/views.view.test_rename_reset_button.yml
rename to tests/views_test_data/config/views.view.test_rename_reset_button.yml
diff --git a/tests/views_test/config/views.view.test_views_groupby_save.yml b/tests/views_test_data/config/views.view.test_views_groupby_save.yml
similarity index 96%
rename from tests/views_test/config/views.view.test_views_groupby_save.yml
rename to tests/views_test_data/config/views.view.test_views_groupby_save.yml
index d9d4c11..b38261b 100644
--- a/tests/views_test/config/views.view.test_views_groupby_save.yml
+++ b/tests/views_test_data/config/views.view.test_views_groupby_save.yml
@@ -20,6 +20,6 @@ display:
         display_title: Master
         id: default
         position: '0'
-human_name: {  }
+human_name: ''
 name: test_views_groupby_save
 tag: ''
diff --git a/tests/views_test/lib/Drupal/views_test/Plugin/views/access/DynamicTest.php b/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/DynamicTest.php
similarity index 80%
rename from tests/views_test/lib/Drupal/views_test/Plugin/views/access/DynamicTest.php
rename to tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/DynamicTest.php
index 7466615..1704661 100644
--- a/tests/views_test/lib/Drupal/views_test/Plugin/views/access/DynamicTest.php
+++ b/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/DynamicTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views_test\Plugin\views\access\DynamicTest.
+ * Definition of Drupal\views_test_data\Plugin\views\access\DynamicTest.
  */
 
-namespace Drupal\views_test\Plugin\views\access;
+namespace Drupal\views_test_data\Plugin\views\access;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
@@ -34,7 +34,7 @@ public function access($account) {
   }
 
   function get_access_callback() {
-    return array('views_test_test_dynamic_access_callback', array(!empty($options['access']), 1, 2));
+    return array('views_test_data_test_dynamic_access_callback', array(!empty($options['access']), 1, 2));
   }
 
 }
diff --git a/tests/views_test/lib/Drupal/views_test/Plugin/views/access/StaticTest.php b/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php
similarity index 75%
rename from tests/views_test/lib/Drupal/views_test/Plugin/views/access/StaticTest.php
rename to tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php
index 61ea392..5f5770c 100644
--- a/tests/views_test/lib/Drupal/views_test/Plugin/views/access/StaticTest.php
+++ b/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views_test\Plugin\views\access\StaticTest.
+ * Definition of Drupal\views_test_data\Plugin\views\access\StaticTest.
  */
 
-namespace Drupal\views_test\Plugin\views\access;
+namespace Drupal\views_test_data\Plugin\views\access;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
@@ -34,7 +34,7 @@ public function access($account) {
   }
 
   function get_access_callback() {
-    return array('views_test_test_static_access_callback', array(!empty($options['access'])));
+    return array('views_test_data_test_static_access_callback', array(!empty($options['access'])));
   }
 
 }
diff --git a/tests/views_test/lib/Drupal/views_test/Plugin/views/localization/LocalizationTest.php b/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/localization/LocalizationTest.php
similarity index 88%
rename from tests/views_test/lib/Drupal/views_test/Plugin/views/localization/LocalizationTest.php
rename to tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/localization/LocalizationTest.php
index 1cdb9fa..ce427dd 100644
--- a/tests/views_test/lib/Drupal/views_test/Plugin/views/localization/LocalizationTest.php
+++ b/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/localization/LocalizationTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views_test\Plugin\views\localization\LocalizationTest.
+ * Definition of Drupal\views_test_data\Plugin\views\localization\LocalizationTest.
  */
 
-namespace Drupal\views_test\Plugin\views\localization;
+namespace Drupal\views_test_data\Plugin\views\localization;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/tests/views_test/templates/views-view--frontpage.tpl.php b/tests/views_test_data/templates/views-view--frontpage.tpl.php
similarity index 100%
rename from tests/views_test/templates/views-view--frontpage.tpl.php
rename to tests/views_test_data/templates/views-view--frontpage.tpl.php
diff --git a/tests/views_test/views_cache.test.css b/tests/views_test_data/views_cache.test.css
similarity index 100%
rename from tests/views_test/views_cache.test.css
rename to tests/views_test_data/views_cache.test.css
diff --git a/tests/views_test/views_cache.test.js b/tests/views_test_data/views_cache.test.js
similarity index 100%
rename from tests/views_test/views_cache.test.js
rename to tests/views_test_data/views_cache.test.js
diff --git a/tests/views_test/views_test.info b/tests/views_test_data/views_test_data.info
similarity index 100%
rename from tests/views_test/views_test.info
rename to tests/views_test_data/views_test_data.info
diff --git a/tests/views_test/views_test.install b/tests/views_test_data/views_test_data.install
similarity index 100%
rename from tests/views_test/views_test.install
rename to tests/views_test_data/views_test_data.install
diff --git a/tests/views_test/views_test.module b/tests/views_test_data/views_test_data.module
similarity index 73%
rename from tests/views_test/views_test.module
rename to tests/views_test_data/views_test_data.module
index 0eebad7..801c7be 100644
--- a/tests/views_test/views_test.module
+++ b/tests/views_test_data/views_test_data.module
@@ -5,10 +5,12 @@
  * Helper module for Views tests.
  */
 
+use Drupal\views\View;
+
 /**
  * Implements hook_permission().
  */
-function views_test_permission() {
+function views_test_data_permission() {
   return array(
     'views_test test permission' => array(
       'title' => t('Test permission'),
@@ -20,7 +22,7 @@ function views_test_permission() {
 /**
  * Implements hook_views_api().
  */
-function views_test_views_api() {
+function views_test_data_views_api() {
   return array(
     'api' => 3.0,
     'template path' => drupal_get_path('module', 'views_test') . '/templates',
@@ -30,22 +32,22 @@ function views_test_views_api() {
 /**
  * Implements hook_views_data().
  */
-function views_test_views_data() {
-  return  variable_get('views_test_views_data', array());
+function views_test_data_views_data() {
+  return variable_get('views_test_views_data', array());
 }
 
-function views_test_test_static_access_callback($access) {
+function views_test_data_test_static_access_callback($access) {
   return $access;
 }
 
-function views_test_test_dynamic_access_callback($access, $argument1, $argument2) {
+function views_test_data_test_dynamic_access_callback($access, $argument1, $argument2) {
   return $access && $argument1 == variable_get('test_dynamic_access_argument1', NULL) && $argument2 == variable_get('test_dynamic_access_argument2', NULL);
 }
 
 /**
  * Implements hook_views_pre_render().
  */
-function views_test_views_pre_render(&$view) {
+function views_test_data_views_pre_render(&$view) {
   if ($view->name == 'test_cache_header_storage') {
     drupal_add_js(drupal_get_path('module', 'views_test') . '/views_cache.test.js');
     drupal_add_css(drupal_get_path('module', 'views_test') . '/views_cache.test.css');
@@ -56,8 +58,7 @@ function views_test_views_pre_render(&$view) {
 /**
  * Implements hook_views_post_build().
  */
-function views_test_views_post_build(Drupal\views\View &$view) {
-  debug($view->current_display);
+function views_test_data_views_post_build(View &$view) {
   if ($view->name == 'test_page_display') {
     if ($view->current_display == 'page_1') {
       $view->build_info['denied'] = TRUE;