diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
index 0f58049..bce08d4 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains Drupal\comment\Tests\CommentTestBase.
+ * Contains \Drupal\comment\Tests\CommentTestBase.
  */
 
 namespace Drupal\comment\Tests;
 
 use Drupal\Core\Language\Language;
-use Drupal\comment\Entity\Comment;
+use Drupal\comment\CommentInterface;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -26,21 +26,21 @@
   /**
    * An administrative user with permission to configure comment settings.
    *
-   * @var Drupal\user\User
+   * @var \Drupal\user\UserInterface
    */
   protected $admin_user;
 
   /**
    * A normal user with permission to post comments.
    *
-   * @var Drupal\user\User
+   * @var \Drupal\user\UserInterface
    */
   protected $web_user;
 
   /**
    * A test node to which comments will be posted.
    *
-   * @var Drupal\node\Node
+   * @var \Drupal\node\NodeInterface
    */
   protected $node;
 
@@ -69,7 +69,6 @@ function setUp() {
       'post comments',
       'create article content',
       'edit own comments',
-      'post comments',
       'skip comment approval',
       'access content',
     ));
@@ -81,8 +80,8 @@ function setUp() {
   /**
    * Posts a comment.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $node|null $node
-   *   Node to post comment on or NULL to post to the previusly loaded page.
+   * @param \Drupal\Core\Entity\EntityInterface|null $node
+   *   Node to post comment on or NULL to post to the previously loaded page.
    * @param $comment
    *   Comment body.
    * @param $subject
@@ -90,6 +89,9 @@ function setUp() {
    * @param $contact
    *   Set to NULL for no contact info, TRUE to ignore success checking, and
    *   array of values to set contact info.
+   *
+   * @return \Drupal\comment\CommentInterface|null
+   *   The posted comment or NULL when posted comment was not found.
    */
   function postComment($node, $comment, $subject = '', $contact = NULL) {
     $langcode = Language::LANGCODE_NOT_SPECIFIED;
@@ -155,7 +157,7 @@ function postComment($node, $comment, $subject = '', $contact = NULL) {
   /**
    * Checks current page for specified comment.
    *
-   * @param Drupal\comment\Comment $comment
+   * @param \Drupal\comment\CommentInterface $comment
    *   The comment object.
    * @param boolean $reply
    *   Boolean indicating whether the comment is a reply to another comment.
@@ -163,7 +165,7 @@ function postComment($node, $comment, $subject = '', $contact = NULL) {
    * @return boolean
    *   Boolean indicating whether the comment was found.
    */
-  function commentExists(Comment $comment = NULL, $reply = FALSE) {
+  function commentExists(CommentInterface $comment = NULL, $reply = FALSE) {
     if ($comment) {
       $regex = '/' . ($reply ? '<div class="indented">(.*?)' : '');
       $regex .= '<a id="comment-' . $comment->id() . '"(.*?)'; // Comment anchor.
@@ -181,10 +183,10 @@ function commentExists(Comment $comment = NULL, $reply = FALSE) {
   /**
    * Deletes a comment.
    *
-   * @param Drupal\comment\Comment $comment
+   * @param \Drupal\comment\CommentInterface $comment
    *   Comment to delete.
    */
-  function deleteComment(Comment $comment) {
+  function deleteComment(CommentInterface $comment) {
     $this->drupalPost('comment/' . $comment->id() . '/delete', array(), t('Delete'));
     $this->assertText(t('The comment and all its replies have been deleted.'), 'Comment deleted.');
   }
@@ -285,14 +287,14 @@ function commentContactInfoAvailable() {
   /**
    * Performs the specified operation on the specified comment.
    *
-   * @param object $comment
+   * @param \Drupal\comment\CommentInterface $comment
    *   Comment to perform operation on.
    * @param string $operation
    *   Operation to perform.
    * @param boolean $aproval
    *   Operation is found on approval page.
    */
-  function performCommentOperation($comment, $operation, $approval = FALSE) {
+  function performCommentOperation(CommentInterface $comment, $operation, $approval = FALSE) {
     $edit = array();
     $edit['operation'] = $operation;
     $edit['comments[' . $comment->id() . ']'] = TRUE;