diff --git a/src/Tests/FlagConfirmFormTest.php b/src/Tests/FlagConfirmFormTest.php
index 52a20ba..6cbffaf 100644
--- a/src/Tests/FlagConfirmFormTest.php
+++ b/src/Tests/FlagConfirmFormTest.php
@@ -83,7 +83,7 @@ class FlagConfirmFormTest extends WebTestBase {
 
     $this->drupalLogin($this->adminUser);
     $this->doCreateFlag();
-    $this->doCreateNode();
+    $this->doFlagUnflagNode();
   }
 
   /**
@@ -123,9 +123,9 @@ class FlagConfirmFormTest extends WebTestBase {
   }
 
   /**
-   * Create a node and flag it.
+   * Create a node, flag it and unflag it.
    */
-  public function doCreateNode() {
+  public function doFlagUnflagNode() {
     $node = $this->drupalCreateNode(['type' => $this->nodeType]);
     $node_id = $node->id();
 
diff --git a/src/Tests/FlagEnableDisableTest.php b/src/Tests/FlagEnableDisableTest.php
index b19f6dc..b2b6963 100644
--- a/src/Tests/FlagEnableDisableTest.php
+++ b/src/Tests/FlagEnableDisableTest.php
@@ -86,7 +86,7 @@ class FlagEnableDisableTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
 
     $this->doCreateFlag();
-    $this->doCreateNode();
+    $this->doFlagNode();
     $this->doDisableFlag();
     $this->doEnableFlag();
   }
@@ -117,7 +117,7 @@ class FlagEnableDisableTest extends WebTestBase {
   /**
    * Create a node and flag it.
    */
-  public function doCreateNode() {
+  public function doFlagNode() {
     $node = $this->drupalCreateNode(['type' => $this->nodeType]);
     $this->node_id = $node->id();
 
diff --git a/src/Tests/FlagFieldEntryTest.php b/src/Tests/FlagFieldEntryTest.php
index 2846df5..9feea6d 100644
--- a/src/Tests/FlagFieldEntryTest.php
+++ b/src/Tests/FlagFieldEntryTest.php
@@ -103,7 +103,7 @@ class FlagFieldEntryTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
     $this->doCreateFlag();
     $this->doAddFields();
-    $this->doCreateFlagNode();
+    $this->doFlagNode();
     $this->doEditFlagField();
   }
 
@@ -159,7 +159,7 @@ class FlagFieldEntryTest extends WebTestBase {
   /**
    * Create a node and flag it.
    */
-  public function doCreateFlagNode() {
+  public function doFlagNode() {
     $node = $this->drupalCreateNode(['type' => $this->nodeType]);
     $this->nodeId = $node->id();
 
diff --git a/src/Tests/FlagSimpleTest.php b/src/Tests/FlagSimpleTest.php
index 47fd2c6..1e27544 100644
--- a/src/Tests/FlagSimpleTest.php
+++ b/src/Tests/FlagSimpleTest.php
@@ -82,17 +82,17 @@ class FlagSimpleTest extends WebTestBase {
 
     $this->drupalLogin($this->adminUser);
 
-    $this->doTestFlagAdd();
-    $this->doTestCreateNodeAndFlagIt();
-    $this->doGlobalFlag();
-    $this->doTestHideFlagLinkFromTeaser();
-    $this->doTestUserDeletion();
+    $this->doFlagAdd();
+    $this->doFlagLinksTest();
+    $this->doGlobalFlagLinksTest();
+    $this->doFlagLinkTeaserTest();
+    $this->doUserDeletionTest();
   }
 
   /**
    * Flag creation.
    */
-  public function doTestFlagAdd() {
+  public function doFlagAdd() {
     // Create content type.
     $this->drupalCreateContentType(['type' => $this->nodeType]);
 
@@ -114,9 +114,9 @@ class FlagSimpleTest extends WebTestBase {
   }
 
   /**
-   * Node creation and flagging.
+   * Test the flag link in different states, for different users.
    */
-  public function doTestCreateNodeAndFlagIt() {
+  public function doFlagLinksTest() {
     $node = $this->drupalCreateNode(['type' => $this->nodeType]);
     $node_id = $node->id();
 
@@ -159,9 +159,9 @@ class FlagSimpleTest extends WebTestBase {
   }
 
   /**
-   * Test global flag.
+   * Test a global flag link appears correctly in different states.
    */
-  public function doGlobalFlag() {
+  public function doGlobalFlagLinksTest() {
     $node = $this->drupalCreateNode(['type' => $this->nodeType]);
     $node_id = $node->id();
 
@@ -213,9 +213,9 @@ class FlagSimpleTest extends WebTestBase {
   }
 
   /**
-   * Node creation and flag link.
+   * Test the flag link doesn't appear when set to hidden for a view mode.
    */
-  public function doTestHideFlagLinkFromTeaser() {
+  public function doFlagLinkTeaserTest() {
     $this->drupalLogin($this->adminUser);
 
     $node = $this->drupalCreateNode([
@@ -250,7 +250,7 @@ class FlagSimpleTest extends WebTestBase {
   /**
    * Creates user, sets flags and deletes user.
    */
-  public function doTestUserDeletion() {
+  public function doUserDeletionTest() {
     $node = $this->drupalCreateNode(['type' => $this->nodeType]);
     $node_id = $node->id();