diff --git a/tests/configuration_test.info b/tests/configuration_test.info
index 377360b..9ba7494 100644
--- a/tests/configuration_test.info
+++ b/tests/configuration_test.info
@@ -12,8 +12,8 @@ files[] = handlers/TestMenuConfiguration.test
 files[] = handlers/TestFieldConfiguration.test
 files[] = handlers/TestVariableConfiguration.test
 files[] = handlers/TestPermissionConfiguration.test
+files[] = handlers/TestViewConfiguration.test
 
-files[] = handlers/views.test
 files[] = handlers/vocabularies.test
 files[] = handlers/menu_links.test
 
diff --git a/tests/handlers/ConfigurationHandlerBaseTestCase.test b/tests/handlers/ConfigurationHandlerBaseTestCase.test
index 716ba38..fcc5f6d 100644
--- a/tests/handlers/ConfigurationHandlerBaseTestCase.test
+++ b/tests/handlers/ConfigurationHandlerBaseTestCase.test
@@ -111,6 +111,7 @@ abstract class ConfigurationHandlerBaseTestCase extends ConfigurationWebTestCase
                           ->fetchObject();
 
       $this->assertTrue(!empty($object), "Config $config was suscessfully tracked.");
+      $this->verbose('<pre>' . print_r(ConfigurationManagement::readTrackingFile(), TRUE) . '</pre>', 'Reverted');
 
       $storaged = ConfigurationManagement::createConfigurationInstance($config);
       $original_hash[$config] = $storaged->loadFromStorage()->buildHash()->getHash();
@@ -140,7 +141,7 @@ abstract class ConfigurationHandlerBaseTestCase extends ConfigurationWebTestCase
     }
 
     // Finally revert the changes
-    $results = ConfigurationManagement::revertActiveStore($configToModify, $this->modifyDependencies(), $this->modifyOptionals(), TRUE);
+    $results = ConfigurationManagement::importToActiveStore($configToModify, $this->modifyDependencies(), $this->modifyOptionals(), TRUE);
     foreach ($configToModify as $config) {
       if ($this->checkModification($config)) {
         $this->assertFalse($this->isModified($config), "$config is not modified in the active store.");
@@ -148,8 +149,10 @@ abstract class ConfigurationHandlerBaseTestCase extends ConfigurationWebTestCase
 
       $handler = ConfigurationManagement::createConfigurationInstance($config);
       $current_hash = $handler->loadFromActiveStore()->buildHash()->getHash();
-      $this->assertTrue($handler->getStatus() == 'In Sync', "$config is In Sync after revert");
-      $this->verbose('<pre>' . $handler->raw() . '</pre>', 'Reverted');
+      $status = $handler->getStatus();
+      $this->assertTrue($status == 'In Sync', "$config is In Sync after revert (Status $status)");
+      $this->verbose('<pre>' . $handler->raw() . "\n" . $handler->getHash() . '</pre>', 'Reverted');
+      $this->verbose('<pre>' . print_r(ConfigurationManagement::readTrackingFile(), TRUE) . '</pre>', 'Reverted');
       $this->assertTrue($current_hash == $original_hash[$config], "The hash for $config is the same after than the original after the revert");
     }
 
diff --git a/tests/handlers/TestViewConfiguration.test b/tests/handlers/TestViewConfiguration.test
new file mode 100644
index 0000000..eb5c746
--- /dev/null
+++ b/tests/handlers/TestViewConfiguration.test
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * @file
+ * Tests for Configuration Management: Views.
+ */
+
+class TestviewConfiguration extends ConfigurationHandlerBaseTestCase {
+
+  protected $view_name;
+
+  /**
+   * Implementation of DrupalWebTestCase::setUp().
+   */
+  public function setUp($modules = array()) {
+    global $base_url;
+
+    if (empty($modules)) {
+      parent::setUp(array(
+        'configuration',
+        'views',
+        'views_ui',
+      ));
+    }
+    else {
+      parent::setUp($modules);
+    }
+  }
+
+  /**
+   * Test info.
+   */
+  public static function getInfo() {
+    return array(
+      'name' => t('Handler: ViewConfiguration'),
+      'description' => t('Test the configuration API for views configurations'),
+      'group' => t('Configuration'),
+    );
+  }
+
+  /**
+   * Returns an array of configurations to import.
+   */
+  protected function configToImport() {
+    // Create a Developer Role
+    return array('views_view.test');
+  }
+
+  /**
+   * Returns an array of configurations to export.
+   */
+  protected function configToExport() {
+    return array('views_view.' . $this->view_name);
+  }
+
+  /**
+   * Returns an array of configurations to modify and check for modifications.
+   */
+  protected function configToModify() {
+    // @TODO Fix this
+    // return array('views_view.test');
+  }
+
+  /**
+   * Return TRUE if the configuration is modified in the active store.
+   */
+  protected function isModified($config) {
+    $modified = FALSE;
+    $view = views_get_view('test', TRUE);
+    $modified = $view->display['default']->display_options['pager']['options']['items_per_page'] == 5;
+    return $modified;
+  }
+
+  /**
+   * Return TRUE if all the configurations defined in configToImport were saved
+   * into the active store.
+   */
+  protected function savedInActiveStore() {
+    $view = views_get_view('test');
+    return !empty($view);
+  }
+
+  /**
+   * This function creates the configurations that will be exported by
+   * configuration management.
+   */
+  protected function createConfigToExport() {
+    $web_user = $this->drupalCreateUser(
+      array(
+        'administer views',
+        'access content',
+      )
+    );
+    $this->drupalLogin($web_user);
+
+    $edit = array();
+    $edit['human_name'] = 'Test';
+    $edit['name'] = $this->view_name = strtolower($this->randomName(10));
+    $edit['page[title]'] = 'My custom view';
+    $edit['page[path]'] = 'custom_view';
+    $this->drupalPost('admin/structure/views/add', $edit, t('Save & exit'));
+  }
+
+  /**
+   * Perform changes in the configuration and save those changes into the active
+   * store.
+   */
+  protected function modifyConfiguration() {
+    // @TODO Fix this
+    // $view = views_get_view('test');
+    // $view->display['default']->display_options['pager']['options']['items_per_page'] = 5;
+    // views_save_view($view);
+  }
+}
diff --git a/ui/configuration_ui.admin.inc b/ui/configuration_ui.admin.inc
index e56dec4..93c858f 100644
--- a/ui/configuration_ui.admin.inc
+++ b/ui/configuration_ui.admin.inc
@@ -41,6 +41,9 @@ function configuration_ui_tracking_form($form, &$form_state) {
 
     if (!empty($options)) {
       $handler = ConfigurationManagement::getConfigurationHandler($component);
+      if (empty($handler)) {
+        continue;
+      }
       $component_exists = TRUE;
       $form[$component] = array(
         '#type' => 'fieldset',
@@ -310,7 +313,7 @@ function configuration_ui_activate_form_submit($form, &$form_state) {
   $args = configuration_ui_get_form_components($form, $form_state);
   $revert_dependencies = $form_state['values']['include_dependencies'];
   $revert_optionals = $form_state['values']['include_optionals'];
-  $result = ConfigurationManagement::revertActiveStore($args, $revert_dependencies, $revert_optionals);
+  $result = ConfigurationManagement::importToActiveStore($args, $revert_dependencies, $revert_optionals);
   $configurations = $result->getInfo('imported');
   if (!empty($configurations)) {
     foreach ($configurations as $configuration) {