diff --git a/src/Palantirnet/PalantirBehatExtension/Context/DrupalAutoNodetitleContext.php b/src/Palantirnet/PalantirBehatExtension/Context/DrupalAutoNodetitleContext.php
index c38c5ed..76fca52 100644
--- a/src/Palantirnet/PalantirBehatExtension/Context/DrupalAutoNodetitleContext.php
+++ b/src/Palantirnet/PalantirBehatExtension/Context/DrupalAutoNodetitleContext.php
@@ -38,8 +38,6 @@ class DrupalAutoNodetitleContext extends SharedDrupalContext
      */
     public function disableAutoNodetitle()
     {
-        throw new NotUpdatedException();
-
         $this->disableAutoNodetitle = true;
 
     }//end disableAutoNodetitle()
@@ -59,7 +57,7 @@ public function disableAutoNodetitle()
      */
     public function prepareAutoNodetitleNode(BeforeNodeCreateScope $scope)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         if ($this->disableAutoNodetitle === true) {
             $node = $scope->getEntity();
diff --git a/src/Palantirnet/PalantirBehatExtension/Context/DrupalCommentContext.php b/src/Palantirnet/PalantirBehatExtension/Context/DrupalCommentContext.php
index 5dc474b..2b0e1a6 100644
--- a/src/Palantirnet/PalantirBehatExtension/Context/DrupalCommentContext.php
+++ b/src/Palantirnet/PalantirBehatExtension/Context/DrupalCommentContext.php
@@ -63,8 +63,6 @@ class DrupalCommentContext extends SharedDrupalContext
      */
     public function gatherContexts(BeforeScenarioScope $scope)
     {
-        throw new NotUpdatedException();
-
         $environment         = $scope->getEnvironment();
         $this->drupalContext = $environment->getContext('Drupal\DrupalExtension\Context\DrupalContext');
 
@@ -82,11 +80,14 @@ public function gatherContexts(BeforeScenarioScope $scope)
      */
     public function checkDependencies(BeforeScenarioScope $scope)
     {
-        throw new NotUpdatedException();
+        /*
+            @todo Update for Drupal 8
+            @see NotUpdatedException
 
-        if (module_exists('comment') === false) {
-            throw new \Exception('The Comment module is not available.');
-        }
+            if (module_exists('comment') === false) {
+                throw new \Exception('The Comment module is not available.');
+            }
+        */
 
     }//end checkDependencies()
 
@@ -100,12 +101,15 @@ public function checkDependencies(BeforeScenarioScope $scope)
      */
     public function cleanComments()
     {
-        throw new NotUpdatedException();
+        /*
+            @todo Update for Drupal 8
+            @see NotUpdatedException
 
-        // Remove any comments that were created.
-        foreach ($this->comments as $comment) {
-            comment_delete($comment->cid);
-        }
+            // Remove any comments that were created.
+            foreach ($this->comments as $comment) {
+                comment_delete($comment->cid);
+            }
+        */
 
         $this->comments = array();
 
@@ -127,7 +131,7 @@ public function cleanComments()
      */
     protected function getAccount()
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         if (empty($this->drupalContext->user) === false) {
             $account = user_load($this->drupalContext->user->uid);
@@ -154,7 +158,7 @@ protected function getAccount()
      */
     protected function createComment($comment)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         // Assign authorship if none exists and `author` is passed.
         if (isset($comment->uid) === false && empty($comment->author) === false) {
@@ -211,7 +215,7 @@ protected function createComment($comment)
      */
     protected function expandEntityFields($entity_type, \stdClass $entity)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $field_types = $this->getDriver()->getCore()->getEntityFieldTypes($entity_type);
 
@@ -238,7 +242,7 @@ protected function expandEntityFields($entity_type, \stdClass $entity)
      */
     public function assertCommentsAreOpen($type, $title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $node = $this->getNodeByTitle($type, $title);
         if ((int) $node->comment !== COMMENT_NODE_OPEN) {
@@ -261,7 +265,7 @@ public function assertCommentsAreOpen($type, $title)
      */
     function createCommentOnContent($text, $type, $title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $this->assertCommentsAreOpen($type, $title);
 
@@ -298,7 +302,7 @@ function createCommentOnContent($text, $type, $title)
      */
     public function createCommentsOnContent($type, $title, TableNode $commentsTable)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $this->assertCommentsAreOpen($type, $title);
 
diff --git a/src/Palantirnet/PalantirBehatExtension/Context/DrupalFileContext.php b/src/Palantirnet/PalantirBehatExtension/Context/DrupalFileContext.php
index 4ffb1a4..55ca2cf 100644
--- a/src/Palantirnet/PalantirBehatExtension/Context/DrupalFileContext.php
+++ b/src/Palantirnet/PalantirBehatExtension/Context/DrupalFileContext.php
@@ -29,7 +29,7 @@ class DrupalFileContext extends SharedDrupalContext
      */
     public function createFile($filename, $status = 1)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $file = (object) array(
                           'filename' => $filename,
@@ -60,7 +60,7 @@ public function createFile($filename, $status = 1)
      */
     public function createFiles(TableNode $filesTable)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         foreach ($filesTable->getHash() as $fileHash) {
             $file = (object) $fileHash;
diff --git a/src/Palantirnet/PalantirBehatExtension/Context/DrupalOrganicGroupsContext.php b/src/Palantirnet/PalantirBehatExtension/Context/DrupalOrganicGroupsContext.php
index 2e4ae11..e3722ef 100644
--- a/src/Palantirnet/PalantirBehatExtension/Context/DrupalOrganicGroupsContext.php
+++ b/src/Palantirnet/PalantirBehatExtension/Context/DrupalOrganicGroupsContext.php
@@ -46,8 +46,6 @@ class DrupalOrganicGroupsContext extends SharedDrupalContext
      */
     public function gatherContexts(BeforeScenarioScope $scope)
     {
-        throw new NotUpdatedException();
-
         $environment         = $scope->getEnvironment();
         $this->drupalContext = $environment->getContext('Drupal\DrupalExtension\Context\DrupalContext');
 
@@ -65,11 +63,14 @@ public function gatherContexts(BeforeScenarioScope $scope)
      */
     public function checkDependencies(BeforeScenarioScope $scope)
     {
-        throw new NotUpdatedException();
+        /*
+            @todo Update for Drupal 8
+            @see NotUpdatedException
 
-        if (module_exists('og') === false) {
-            throw new \Exception('The Organic Groups module is not installed.');
-        }
+            if (module_exists('og') === false) {
+                throw new \Exception('The Organic Groups module is not installed.');
+            }
+        */
 
     }//end checkDependencies()
 
@@ -85,7 +86,7 @@ public function checkDependencies(BeforeScenarioScope $scope)
      */
     protected function getAccount()
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         if (empty($this->drupalContext->user) === false) {
             $account = user_load($this->drupalContext->user->uid);
@@ -114,7 +115,7 @@ protected function getAccount()
      */
     public function assertGroupRole($group_role, $group_node_type, $group_node_title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $this->drupalContext->assertAuthenticatedByRole('authenticated user');
 
@@ -161,7 +162,7 @@ public function assertGroupRole($group_role, $group_node_type, $group_node_title
      */
     public function assertHasGroupRole($group_role, $group_node_type, $group_node_title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $group_node = $this->findNodeByTitle($group_node_type, $group_node_title);
 
@@ -188,7 +189,7 @@ public function assertHasGroupRole($group_role, $group_node_type, $group_node_ti
      */
     public function assertNodeIsGroup($type, $title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $node = $this->findNodeByTitle($type, $title);
 
@@ -214,7 +215,7 @@ public function assertNodeIsGroup($type, $title)
      */
     public function assertCreateGroupContent($type, $group_type, $group_title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $this->assertGroupContent($type, $group_type, $group_title);
 
@@ -242,7 +243,7 @@ public function assertCreateGroupContent($type, $group_type, $group_title)
      */
     public function assertNotCreateGroupContent($type, $group_type, $group_title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $this->assertGroupContent($type, $group_type, $group_title);
 
@@ -267,7 +268,7 @@ public function assertNotCreateGroupContent($type, $group_type, $group_title)
      */
     public function assertEditGroupContent($type, $group_type, $group_title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $this->assertGroupContent($type, $group_type, $group_title);
 
@@ -292,7 +293,7 @@ public function assertEditGroupContent($type, $group_type, $group_title)
      */
     public function assertNotEditGroupContent($type, $group_type, $group_title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $this->assertGroupContent($type, $group_type, $group_title);
 
@@ -318,7 +319,7 @@ public function assertNotEditGroupContent($type, $group_type, $group_title)
      */
     protected function assertGroupContent($type, $group_type, $group_title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         if (og_is_group_content_type('node', $type) === false) {
             throw new \Exception(sprintf('Content of type "%s" can not be added to any group because it is not a group content type.'));
diff --git a/src/Palantirnet/PalantirBehatExtension/Context/DrupalSetupContext.php b/src/Palantirnet/PalantirBehatExtension/Context/DrupalSetupContext.php
index 504ad20..b288986 100644
--- a/src/Palantirnet/PalantirBehatExtension/Context/DrupalSetupContext.php
+++ b/src/Palantirnet/PalantirBehatExtension/Context/DrupalSetupContext.php
@@ -25,7 +25,7 @@ class DrupalSetupContext extends SharedDrupalContext
      */
     public function assertDrupal()
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         if ($this->getDriver()->isBootstrapped() === false) {
             throw new \Exception('The Drupal site is not bootstrapped.');
@@ -45,7 +45,7 @@ public function assertDrupal()
      */
     public function assertModuleInstalled($module)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         if (module_exists($module) === false) {
             throw new \Exception(sprintf('The "%s" module is not installed.', $module));
@@ -63,7 +63,7 @@ public function assertModuleInstalled($module)
      */
     public function assertDefaultDrupalFeatures()
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $this->assertModuleInstalled('features');
 
diff --git a/src/Palantirnet/PalantirBehatExtension/Context/DrupalWorkbenchModerationContext.php b/src/Palantirnet/PalantirBehatExtension/Context/DrupalWorkbenchModerationContext.php
index 36ff72e..382d48f 100644
--- a/src/Palantirnet/PalantirBehatExtension/Context/DrupalWorkbenchModerationContext.php
+++ b/src/Palantirnet/PalantirBehatExtension/Context/DrupalWorkbenchModerationContext.php
@@ -37,8 +37,6 @@ class DrupalWorkbenchModerationContext extends SharedDrupalContext
      */
     public function disableWorkbenchModeration()
     {
-        throw new NotUpdatedException();
-
         $this->disableWorkbenchModeration = true;
 
     }//end disableWorkbenchModeration()
@@ -58,7 +56,7 @@ public function disableWorkbenchModeration()
      */
     public function prepareWorkbenchModerationNode(BeforeNodeCreateScope $scope)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         if ($this->disableWorkbenchModeration === true) {
             $node         = $scope->getEntity();
diff --git a/src/Palantirnet/PalantirBehatExtension/Context/EntityDataContext.php b/src/Palantirnet/PalantirBehatExtension/Context/EntityDataContext.php
index 28fef6e..d013167 100644
--- a/src/Palantirnet/PalantirBehatExtension/Context/EntityDataContext.php
+++ b/src/Palantirnet/PalantirBehatExtension/Context/EntityDataContext.php
@@ -44,7 +44,7 @@ class EntityDataContext extends SharedDrupalContext
      */
     public function assertNodeByTitle($contentType, $title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $node = $this->findNodeByTitle($contentType, $title);
 
@@ -66,7 +66,7 @@ public function assertNodeByTitle($contentType, $title)
      */
     public function assertTermByName($termName, $vocabulary)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $term = $this->findTermByName($termName, $vocabulary);
 
@@ -87,7 +87,7 @@ public function assertTermByName($termName, $vocabulary)
      */
     public function assertUserByName($userName)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $account = $this->findUserByName($userName);
 
@@ -109,7 +109,7 @@ public function assertUserByName($userName)
      */
     public function assertEntityPropertyValue($property, $value)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $wrapper = entity_metadata_wrapper($this->currentEntityType, $this->currentEntity);
         if ($wrapper->$property->value() !== $value) {
@@ -130,7 +130,7 @@ public function assertEntityPropertyValue($property, $value)
      */
     public function assertUserHasRoles($role)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $this->assertEntityIsUser();
 
@@ -152,7 +152,7 @@ public function assertUserHasRoles($role)
      */
     public function assertNotUserHasRoles($role)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $this->assertEntityIsUser();
 
@@ -170,7 +170,7 @@ public function assertNotUserHasRoles($role)
      */
     public function assertEntityIsUser()
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         if ('user' !== $this->currentEntityType) {
             throw new \Exception(sprintf('Entity is not a user.'));
@@ -189,7 +189,7 @@ public function assertEntityIsUser()
      */
     public function assertUserRoles($account, $roles)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         foreach ($roles as $role) {
             if (false === user_has_role($role->rid, $account)) {
@@ -210,7 +210,7 @@ public function assertUserRoles($account, $roles)
      */
     public function assertNotUserRoles($account, $roles)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         foreach ($roles as $role) {
             if (true === user_has_role($role->rid, $account)) {
@@ -230,7 +230,7 @@ public function assertNotUserRoles($account, $roles)
      */
     public function getRoles($roles)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $role_objects = array();
 
@@ -261,7 +261,7 @@ public function getRoles($roles)
      */
     public function assertNotEntityPropertyValue($property, $value)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $wrapper = entity_metadata_wrapper($this->currentEntityType, $this->currentEntity);
         if ($wrapper->$property->value() === $value) {
@@ -283,7 +283,7 @@ public function assertNotEntityPropertyValue($property, $value)
      */
     public function assertEntityFieldValue($field, $value)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         if (empty($field) === true || empty($value) === true) {
             return;
@@ -326,7 +326,7 @@ public function assertEntityFieldValue($field, $value)
      */
     public function assertNotEntityFieldValue($field, $value)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         try {
             $this->assertEntityFieldValue($field, $value);
@@ -353,7 +353,7 @@ public function assertNotEntityFieldValue($field, $value)
      */
     public function assertEntityFieldValueLinkField($field, $value)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $wrapper = entity_metadata_wrapper($this->currentEntityType, $this->currentEntity);
 
@@ -385,7 +385,7 @@ public function assertEntityFieldValueLinkField($field, $value)
      */
     public function assertEntityFieldValueTextLong($field, $value)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $items = field_get_items($this->currentEntityType, $this->currentEntity, $field);
 
@@ -416,7 +416,7 @@ public function assertEntityFieldValueTextLong($field, $value)
      */
     public function assertEntityFieldValueFile($field, $value)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $wrapper = entity_metadata_wrapper($this->currentEntityType, $this->currentEntity);
 
@@ -451,7 +451,7 @@ public function assertEntityFieldValueFile($field, $value)
      */
     public function assertEntityFieldValueImage($field, $value)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $this->assertEntityFieldValueFile($field, $value);
 
@@ -470,7 +470,7 @@ public function assertEntityFieldValueImage($field, $value)
      */
     public function assertEntityFieldValueTaxonomyTermReference($field, $value)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $wrapper = entity_metadata_wrapper($this->currentEntityType, $this->currentEntity);
 
@@ -506,7 +506,7 @@ public function assertEntityFieldValueTaxonomyTermReference($field, $value)
      */
     public function assertEntityFieldValueEntityReference($field, $value)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $field_info = field_info_field($field);
         $items      = field_get_items($this->currentEntityType, $this->currentEntity, $field);
@@ -550,7 +550,7 @@ public function assertEntityFieldValueEntityReference($field, $value)
      */
     public function assertEntityFieldValueDatetime($field, $value)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $wrapper     = entity_metadata_wrapper($this->currentEntityType, $this->currentEntity);
         $field_value = $wrapper->$field->value();
@@ -601,7 +601,7 @@ public function assertEntityFieldValueDatetime($field, $value)
      */
     public function dumpField($field)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $wrapper     = entity_metadata_wrapper($this->currentEntityType, $this->currentEntity);
         $field_value = $wrapper->$field->value();
diff --git a/src/Palantirnet/PalantirBehatExtension/Context/MarkupContext.php b/src/Palantirnet/PalantirBehatExtension/Context/MarkupContext.php
index 05c88bd..0d858d7 100644
--- a/src/Palantirnet/PalantirBehatExtension/Context/MarkupContext.php
+++ b/src/Palantirnet/PalantirBehatExtension/Context/MarkupContext.php
@@ -28,8 +28,6 @@ class MarkupContext extends DrupalExtensionMarkupContext
      */
     public function dumpRegion($region)
     {
-        throw new NotUpdatedException();
-
         print $this->getRegion($region)->getHTML()."\r\n";
 
     }//end dumpRegion()
@@ -44,8 +42,6 @@ public function dumpRegion($region)
      */
     public function dumpUrl()
     {
-        throw new NotUpdatedException();
-
         print $this->getSession()->getCurrentUrl()."\r\n";
 
     }//end dumpUrl()
@@ -64,8 +60,6 @@ public function dumpUrl()
      */
     public function assertRegionElementText($text, $tag, $region)
     {
-        throw new NotUpdatedException();
-
         $regionObj = $this->getRegion($region);
         $results   = $regionObj->findAll('css', $tag);
 
@@ -85,40 +79,6 @@ public function assertRegionElementText($text, $tag, $region)
     }//end assertRegionElementText()
 
 
-    /**
-     * Test for absence of a tag containing some text.
-     *
-     * @Then I should not see :text in the :tag element in the :region( region)
-     *
-     * @param string $text   The text to look for.
-     * @param string $tag    A CSS selector.
-     * @param string $region A region name from the behat config.
-     *
-     * @return void
-     */
-    public function assertNotRegionElementText($text, $tag, $region)
-    {
-        throw new NotUpdatedException();
-
-        $regionObj = $this->getRegion($region);
-        $results   = $regionObj->findAll('css', $tag);
-
-        $found = false;
-        if (empty($results) === false) {
-            foreach ($results as $result) {
-                if ($result->getText() === $text) {
-                    $found = true;
-                }
-            }
-        }
-
-        if ($found === true) {
-            throw new \Exception(sprintf('The text "%s" was found in the "%s" element in the "%s" region on the page %s', $text, $tag, $region, $this->getSession()->getCurrentUrl()));
-        }
-
-    }//end assertNotRegionElementText()
-
-
     /**
      * Validate that a particular field label appears on the page.
      *
@@ -130,8 +90,6 @@ public function assertNotRegionElementText($text, $tag, $region)
      */
     public function assertFieldByLabel($label)
     {
-        throw new NotUpdatedException();
-
         $page  = $this->getSession()->getPage();
         $field = $page->findField($label);
 
@@ -153,8 +111,6 @@ public function assertFieldByLabel($label)
      */
     public function assertNotFieldByLabel($label)
     {
-        throw new NotUpdatedException();
-
         try {
             $this->assertFieldByLabel($label);
         }
@@ -178,7 +134,7 @@ public function assertNotFieldByLabel($label)
      */
     public function assertFieldsetByLabel($label)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $page     = $this->getSession()->getPage();
         $legend   = $this->getSession()->getSelectorsHandler()->xpathLiteral($label);
diff --git a/src/Palantirnet/PalantirBehatExtension/Context/NodeContext.php b/src/Palantirnet/PalantirBehatExtension/Context/NodeContext.php
index 7301963..335cd57 100644
--- a/src/Palantirnet/PalantirBehatExtension/Context/NodeContext.php
+++ b/src/Palantirnet/PalantirBehatExtension/Context/NodeContext.php
@@ -29,7 +29,7 @@ class NodeContext extends SharedDrupalContext
      */
     public function assertNodeByTitle($contentType, $title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $node = $this->findNodeByTitle($contentType, $title);
         $this->getSession()->visit($this->locatePath("node/{$node->nid}"));
@@ -49,7 +49,7 @@ public function assertNodeByTitle($contentType, $title)
      */
     public function assertEditNodeByTitle($contentType, $title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $node = $this->findNodeByTitle($contentType, $title);
         $this->getSession()->visit($this->locatePath("node/{$node->nid}/edit"));
diff --git a/src/Palantirnet/PalantirBehatExtension/Context/SharedDrupalContext.php b/src/Palantirnet/PalantirBehatExtension/Context/SharedDrupalContext.php
index a814b13..a3c5613 100644
--- a/src/Palantirnet/PalantirBehatExtension/Context/SharedDrupalContext.php
+++ b/src/Palantirnet/PalantirBehatExtension/Context/SharedDrupalContext.php
@@ -38,7 +38,7 @@ class SharedDrupalContext extends RawDrupalContext
      */
     public function findNodeByTitle($contentType, $title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $query = new \EntityFieldQuery();
 
@@ -70,7 +70,7 @@ public function findNodeByTitle($contentType, $title)
      */
     protected function getNodeByTitle($contentType, $title)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         try {
             $node = $this->findNodeByTitle($contentType, $title);
@@ -101,7 +101,7 @@ protected function getNodeByTitle($contentType, $title)
      */
     public function findTermByName($termName, $vocabulary)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $query = new \EntityFieldQuery();
 
@@ -132,7 +132,7 @@ public function findTermByName($termName, $vocabulary)
      */
     public function findUserByName($userName)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         $query = new \EntityFieldQuery();
 
@@ -164,7 +164,7 @@ public function findUserByName($userName)
      */
     public function fileCreate($file)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         // Save the file and overwrite if it already exists.
         $dest   = file_build_uri(drupal_basename($file->uri));
@@ -194,7 +194,7 @@ public function fileCreate($file)
      */
     public function expandFile($file)
     {
-        throw new NotUpdatedException();
+        throw new NotUpdatedException('Method not yet updated for Drupal 8.');
 
         if (empty($file->filename) === true) {
             throw new \Exception("Can't create file with no source filename; this should be the name of a file within the MinkExtension's files_path directory.");
@@ -246,11 +246,14 @@ public function expandFile($file)
      */
     public function cleanFiles()
     {
-        throw new NotUpdatedException();
+        /*
+            @todo Update for Drupal 8
+            @see NotUpdatedException
 
-        foreach ($this->files as $file) {
-            file_delete($file, true);
-        }
+            foreach ($this->files as $file) {
+                file_delete($file, true);
+            }
+        */
 
         $this->files = array();