diff --git a/src/Tests/AdminUI.php b/src/Tests/AdminUI.php
index e5aa8ea..c724304 100644
--- a/src/Tests/AdminUI.php
+++ b/src/Tests/AdminUI.php
@@ -7,7 +7,6 @@
 namespace Drupal\flag\Tests;
 
 use Drupal\flag\Tests\FlagTestBase;
-use Drupal\node\Entity\Node;
 
 /**
  * Tests the Flag admin UI.
@@ -45,11 +44,11 @@ class AdminUI extends FlagTestBase {
   protected $label = 'Test label 123';
 
   /**
-   * The ID of the flag to create for the test.
+   * The ID of the flag created for the test.
    *
    * @var string
    */
-  protected $id = 'test_label_123';
+  protected $flagId = 'test_label_123';
 
   /**
    * The flag used for the test.
@@ -72,9 +71,25 @@ class AdminUI extends FlagTestBase {
    */
   protected $node;
 
-  protected $node_id;
+  /**
+   * The ID of the entity to created for the test.
+   *
+   * @var type
+   */
+  protected $nodeId;
 
+  /**
+   * Text used in construction of the flag.
+   *
+   * @var string
+   */
   protected $flagShortText = 'Flag this stuff';
+
+  /**
+   * Text used in construction of the flag.
+   *
+   * @var string
+   */
   protected $unflagShortText = 'Unflag this stuff';
 
   /**
@@ -101,7 +116,7 @@ class AdminUI extends FlagTestBase {
 
     // Create a node to flag.
     $this->node = $this->drupalCreateNode(['type' => $this->nodeType]);
-    $this->node_id = $node->id();
+    $this->nodeId = $this->node->id();
   }
 
   /**
@@ -127,7 +142,8 @@ class AdminUI extends FlagTestBase {
     $this->drupalCreateContentType(['type' => $this->nodeType]);
 
     // Test with minimal value requirement.
-    $this->drupalPostForm('admin/structure/flags/add', [], t('Continue'));
+    $this->t();
+    $this->drupalPostForm('admin/structure/flags/add', [], $this->t('Continue'));
     // Check for fieldset titles.
     $this->assertText(t('Messages'));
     $this->assertText(t('Flag access'));
@@ -135,12 +151,12 @@ class AdminUI extends FlagTestBase {
 
     $edit = [
       'label' => $this->label,
-      'id' => $this->id,
+      'id' => $this->flagId,
       'bundles[' . $this->nodeType . ']' => $this->nodeType,
       'flag_short' => $this->flagShortText,
       'unflag_short' => $this->unflagShortText,
     ];
-    $this->drupalPostForm(NULL, $edit, t('Create Flag'));
+    $this->drupalPostForm(NULL, $edit, $this->t('Create Flag'));
 
     $this->assertText(t('Flag @this_label has been added.', ['@this_label' => $this->label]));
   }
@@ -152,13 +168,13 @@ class AdminUI extends FlagTestBase {
     $this->drupalGet('admin/structure/flags');
     $this->assertText(t('enabled'));
 
-    $this->drupalPostForm('flag/disable/' . $this->id, [], t('Disable'));
+    $this->drupalPostForm('flag/disable/' . $this->flagId, [], $this->t('Disable'));
     $this->assertResponse(200);
 
     $this->drupalGet('admin/structure/flags');
     $this->assertText(t('disabled'));
 
-    $this->drupalGet('node/' . $this->node_id);
+    $this->drupalGet('node/' . $this->nodeId);
     $this->assertNoText($this->flagShortText);
   }
 
@@ -169,13 +185,13 @@ class AdminUI extends FlagTestBase {
     $this->drupalGet('admin/structure/flags');
     $this->assertText(t('disabled'));
 
-    $this->drupalPostForm('flag/enable/' . $this->id, [], t('Enable'));
+    $this->drupalPostForm('flag/enable/' . $this->flagId, [], $this->t('Enable'));
     $this->assertResponse(200);
 
     $this->drupalGet('admin/structure/flags');
     $this->assertText(t('enabled'));
 
-    $this->drupalGet('node/' . $this->node_id);
+    $this->drupalGet('node/' . $this->nodeId);
     $this->assertText($this->flagShortText);
   }