diff --git a/lib/Drupal/configuration/Config/Configuration.php b/lib/Drupal/configuration/Config/Configuration.php
index 4c8b95c..c29aee8 100644
--- a/lib/Drupal/configuration/Config/Configuration.php
+++ b/lib/Drupal/configuration/Config/Configuration.php
@@ -132,6 +132,9 @@ abstract class Configuration {
 
   public function loadFromActiveStore() {
     $this->build();
+    if (empty($this->broken)) {
+      $this->findRequiredModules();
+    }
     $this->buildHash();
     return $this;
   }
@@ -343,9 +346,6 @@ abstract class Configuration {
     if ($include_dependencies) {
       $this->findDependencies();
     }
-    if (empty($this->broken)) {
-      $this->findRequiredModules();
-    }
     $this->built = TRUE;
     return $this;
   }
diff --git a/tests/handlers/content_types.test b/tests/handlers/content_types.test
index 6d52f95..fbf7e1f 100644
--- a/tests/handlers/content_types.test
+++ b/tests/handlers/content_types.test
@@ -123,7 +123,7 @@ class ConfigurationHandlerContentTypeTestCase extends ConfigurationWebTestCase {
     $modified_article->description = 'modified';
     node_type_save($modified_article);
 
-    $results = ConfigurationManagement::revertActiveStore(array('content_type.article'), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array('content_type.article'), FALSE, FALSE, FALSE);
 
     drupal_flush_all_caches();
     $modified_article = node_type_load('article');
diff --git a/tests/handlers/field.test b/tests/handlers/field.test
index 30702a5..7f8ff37 100644
--- a/tests/handlers/field.test
+++ b/tests/handlers/field.test
@@ -136,7 +136,7 @@ class ConfigurationHandlerFieldTestCase extends ConfigurationWebTestCase {
     $edit['instance[label]'] = 'Modified';
     $this->drupalPost('admin/structure/types/manage/article/fields/body', $edit, t('Save settings'));
 
-    $results = ConfigurationManagement::revertActiveStore(array('field.node.body.article'), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array('field.node.body.article'), FALSE, FALSE, FALSE);
 
     list($component, $entity_type, $field_name, $bundle) = explode('.', $config);
     $field = field_info_instance($entity_type, $field_name, $bundle);
diff --git a/tests/handlers/image_styles.test b/tests/handlers/image_styles.test
index 2d074de..b10fd83 100644
--- a/tests/handlers/image_styles.test
+++ b/tests/handlers/image_styles.test
@@ -149,7 +149,7 @@ class ConfigurationHandlerImageStyleTestCase extends ConfigurationWebTestCase {
     $final_hash = $image_config->loadFromActiveStore()->buildHash()->getHash();
     $this->assertFalse($initial_hash == $final_hash, 'Image Style hash is not the same after modify the image.');
 
-    $results = ConfigurationManagement::revertActiveStore(array('image_style.custom'), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array('image_style.custom'), FALSE, FALSE, FALSE);
 
     drupal_static_reset('image_styles');
     $modified_image_style = image_style_load('custom');
diff --git a/tests/handlers/permissions.test b/tests/handlers/permissions.test
index 4bf8285..3348255 100644
--- a/tests/handlers/permissions.test
+++ b/tests/handlers/permissions.test
@@ -114,7 +114,7 @@ class ConfigurationHandlerPermissionTestCase extends ConfigurationWebTestCase {
 
     $this->assertTrue(empty($current_value), 'Developers cannot administer content types.');
 
-    $results = ConfigurationManagement::revertActiveStore(array('permission.administer_content_types'), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array('permission.administer_content_types'), FALSE, FALSE, FALSE);
 
     $current_value = $this->canDevelopersAdministerContentTypes($developer_rid);
 
diff --git a/tests/handlers/text_formats.test b/tests/handlers/text_formats.test
index 31f2371..05fe7e9 100644
--- a/tests/handlers/text_formats.test
+++ b/tests/handlers/text_formats.test
@@ -137,7 +137,7 @@ class ConfigurationHandlerTextFormatTestCase extends ConfigurationWebTestCase {
     $this->assertTrue($modified_filters['filter_html']->settings['allowed_html'] == '<a> <modified>', 'The filter settings for custom text format were modified');
     $this->assertTrue($modified_format->name == 'modified', 'The format name for custom text format was modified');
 
-    $results = ConfigurationManagement::revertActiveStore(array('text_format.custom'), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array('text_format.custom'), FALSE, FALSE, FALSE);
 
     filter_formats_reset();
     $modified_format = filter_format_load('custom');
diff --git a/tests/handlers/variables.test b/tests/handlers/variables.test
index 36b9449..a8d590a 100644
--- a/tests/handlers/variables.test
+++ b/tests/handlers/variables.test
@@ -106,7 +106,7 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
 
     $this->assertTrue(variable_get('site_name', '') == 'Modified', 'The variable for site name was modified');
 
-    $results = ConfigurationManagement::revertActiveStore(array('variable.site_name'), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array('variable.site_name'), FALSE, FALSE, FALSE);
 
     $current_value = variable_get('site_name', '');
 
diff --git a/tests/handlers/vocabularies.test b/tests/handlers/vocabularies.test
index 8e7b7c8..38d9c78 100644
--- a/tests/handlers/vocabularies.test
+++ b/tests/handlers/vocabularies.test
@@ -115,7 +115,7 @@ class ConfigurationHandlerVariableTestCase extends ConfigurationWebTestCase {
 
     $this->assertRaw(t('Updated vocabulary %name.', array('%name' => 'Modified')), 'The vocabulary for site name was modified');
 
-    $results = ConfigurationManagement::revertActiveStore(array('vocabulary.tags'), FALSE, FALSE);
+    $results = ConfigurationManagement::importToActiveStore(array('vocabulary.tags'), FALSE, FALSE, FALSE);
     $current_vocabulary = taxonomy_vocabulary_load($vid);
 
     $this->assertEqual($original_vocabulary->name, $current_vocabulary->name, 'The vocabulary was suscessfully reverted.');