diff --git a/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php b/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php
index fdcb8f5..202f6a4 100644
--- a/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php
+++ b/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php
@@ -104,7 +104,7 @@ protected function setUp() {
    *
    * @dataProvider getLinkCombinations
    *
-   * @covers ::buildCommentedEntityLinks()
+   * @covers ::buildCommentedEntityLinks
    */
   public function testCommentLinkBuilder(NodeInterface $node, $context, $has_access_comments, $history_exists, $has_post_comments, $is_anonymous, $expected) {
     $this->moduleHandler->expects($this->any())
diff --git a/core/modules/comment/tests/src/Unit/CommentManagerTest.php b/core/modules/comment/tests/src/Unit/CommentManagerTest.php
index e2a00c7..acdd57a 100644
--- a/core/modules/comment/tests/src/Unit/CommentManagerTest.php
+++ b/core/modules/comment/tests/src/Unit/CommentManagerTest.php
@@ -19,7 +19,7 @@ class CommentManagerTest extends UnitTestCase {
   /**
    * Tests the getFields method.
    *
-   * @covers ::getFields()
+   * @covers ::getFields
    */
   public function testGetFields() {
     // Set up a content entity type.
diff --git a/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php b/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
index c8657b0..0487d08 100644
--- a/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
+++ b/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
@@ -25,7 +25,7 @@ class ContentTranslationManageAccessCheckTest extends UnitTestCase {
   /**
    * Tests the create access method.
    *
-   * @covers ::access()
+   * @covers ::access
    */
   public function testCreateAccess() {
     // Set the mock translation handler.
diff --git a/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php b/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
index fd401fa..5580e40 100644
--- a/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
+++ b/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
@@ -175,7 +175,7 @@ public function testCalculateDependencies() {
   }
 
   /**
-   * @covers ::toArray()
+   * @covers ::toArray
    */
   public function testToArray() {
     $field = new FieldConfig(array(
diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
index e7542c5..da7ff11 100644
--- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
+++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
@@ -19,7 +19,7 @@ class ForumBreadcrumbBuilderBaseTest extends UnitTestCase {
   /**
    * Tests ForumBreadcrumbBuilderBase::__construct().
    *
-   * @covers ::__construct()
+   * @covers ::__construct
    */
   public function testConstructor() {
     // Make some test doubles.
diff --git a/core/modules/locale/tests/src/Unit/LocaleLookupTest.php b/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
index 1b5276d..8519291 100644
--- a/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
+++ b/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
@@ -86,7 +86,7 @@ protected function setUp() {
   /**
    * Tests locale lookups without fallback.
    *
-   * @covers ::resolveCacheMiss()
+   * @covers ::resolveCacheMiss
    */
   public function testResolveCacheMissWithoutFallback() {
     $args = array(
@@ -122,7 +122,7 @@ public function testResolveCacheMissWithoutFallback() {
    *
    * Note that context is irrelevant here. It is not used but it is required.
    *
-   * @covers ::resolveCacheMiss()
+   * @covers ::resolveCacheMiss
    *
    * @dataProvider resolveCacheMissWithFallbackProvider
    */
@@ -202,7 +202,7 @@ public function resolveCacheMissWithFallbackProvider() {
   /**
    * Tests locale lookups with persistent tracking.
    *
-   * @covers ::resolveCacheMiss()
+   * @covers ::resolveCacheMiss
    */
   public function testResolveCacheMissWithPersist() {
     $args = array(
@@ -234,7 +234,7 @@ public function testResolveCacheMissWithPersist() {
   /**
    * Tests locale lookups without a found translation.
    *
-   * @covers ::resolveCacheMiss()
+   * @covers ::resolveCacheMiss
    */
   public function testResolveCacheMissNoTranslation() {
     $string = $this->getMock('Drupal\locale\StringInterface');
diff --git a/core/modules/migrate/tests/src/Unit/RowTest.php b/core/modules/migrate/tests/src/Unit/RowTest.php
index ba941df..5d79b2c 100644
--- a/core/modules/migrate/tests/src/Unit/RowTest.php
+++ b/core/modules/migrate/tests/src/Unit/RowTest.php
@@ -179,8 +179,8 @@ public function testHashing() {
   /**
    * Tests getting/setting the ID Map.
    *
-   * @covers \Drupal\migrate\Row::setIdMap()
-   * @covers \Drupal\migrate\Row::getIdMap()
+   * @covers \Drupal\migrate\Row::setIdMap
+   * @covers \Drupal\migrate\Row::getIdMap
    */
   public function testGetSetIdMap() {
     $row = new Row($this->testValues, $this->testSourceIds);
@@ -204,7 +204,7 @@ public function testSourceIdValues() {
   /**
    * Tests getting the source property.
    *
-   * @covers \Drupal\migrate\Row::getSourceProperty()
+   * @covers \Drupal\migrate\Row::getSourceProperty
    */
   public function testGetSourceProperty() {
     $row = new Row($this->testValues, $this->testSourceIds);
diff --git a/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php b/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
index 62488f4..8ceea8a 100644
--- a/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
+++ b/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
@@ -79,7 +79,7 @@ class PathBasedBreadcrumbBuilderTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    *
-   * @covers ::__construct()
+   * @covers ::__construct
    */
   protected function setUp() {
     parent::setUp();
@@ -110,7 +110,7 @@ protected function setUp() {
   /**
    * Tests the build method on the frontpage.
    *
-   * @covers ::build()
+   * @covers ::build
    */
   public function testBuildOnFrontpage() {
     $this->context->expects($this->once())
@@ -124,7 +124,7 @@ public function testBuildOnFrontpage() {
   /**
    * Tests the build method with one path element.
    *
-   * @covers ::build()
+   * @covers ::build
    */
   public function testBuildWithOnePathElement() {
     $this->context->expects($this->once())
@@ -138,8 +138,8 @@ public function testBuildWithOnePathElement() {
   /**
    * Tests the build method with two path elements.
    *
-   * @covers ::build()
-   * @covers ::getRequestForPath()
+   * @covers ::build
+   * @covers ::getRequestForPath
    */
   public function testBuildWithTwoPathElements() {
     $this->context->expects($this->once())
@@ -170,8 +170,8 @@ public function testBuildWithTwoPathElements() {
   /**
    * Tests the build method with three path elements.
    *
-   * @covers ::build()
-   * @covers ::getRequestForPath()
+   * @covers ::build
+   * @covers ::getRequestForPath
    */
   public function testBuildWithThreePathElements() {
     $this->context->expects($this->once())
@@ -214,8 +214,8 @@ public function testBuildWithThreePathElements() {
   /**
    * Tests that exceptions during request matching are caught.
    *
-   * @covers ::build()
-   * @covers ::getRequestForPath()
+   * @covers ::build
+   * @covers ::getRequestForPath
    *
    * @dataProvider providerTestBuildWithException
    */
@@ -254,8 +254,8 @@ public function providerTestBuildWithException() {
   /**
    * Tests the build method with a non processed path.
    *
-   * @covers ::build()
-   * @covers ::getRequestForPath()
+   * @covers ::build
+   * @covers ::getRequestForPath
    */
   public function testBuildWithNonProcessedPath() {
     $this->context->expects($this->once())
@@ -279,7 +279,7 @@ public function testBuildWithNonProcessedPath() {
   /**
    * Tests the applied method.
    *
-   * @covers ::applies()
+   * @covers ::applies
    */
   public function testApplies() {
     $this->assertTrue($this->builder->applies($this->getMock('Drupal\Core\Routing\RouteMatchInterface')));
@@ -288,8 +288,8 @@ public function testApplies() {
   /**
    * Tests the breadcrumb for a user path.
    *
-   * @covers ::build()
-   * @covers ::getRequestForPath()
+   * @covers ::build
+   * @covers ::getRequestForPath
    */
   public function testBuildWithUserPath() {
     $this->context->expects($this->once())
diff --git a/core/modules/tour/tests/src/Unit/Entity/TourTest.php b/core/modules/tour/tests/src/Unit/Entity/TourTest.php
index b021ab8..a6625c8 100644
--- a/core/modules/tour/tests/src/Unit/Entity/TourTest.php
+++ b/core/modules/tour/tests/src/Unit/Entity/TourTest.php
@@ -26,7 +26,7 @@ class TourTest extends UnitTestCase {
    * @param bool $result
    *   Expected result.
    *
-   * @covers ::hasMatchingRoute()
+   * @covers ::hasMatchingRoute
    *
    * @dataProvider routeProvider
    */
diff --git a/core/modules/user/tests/src/Unit/TempStoreTest.php b/core/modules/user/tests/src/Unit/TempStoreTest.php
index 959df5c..68b4e70 100644
--- a/core/modules/user/tests/src/Unit/TempStoreTest.php
+++ b/core/modules/user/tests/src/Unit/TempStoreTest.php
@@ -81,7 +81,7 @@ protected function setUp() {
   }
 
   /**
-   * @covers ::get()
+   * @covers ::get
    */
   public function testGet() {
     $this->keyValue->expects($this->at(0))
@@ -100,7 +100,7 @@ public function testGet() {
   /**
    * Tests the getIfOwner() method.
    *
-   * @covers ::getIfOwner()
+   * @covers ::getIfOwner
    */
   public function testGetIfOwner() {
     $this->keyValue->expects($this->at(0))
@@ -124,7 +124,7 @@ public function testGetIfOwner() {
   /**
    * Tests the set() method with no lock available.
    *
-   * @covers ::set()
+   * @covers ::set
    * @expectedException \Drupal\user\TempStoreException
    */
   public function testSetWithNoLockAvailable() {
@@ -149,7 +149,7 @@ public function testSetWithNoLockAvailable() {
   /**
    * Tests a successful set() call.
    *
-   * @covers ::set()
+   * @covers ::set
    */
   public function testSet() {
     $this->lock->expects($this->once())
@@ -172,7 +172,7 @@ public function testSet() {
   /**
    * Tests the setIfNotExists() methods.
    *
-   * @covers ::setIfNotExists()
+   * @covers ::setIfNotExists
    */
   public function testSetIfNotExists() {
     $this->keyValue->expects($this->once())
@@ -186,7 +186,7 @@ public function testSetIfNotExists() {
   /**
    * Tests the setIfOwner() method when no key exists.
    *
-   * @covers ::setIfOwner()
+   * @covers ::setIfOwner
    */
   public function testSetIfOwnerWhenNotExists() {
     $this->keyValue->expects($this->once())
@@ -199,7 +199,7 @@ public function testSetIfOwnerWhenNotExists() {
   /**
    * Tests the setIfOwner() method when a key already exists but no object.
    *
-   * @covers ::setIfOwner()
+   * @covers ::setIfOwner
    */
   public function testSetIfOwnerNoObject() {
     $this->keyValue->expects($this->once())
@@ -217,7 +217,7 @@ public function testSetIfOwnerNoObject() {
   /**
    * Tests the setIfOwner() method with matching and non matching owners.
    *
-   * @covers ::setIfOwner()
+   * @covers ::setIfOwner
    */
   public function testSetIfOwner() {
     $this->lock->expects($this->once())
@@ -241,7 +241,7 @@ public function testSetIfOwner() {
   /**
    * Tests the getMetadata() method.
    *
-   * @covers ::getMetadata()
+   * @covers ::getMetadata
    */
   public function testGetMetadata() {
     $this->keyValue->expects($this->at(0))
@@ -265,7 +265,7 @@ public function testGetMetadata() {
   /**
    * Tests the delete() method.
    *
-   * @covers ::delete()
+   * @covers ::delete
    */
   public function testDelete() {
     $this->lock->expects($this->once())
@@ -288,7 +288,7 @@ public function testDelete() {
   /**
    * Tests the delete() method with no lock available.
    *
-   * @covers ::delete()
+   * @covers ::delete
    * @expectedException \Drupal\user\TempStoreException
    */
   public function testDeleteWithNoLockAvailable() {
@@ -313,7 +313,7 @@ public function testDeleteWithNoLockAvailable() {
   /**
    * Tests the deleteIfOwner() method.
    *
-   * @covers ::deleteIfOwner()
+   * @covers ::deleteIfOwner
    */
   public function testDeleteIfOwner() {
     $this->lock->expects($this->once())
diff --git a/core/modules/views/tests/src/Unit/Plugin/area/MessagesTest.php b/core/modules/views/tests/src/Unit/Plugin/area/MessagesTest.php
index d9a3500..6380021 100644
--- a/core/modules/views/tests/src/Unit/Plugin/area/MessagesTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/area/MessagesTest.php
@@ -42,8 +42,8 @@ protected function setUp() {
   /**
    * Tests the render method.
    *
-   * @covers ::defineOptions()
-   * @covers ::render()
+   * @covers ::defineOptions
+   * @covers ::render
    */
   public function testRender() {
     // The handler is configured to show with empty views by default, so should
diff --git a/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php b/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php
index a2e9c5c..0df15f2 100644
--- a/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php
@@ -20,7 +20,7 @@ class QueryParameterTest extends UnitTestCase {
   /**
    * Test the getArgument() method.
    *
-   * @covers ::getArgument()
+   * @covers ::getArgument
    * @dataProvider providerGetArgument
    */
   public function testGetArgument($options, Request $request, $expected) {
diff --git a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
index cd0ee1d..b737bc7 100644
--- a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
@@ -35,7 +35,7 @@ public static function getInfo() {
    * @param string $message
    *   The message to provide as output for the test.
    *
-   * @covers ::set()
+   * @covers ::set
    */
   public function testSet($text, $message) {
     $returned = SafeMarkup::set($text);
@@ -63,7 +63,7 @@ public function providerSet() {
   /**
    * Tests SafeMarkup::set() and SafeMarkup::isSafe() with different providers.
    *
-   * @covers ::isSafe()
+   * @covers ::isSafe
    */
   public function testStrategy() {
     $returned = SafeMarkup::set('string0', 'html');
@@ -79,7 +79,7 @@ public function testStrategy() {
   /**
    * Tests SafeMarkup::setMultiple().
    *
-   * @covers ::setMultiple()
+   * @covers ::setMultiple
    */
   public function testSetMultiple() {
     $texts = array(
@@ -97,7 +97,7 @@ public function testSetMultiple() {
    *
    * Only TRUE may be passed in as the value.
    *
-   * @covers ::setMultiple()
+   * @covers ::setMultiple
    *
    * @expectedException \UnexpectedValueException
    */
diff --git a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
index faa4eac..98cffaf 100644
--- a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
@@ -498,7 +498,7 @@ public function testCheckNamedRouteWithUpcastedValues() {
   /**
    * Tests the checkNamedRoute with default values.
    *
-   * @covers \Drupal\Core\Access\AccessManager::checkNamedRoute()
+   * @covers \Drupal\Core\Access\AccessManager::checkNamedRoute
    */
   public function testCheckNamedRouteWithDefaultValue() {
     $this->routeCollection = new RouteCollection();
diff --git a/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php b/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php
index c4f59fa..8db1185 100644
--- a/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php
+++ b/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php
@@ -31,7 +31,7 @@ protected function setUp() {
   }
 
   /**
-   * @covers \Drupal\Core\Annotation\Translation::get()
+   * @covers \Drupal\Core\Annotation\Translation::get
    *
    * @dataProvider providerTestGet
    */
diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
index f1a7146..2c20ae0 100644
--- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
@@ -69,7 +69,7 @@ protected function setUp() {
   /**
    * Tests that basic functionality works for getLibraryByName.
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testBuildByExtensionSimple() {
     $this->moduleHandler->expects($this->atLeastOnce())
@@ -96,7 +96,7 @@ public function testBuildByExtensionSimple() {
   /**
    * Tests that a theme can be used instead of a module.
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testBuildByExtensionWithTheme() {
     $this->moduleHandler->expects($this->atLeastOnce())
@@ -120,7 +120,7 @@ public function testBuildByExtensionWithTheme() {
   /**
    * Tests that a module with a missing library file results in FALSE.
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testBuildByExtensionWithMissingLibraryFile() {
     $this->moduleHandler->expects($this->atLeastOnce())
@@ -140,7 +140,7 @@ public function testBuildByExtensionWithMissingLibraryFile() {
    *
    * @expectedException \Drupal\Core\Asset\Exception\InvalidLibraryFileException
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testInvalidLibrariesFile() {
     $this->moduleHandler->expects($this->atLeastOnce())
@@ -161,7 +161,7 @@ public function testInvalidLibrariesFile() {
    * @expectedException \Drupal\Core\Asset\Exception\IncompleteLibraryDefinitionException
    * @expectedExceptionMessage Incomplete library definition for 'example' in core/tests/Drupal/Tests/Core/Asset/library_test_files/example_module_missing_information.libraries.yml
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testBuildByExtensionWithMissingInformation() {
     $this->moduleHandler->expects($this->atLeastOnce())
@@ -179,7 +179,7 @@ public function testBuildByExtensionWithMissingInformation() {
   /**
    * Tests that the version property of external libraries is handled.
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testExternalLibraries() {
     $this->moduleHandler->expects($this->atLeastOnce())
@@ -201,7 +201,7 @@ public function testExternalLibraries() {
   /**
    * Ensures that CSS weights are taken into account properly.
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testDefaultCssWeights() {
     $this->moduleHandler->expects($this->atLeastOnce())
@@ -241,7 +241,7 @@ public function testDefaultCssWeights() {
    *
    * @expectedException \UnexpectedValueException
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testJsWithPositiveWeight() {
     $this->moduleHandler->expects($this->atLeastOnce())
@@ -259,7 +259,7 @@ public function testJsWithPositiveWeight() {
   /**
    * Tests a library with CSS/JavaScript and a setting.
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testLibraryWithCssJsSetting() {
     $this->moduleHandler->expects($this->atLeastOnce())
@@ -290,7 +290,7 @@ public function testLibraryWithCssJsSetting() {
   /**
    * Tests a library with dependencies.
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testLibraryWithDependencies() {
      $this->moduleHandler->expects($this->atLeastOnce())
@@ -313,7 +313,7 @@ public function testLibraryWithDependencies() {
   /**
    * Tests a library with a couple of data formats like full URL.
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testLibraryWithDataTypes() {
     $this->moduleHandler->expects($this->atLeastOnce())
@@ -345,7 +345,7 @@ public function testLibraryWithDataTypes() {
   /**
    * Tests a library with JavaScript-specific flags.
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testLibraryWithJavaScript() {
     $this->moduleHandler->expects($this->atLeastOnce())
@@ -370,7 +370,7 @@ public function testLibraryWithJavaScript() {
    * @expectedException \Drupal\Core\Asset\Exception\LibraryDefinitionMissingLicenseException
    * @expectedExceptionMessage Missing license information in library definition for 'no-license-info-but-remote' in core/tests/Drupal/Tests/Core/Asset/library_test_files/licenses_missing_information.libraries.yml: it has a remote, but no license.
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testLibraryThirdPartyWithMissingLicense() {
     $this->moduleHandler->expects($this->atLeastOnce())
@@ -388,7 +388,7 @@ public function testLibraryThirdPartyWithMissingLicense() {
   /**
    * Tests a library with various licenses, some GPL-compatible, some not.
    *
-   * @covers ::buildByExtension()
+   * @covers ::buildByExtension
    */
   public function testLibraryWithLicenses() {
     $this->moduleHandler->expects($this->atLeastOnce())
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
index c0cd87b..fb14691 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
@@ -99,7 +99,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    *
-   * @covers ::__construct()
+   * @covers ::__construct
    */
   protected function setUp() {
     parent::setUp();
@@ -169,8 +169,8 @@ protected function setUp() {
   }
 
   /**
-   * @covers ::create()
-   * @covers ::doCreate()
+   * @covers ::create
+   * @covers ::doCreate
    */
   public function testCreateWithPredefinedUuid() {
     $this->cacheBackend->expects($this->never())
@@ -192,8 +192,8 @@ public function testCreateWithPredefinedUuid() {
   }
 
   /**
-   * @covers ::create()
-   * @covers ::doCreate()
+   * @covers ::create
+   * @covers ::doCreate
    *
    * @return \Drupal\Core\Entity\EntityInterface
    */
@@ -219,8 +219,8 @@ public function testCreate() {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *
@@ -278,8 +278,8 @@ public function testSaveInsert(EntityInterface $entity) {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *
@@ -342,8 +342,8 @@ public function testSaveUpdate(EntityInterface $entity) {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    *
    * @depends testSaveInsert
    */
@@ -397,7 +397,7 @@ public function testSaveRename(ConfigEntityInterface $entity) {
   }
 
   /**
-   * @covers ::save()
+   * @covers ::save
    *
    * @expectedException \Drupal\Core\Entity\EntityMalformedException
    * @expectedExceptionMessage The entity does not have an ID.
@@ -411,8 +411,8 @@ public function testSaveInvalid() {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    *
    * @expectedException \Drupal\Core\Entity\EntityStorageException
    */
@@ -443,8 +443,8 @@ public function testSaveDuplicate() {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    *
    * @expectedException \Drupal\Core\Config\ConfigDuplicateUUIDException
    * @expectedExceptionMessage when this UUID is already used for
@@ -479,8 +479,8 @@ public function testSaveMismatch() {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    */
   public function testSaveNoMismatch() {
     $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
@@ -520,8 +520,8 @@ public function testSaveNoMismatch() {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    *
    * @expectedException \Drupal\Core\Config\ConfigDuplicateUUIDException
    * @expectedExceptionMessage when this entity already exists with UUID
@@ -579,10 +579,10 @@ public function testSaveChangedUuid() {
   }
 
   /**
-   * @covers ::load()
-   * @covers ::postLoad()
-   * @covers ::mapFromStorageRecords()
-   * @covers ::doLoadMultiple()
+   * @covers ::load
+   * @covers ::postLoad
+   * @covers ::mapFromStorageRecords
+   * @covers ::doLoadMultiple
    */
   public function testLoad() {
     $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
@@ -609,10 +609,10 @@ public function testLoad() {
   }
 
   /**
-   * @covers ::loadMultiple()
-   * @covers ::postLoad()
-   * @covers ::mapFromStorageRecords()
-   * @covers ::doLoadMultiple()
+   * @covers ::loadMultiple
+   * @covers ::postLoad
+   * @covers ::mapFromStorageRecords
+   * @covers ::doLoadMultiple
    */
   public function testLoadMultipleAll() {
     $foo_config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
@@ -657,10 +657,10 @@ public function testLoadMultipleAll() {
   }
 
   /**
-   * @covers ::loadMultiple()
-   * @covers ::postLoad()
-   * @covers ::mapFromStorageRecords()
-   * @covers ::doLoadMultiple()
+   * @covers ::loadMultiple
+   * @covers ::postLoad
+   * @covers ::mapFromStorageRecords
+   * @covers ::doLoadMultiple
    */
   public function testLoadMultipleIds() {
     $config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
@@ -689,14 +689,14 @@ public function testLoadMultipleIds() {
   }
 
   /**
-   * @covers ::loadRevision()
+   * @covers ::loadRevision
    */
   public function testLoadRevision() {
     $this->assertSame(NULL, $this->entityStorage->loadRevision(1));
   }
 
   /**
-   * @covers ::deleteRevision()
+   * @covers ::deleteRevision
    */
   public function testDeleteRevision() {
     $this->cacheBackend->expects($this->never())
@@ -706,8 +706,8 @@ public function testDeleteRevision() {
   }
 
   /**
-   * @covers ::delete()
-   * @covers ::doDelete()
+   * @covers ::delete
+   * @covers ::doDelete
    */
   public function testDelete() {
     $entities = array();
@@ -766,8 +766,8 @@ public function testDelete() {
   }
 
   /**
-   * @covers ::delete()
-   * @covers ::doDelete()
+   * @covers ::delete
+   * @covers ::doDelete
    */
   public function testDeleteNothing() {
     $this->moduleHandler->expects($this->never())
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
index 3ad97d3..0af505d 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
@@ -38,7 +38,7 @@ protected function setUpConfigEntityType($definition) {
    * Tests that we get an exception when the length of the config prefix that is
    * returned by getConfigPrefix() exceeds the maximum defined prefix length.
    *
-   * @covers ::getConfigPrefix()
+   * @covers ::getConfigPrefix
    */
   public function testConfigPrefixLengthExceeds() {
     $message_text = 'The configuration file name prefix @config_prefix exceeds the maximum character limit of @max_char.';
@@ -61,7 +61,7 @@ public function testConfigPrefixLengthExceeds() {
    * Tests that a valid config prefix returned by getConfigPrefix()
    * does not throw an exception and is formatted as expected.
    *
-   * @covers ::getConfigPrefix()
+   * @covers ::getConfigPrefix
    */
   public function testConfigPrefixLengthValid() {
     // A provider length of 24 and config_prefix length of 58 (+1 for the .)
diff --git a/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php b/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php
index e077f9c..a4c8af6 100644
--- a/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php
+++ b/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php
@@ -41,7 +41,7 @@ protected function setUp() {
   }
 
   /**
-   * @covers ::enhance()
+   * @covers ::enhance
    */
   public function testEnhance() {
     $route = new Route('/test/{id}/{literal}/{null}');
@@ -70,7 +70,7 @@ public function testEnhance() {
   }
 
   /**
-   * @covers ::copyRawVariables()
+   * @covers ::copyRawVariables
    */
   public function testCopyRawVariables() {
     $route = new Route('/test/{id}');
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php
index 2e7ab80..963c1a1 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php
@@ -46,7 +46,7 @@ protected function setUp() {
   /**
    * Tests the getForm() method.
    *
-   * @covers ::getForm()
+   * @covers ::getForm
    */
   public function testGetForm() {
     $form_controller = $this->getMock('Drupal\Core\Entity\EntityFormInterface');
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
index 35f8913..adfc714 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
@@ -35,7 +35,7 @@ protected function setUp() {
   /**
    * Tests the form ID generation.
    *
-   * @covers ::getFormId()
+   * @covers ::getFormId
    *
    * @dataProvider providerTestFormIds
    */
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
index 3b17502..933b7ed 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
@@ -188,7 +188,7 @@ protected function setUpEntityManager($definitions = array()) {
   /**
    * Tests the clearCachedDefinitions() method.
    *
-   * @covers ::clearCachedDefinitions()
+   * @covers ::clearCachedDefinitions
    *
    */
   public function testClearCachedDefinitions() {
@@ -209,7 +209,7 @@ public function testClearCachedDefinitions() {
   /**
    * Tests the getDefinition() method.
    *
-   * @covers ::getDefinition()
+   * @covers ::getDefinition
    *
    * @dataProvider providerTestGetDefinition
    */
@@ -246,7 +246,7 @@ public function providerTestGetDefinition() {
   /**
    * Tests the getDefinition() method with an invalid definition.
    *
-   * @covers ::getDefinition()
+   * @covers ::getDefinition
    *
    * @expectedException \Drupal\Component\Plugin\Exception\PluginNotFoundException
    * @expectedExceptionMessage The "pear" entity type does not exist.
@@ -260,7 +260,7 @@ public function testGetDefinitionInvalidException() {
   /**
    * Tests the hasHandler() method.
    *
-   * @covers ::hasHandler()
+   * @covers ::hasHandler
    *
    * @dataProvider providerTestHasHandler
    */
@@ -301,7 +301,7 @@ public function providerTestHasHandler() {
   /**
    * Tests the getStorage() method.
    *
-   * @covers ::getStorage()
+   * @covers ::getStorage
    */
   public function testGetStorage() {
     $class = $this->getTestHandlerClass();
@@ -318,7 +318,7 @@ public function testGetStorage() {
   /**
    * Tests the getListBuilder() method.
    *
-   * @covers ::getListBuilder()
+   * @covers ::getListBuilder
    */
   public function testGetListBuilder() {
     $class = $this->getTestHandlerClass();
@@ -335,7 +335,7 @@ public function testGetListBuilder() {
   /**
    * Tests the getViewBuilder() method.
    *
-   * @covers ::getViewBuilder()
+   * @covers ::getViewBuilder
    */
   public function testGetViewBuilder() {
     $class = $this->getTestHandlerClass();
@@ -352,7 +352,7 @@ public function testGetViewBuilder() {
   /**
    * Tests the getAccessControlHandler() method.
    *
-   * @covers ::getAccessControlHandler()
+   * @covers ::getAccessControlHandler
    */
   public function testGetAccessControlHandler() {
     $class = $this->getTestHandlerClass();
@@ -369,7 +369,7 @@ public function testGetAccessControlHandler() {
   /**
    * Tests the getFormObject() method.
    *
-   * @covers ::getFormObject()
+   * @covers ::getFormObject
    */
   public function testGetFormObject() {
     $apple = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
@@ -401,7 +401,7 @@ public function testGetFormObject() {
   /**
    * Tests the getFormObject() method with an invalid operation.
    *
-   * @covers ::getFormObject()
+   * @covers ::getFormObject
    *
    * @expectedException \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
    */
@@ -419,7 +419,7 @@ public function testGetFormObjectInvalidOperation() {
   /**
    * Tests the getHandler() method.
    *
-   * @covers ::getHandler()
+   * @covers ::getHandler
    */
   public function testGetHandler() {
     $class = $this->getTestHandlerClass();
@@ -441,7 +441,7 @@ public function testGetHandler() {
   /**
    * Tests the getHandler() method when no controller is defined.
    *
-   * @covers ::getHandler()
+   * @covers ::getHandler
    *
    * @expectedException \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
    */
@@ -458,8 +458,8 @@ public function testGetHandlerMissingHandler() {
   /**
    * Tests the getBaseFieldDefinitions() method.
    *
-   * @covers ::getBaseFieldDefinitions()
-   * @covers ::buildBaseFieldDefinitions()
+   * @covers ::getBaseFieldDefinitions
+   * @covers ::buildBaseFieldDefinitions
    */
   public function testGetBaseFieldDefinitions() {
     $field_definition = $this->setUpEntityWithFieldDefinition();
@@ -471,8 +471,8 @@ public function testGetBaseFieldDefinitions() {
   /**
    * Tests the getFieldDefinitions() method.
    *
-   * @covers ::getFieldDefinitions()
-   * @covers ::buildBundleFieldDefinitions()
+   * @covers ::getFieldDefinitions
+   * @covers ::buildBundleFieldDefinitions
    */
   public function testGetFieldDefinitions() {
     $field_definition = $this->setUpEntityWithFieldDefinition();
@@ -484,8 +484,8 @@ public function testGetFieldDefinitions() {
   /**
    * Tests the getFieldStorageDefinitions() method.
    *
-   * @covers ::getFieldStorageDefinitions()
-   * @covers ::buildFieldStorageDefinitions()
+   * @covers ::getFieldStorageDefinitions
+   * @covers ::buildFieldStorageDefinitions
    */
   public function testGetFieldStorageDefinitions() {
     $field_definition = $this->setUpEntityWithFieldDefinition(TRUE);
@@ -517,7 +517,7 @@ public function testGetFieldStorageDefinitions() {
   /**
    * Tests the getBaseFieldDefinitions() method with caching.
    *
-   * @covers ::getBaseFieldDefinitions()
+   * @covers ::getBaseFieldDefinitions
    */
   public function testGetBaseFieldDefinitionsWithCaching() {
     $field_definition = $this->setUpEntityWithFieldDefinition();
@@ -551,7 +551,7 @@ public function testGetBaseFieldDefinitionsWithCaching() {
   /**
    * Tests the getFieldDefinitions() method with caching.
    *
-   * @covers ::getFieldDefinitions()
+   * @covers ::getFieldDefinitions
    */
   public function testGetFieldDefinitionsWithCaching() {
     $field_definition = $this->setUpEntityWithFieldDefinition(FALSE, 'id', 0);
@@ -591,7 +591,7 @@ public function testGetFieldDefinitionsWithCaching() {
   /**
    * Tests the getFieldStorageDefinitions() method with caching.
    *
-   * @covers ::getFieldStorageDefinitions()
+   * @covers ::getFieldStorageDefinitions
    */
   public function testGetFieldStorageDefinitionsWithCaching() {
     $field_definition = $this->setUpEntityWithFieldDefinition(TRUE, 'id', 0);
@@ -652,8 +652,8 @@ public function testGetFieldStorageDefinitionsWithCaching() {
   /**
    * Tests the getBaseFieldDefinitions() method with an invalid definition.
    *
-   * @covers ::getBaseFieldDefinitions()
-   * @covers ::buildBaseFieldDefinitions()
+   * @covers ::getBaseFieldDefinitions
+   * @covers ::buildBaseFieldDefinitions
    *
    * @expectedException \LogicException
    */
@@ -669,8 +669,8 @@ public function testGetBaseFieldDefinitionsInvalidDefinition() {
   /**
    * Tests that getFieldDefinitions() method sets the 'provider' definition key.
    *
-   * @covers ::getFieldDefinitions()
-   * @covers ::buildBundleFieldDefinitions()
+   * @covers ::getFieldDefinitions
+   * @covers ::buildBundleFieldDefinitions
    */
   public function testGetFieldDefinitionsProvider() {
     $this->setUpEntityWithFieldDefinition(TRUE);
@@ -767,7 +767,7 @@ protected function setUpEntityWithFieldDefinition($custom_invoke_all = FALSE, $f
   /**
    * Tests the clearCachedFieldDefinitions() method.
    *
-   * @covers ::clearCachedFieldDefinitions()
+   * @covers ::clearCachedFieldDefinitions
    */
   public function testClearCachedFieldDefinitions() {
     $this->setUpEntityManager();
@@ -783,7 +783,7 @@ public function testClearCachedFieldDefinitions() {
   /**
    * Tests the clearCachedBundles() method.
    *
-   * @covers ::clearCachedBundles()
+   * @covers ::clearCachedBundles
    */
   public function testClearCachedBundles() {
     $this->setUpEntityManager();
@@ -797,7 +797,7 @@ public function testClearCachedBundles() {
   /**
    * Tests the getBundleInfo() method.
    *
-   * @covers ::getBundleInfo()
+   * @covers ::getBundleInfo
    *
    * @dataProvider providerTestGetBundleInfo
    */
@@ -844,7 +844,7 @@ public function providerTestGetBundleInfo() {
   /**
    * Tests the getAllBundleInfo() method.
    *
-   * @covers ::getAllBundleInfo()
+   * @covers ::getAllBundleInfo
    */
   public function testGetAllBundleInfo() {
     $apple = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
@@ -914,7 +914,7 @@ public function testGetAllBundleInfo() {
   /**
    * Tests the getEntityTypeLabels() method.
    *
-   * @covers ::getEntityTypeLabels()
+   * @covers ::getEntityTypeLabels
    */
   public function testGetEntityTypeLabels() {
     $apple = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
@@ -940,7 +940,7 @@ public function testGetEntityTypeLabels() {
   /**
    * Tests the getTranslationFromContext() method.
    *
-   * @covers ::getTranslationFromContext()
+   * @covers ::getTranslationFromContext
    */
   public function testGetTranslationFromContext() {
     $this->setUpEntityManager();
@@ -1283,7 +1283,7 @@ public function testGetFieldMapByFieldType() {
   }
 
   /**
-   * @covers ::getEntityTypeFromClass()
+   * @covers ::getEntityTypeFromClass
    */
   public function testGetEntityTypeFromClass() {
     $apple = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
@@ -1312,7 +1312,7 @@ public function testGetEntityTypeFromClass() {
   }
 
   /**
-   * @covers ::getEntityTypeFromClass()
+   * @covers ::getEntityTypeFromClass
    *
    * @expectedException \Drupal\Core\Entity\Exception\NoCorrespondingEntityClassException
    * @expectedExceptionMessage The \Drupal\pear\Entity\Pear class does not correspond to an entity type.
@@ -1335,7 +1335,7 @@ public function testGetEntityTypeFromClassNoMatch() {
   }
 
   /**
-   * @covers ::getEntityTypeFromClass()
+   * @covers ::getEntityTypeFromClass
    *
    * @expectedException \Drupal\Core\Entity\Exception\AmbiguousEntityClassException
    * @expectedExceptionMessage Multiple entity types found for \Drupal\apple\Entity\Apple.
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
index 289aa22..edd8279 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
@@ -53,7 +53,7 @@ class EntityResolverManagerTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    *
-   * @covers ::__construct()
+   * @covers ::__construct
    */
   protected function setUp() {
     $this->entityManager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
@@ -69,7 +69,7 @@ protected function setUp() {
    * We don't have any entity type involved, so we don't need any upcasting.
    *
    * @covers ::setRouteOptions
-   * @covers ::getControllerClass
+   * @covers ::getController
    *
    * @dataProvider providerTestSetRouteOptionsWithStandardRoute
    */
@@ -97,8 +97,8 @@ public function providerTestSetRouteOptionsWithStandardRoute() {
   /**
    * Tests setRouteOptions() with a controller with a non entity argument.
    *
-   * @covers ::setRouteOptions()
-   * @covers ::getControllerClass()
+   * @covers ::setRouteOptions
+   * @covers ::getController
    *
    * @dataProvider providerTestSetRouteOptionsWithStandardRouteWithArgument
    */
@@ -127,8 +127,8 @@ public function providerTestSetRouteOptionsWithStandardRouteWithArgument() {
   /**
    * Tests setRouteOptions() with a _content default.
    *
-   * @covers ::setRouteOptions()
-   * @covers ::getControllerClass()
+   * @covers ::setRouteOptions
+   * @covers ::getController
    *
    * @dataProvider providerTestSetRouteOptionsWithContentController
    */
@@ -157,10 +157,10 @@ public function providerTestSetRouteOptionsWithContentController() {
   /**
    * Tests setRouteOptions() with an entity type parameter.
    *
-   * @covers ::setRouteOptions()
-   * @covers ::getControllerClass()
-   * @covers ::getEntityTypes()
-   * @covers ::setParametersFromReflection()
+   * @covers ::setRouteOptions
+   * @covers ::getController
+   * @covers ::getEntityTypes
+   * @covers ::setParametersFromReflection
    *
    * @dataProvider providerTestSetRouteOptionsWithEntityTypeNoUpcasting
    */
@@ -190,10 +190,10 @@ public function providerTestSetRouteOptionsWithEntityTypeNoUpcasting() {
   /**
    * Tests setRouteOptions() with an entity type parameter, upcasting.
    *
-   * @covers ::setRouteOptions()
-   * @covers ::getControllerClass()
-   * @covers ::getEntityTypes()
-   * @covers ::setParametersFromReflection()
+   * @covers ::setRouteOptions
+   * @covers ::getController
+   * @covers ::getEntityTypes
+   * @covers ::setParametersFromReflection
    *
    * @dataProvider providerTestSetRouteOptionsWithEntityTypeUpcasting
    */
@@ -224,10 +224,10 @@ public function providerTestSetRouteOptionsWithEntityTypeUpcasting() {
   /**
    * Tests setRouteOptions() with an entity type parameter form.
    *
-   * @covers ::setRouteOptions()
-   * @covers ::getControllerClass()
-   * @covers ::getEntityTypes()
-   * @covers ::setParametersFromReflection()
+   * @covers ::setRouteOptions
+   * @covers ::getController
+   * @covers ::getEntityTypes
+   * @covers ::setParametersFromReflection
    */
   public function testSetRouteOptionsWithEntityFormUpcasting() {
     $this->setupEntityTypes();
@@ -246,10 +246,10 @@ public function testSetRouteOptionsWithEntityFormUpcasting() {
   /**
    * Tests setRouteOptions() with entity form upcasting, no create method.
    *
-   * @covers ::setRouteOptions()
-   * @covers ::getControllerClass()
-   * @covers ::getEntityTypes()
-   * @covers ::setParametersFromReflection()
+   * @covers ::setRouteOptions
+   * @covers ::getController
+   * @covers ::getEntityTypes
+   * @covers ::setParametersFromReflection
    */
   public function testSetRouteOptionsWithEntityUpcastingNoCreate() {
     $this->setupEntityTypes();
@@ -268,10 +268,10 @@ public function testSetRouteOptionsWithEntityUpcastingNoCreate() {
   /**
    * Tests setRouteOptions() with an form parameter without interface.
    *
-   * @covers ::setRouteOptions()
-   * @covers ::getControllerClass()
-   * @covers ::getEntityTypes()
-   * @covers ::setParametersFromReflection()
+   * @covers ::setRouteOptions
+   * @covers ::getController
+   * @covers ::getEntityTypes
+   * @covers ::setParametersFromReflection
    */
   public function testSetRouteOptionsWithEntityFormNoUpcasting() {
     $this->setupEntityTypes();
@@ -289,11 +289,11 @@ public function testSetRouteOptionsWithEntityFormNoUpcasting() {
   /**
    * Tests setRouteOptions() with an _entity_view route.
    *
-   * @covers ::setRouteOptions()
-   * @covers ::getControllerClass()
-   * @covers ::getEntityTypes()
-   * @covers ::setParametersFromReflection()
-   * @covers ::setParametersFromEntityInformation()
+   * @covers ::setRouteOptions
+   * @covers ::getController
+   * @covers ::getEntityTypes
+   * @covers ::setParametersFromReflection
+   * @covers ::setParametersFromEntityInformation
    */
   public function testSetRouteOptionsWithEntityViewRouteAndManualParameters() {
     $this->setupEntityTypes();
@@ -321,11 +321,11 @@ public function testSetRouteOptionsWithEntityViewRouteAndManualParameters() {
   /**
    * Tests setRouteOptions() with an _entity_view route.
    *
-   * @covers ::setRouteOptions()
-   * @covers ::getControllerClass()
-   * @covers ::getEntityTypes()
-   * @covers ::setParametersFromReflection()
-   * @covers ::setParametersFromEntityInformation()
+   * @covers ::setRouteOptions
+   * @covers ::getController
+   * @covers ::getEntityTypes
+   * @covers ::setParametersFromReflection
+   * @covers ::setParametersFromEntityInformation
    */
   public function testSetRouteOptionsWithEntityViewRoute() {
     $this->setupEntityTypes();
@@ -343,11 +343,11 @@ public function testSetRouteOptionsWithEntityViewRoute() {
   /**
    * Tests setRouteOptions() with an _entity_list route.
    *
-   * @covers ::setRouteOptions()
-   * @covers ::getControllerClass()
-   * @covers ::getEntityTypes()
-   * @covers ::setParametersFromReflection()
-   * @covers ::setParametersFromEntityInformation()
+   * @covers ::setRouteOptions
+   * @covers ::getController
+   * @covers ::getEntityTypes
+   * @covers ::setParametersFromReflection
+   * @covers ::setParametersFromEntityInformation
    */
   public function testSetRouteOptionsWithEntityListRoute() {
     $this->setupEntityTypes();
@@ -365,11 +365,11 @@ public function testSetRouteOptionsWithEntityListRoute() {
   /**
    * Tests setRouteOptions() with an _entity_form route.
    *
-   * @covers ::setRouteOptions()
-   * @covers ::getControllerClass()
-   * @covers ::getEntityTypes()
-   * @covers ::setParametersFromReflection()
-   * @covers ::setParametersFromEntityInformation()
+   * @covers ::setRouteOptions
+   * @covers ::getController
+   * @covers ::getEntityTypes
+   * @covers ::setParametersFromReflection
+   * @covers ::setParametersFromEntityInformation
    */
   public function testSetRouteOptionsWithEntityFormRoute() {
     $this->setupEntityTypes();
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
index d1e8114..ba6f046 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
@@ -47,7 +47,7 @@ protected function setUp() {
   /**
    * Tests the urlInfo() method.
    *
-   * @covers ::urlInfo()
+   * @covers ::urlInfo
    *
    * @dataProvider providerTestUrlInfo
    */
@@ -75,7 +75,7 @@ public function providerTestUrlInfo() {
   /**
    * Tests the urlInfo() method with an invalid link template.
    *
-   * @covers ::urlInfo()
+   * @covers ::urlInfo
    *
    * @expectedException \Drupal\Core\Entity\Exception\UndefinedLinkTemplateException
    * @expectedExceptionMessage No link template "canonical" found for the "test_entity_type" entity type
@@ -142,7 +142,7 @@ protected function getTestUrlInfo(EntityInterface $entity, $link_template) {
    *
    * @see \Drupal\Core\Entity\EntityInterface::isNew()
    *
-   * @covers ::urlInfo()
+   * @covers ::urlInfo
    *
    * @expectedException \Drupal\Core\Entity\EntityMalformedException
    */
@@ -154,7 +154,7 @@ public function testUrlInfoForNewEntity() {
   /**
    * Tests the _url() method.
    *
-   * @covers ::url()
+   * @covers ::url
    */
   public function testUrl() {
     $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
@@ -201,7 +201,7 @@ public function testUrl() {
   /**
    * Tests the getPathByAlias() method.
    *
-   * @covers ::getSystemPath()
+   * @covers ::getSystemPath
    */
   public function testGetSystemPath() {
     $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
@@ -233,8 +233,8 @@ public function testGetSystemPath() {
   /**
    * Tests the retrieval of link templates.
    *
-   * @covers ::hasLinkTemplate()
-   * @covers ::linkTemplates()
+   * @covers ::hasLinkTemplate
+   * @covers ::linkTemplates
    *
    * @dataProvider providerTestLinkTemplates
    */
diff --git a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
index 5dc9fcf..ee10e54 100644
--- a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
@@ -85,7 +85,7 @@ protected function setUp() {
   /**
    * Prepares the key value entity storage.
    *
-   * @covers ::__construct()
+   * @covers ::__construct
    *
    * @param string $uuid_key
    *   (optional) The entity key used for the UUID. Defaults to 'uuid'.
@@ -136,8 +136,8 @@ protected function setUpKeyValueEntityStorage($uuid_key = 'uuid') {
   }
 
   /**
-   * @covers ::create()
-   * @covers ::doCreate()
+   * @covers ::create
+   * @covers ::doCreate
    */
   public function testCreateWithPredefinedUuid() {
     $this->entityType->expects($this->once())
@@ -161,8 +161,8 @@ public function testCreateWithPredefinedUuid() {
   }
 
   /**
-   * @covers ::create()
-   * @covers ::doCreate()
+   * @covers ::create
+   * @covers ::doCreate
    */
   public function testCreateWithoutUuidKey() {
     // Set up the entity storage to expect no UUID key.
@@ -187,8 +187,8 @@ public function testCreateWithoutUuidKey() {
   }
 
   /**
-   * @covers ::create()
-   * @covers ::doCreate()
+   * @covers ::create
+   * @covers ::doCreate
    *
    * @return \Drupal\Core\Entity\EntityInterface
    */
@@ -217,8 +217,8 @@ public function testCreate() {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *
@@ -267,8 +267,8 @@ public function testSaveInsert(EntityInterface $entity) {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *
@@ -323,8 +323,8 @@ public function testSaveUpdate(EntityInterface $entity) {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    */
   public function testSaveConfigEntity() {
     $this->setUpKeyValueEntityStorage();
@@ -358,8 +358,8 @@ public function testSaveConfigEntity() {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    *
    * @depends testSaveConfigEntity
    */
@@ -407,8 +407,8 @@ public function testSaveRenameConfigEntity(ConfigEntityInterface $entity) {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    */
   public function testSaveContentEntity() {
     $this->entityType->expects($this->any())
@@ -442,8 +442,8 @@ public function testSaveContentEntity() {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    *
    * @expectedException \Drupal\Core\Entity\EntityMalformedException
    * @expectedExceptionMessage The entity does not have an ID.
@@ -462,8 +462,8 @@ public function testSaveInvalid() {
   }
 
   /**
-   * @covers ::save()
-   * @covers ::doSave()
+   * @covers ::save
+   * @covers ::doSave
    *
    * @expectedException \Drupal\Core\Entity\EntityStorageException
    * @expectedExceptionMessage test_entity_type entity with ID foo already exists
@@ -484,8 +484,8 @@ public function testSaveDuplicate() {
   }
 
   /**
-   * @covers ::load()
-   * @covers ::postLoad()
+   * @covers ::load
+   * @covers ::postLoad
    */
   public function testLoad() {
     $entity = $this->getMockEntity();
@@ -512,7 +512,7 @@ public function testLoad() {
   }
 
   /**
-   * @covers ::load()
+   * @covers ::load
    */
   public function testLoadMissingEntity() {
     $this->entityType->expects($this->once())
@@ -530,10 +530,10 @@ public function testLoadMissingEntity() {
   }
 
   /**
-   * @covers ::loadMultiple()
-   * @covers ::postLoad()
-   * @covers ::mapFromStorageRecords()
-   * @covers ::doLoadMultiple()
+   * @covers ::loadMultiple
+   * @covers ::postLoad
+   * @covers ::mapFromStorageRecords
+   * @covers ::doLoadMultiple
    */
   public function testLoadMultipleAll() {
     $expected['foo'] = $this->getMockEntity('Drupal\Core\Entity\Entity', array(array('id' => 'foo')));
@@ -563,10 +563,10 @@ public function testLoadMultipleAll() {
   }
 
   /**
-   * @covers ::loadMultiple()
-   * @covers ::postLoad()
-   * @covers ::mapFromStorageRecords()
-   * @covers ::doLoadMultiple()
+   * @covers ::loadMultiple
+   * @covers ::postLoad
+   * @covers ::mapFromStorageRecords
+   * @covers ::doLoadMultiple
    */
   public function testLoadMultipleIds() {
     $entity = $this->getMockEntity('Drupal\Core\Entity\Entity', array(array('id' => 'foo')));
@@ -596,7 +596,7 @@ public function testLoadMultipleIds() {
   }
 
   /**
-   * @covers ::loadRevision()
+   * @covers ::loadRevision
    */
   public function testLoadRevision() {
     $this->setUpKeyValueEntityStorage();
@@ -605,7 +605,7 @@ public function testLoadRevision() {
   }
 
   /**
-   * @covers ::deleteRevision()
+   * @covers ::deleteRevision
    */
   public function testDeleteRevision() {
     $this->setUpKeyValueEntityStorage();
@@ -614,8 +614,8 @@ public function testDeleteRevision() {
   }
 
   /**
-   * @covers ::delete()
-   * @covers ::doDelete()
+   * @covers ::delete
+   * @covers ::doDelete
    */
   public function testDelete() {
     $entities['foo'] = $this->getMockEntity('Drupal\Core\Entity\Entity', array(array('id' => 'foo')));
@@ -657,8 +657,8 @@ public function testDelete() {
   }
 
   /**
-   * @covers ::delete()
-   * @covers ::doDelete()
+   * @covers ::delete
+   * @covers ::doDelete
    */
   public function testDeleteNothing() {
     $this->setUpKeyValueEntityStorage();
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
index e647387..007efc3 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
@@ -18,7 +18,7 @@ class DefaultTableMappingTest extends UnitTestCase {
   /**
    * Tests DefaultTableMapping::getTableNames().
    *
-   * @covers ::getTableNames()
+   * @covers ::getTableNames
    */
   public function testGetTableNames() {
     // The storage definitions are only used in getColumnNames() so we do not
@@ -43,13 +43,13 @@ public function testGetTableNames() {
   /**
    * Tests DefaultTableMapping::getAllColumns().
    *
-   * @covers ::__construct()
-   * @covers ::getAllColumns()
-   * @covers ::getFieldNames()
-   * @covers ::getColumnNames()
-   * @covers ::setFieldNames()
-   * @covers ::getExtraColumns()
-   * @covers ::setExtraColumns()
+   * @covers ::__construct
+   * @covers ::getAllColumns
+   * @covers ::getFieldNames
+   * @covers ::getColumnNames
+   * @covers ::setFieldNames
+   * @covers ::getExtraColumns
+   * @covers ::setExtraColumns
    */
   public function testGetAllColumns() {
     // Set up single-column and multi-column definitions.
@@ -154,8 +154,8 @@ public function testGetAllColumns() {
   /**
    * Tests DefaultTableMapping::getFieldNames().
    *
-   * @covers ::getFieldNames()
-   * @covers ::setFieldNames()
+   * @covers ::getFieldNames
+   * @covers ::setFieldNames
    */
   public function testGetFieldNames() {
     // The storage definitions are only used in getColumnNames() so we do not
@@ -184,8 +184,8 @@ public function testGetFieldNames() {
   /**
    * Tests DefaultTableMapping::getColumnNames().
    *
-   * @covers ::__construct()
-   * @covers ::getColumnNames()
+   * @covers ::__construct
+   * @covers ::getColumnNames
    */
   public function testGetColumnNames() {
     $definitions['test'] = $this->setUpDefinition('test', []);
@@ -207,8 +207,8 @@ public function testGetColumnNames() {
   /**
    * Tests DefaultTableMapping::getExtraColumns().
    *
-   * @covers ::getExtraColumns()
-   * @covers ::setExtraColumns()
+   * @covers ::getExtraColumns
+   * @covers ::setExtraColumns
    */
   public function testGetExtraColumns() {
     // The storage definitions are only used in getColumnNames() so we do not
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
index 222dd13..3d55d91 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
@@ -80,18 +80,18 @@ protected function setUp() {
   /**
    * Tests the schema for non-revisionable, non-translatable entities.
    *
-   * @covers ::__construct()
-   * @covers ::getEntitySchemaTables()
-   * @covers ::initializeBaseTable()
-   * @covers ::addTableDefaults()
-   * @covers ::getEntityIndexName()
-   * @covers ::getFieldIndexes()
-   * @covers ::getFieldUniqueKeys()
-   * @covers ::getFieldForeignKeys()
-   * @covers ::getFieldSchemaData()
-   * @covers ::addDefaultLangcodeSchema()
-   * @covers ::processBaseTable()
-   * @covers ::processIdentifierSchema()
+   * @covers ::__construct
+   * @covers ::getEntitySchemaTables
+   * @covers ::initializeBaseTable
+   * @covers ::addTableDefaults
+   * @covers ::getEntityIndexName
+   * @covers ::getFieldIndexes
+   * @covers ::getFieldUniqueKeys
+   * @covers ::getFieldForeignKeys
+   * @covers ::getFieldSchemaData
+   * @covers ::addDefaultLangcodeSchema
+   * @covers ::processBaseTable
+   * @covers ::processIdentifierSchema
    */
   public function testGetSchemaBase() {
     $this->entityType = new ContentEntityType(array(
@@ -386,14 +386,14 @@ public function testGetSchemaBase() {
   /**
    * Tests the schema for revisionable, non-translatable entities.
    *
-   * @covers ::__construct()
-   * @covers ::getEntitySchemaTables()
-   * @covers ::initializeBaseTable()
-   * @covers ::initializeRevisionTable()
-   * @covers ::addTableDefaults()
-   * @covers ::getEntityIndexName()
-   * @covers ::processRevisionTable()
-   * @covers ::processIdentifierSchema()
+   * @covers ::__construct
+   * @covers ::getEntitySchemaTables
+   * @covers ::initializeBaseTable
+   * @covers ::initializeRevisionTable
+   * @covers ::addTableDefaults
+   * @covers ::getEntityIndexName
+   * @covers ::processRevisionTable
+   * @covers ::processIdentifierSchema
    */
   public function testGetSchemaRevisionable() {
     $this->entityType = new ContentEntityType(array(
@@ -485,12 +485,12 @@ public function testGetSchemaRevisionable() {
   /**
    * Tests the schema for non-revisionable, translatable entities.
    *
-   * @covers ::__construct()
-   * @covers ::getEntitySchemaTables()
-   * @covers ::initializeDataTable()
-   * @covers ::addTableDefaults()
-   * @covers ::getEntityIndexName()
-   * @covers ::processDataTable()
+   * @covers ::__construct
+   * @covers ::getEntitySchemaTables
+   * @covers ::initializeDataTable
+   * @covers ::addTableDefaults
+   * @covers ::getEntityIndexName
+   * @covers ::processDataTable
    */
   public function testGetSchemaTranslatable() {
     $this->entityType = new ContentEntityType(array(
@@ -574,13 +574,13 @@ public function testGetSchemaTranslatable() {
   /**
    * Tests the schema for revisionable, translatable entities.
    *
-   * @covers ::__construct()
-   * @covers ::getEntitySchemaTables()
-   * @covers ::initializeDataTable()
-   * @covers ::addTableDefaults()
-   * @covers ::getEntityIndexName()
-   * @covers ::initializeRevisionDataTable()
-   * @covers ::processRevisionDataTable()
+   * @covers ::__construct
+   * @covers ::getEntitySchemaTables
+   * @covers ::initializeDataTable
+   * @covers ::addTableDefaults
+   * @covers ::getEntityIndexName
+   * @covers ::initializeRevisionDataTable
+   * @covers ::processRevisionDataTable
    */
   public function testGetSchemaRevisionableTranslatable() {
     $this->entityType = new ContentEntityType(array(
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
index d86fe33..3589a63 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
@@ -115,8 +115,8 @@ protected function setUp() {
    *   The expected return value of
    *   SqlContentEntityStorage::getBaseTable().
    *
-   * @covers ::__construct()
-   * @covers ::getBaseTable()
+   * @covers ::__construct
+   * @covers ::getBaseTable
    *
    * @dataProvider providerTestGetBaseTable
    */
@@ -157,8 +157,8 @@ public function providerTestGetBaseTable() {
    *   The expected return value of
    *   SqlContentEntityStorage::getRevisionTable().
    *
-   * @cover ::__construct()
-   * @covers ::getRevisionTable()
+   * @covers ::__construct
+   * @covers ::getRevisionTable
    *
    * @dataProvider providerTestGetRevisionTable
    */
@@ -197,8 +197,8 @@ public function providerTestGetRevisionTable() {
   /**
    * Tests SqlContentEntityStorage::getDataTable().
    *
-   * @cover ::__construct()
-   * @covers ::getDataTable()
+   * @covers ::__construct
+   * @covers ::getDataTable
    */
   public function testGetDataTable() {
     $this->entityType->expects($this->once())
@@ -222,8 +222,8 @@ public function testGetDataTable() {
    *   The expected return value of
    *   SqlContentEntityStorage::getRevisionDataTable().
    *
-   * @cover ::__construct()
-   * @covers ::getRevisionDataTable()
+   * @covers ::__construct
+   * @covers ::getRevisionDataTable
    *
    * @dataProvider providerTestGetRevisionDataTable
    */
@@ -269,9 +269,9 @@ public function providerTestGetRevisionDataTable() {
   /**
    * Tests ContentEntityDatabaseStorage::onEntityTypeCreate().
    *
-   * @covers ::__construct()
-   * @covers ::onEntityTypeCreate()
-   * @covers ::getTableMapping()
+   * @covers ::__construct
+   * @covers ::onEntityTypeCreate
+   * @covers ::getTableMapping
    */
   public function testOnEntityTypeCreate() {
     $columns = array(
@@ -359,8 +359,8 @@ public function testOnEntityTypeCreate() {
   /**
    * Tests getTableMapping() with an empty entity type.
    *
-   * @covers ::__construct()
-   * @covers ::getTableMapping()
+   * @covers ::__construct
+   * @covers ::getTableMapping
    */
   public function testGetTableMappingEmpty() {
     $this->setUpEntityStorage();
@@ -377,8 +377,8 @@ public function testGetTableMappingEmpty() {
    * @param string[] $entity_keys
    *   A map of entity keys to use for the mocked entity type.
    *
-   * @covers ::__construct()
-   * @covers ::getTableMapping()
+   * @covers ::__construct
+   * @covers ::getTableMapping
    *
    * @dataProvider providerTestGetTableMappingSimple()
    */
@@ -409,8 +409,8 @@ public function testGetTableMappingSimple(array $entity_keys) {
    * @param string[] $entity_keys
    *   A map of entity keys to use for the mocked entity type.
    *
-   * @covers ::__construct()
-   * @covers ::getTableMapping()
+   * @covers ::__construct
+   * @covers ::getTableMapping
    *
    * @dataProvider providerTestGetTableMappingSimple()
    */
@@ -464,8 +464,8 @@ public function providerTestGetTableMappingSimple() {
    * @param string[] $entity_keys
    *   A map of entity keys to use for the mocked entity type.
    *
-   * @covers ::__construct()
-   * @covers ::getTableMapping()
+   * @covers ::__construct
+   * @covers ::getTableMapping
    *
    * @dataProvider providerTestGetTableMappingSimple()
    */
@@ -512,8 +512,8 @@ public function testGetTableMappingRevisionable(array $entity_keys) {
    * @param string[] $entity_keys
    *   A map of entity keys to use for the mocked entity type.
    *
-   * @covers ::__construct()
-   * @covers ::getTableMapping()
+   * @covers ::__construct
+   * @covers ::getTableMapping
    *
    * @dataProvider providerTestGetTableMappingSimple()
    */
@@ -586,8 +586,8 @@ public function testGetTableMappingRevisionableWithFields(array $entity_keys) {
    * @param string[] $entity_keys
    *   A map of entity keys to use for the mocked entity type.
    *
-   * @covers ::__construct()
-   * @covers ::getTableMapping()
+   * @covers ::__construct
+   * @covers ::getTableMapping
    *
    * @dataProvider providerTestGetTableMappingSimple()
    */
@@ -642,8 +642,8 @@ public function testGetTableMappingTranslatable(array $entity_keys) {
    * @param string[] $entity_keys
    *   A map of entity keys to use for the mocked entity type.
    *
-   * @covers ::__construct()
-   * @covers ::getTableMapping()
+   * @covers ::__construct
+   * @covers ::getTableMapping
    *
    * @dataProvider providerTestGetTableMappingSimple()
    */
@@ -702,8 +702,8 @@ public function testGetTableMappingTranslatableWithFields(array $entity_keys) {
    * @param string[] $entity_keys
    *   A map of entity keys to use for the mocked entity type.
    *
-   * @covers ::__construct()
-   * @covers ::getTableMapping()
+   * @covers ::__construct
+   * @covers ::getTableMapping
    *
    * @dataProvider providerTestGetTableMappingSimple()
    */
@@ -802,8 +802,8 @@ public function testGetTableMappingRevisionableTranslatable(array $entity_keys)
    * @param string[] $entity_keys
    *   A map of entity keys to use for the mocked entity type.
    *
-   * @covers ::__construct()
-   * @covers ::getTableMapping()
+   * @covers ::__construct
+   * @covers ::getTableMapping
    *
    * @dataProvider providerTestGetTableMappingSimple()
    */
@@ -927,7 +927,7 @@ public function testGetTableMappingRevisionableTranslatableWithFields(array $ent
   }
 
   /**
-   * @covers ::create()
+   * @covers ::create
    */
   public function testCreate() {
     $language_manager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
index 02acb66..1c67205 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
@@ -44,8 +44,8 @@ protected function setUp() {
   /**
    * Tests altering and finished event.
    *
-   * @covers ::onRouteAlter()
-   * @covers ::onRouteFinished()
+   * @covers ::onRouteAlter
+   * @covers ::onRouteFinished
    */
   public function testSubscribing() {
     $route_collection = new RouteCollection();
diff --git a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
index 493e201..bf89c74 100644
--- a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
@@ -444,7 +444,7 @@ public function testGetHookInfo() {
   /**
    * Test internal implementation cache reset.
    *
-   * @covers ::resetImplementations()
+   * @covers ::resetImplementations
    */
   public function testResetImplementations() {
 
diff --git a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
index 83e2518..58132d0 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
@@ -223,7 +223,7 @@ public function testSetValue($key, $value, $expected) {
   }
 
   /**
-   * @covers ::prepareCallback()
+   * @covers ::prepareCallback
    */
   public function testPrepareCallbackValidMethod() {
     $form_state = new FormState();
@@ -233,7 +233,7 @@ public function testPrepareCallbackValidMethod() {
   }
 
   /**
-   * @covers ::prepareCallback()
+   * @covers ::prepareCallback
    */
   public function testPrepareCallbackInValidMethod() {
     $form_state = new FormState();
@@ -244,7 +244,7 @@ public function testPrepareCallbackInValidMethod() {
   }
 
   /**
-   * @covers ::prepareCallback()
+   * @covers ::prepareCallback
    */
   public function testPrepareCallbackArray() {
     $form_state = new FormState();
diff --git a/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php b/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
index 49a9dbf..a438e46 100644
--- a/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
@@ -32,8 +32,8 @@ public function testConstruct() {
   }
 
   /**
-   * @covers ::getName()
-   * @covers ::setName()
+   * @covers ::getName
+   * @covers ::setName
    */
   public function testGetName() {
     $name = $this->randomMachineName();
@@ -45,7 +45,7 @@ public function testGetName() {
   }
 
   /**
-   * @covers ::getId()
+   * @covers ::getId
    */
   public function testGetLangcode() {
     $language_code = $this->randomMachineName(2);
@@ -54,7 +54,7 @@ public function testGetLangcode() {
   }
 
   /**
-   * @covers ::getDirection()
+   * @covers ::getDirection
    */
   public function testGetDirection() {
     $language_code = $this->randomMachineName(2);
@@ -63,7 +63,7 @@ public function testGetDirection() {
   }
 
   /**
-   * @covers ::isDefault()
+   * @covers ::isDefault
    */
   public function testIsDefault() {
     $language_default = $this->getMockBuilder('Drupal\Core\Language\LanguageDefault')->disableOriginalConstructor()->getMock();
@@ -91,7 +91,7 @@ public function testIsDefault() {
   /**
    * Tests sorting an array of language objects.
    *
-   * @covers ::sort()
+   * @covers ::sort
    *
    * @dataProvider providerTestSortArrayOfLanguages
    *
diff --git a/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php b/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php
index 7d19b8a..23aee76 100644
--- a/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php
@@ -104,7 +104,7 @@ protected function setUpMailManager($interface = array()) {
   /**
    * Tests the getInstance method.
    *
-   * @covers \Drupal\Core\Mail\MailManager::getInstance()
+   * @covers \Drupal\Core\Mail\MailManager::getInstance
    */
   public function testGetInstance() {
     $interface = array(
diff --git a/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php b/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php
index 24e58c0..d876173 100644
--- a/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php
@@ -119,7 +119,7 @@ public function testGetTitleWithTitleArguments() {
   /**
    * Tests the getRouteName() method.
    *
-   * @covers \Drupal\Core\Menu\ContextualLinkDefault::getRouteName()
+   * @covers \Drupal\Core\Menu\ContextualLinkDefault::getRouteName
    */
   public function testGetRouteName($route_name = 'test_route_name') {
     $this->pluginDefinition['route_name'] = $route_name;
@@ -131,7 +131,7 @@ public function testGetRouteName($route_name = 'test_route_name') {
   /**
    * Tests the getGroup() method.
    *
-   * @covers \Drupal\Core\Menu\ContextualLinkDefault::getGroup()
+   * @covers \Drupal\Core\Menu\ContextualLinkDefault::getGroup
    */
   public function testGetGroup($group_name = 'test_group') {
     $this->pluginDefinition['group'] = $group_name;
@@ -143,7 +143,7 @@ public function testGetGroup($group_name = 'test_group') {
   /**
    * Tests the getOptions() method.
    *
-   * @covers \Drupal\Core\Menu\ContextualLinkDefault::getOptions()
+   * @covers \Drupal\Core\Menu\ContextualLinkDefault::getOptions
    */
   public function testGetOptions($options = array('key' => 'value')) {
     $this->pluginDefinition['options'] = $options;
@@ -155,7 +155,7 @@ public function testGetOptions($options = array('key' => 'value')) {
   /**
    * Tests the getWeight() method.
    *
-   * @covers \Drupal\Core\Menu\ContextualLinkDefault::getWeight()
+   * @covers \Drupal\Core\Menu\ContextualLinkDefault::getWeight
    */
   public function testGetWeight($weight = 5) {
     $this->pluginDefinition['weight'] = $weight;
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
index 219ef03..7cb34b7 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
@@ -120,7 +120,7 @@ protected function setUp() {
   }
 
   /**
-   * @covers \Drupal\Core\Menu\LocalActionManager::getTitle()
+   * @covers \Drupal\Core\Menu\LocalActionManager::getTitle
    */
   public function testGetTitle() {
     $local_action = $this->getMock('Drupal\Core\Menu\LocalActionInterface');
@@ -137,7 +137,7 @@ public function testGetTitle() {
   }
 
   /**
-   * @covers \Drupal\Core\Menu\LocalActionManager::getActionsForRoute()
+   * @covers \Drupal\Core\Menu\LocalActionManager::getActionsForRoute
    *
    * @dataProvider getActionsForRouteProvider
    */
diff --git a/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php b/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
index 02d0479..fc99cc3 100644
--- a/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
@@ -123,7 +123,7 @@ public function provider() {
   /**
    * Tests getActiveLink().
    *
-   * @covers ::getActiveLink()
+   * @covers ::getActiveLink
    * @dataProvider provider
    */
   public function testGetActiveLink(Request $request, $links, $menu_name, $expected_link) {
@@ -143,8 +143,8 @@ public function testGetActiveLink(Request $request, $links, $menu_name, $expecte
   /**
    * Tests getActiveTrailIds().
    *
-   * @covers ::getActiveTrailIds()
-   * @covers ::getActiveTrailCacheKey()
+   * @covers ::getActiveTrailIds
+   * @covers ::getActiveTrailCacheKey
    * @dataProvider provider
    */
   public function testGetActiveTrailIds(Request $request, $links, $menu_name, $expected_link, $expected_trail, $expected_cache_key) {
diff --git a/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php b/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
index 3519ec7..dc0f3cc 100644
--- a/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
@@ -38,7 +38,7 @@ protected function setUp() {
    *
    * @dataProvider providerTestGetConverter
    *
-   * @covers ::getConverter()
+   * @covers ::getConverter
    */
   public function testGetConverter($name, $class) {
     $converter = $this->getMockBuilder('Drupal\Core\ParamConverter\ParamConverterInterface')
@@ -55,7 +55,7 @@ public function testGetConverter($name, $class) {
   /**
    * Tests \Drupal\Core\ParamConverter\ParamConverterManager::getConverter().
    *
-   * @covers ::getConverter()
+   * @covers ::getConverter
    *
    * @expectedException \InvalidArgumentException
    */
@@ -128,7 +128,7 @@ public function providerTestGetConverter() {
   }
 
   /**
-   * @covers ::setRouteParameterConverters()
+   * @covers ::setRouteParameterConverters
    *
    * @dataProvider providerTestSetRouteParameterConverters
    */
@@ -171,7 +171,7 @@ public function providerTestSetRouteParameterConverters() {
   }
 
   /**
-   * @covers ::convert()
+   * @covers ::convert
    */
   public function testConvert() {
     $route = new Route('/test/{id}/{literal}/{null}');
@@ -208,7 +208,7 @@ public function testConvert() {
   }
 
   /**
-   * @covers ::convert()
+   * @covers ::convert
    */
   public function testConvertNoConverting() {
     $route = new Route('/test');
@@ -224,7 +224,7 @@ public function testConvertNoConverting() {
   }
 
   /**
-   * @covers ::convert()
+   * @covers ::convert
    *
    * @expectedException \Drupal\Core\ParamConverter\ParamNotConvertedException
    * @expectedExceptionMessage The "id" parameter was not converted for the path "/test/{id}" (route name: "test_route")
diff --git a/core/tests/Drupal/Tests/Core/Path/AliasManagerTest.php b/core/tests/Drupal/Tests/Core/Path/AliasManagerTest.php
index 86108a5..a8c0988 100644
--- a/core/tests/Drupal/Tests/Core/Path/AliasManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Path/AliasManagerTest.php
@@ -89,7 +89,7 @@ protected function setUp() {
   /**
    * Tests the getPathByAlias method for an alias that have no matching path.
    *
-   * @covers ::getPathByAlias()
+   * @covers ::getPathByAlias
    */
   public function testGetPathByAliasNoMatch() {
     $alias = $this->randomMachineName();
@@ -114,7 +114,7 @@ public function testGetPathByAliasNoMatch() {
   /**
    * Tests the getPathByAlias method for an alias that have a matching path.
    *
-   * @covers ::getPathByAlias()
+   * @covers ::getPathByAlias
    */
   public function testGetPathByAliasNatch() {
     $alias = $this->randomMachineName();
@@ -135,7 +135,7 @@ public function testGetPathByAliasNatch() {
   /**
    * Tests the getPathByAlias method when a langcode is passed explicitly.
    *
-   * @covers ::getPathByAlias()
+   * @covers ::getPathByAlias
    */
   public function testGetPathByAliasLangcode() {
     $alias = $this->randomMachineName();
@@ -158,7 +158,7 @@ public function testGetPathByAliasLangcode() {
   /**
    * Tests the getAliasByPath method for a path that is not in the whitelist.
    *
-   * @covers ::getAliasByPath()
+   * @covers ::getAliasByPath
    */
   public function testGetAliasByPathWhitelist() {
     $path_part1 = $this->randomMachineName();
@@ -183,7 +183,7 @@ public function testGetAliasByPathWhitelist() {
   /**
    * Tests the getAliasByPath method for a path that has no matching alias.
    *
-   * @covers ::getAliasByPath()
+   * @covers ::getAliasByPath
    */
   public function testGetAliasByPathNoMatch() {
     $path_part1 = $this->randomMachineName();
@@ -219,8 +219,8 @@ public function testGetAliasByPathNoMatch() {
   /**
    * Tests the getAliasByPath method for a path that has a matching alias.
    *
-   * @covers ::getAliasByPath()
-   * @covers ::writeCache()
+   * @covers ::getAliasByPath
+   * @covers ::writeCache
    */
   public function testGetAliasByPathMatch() {
     $path_part1 = $this->randomMachineName();
@@ -257,8 +257,8 @@ public function testGetAliasByPathMatch() {
   /**
    * Tests the getAliasByPath method for a path that is preloaded.
    *
-   * @covers ::getAliasByPath()
-   * @covers ::writeCache()
+   * @covers ::getAliasByPath
+   * @covers ::writeCache
    */
   public function testGetAliasByPathCachedMatch() {
     $path_part1 = $this->randomMachineName();
@@ -304,8 +304,8 @@ public function testGetAliasByPathCachedMatch() {
   /**
    * Tests the getAliasByPath cache when a different language is requested.
    *
-   * @covers ::getAliasByPath()
-   * @covers ::writeCache()
+   * @covers ::getAliasByPath
+   * @covers ::writeCache
    */
   public function testGetAliasByPathCachedMissLanguage() {
     $path_part1 = $this->randomMachineName();
@@ -357,8 +357,8 @@ public function testGetAliasByPathCachedMissLanguage() {
   /**
    * Tests the getAliasByPath cache with a preloaded path without alias.
    *
-   * @covers ::getAliasByPath()
-   * @covers ::writeCache()
+   * @covers ::getAliasByPath
+   * @covers ::writeCache
    */
   public function testGetAliasByPathCachedMissNoAlias() {
     $path_part1 = $this->randomMachineName();
@@ -405,8 +405,8 @@ public function testGetAliasByPathCachedMissNoAlias() {
   /**
    * Tests the getAliasByPath cache with an unpreloaded path without alias.
    *
-   * @covers ::getAliasByPath()
-   * @covers ::writeCache()
+   * @covers ::getAliasByPath
+   * @covers ::writeCache
    */
   public function testGetAliasByPathUncachedMissNoAlias() {
     $path_part1 = $this->randomMachineName();
@@ -458,8 +458,8 @@ public function testGetAliasByPathUncachedMissNoAlias() {
   /**
    * Tests the getAliasByPath cache with an unpreloaded path with alias.
    *
-   * @covers ::getAliasByPath()
-   * @covers ::writeCache()
+   * @covers ::getAliasByPath
+   * @covers ::writeCache
    */
   public function testGetAliasByPathUncachedMissWithAlias() {
     $path_part1 = $this->randomMachineName();
diff --git a/core/tests/Drupal/Tests/Core/Session/AnonymousUserSessionTest.php b/core/tests/Drupal/Tests/Core/Session/AnonymousUserSessionTest.php
index 7bdb506..59f6f1c 100644
--- a/core/tests/Drupal/Tests/Core/Session/AnonymousUserSessionTest.php
+++ b/core/tests/Drupal/Tests/Core/Session/AnonymousUserSessionTest.php
@@ -23,7 +23,7 @@ class AnonymousUserSessionTest extends UnitTestCase {
   /**
    * Tests creating an AnonymousUserSession when the request is available.
    *
-   * @covers ::__construct()
+   * @covers ::__construct
    */
   public function testAnonymousUserSessionWithRequest() {
     $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
@@ -44,7 +44,7 @@ public function testAnonymousUserSessionWithRequest() {
   /**
    * Tests creating an AnonymousUserSession when the request is not available.
    *
-   * @covers ::__construct()
+   * @covers ::__construct
    */
   public function testAnonymousUserSessionWithNoRequest() {
     $container = new ContainerBuilder();
diff --git a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
index db8ea99..7ac7445 100644
--- a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
@@ -131,7 +131,7 @@ public function testRemoveAttribute() {
 
   /**
    * Tests adding class attributes with the AttributeArray helper method.
-   * @covers ::addClass()
+   * @covers ::addClass
    */
   public function testAddClasses() {
     // Add empty Attribute object with no classes.
@@ -183,7 +183,7 @@ public function testAddClasses() {
 
   /**
    * Tests removing class attributes with the AttributeArray helper method.
-   * @covers ::removeClass()
+   * @covers ::removeClass
    */
   public function testRemoveClasses() {
     // Add duplicate class to ensure that both duplicates are removed.
@@ -229,8 +229,8 @@ public function testHasClass() {
 
   /**
    * Tests removing class attributes with the Attribute helper methods.
-   * @covers ::removeClass()
-   * @covers ::addClass()
+   * @covers ::removeClass
+   * @covers ::addClass
    */
   public function testChainAddRemoveClasses() {
     $attribute = new Attribute(
@@ -249,8 +249,8 @@ public function testChainAddRemoveClasses() {
    * Tests the twig calls to the Attribute.
    * @dataProvider providerTestAttributeClassHelpers
    *
-   * @covers ::removeClass()
-   * @covers ::addClass()
+   * @covers ::removeClass
+   * @covers ::addClass
    */
   public function testTwigAddRemoveClasses($template, $expected, $seed_attributes = array()) {
     $loader = new \Twig_Loader_String();
diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
index 5721010..1f371fa 100644
--- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -118,7 +118,7 @@ public function testGenerateHrefs($route_name, array $parameters, $absolute, $ex
   /**
    * Tests the generate() method with a route.
    *
-   * @covers ::generate()
+   * @covers ::generate
    */
   public function testGenerate() {
     $this->urlGenerator->expects($this->once())
@@ -149,7 +149,7 @@ public function testGenerate() {
    * The set_active_class option is set to TRUE to ensure this does not cause
    * an error together with an external URL.
    *
-   * @covers ::generate()
+   * @covers ::generate
    */
   public function testGenerateExternal() {
     $this->urlAssembler->expects($this->once())