.../src/Functional/CookieResourceTestTrait.php     | 25 ++++++++++++++++++----
 .../Vocabulary/VocabularyJsonBasicAuthTest.php     |  1 -
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php b/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php
index 500cfe2..f313b96 100644
--- a/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php
+++ b/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php
@@ -11,11 +11,31 @@
  */
 trait CookieResourceTestTrait {
 
-
+  /**
+   * The session cookie.
+   *
+   * @see ::initAuthentication
+   *
+   * @var string
+   */
   protected $sessionCookie;
 
+  /**
+   * The CSRF token.
+   *
+   * @see ::initAuthentication
+   *
+   * @var string
+   */
   protected $csrfToken;
 
+  /**
+   * The logout token.
+   *
+   * @see ::initAuthentication
+   *
+   * @var string
+   */
   protected $logoutToken;
 
   /**
@@ -55,8 +75,6 @@ protected function getAuthenticationRequestOptions($method) {
     return $request_options;
   }
 
-  // @todo XCSRF token missing/invalid edge cases!!!!!!!!!!!
-
   /**
    * {@inheritdoc}
    */
@@ -64,7 +82,6 @@ protected function verifyResponseWhenMissingAuthentication(ResponseInterface $re
     $this->assertResourceErrorResponse(403, '', $response);
   }
 
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php
index 8549963..1840a21 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\rest\Functional\EntityResource\Vocabulary;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\JsonBasicAuthWorkaroundFor2805281Trait;
 
 /**