diff --git a/src/FeedClearHandler.php b/src/FeedClearHandler.php
index 04a565f..2ae0db0 100644
--- a/src/FeedClearHandler.php
+++ b/src/FeedClearHandler.php
@@ -32,7 +32,12 @@ class FeedClearHandler extends FeedHandlerBase {
   }
 
   /**
-   * {@inheritdoc}
+   * Deletes all items from a feed.
+   *
+   * @param \Drupal\feeds\FeedInterface $feed
+   *   The feed entity from which to delete all items.
+   * @param array $context
+   *   Status of the batch.
    */
   public function clear(FeedInterface $feed, array &$context) {
     try {
diff --git a/tests/src/Unit/Component/CsvParserTest.php b/tests/src/Unit/Component/CsvParserTest.php
index b7bd968..72226ac 100644
--- a/tests/src/Unit/Component/CsvParserTest.php
+++ b/tests/src/Unit/Component/CsvParserTest.php
@@ -6,12 +6,14 @@ use Drupal\feeds\Component\CsvParser;
 use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 
 /**
- * @group feeds
  * @coversDefaultClass \Drupal\feeds\Component\CsvParser
+ * @group feeds
  */
 class CsvParserTest extends FeedsUnitTestCase {
 
   /**
+   * Tests parsing a CSV source with several line endings.
+   *
    * @dataProvider provider
    */
   public function testAlternateLineEnding(array $expected, $ending) {
@@ -44,7 +46,7 @@ class CsvParserTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * Data provider for testAlternateLineEnding().
    */
   public function provider() {
     $expected = [
@@ -74,7 +76,8 @@ class CsvParserTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::setHasHeader
+   * @covers ::getHeader
    */
   public function testHasHeader() {
     $file = dirname(dirname(dirname(dirname(__DIR__)))) . '/tests/resources/example.csv';
@@ -85,7 +88,7 @@ class CsvParserTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * Tests using an asterisk as delimiter.
    */
   public function testAlternateSeparator() {
     // This implicitly tests lines without a newline.
@@ -96,6 +99,8 @@ class CsvParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tries to create a CsvParser instance with an invalid file path.
+   *
    * @expectedException \InvalidArgumentException
    */
   public function testInvalidFilePath() {
@@ -103,6 +108,8 @@ class CsvParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Creates a new CsvParser instance with an invalid CSV source.
+   *
    * @expectedException \InvalidArgumentException
    */
   public function testInvalidResourcePath() {
@@ -110,6 +117,8 @@ class CsvParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Basic test for parsing CSV.
+   *
    * @dataProvider csvFileProvider
    */
   public function testCsvParsing($file, $expected) {
@@ -134,7 +143,7 @@ class CsvParserTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * Data provider for testCsvParsing().
    */
   public function csvFileProvider() {
     $path = dirname(dirname(dirname(dirname(__DIR__)))) . '/tests/resources/csvs';
diff --git a/tests/src/Unit/Component/GenericOpmlParserTest.php b/tests/src/Unit/Component/GenericOpmlParserTest.php
index 4226255..243eb95 100644
--- a/tests/src/Unit/Component/GenericOpmlParserTest.php
+++ b/tests/src/Unit/Component/GenericOpmlParserTest.php
@@ -12,7 +12,7 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class GenericOpmlParserTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * Basic tests for the generic OPML parser.
    */
   public function test() {
     $file = dirname(dirname(dirname(dirname(dirname(__FILE__))))) . '/tests/resources/opml-example.xml';
diff --git a/tests/src/Unit/Component/HttpHelpersTest.php b/tests/src/Unit/Component/HttpHelpersTest.php
index 28f53b9..d36daf5 100644
--- a/tests/src/Unit/Component/HttpHelpersTest.php
+++ b/tests/src/Unit/Component/HttpHelpersTest.php
@@ -12,6 +12,8 @@ use Drupal\Tests\UnitTestCase;
 class HttpHelpersTest extends UnitTestCase {
 
   /**
+   * Tests finding relation links in several headers.
+   *
    * @dataProvider httpResponses
    */
   public function testFindLinkHeader($headers, $rel, $expected) {
@@ -19,7 +21,7 @@ class HttpHelpersTest extends UnitTestCase {
   }
 
   /**
-   *
+   * @covers ::findRelationFromXml
    */
   public function testFindLinkXml() {
     $xml = '<feed xmlns="http://www.w3.org/2005/Atom">
@@ -44,7 +46,7 @@ class HttpHelpersTest extends UnitTestCase {
   }
 
   /**
-   *
+   * Data provider for testFindLinkHeader().
    */
   public function httpResponses() {
     $headers1 = [
diff --git a/tests/src/Unit/Component/XmlParserTraitTest.php b/tests/src/Unit/Component/XmlParserTraitTest.php
index e5d2ccc..b91dddf 100644
--- a/tests/src/Unit/Component/XmlParserTraitTest.php
+++ b/tests/src/Unit/Component/XmlParserTraitTest.php
@@ -11,7 +11,7 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class XmlParserTraitTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * Basic XML parsing test.
    */
   public function test() {
     $trait = $this->getMockForTrait('Drupal\feeds\Component\XmlParserTrait');
@@ -24,7 +24,7 @@ class XmlParserTraitTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * Tests parsing a document with invalid XML.
    */
   public function testErrors() {
     $trait = $this->getMockForTrait('Drupal\feeds\Component\XmlParserTrait');
@@ -49,6 +49,8 @@ class XmlParserTraitTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Data provider for testRemoveDefaultNamespaces().
+   *
    * Checks that the input and output are equal.
    */
   public function namespaceProvider() {
diff --git a/tests/src/Unit/Controller/SubscriptionControllerTest.php b/tests/src/Unit/Controller/SubscriptionControllerTest.php
index ae042b0..0615dd8 100644
--- a/tests/src/Unit/Controller/SubscriptionControllerTest.php
+++ b/tests/src/Unit/Controller/SubscriptionControllerTest.php
@@ -14,18 +14,46 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class SubscriptionControllerTest extends UnitTestCase {
 
+  /**
+   * The controller under test.
+   *
+   * @var \Drupal\feeds\Controller\SubscriptionController
+   */
   protected $controller;
 
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
   protected $entityTypeManager;
 
+  /**
+   * The feed entity.
+   *
+   * @var \Drupal\feeds\FeedInterface
+   */
   protected $feed;
 
-  protected $feedStorage;
-
+  /**
+   * The HTTP request.
+   *
+   * @var \Symfony\Component\HttpFoundation\Request
+   */
   protected $request;
 
+  /**
+   * The subscription entity.
+   *
+   * @var \Drupal\feeds\SubscriptionInterface
+   */
   protected $subscription;
 
+  /**
+   * The key/value store.
+   *
+   * @var \Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface
+   */
   protected $kv;
 
   /**
@@ -169,7 +197,7 @@ class SubscriptionControllerTest extends UnitTestCase {
    * @covers ::handleUnsubscribe
    * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
    */
-  public function testSubscriptionMissingKV() {
+  public function testSubscriptionMissingKv() {
     $this->request->query->set('hub_mode', 'unsubscribe');
     $this->request->query->set('hub_topic', 'http://example.com/topic');
     $this->controller->subscribe(1, 'valid_token', $this->request);
diff --git a/tests/src/Unit/Event/DeleteFeedsEventTest.php b/tests/src/Unit/Event/DeleteFeedsEventTest.php
index 17d5814..8d5d520 100644
--- a/tests/src/Unit/Event/DeleteFeedsEventTest.php
+++ b/tests/src/Unit/Event/DeleteFeedsEventTest.php
@@ -12,9 +12,9 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class DeleteFeedsEventTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::getFeeds
    */
-  public function test() {
+  public function testGetFeeds() {
     $feeds = [$this->getMock('Drupal\feeds\FeedInterface')];
     $event = new DeleteFeedsEvent($feeds);
 
diff --git a/tests/src/Unit/Event/EventBaseTest.php b/tests/src/Unit/Event/EventBaseTest.php
index 52c1534..1b3f03f 100644
--- a/tests/src/Unit/Event/EventBaseTest.php
+++ b/tests/src/Unit/Event/EventBaseTest.php
@@ -11,9 +11,9 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class EventBaseTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::getFeed
    */
-  public function test() {
+  public function testGetFeed() {
     $feed = $this->getMock('Drupal\feeds\FeedInterface');
     $event = $this->getMockForAbstractClass('Drupal\feeds\Event\EventBase', [$feed]);
     $this->assertSame($feed, $event->getFeed());
diff --git a/tests/src/Unit/Event/EventDispatcherTraitTest.php b/tests/src/Unit/Event/EventDispatcherTraitTest.php
index 6ae01fb..c8558d1 100644
--- a/tests/src/Unit/Event/EventDispatcherTraitTest.php
+++ b/tests/src/Unit/Event/EventDispatcherTraitTest.php
@@ -13,7 +13,8 @@ use Symfony\Component\EventDispatcher\Event;
 class EventDispatcherTraitTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::getEventDispatcher
+   * @covers ::dispatchEvent
    */
   public function test() {
     $mock = $this->getMockForTrait('Drupal\feeds\Event\EventDispatcherTrait');
diff --git a/tests/src/Unit/Event/FetchEventTest.php b/tests/src/Unit/Event/FetchEventTest.php
index a62af78..e9a69bd 100644
--- a/tests/src/Unit/Event/FetchEventTest.php
+++ b/tests/src/Unit/Event/FetchEventTest.php
@@ -12,9 +12,9 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class FetchEventTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::getFetcherResult
    */
-  public function test() {
+  public function testGetFetcherResult() {
     $feed = $this->getMock('Drupal\feeds\FeedInterface');
     $result = $this->getMock('Drupal\feeds\Result\FetcherResultInterface');
     $event = new FetchEvent($feed);
diff --git a/tests/src/Unit/Event/ParseEventTest.php b/tests/src/Unit/Event/ParseEventTest.php
index c80b355..e6946f4 100644
--- a/tests/src/Unit/Event/ParseEventTest.php
+++ b/tests/src/Unit/Event/ParseEventTest.php
@@ -12,7 +12,8 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class ParseEventTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::getFetcherResult
+   * @covers ::getParserResult
    */
   public function test() {
     $feed = $this->getMock('Drupal\feeds\FeedInterface');
diff --git a/tests/src/Unit/Event/ProcessEventTest.php b/tests/src/Unit/Event/ProcessEventTest.php
index d934fc6..f223ea5 100644
--- a/tests/src/Unit/Event/ProcessEventTest.php
+++ b/tests/src/Unit/Event/ProcessEventTest.php
@@ -12,9 +12,9 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class ProcessEventTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::getParserResult
    */
-  public function test() {
+  public function testGetParserResult() {
     $feed = $this->getMock('Drupal\feeds\FeedInterface');
     $item = $this->getMock('Drupal\feeds\Feeds\Item\ItemInterface');
     $event = new ProcessEvent($feed, $item);
diff --git a/tests/src/Unit/EventSubscriber/LazySubscriberTest.php b/tests/src/Unit/EventSubscriber/LazySubscriberTest.php
index 98e72d2..b62117b 100644
--- a/tests/src/Unit/EventSubscriber/LazySubscriberTest.php
+++ b/tests/src/Unit/EventSubscriber/LazySubscriberTest.php
@@ -21,13 +21,60 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
  */
 class LazySubscriberTest extends FeedsUnitTestCase {
 
+  /**
+   * The event dispatcher.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcher
+   */
   protected $dispatcher;
+
+  /**
+   * A second event dispatcher.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
+   */
   protected $explodingDispatcher;
+
+  /**
+   * The feed entity.
+   *
+   * @var \Drupal\feeds\FeedInterface
+   */
   protected $feed;
+
+  /**
+   * The state object.
+   *
+   * @var \Drupal\feeds\StateInterface
+   */
   protected $state;
+
+  /**
+   * The feed type entity.
+   *
+   * @var \Drupal\feeds\FeedTypeInterface
+   */
   protected $feedType;
+
+  /**
+   * The Feeds fetcher plugin.
+   *
+   * @var \Drupal\feeds\Plugin\Type\Fetcher\FetcherInterface
+   */
   protected $fetcher;
+
+  /**
+   * The Feeds parser plugin.
+   *
+   * @var \Drupal\feeds\Plugin\Type\Parser\ParserInterface
+   */
   protected $parser;
+
+  /**
+   * The Feeds processor plugin.
+   *
+   * @var \Drupal\feeds\Plugin\Type\Processor\ProcessorInterface
+   */
   protected $processor;
 
   /**
@@ -62,7 +109,7 @@ class LazySubscriberTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::getSubscribedEvents
    */
   public function testGetSubscribedEvents() {
     $events = LazySubscriber::getSubscribedEvents();
@@ -70,7 +117,7 @@ class LazySubscriberTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::onInitImport
    */
   public function testOnInitImport() {
     $fetcher_result = $this->getMock('Drupal\feeds\Result\FetcherResultInterface');
@@ -121,7 +168,7 @@ class LazySubscriberTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::onInitClear
    */
   public function testOnInitClear() {
     $clearable = $this->getMock('Drupal\feeds\Plugin\Type\ClearableInterface');
@@ -143,7 +190,7 @@ class LazySubscriberTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::onInitExpire
    */
   public function testOnInitExpire() {
     $this->feedType->expects($this->once())
diff --git a/tests/src/Unit/FeedAccessControlHandlerTest.php b/tests/src/Unit/FeedAccessControlHandlerTest.php
index c6f3db8..d4a6efa 100644
--- a/tests/src/Unit/FeedAccessControlHandlerTest.php
+++ b/tests/src/Unit/FeedAccessControlHandlerTest.php
@@ -11,8 +11,25 @@ use Drupal\feeds\FeedAccessControlHandler;
  */
 class FeedAccessControlHandlerTest extends FeedsUnitTestCase {
 
+  /**
+   * Metadata class for the feed entity type.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeInterface
+   */
   protected $entityType;
+
+  /**
+   * The handler to test.
+   *
+   * @var \Drupal\feeds\FeedAccessControlHandler
+   */
   protected $controller;
+
+  /**
+   * The Drupal module handler.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
   protected $moduleHandler;
 
   /**
@@ -33,9 +50,9 @@ class FeedAccessControlHandlerTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::access
    */
-  public function test() {
+  public function testAccess() {
     $feed = $this->getMockBuilder('\Drupal\feeds\FeedInterface')
       ->disableOriginalConstructor()
       ->getMock();
@@ -76,7 +93,7 @@ class FeedAccessControlHandlerTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::createAccess
    */
   public function testCheckCreateAccess() {
     $account = $this->getMock('\Drupal\Core\Session\AccountInterface');
diff --git a/tests/src/Unit/FeedClearHandlerTest.php b/tests/src/Unit/FeedClearHandlerTest.php
index 49cfd0c..9f60dab 100644
--- a/tests/src/Unit/FeedClearHandlerTest.php
+++ b/tests/src/Unit/FeedClearHandlerTest.php
@@ -14,12 +14,29 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
  */
 class FeedClearHandlerTest extends FeedsUnitTestCase {
 
+  /**
+   * The event dispatcher.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcher
+   */
   protected $dispatcher;
+
+  /**
+   * The feed entity.
+   *
+   * @var \Drupal\feeds\FeedInterface
+   */
   protected $feed;
-  protected $context;
 
   /**
+   * Status of the batch.
    *
+   * @var array
+   */
+  protected $context;
+
+  /**
+   * {@inheritdoc}
    */
   public function setUp() {
     parent::setUp();
@@ -39,7 +56,7 @@ class FeedClearHandlerTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::startBatchClear
    */
   public function testStartBatchClear() {
     $this->feed
@@ -51,7 +68,7 @@ class FeedClearHandlerTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::clear
    */
   public function testClear() {
     $this->feed->expects($this->exactly(2))
@@ -65,6 +82,7 @@ class FeedClearHandlerTest extends FeedsUnitTestCase {
   }
 
   /**
+   * @covers ::clear
    * @expectedException \Exception
    */
   public function testException() {
diff --git a/tests/src/Unit/FeedExpireHandlerTest.php b/tests/src/Unit/FeedExpireHandlerTest.php
index 0520430..ee24a77 100644
--- a/tests/src/Unit/FeedExpireHandlerTest.php
+++ b/tests/src/Unit/FeedExpireHandlerTest.php
@@ -12,9 +12,23 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
  */
 class FeedExpireHandlerTest extends FeedsUnitTestCase {
 
+  /**
+   * The event dispatcher.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcher
+   */
   protected $dispatcher;
+
+  /**
+   * The feed entity.
+   *
+   * @var \Drupal\feeds\FeedInterface
+   */
   protected $feed;
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp() {
     parent::setUp();
 
@@ -22,40 +36,58 @@ class FeedExpireHandlerTest extends FeedsUnitTestCase {
     $this->feed = $this->getMock('Drupal\feeds\FeedInterface');
   }
 
-  public function test() {
-    $this->assertTrue(TRUE);
+  /**
+   * @covers ::startBatchExpire
+   */
+  public function testBatchExpire() {
+    $this->markTestIncomplete('The expire functionality is not working yet.');
+  }
+
+  /**
+   * @covers ::expireItem
+   */
+  public function testExpireItem() {
+    $this->markTestIncomplete('The expire functionality is not working yet.');
+
+    $this->feed
+      ->expects($this->exactly(2))
+      ->method('progressExpiring')
+      ->will($this->onConsecutiveCalls(0.5, 1.0));
+    $this->feed
+      ->expects($this->once())
+      ->method('clearStates');
+
+    $handler = new FeedExpireHandler($this->dispatcher);
+    $result = $handler->expireItem($this->feed);
+    $this->assertSame($result, 0.5);
+    $result = $handler->expireItem($this->feed);
+    $this->assertSame($result, 1.0);
   }
 
-  // public function testExpire() {
-  //   $this->feed
-  //     ->expects($this->exactly(2))
-  //     ->method('progressExpiring')
-  //     ->will($this->onConsecutiveCalls(0.5, 1.0));
-  //   $this->feed
-  //     ->expects($this->once())
-  //     ->method('clearStates');
-
-  //   $handler = new FeedExpireHandler($this->dispatcher);
-  //   $result = $handler->expire($this->feed);
-  //   $this->assertSame($result, 0.5);
-  //   $result = $handler->expire($this->feed);
-  //   $this->assertSame($result, 1.0);
-  // }
+  /**
+   * @covers ::postExpire
+   */
+  public function testPostExpire() {
+    $this->markTestIncomplete('The expire functionality is not working yet.');
+  }
 
   /**
+   * @covers ::expireItem
    * @expectedException \Exception
    */
-  // public function testException() {
-  //   $this->dispatcher->addListener(FeedsEvents::EXPIRE, function($event) {
-  //     throw new \Exception();
-  //   });
-
-  //   $this->feed
-  //     ->expects($this->once())
-  //     ->method('clearStates');
-
-  //   $handler = new FeedExpireHandler($this->dispatcher);
-  //   $handler->expire($this->feed);
-  // }
+  public function testException() {
+    $this->markTestIncomplete('The expire functionality is not working yet.');
+
+    $this->dispatcher->addListener(FeedsEvents::EXPIRE, function ($event) {
+      throw new \Exception();
+    });
+
+    $this->feed
+      ->expects($this->once())
+      ->method('clearStates');
+
+    $handler = new FeedExpireHandler($this->dispatcher);
+    $handler->expireItem($this->feed);
+  }
 
 }
diff --git a/tests/src/Unit/FeedHandlerBaseTest.php b/tests/src/Unit/FeedHandlerBaseTest.php
index 35de818..559f1e0 100644
--- a/tests/src/Unit/FeedHandlerBaseTest.php
+++ b/tests/src/Unit/FeedHandlerBaseTest.php
@@ -11,7 +11,7 @@ use Drupal\Core\DependencyInjection\ContainerBuilder;
 class FeedHandlerBaseTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * Tests if an instance of FeedHandlerBase can be created.
    */
   public function test() {
     $container = new ContainerBuilder();
diff --git a/tests/src/Unit/FeedImportHandlerTest.php b/tests/src/Unit/FeedImportHandlerTest.php
index dacc522..fc4ef66 100644
--- a/tests/src/Unit/FeedImportHandlerTest.php
+++ b/tests/src/Unit/FeedImportHandlerTest.php
@@ -11,7 +11,18 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
  */
 class FeedImportHandlerTest extends FeedsUnitTestCase {
 
+  /**
+   * The event dispatcher.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcher
+   */
   protected $dispatcher;
+
+  /**
+   * The feed entity.
+   *
+   * @var \Drupal\feeds\FeedInterface
+   */
   protected $feed;
 
   /**
@@ -34,7 +45,7 @@ class FeedImportHandlerTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::startBatchImport
    */
   public function testStartBatchImport() {
     $this->feed->expects($this->once())
@@ -45,7 +56,7 @@ class FeedImportHandlerTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::batchFetch
    */
   public function testBatchFetch() {
     $this->handler->batchFetch($this->feed);
diff --git a/tests/src/Unit/Feeds/Fetcher/DirectoryFetcherTest.php b/tests/src/Unit/Feeds/Fetcher/DirectoryFetcherTest.php
index 46f3347..1a1c5ae 100644
--- a/tests/src/Unit/Feeds/Fetcher/DirectoryFetcherTest.php
+++ b/tests/src/Unit/Feeds/Fetcher/DirectoryFetcherTest.php
@@ -13,8 +13,25 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
  */
 class DirectoryFetcherTest extends FeedsUnitTestCase {
 
+  /**
+   * The Feeds fetcher plugin under test.
+   *
+   * @var \Drupal\feeds\Feeds\Fetcher\DirectoryFetcher
+   */
   protected $fetcher;
+
+  /**
+   * The state object.
+   *
+   * @var \Drupal\feeds\StateInterface
+   */
   protected $state;
+
+  /**
+   * The feed entity.
+   *
+   * @var \Drupal\feeds\FeedInterface
+   */
   protected $feed;
 
   /**
@@ -48,7 +65,9 @@ class DirectoryFetcherTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests fetching a file.
    *
+   * @covers ::fetch
    */
   public function testFetchFile() {
     $feed = $this->getMock('Drupal\feeds\FeedInterface');
@@ -60,6 +79,8 @@ class DirectoryFetcherTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests fetching from a directory on which we don't have read permissions.
+   *
    * @expectedException \RuntimeException
    */
   public function testFetchDir() {
@@ -73,7 +94,9 @@ class DirectoryFetcherTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests fetching a directory resursively.
    *
+   * @covers ::fetch
    */
   public function testRecursiveFetchDir() {
     $this->fetcher->setConfiguration(['recursive_scan' => TRUE]);
@@ -86,6 +109,8 @@ class DirectoryFetcherTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests fetching an empty directory.
+   *
    * @expectedException \Drupal\feeds\Exception\EmptyFeedException
    */
   public function testEmptyDirectory() {
diff --git a/tests/src/Unit/Feeds/Fetcher/HttpFetcherTest.php b/tests/src/Unit/Feeds/Fetcher/HttpFetcherTest.php
index cc8af12..582302f 100644
--- a/tests/src/Unit/Feeds/Fetcher/HttpFetcherTest.php
+++ b/tests/src/Unit/Feeds/Fetcher/HttpFetcherTest.php
@@ -23,10 +23,25 @@ use Prophecy\Argument;
  */
 class HttpFetcherTest extends FeedsUnitTestCase {
 
+  /**
+   * The feed entity.
+   *
+   * @var \Drupal\feeds\FeedInterface
+   */
   protected $feed;
 
+  /**
+   * The Feeds fetcher plugin under test.
+   *
+   * @var \Drupal\feeds\Feeds\Fetcher\HttpFetcher
+   */
   protected $fetcher;
 
+  /**
+   * A mocked HTTP handler to use within the handler stack.
+   *
+   * @var \GuzzleHttp\Handler\MockHandler
+   */
   protected $mockHandler;
 
   /**
@@ -58,7 +73,9 @@ class HttpFetcherTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests a successful fetch from a HTTP source.
    *
+   * @covers ::fetch
    */
   public function testFetch() {
     $this->mockHandler->append(new Response(200, [], 'test data'));
@@ -68,6 +85,8 @@ class HttpFetcherTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests fetching from a HTTP source that returns a 304 (not modified).
+   *
    * @expectedException \Drupal\feeds\Exception\EmptyFeedException
    */
   public function testFetch304() {
@@ -76,6 +95,8 @@ class HttpFetcherTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests fetching from a HTTP source that returns a 404 (not found).
+   *
    * @expectedException \RuntimeException
    */
   public function testFetch404() {
@@ -84,6 +105,8 @@ class HttpFetcherTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests a fetch that fails.
+   *
    * @expectedException \RuntimeException
    */
   public function testFetchError() {
@@ -92,7 +115,7 @@ class HttpFetcherTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::onFeedDeleteMultiple
    */
   public function testOnFeedDeleteMultiple() {
     $feed = $this->getMock(FeedInterface::class);
diff --git a/tests/src/Unit/Feeds/Fetcher/UploadFetcherTest.php b/tests/src/Unit/Feeds/Fetcher/UploadFetcherTest.php
index 45d98ec..6e04aee 100644
--- a/tests/src/Unit/Feeds/Fetcher/UploadFetcherTest.php
+++ b/tests/src/Unit/Feeds/Fetcher/UploadFetcherTest.php
@@ -17,8 +17,25 @@ use Drupal\file\FileUsage\FileUsageInterface;
  */
 class UploadFetcherTest extends FeedsUnitTestCase {
 
+  /**
+   * The file entity storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
   protected $fileStorage;
+
+  /**
+   * The Feeds fetcher plugin under test.
+   *
+   * @var \Drupal\feeds\Feeds\Fetcher\UploadFetcher
+   */
   protected $fetcher;
+
+  /**
+   * The state object.
+   *
+   * @var \Drupal\feeds\StateInterface
+   */
   protected $state;
 
   /**
@@ -49,7 +66,9 @@ class UploadFetcherTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests a fetch that succeeds.
    *
+   * @covers ::fetch
    */
   public function testFetch() {
     touch('vfs://feeds/test_file');
@@ -62,6 +81,8 @@ class UploadFetcherTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests a fetch that fails.
+   *
    * @expectedException \RuntimeException
    */
   public function testFetchException() {
@@ -73,7 +94,7 @@ class UploadFetcherTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::onFeedDeleteMultiple
    */
   public function testOnFeedDeleteMultiple() {
     $feed = $this->getMock(FeedInterface::class);
diff --git a/tests/src/Unit/Feeds/Parser/CsvParserTest.php b/tests/src/Unit/Feeds/Parser/CsvParserTest.php
index d8599ba..82bfd01 100644
--- a/tests/src/Unit/Feeds/Parser/CsvParserTest.php
+++ b/tests/src/Unit/Feeds/Parser/CsvParserTest.php
@@ -13,9 +13,32 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
  */
 class CsvParserTest extends FeedsUnitTestCase {
 
+  /**
+   * The Feeds parser plugin under test.
+   *
+   * @var \Drupal\feeds\Feeds\Parser\CsvParser
+   */
   protected $parser;
+
+  /**
+   * The feed type entity.
+   *
+   * @var \Drupal\feeds\FeedTypeInterface
+   */
   protected $feedType;
+
+  /**
+   * The feed entity.
+   *
+   * @var \Drupal\feeds\FeedInterface
+   */
   protected $feed;
+
+  /**
+   * The state object.
+   *
+   * @var \Drupal\feeds\StateInterface
+   */
   protected $state;
 
   /**
@@ -40,9 +63,11 @@ class CsvParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests parsing a CSV file that succeeds.
    *
+   * @covers ::parse
    */
-  public function testFetch() {
+  public function testParse() {
     $this->feed->expects($this->any())
       ->method('getConfigurationFor')
       ->with($this->parser)
@@ -64,6 +89,8 @@ class CsvParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests parsing an empty CSV file.
+   *
    * @expectedException \Drupal\feeds\Exception\EmptyFeedException
    */
   public function testEmptyFeed() {
@@ -73,7 +100,7 @@ class CsvParserTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::getMappingSources
    */
   public function testGetMappingSources() {
     // Not really much to test here.
diff --git a/tests/src/Unit/Feeds/Parser/OpmlParserTest.php b/tests/src/Unit/Feeds/Parser/OpmlParserTest.php
index 05f315d..4b75c21 100644
--- a/tests/src/Unit/Feeds/Parser/OpmlParserTest.php
+++ b/tests/src/Unit/Feeds/Parser/OpmlParserTest.php
@@ -12,9 +12,32 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
  */
 class OpmlParserTest extends FeedsUnitTestCase {
 
+  /**
+   * The Feeds parser plugin under test.
+   *
+   * @var \Drupal\feeds\Feeds\Parser\OpmlParser
+   */
   protected $parser;
+
+  /**
+   * The feed type entity.
+   *
+   * @var \Drupal\feeds\FeedTypeInterface
+   */
   protected $feedType;
+
+  /**
+   * The feed entity.
+   *
+   * @var \Drupal\feeds\FeedInterface
+   */
   protected $feed;
+
+  /**
+   * The state object.
+   *
+   * @var \Drupal\feeds\StateInterface
+   */
   protected $state;
 
   /**
@@ -37,9 +60,11 @@ class OpmlParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests parsing an OPML file that succeeds.
    *
+   * @covers ::parse
    */
-  public function testFetch() {
+  public function testParse() {
     $file = dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . '/tests/resources/opml-example.xml';
     $fetcher_result = new RawFetcherResult(file_get_contents($file));
 
@@ -51,6 +76,8 @@ class OpmlParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests parsing an empty feed.
+   *
    * @expectedException \Drupal\feeds\Exception\EmptyFeedException
    */
   public function testEmptyFeed() {
@@ -58,7 +85,7 @@ class OpmlParserTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::getMappingSources
    */
   public function testGetMappingSources() {
     // Not really much to test here.
diff --git a/tests/src/Unit/Feeds/Parser/SitemapParserTest.php b/tests/src/Unit/Feeds/Parser/SitemapParserTest.php
index dbb9823..2e6d375 100644
--- a/tests/src/Unit/Feeds/Parser/SitemapParserTest.php
+++ b/tests/src/Unit/Feeds/Parser/SitemapParserTest.php
@@ -13,9 +13,32 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
  */
 class SitemapParserTest extends FeedsUnitTestCase {
 
+  /**
+   * The Feeds parser plugin under test.
+   *
+   * @var \Drupal\feeds\Feeds\Parser\SitemapParser
+   */
   protected $parser;
+
+  /**
+   * The feed type entity.
+   *
+   * @var \Drupal\feeds\FeedTypeInterface
+   */
   protected $feedType;
+
+  /**
+   * The feed entity.
+   *
+   * @var \Drupal\feeds\FeedInterface
+   */
   protected $feed;
+
+  /**
+   * The state object.
+   *
+   * @var \Drupal\feeds\StateInterface
+   */
   protected $state;
 
   /**
@@ -38,9 +61,11 @@ class SitemapParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests parsing a sitemap XML file that succeeds.
    *
+   * @covers ::parse
    */
-  public function testFetch() {
+  public function testParse() {
     $file = dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . '/tests/resources/sitemap-example.xml';
     $fetcher_result = new RawFetcherResult(file_get_contents($file));
 
@@ -51,6 +76,8 @@ class SitemapParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests parsing an invalid feed.
+   *
    * @expectedException \Exception
    */
   public function testInvalidFeed() {
@@ -59,6 +86,8 @@ class SitemapParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests parsing an empty feed.
+   *
    * @expectedException \Drupal\feeds\Exception\EmptyFeedException
    */
   public function testEmptyFeed() {
@@ -67,7 +96,7 @@ class SitemapParserTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::getMappingSources
    */
   public function testGetMappingSources() {
     // Not really much to test here.
diff --git a/tests/src/Unit/Feeds/Parser/SyndicationParserTest.php b/tests/src/Unit/Feeds/Parser/SyndicationParserTest.php
index eefc2e5..1f6e50b 100644
--- a/tests/src/Unit/Feeds/Parser/SyndicationParserTest.php
+++ b/tests/src/Unit/Feeds/Parser/SyndicationParserTest.php
@@ -15,11 +15,39 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
  */
 class SyndicationParserTest extends FeedsUnitTestCase {
 
+  /**
+   * The Feeds parser plugin under test.
+   *
+   * @var \Drupal\feeds\Feeds\Parser\SyndicationParser
+   */
   protected $parser;
+
+  /**
+   * The feed type entity.
+   *
+   * @var \Drupal\feeds\FeedTypeInterface
+   */
   protected $feedType;
+
+  /**
+   * The feed entity.
+   *
+   * @var \Drupal\feeds\FeedInterface
+   */
   protected $feed;
+
+  /**
+   * The state object.
+   *
+   * @var \Drupal\feeds\StateInterface
+   */
   protected $state;
 
+  /**
+   * A list of syndication readers.
+   *
+   * @var array
+   */
   protected $readerExtensions = [
     'feed.reader.dublincoreentry' => 'Zend\Feed\Reader\Extension\DublinCore\Entry',
     'feed.reader.dublincorefeed' => 'Zend\Feed\Reader\Extension\DublinCore\Feed',
@@ -65,9 +93,11 @@ class SyndicationParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests parsing a RSS feed that succeeds.
    *
+   * @covers ::parse
    */
-  public function testFetch() {
+  public function testParse() {
     $file = dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . '/tests/resources/googlenewstz.rss2';
     $fetcher_result = new RawFetcherResult(file_get_contents($file));
 
@@ -78,6 +108,8 @@ class SyndicationParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests parsing an invalid feed.
+   *
    * @expectedException \RuntimeException
    */
   public function testInvalidFeed() {
@@ -86,6 +118,8 @@ class SyndicationParserTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests parsing an empty feed.
+   *
    * @expectedException \Drupal\feeds\Exception\EmptyFeedException
    */
   public function testEmptyFeed() {
@@ -94,7 +128,7 @@ class SyndicationParserTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::getMappingSources
    */
   public function testGetMappingSources() {
     // Not really much to test here.
diff --git a/tests/src/Unit/Feeds/Target/BooleanTest.php b/tests/src/Unit/Feeds/Target/BooleanTest.php
index 8900bad..913b6e9 100644
--- a/tests/src/Unit/Feeds/Target/BooleanTest.php
+++ b/tests/src/Unit/Feeds/Target/BooleanTest.php
@@ -14,9 +14,9 @@ use Drupal\feeds\Feeds\Target\Boolean;
 class BooleanTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::prepareValue
    */
-  public function test() {
+  public function testPrepareValue() {
     $method = $this->getMethod(Boolean::class, 'prepareTarget')->getClosure();
 
     $configuration = [
diff --git a/tests/src/Unit/Feeds/Target/DateRangeTest.php b/tests/src/Unit/Feeds/Target/DateRangeTest.php
index dc1bf2d..e936f17 100644
--- a/tests/src/Unit/Feeds/Target/DateRangeTest.php
+++ b/tests/src/Unit/Feeds/Target/DateRangeTest.php
@@ -13,7 +13,7 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class DateRangeTest extends FeedsUnitTestCase {
 
   /**
-   * The mocked feed.
+   * The mocked feed type entity.
    *
    * @var \Drupal\feeds\FeedTypeInterface
    */
@@ -22,7 +22,7 @@ class DateRangeTest extends FeedsUnitTestCase {
   /**
    * The target definition.
    *
-   * @var \Drupal\feeds\FieldTargetDefinition
+   * @var \Drupal\feeds\TargetDefinitionInterface
    */
   protected $targetDefinition;
 
@@ -51,7 +51,7 @@ class DateRangeTest extends FeedsUnitTestCase {
   }
 
   /**
-   * Basic test.
+   * @covers ::prepareValue
    */
   public function test() {
     $configuration = [
diff --git a/tests/src/Unit/Feeds/Target/DateTimeTest.php b/tests/src/Unit/Feeds/Target/DateTimeTest.php
index 5fd4742..d91c08e 100644
--- a/tests/src/Unit/Feeds/Target/DateTimeTest.php
+++ b/tests/src/Unit/Feeds/Target/DateTimeTest.php
@@ -12,7 +12,18 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
  */
 class DateTimeTest extends FeedsUnitTestCase {
 
+  /**
+   * The feed type entity.
+   *
+   * @var \Drupal\feeds\FeedTypeInterface
+   */
   protected $feedType;
+
+  /**
+   * The target definition.
+   *
+   * @var \Drupal\feeds\TargetDefinitionInterface
+   */
   protected $targetDefinition;
 
   /**
@@ -40,7 +51,9 @@ class DateTimeTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests preparing a value that succeeds.
    *
+   * @covers ::prepareValue
    */
   public function test() {
     $method = $this->getMethod('Drupal\feeds\Feeds\Target\DateTime', 'prepareTarget')->getClosure();
@@ -59,7 +72,9 @@ class DateTimeTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests preparing a value that fails.
    *
+   * @covers ::prepareValue
    */
   public function testWithErrors() {
     $configuration = [
@@ -75,7 +90,9 @@ class DateTimeTest extends FeedsUnitTestCase {
   }
 
   /**
+   * Tests parsing a year value.
    *
+   * @covers ::prepareValue
    */
   public function testYearValue() {
     $configuration = [
diff --git a/tests/src/Unit/Feeds/Target/EmailTest.php b/tests/src/Unit/Feeds/Target/EmailTest.php
index ff57c3f..85b77ad 100644
--- a/tests/src/Unit/Feeds/Target/EmailTest.php
+++ b/tests/src/Unit/Feeds/Target/EmailTest.php
@@ -12,9 +12,11 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class EmailTest extends FeedsUnitTestCase {
 
   /**
+   * Basic test for the email target.
    *
+   * @covers ::prepareValue
    */
-  public function test() {
+  public function testPrepareValue() {
     $method = $this->getMethod('Drupal\feeds\Feeds\Target\Email', 'prepareTarget')->getClosure();
 
     $configuration = [
diff --git a/tests/src/Unit/Feeds/Target/IntegerTest.php b/tests/src/Unit/Feeds/Target/IntegerTest.php
index e74e761..c6936b6 100644
--- a/tests/src/Unit/Feeds/Target/IntegerTest.php
+++ b/tests/src/Unit/Feeds/Target/IntegerTest.php
@@ -12,7 +12,7 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class IntegerTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::prepareValue
    */
   public function testPrepareValue() {
     $method = $this->getMethod('Drupal\feeds\Feeds\Target\Integer', 'prepareTarget')->getClosure();
diff --git a/tests/src/Unit/Feeds/Target/NumberTest.php b/tests/src/Unit/Feeds/Target/NumberTest.php
index 30b01d1..b127730 100644
--- a/tests/src/Unit/Feeds/Target/NumberTest.php
+++ b/tests/src/Unit/Feeds/Target/NumberTest.php
@@ -12,7 +12,7 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class NumberTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::prepareValue
    */
   public function testPrepareValue() {
     $method = $this->getMethod('Drupal\feeds\Feeds\Target\Number', 'prepareTarget')->getClosure();
diff --git a/tests/src/Unit/Feeds/Target/PathTest.php b/tests/src/Unit/Feeds/Target/PathTest.php
index 9975af7..70fc4cd 100644
--- a/tests/src/Unit/Feeds/Target/PathTest.php
+++ b/tests/src/Unit/Feeds/Target/PathTest.php
@@ -12,7 +12,7 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class PathTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::prepareValue
    */
   public function testPrepareValue() {
     $method = $this->getMethod('Drupal\feeds\Feeds\Target\Path', 'prepareTarget')->getClosure();
diff --git a/tests/src/Unit/Feeds/Target/StringTargetTest.php b/tests/src/Unit/Feeds/Target/StringTargetTest.php
index 11c9abd..6a14d57 100644
--- a/tests/src/Unit/Feeds/Target/StringTargetTest.php
+++ b/tests/src/Unit/Feeds/Target/StringTargetTest.php
@@ -12,7 +12,7 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class StringTargetTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::prepareValue
    */
   public function testPrepareValue() {
     $method = $this->getMethod('Drupal\feeds\Feeds\Target\StringTarget', 'prepareTarget')->getClosure();
diff --git a/tests/src/Unit/Feeds/Target/TextTest.php b/tests/src/Unit/Feeds/Target/TextTest.php
index fc89fcd..58d6c3f 100644
--- a/tests/src/Unit/Feeds/Target/TextTest.php
+++ b/tests/src/Unit/Feeds/Target/TextTest.php
@@ -13,6 +13,11 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
  */
 class TextTest extends FeedsUnitTestCase {
 
+  /**
+   * The FeedsTarget plugin being tested.
+   *
+   * @var \Drupal\feeds\Feeds\Target\Text
+   */
   protected $target;
 
   /**
@@ -31,9 +36,9 @@ class TextTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::prepareValue
    */
-  public function test() {
+  public function testPrepareValue() {
     $method = $this->getProtectedClosure($this->target, 'prepareValue');
 
     $values = ['value' => 'longstring'];
@@ -43,7 +48,7 @@ class TextTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::buildConfigurationForm
    */
   public function testBuildConfigurationForm() {
     $form_state = new FormState();
@@ -52,9 +57,9 @@ class TextTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::getSummary
    */
-  public function testSummary() {
+  public function testGetSummary() {
     $storage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
     $storage->expects($this->any())
       ->method('loadByProperties')
diff --git a/tests/src/Unit/Feeds/Target/TimestampTest.php b/tests/src/Unit/Feeds/Target/TimestampTest.php
index fbba383..0cfec2b 100644
--- a/tests/src/Unit/Feeds/Target/TimestampTest.php
+++ b/tests/src/Unit/Feeds/Target/TimestampTest.php
@@ -12,9 +12,9 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class TimestampTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::prepareValue
    */
-  public function test() {
+  public function testPrepareValue() {
     $method = $this->getMethod('Drupal\feeds\Feeds\Target\Timestamp', 'prepareTarget')->getClosure();
     $target_definition = $method($this->getMockFieldDefinition());
 
diff --git a/tests/src/Unit/Feeds/Target/UriTest.php b/tests/src/Unit/Feeds/Target/UriTest.php
index 6975950..cdf4d24 100644
--- a/tests/src/Unit/Feeds/Target/UriTest.php
+++ b/tests/src/Unit/Feeds/Target/UriTest.php
@@ -11,7 +11,7 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class UriTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::prepareValue
    */
   public function testPrepareValue() {
     $method = $this->getMethod('Drupal\feeds\Feeds\Target\Uri', 'prepareTarget')->getClosure();
diff --git a/tests/src/Unit/FeedsUnitTestCase.php b/tests/src/Unit/FeedsUnitTestCase.php
index 375aaec..fdab781 100644
--- a/tests/src/Unit/FeedsUnitTestCase.php
+++ b/tests/src/Unit/FeedsUnitTestCase.php
@@ -14,7 +14,7 @@ namespace Drupal\Tests\feeds\Unit {
   abstract class FeedsUnitTestCase extends UnitTestCase {
 
     /**
-     *
+     * {@inheritdoc}
      */
     public function setUp() {
       parent::setUp();
@@ -24,7 +24,10 @@ namespace Drupal\Tests\feeds\Unit {
     }
 
     /**
+     * Returns a mocked feed type entity.
      *
+     * @return \Drupal\feeds\FeedTypeInterface
+     *   A mocked feed type entity.
      */
     protected function getMockFeedType() {
       $feed_type = $this->getMock('\Drupal\feeds\FeedTypeInterface');
@@ -38,7 +41,10 @@ namespace Drupal\Tests\feeds\Unit {
     }
 
     /**
+     * Returns a mocked feed entity.
      *
+     * @return \Drupal\feeds\FeedInterface
+     *   A mocked feed entity.
      */
     protected function getMockFeed() {
       $feed = $this->getMock('Drupal\feeds\FeedInterface');
@@ -74,7 +80,15 @@ namespace Drupal\Tests\feeds\Unit {
     }
 
     /**
+     * Gets a ReflectionMethod for a class method.
+     *
+     * @param string $class
+     *   The class to reflect.
+     * @param string $name
+     *   The method name to reflect.
      *
+     * @return \ReflectionMethod
+     *   A ReflectionMethod.
      */
     protected function getMethod($class, $name) {
       $class = new \ReflectionClass($class);
@@ -86,10 +100,11 @@ namespace Drupal\Tests\feeds\Unit {
     /**
      * Returns a mocked AccountSwitcher object.
      *
-     * The returned object verifies that if switchTo() is called, switchBack() is
-     * also called.
+     * The returned object verifies that if switchTo() is called, switchBack()
+     * is also called.
      *
      * @return \Drupal\Core\Session\AccountSwitcherInterface
+     *   A mocked AccountSwitcher object.
      */
     protected function getMockedAccountSwitcher() {
       $switcher = $this->prophesize(AccountSwitcherInterface::class);
@@ -105,14 +120,32 @@ namespace Drupal\Tests\feeds\Unit {
     }
 
     /**
+     * Returns a dynamically created closure for the object's method.
      *
+     * @param object $object
+     *   The object for which to get a closure.
+     * @param string $method
+     *   The object's method for which to get a closure.
+     *
+     * @return \Closure
+     *   A Closure object.
      */
     protected function getProtectedClosure($object, $method) {
       return $this->getMethod(get_class($object), $method)->getClosure($object);
     }
 
     /**
+     * Calls a protected method on the given object.
+     *
+     * @param object $object
+     *   The object on which to call a protected method.
+     * @param string $method
+     *   The protected method to call.
+     * @param array $args
+     *   The arguments to pass to the method.
      *
+     * @return mixed
+     *   The result of the method call.
      */
     protected function callProtectedMethod($object, $method, array $args = []) {
       $closure = $this->getProtectedClosure($object, $method);
@@ -120,7 +153,13 @@ namespace Drupal\Tests\feeds\Unit {
     }
 
     /**
+     * Mocks an account object.
      *
+     * @param array $perms
+     *   The account's permissions.
+     *
+     * @return \Drupal\Core\Session\AccountInterface
+     *   The mocked acount object.
      */
     protected function getMockAccount(array $perms = []) {
       $account = $this->getMock('\Drupal\Core\Session\AccountInterface');
@@ -138,10 +177,16 @@ namespace Drupal\Tests\feeds\Unit {
     }
 
     /**
+     * Mocks a field definition.
+     *
+     * @param array $settings
+     *   The field storage and instance settings.
      *
+     * @return \Drupal\Core\Field\FieldDefinitionInterface
+     *   A mocked field definition.
      */
     protected function getMockFieldDefinition(array $settings = []) {
-      $definition = $this->getMock('Drupal\Core\Field\FieldDefinitionInterface');
+      $definition = $this->getMock('\Drupal\Core\Field\FieldDefinitionInterface');
       $definition->expects($this->any())
         ->method('getSettings')
         ->will($this->returnValue($settings));
@@ -279,7 +324,8 @@ namespace {
      *
      */
     function _format_date_callback(array $matches = NULL, $new_langcode = NULL) {
-      // We cache translations to avoid redundant and rather costly calls to t().
+      // We cache translations to avoid redundant and rather costly calls to
+      // t().
       static $cache, $langcode;
 
       if (!isset($matches)) {
@@ -310,6 +356,7 @@ namespace {
     }
 
   }
+
   /**
    *
    */
diff --git a/tests/src/Unit/Result/FetcherResultTest.php b/tests/src/Unit/Result/FetcherResultTest.php
index 269e3be..a3e485a 100644
--- a/tests/src/Unit/Result/FetcherResultTest.php
+++ b/tests/src/Unit/Result/FetcherResultTest.php
@@ -12,7 +12,7 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class FetcherResultTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::getRaw
    */
   public function testGetRaw() {
     file_put_contents('vfs://feeds/test_file', pack('CCC', 0xef, 0xbb, 0xbf) . 'I am test data.');
@@ -21,7 +21,7 @@ class FetcherResultTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::getFilePath
    */
   public function testGetFilePath() {
     file_put_contents('vfs://feeds/test_file', 'I am test data.');
@@ -30,7 +30,7 @@ class FetcherResultTest extends FeedsUnitTestCase {
   }
 
   /**
-   *
+   * @covers ::getFilePath
    */
   public function testGetSanitizedFilePath() {
     file_put_contents('vfs://feeds/test_file', pack('CCC', 0xef, 0xbb, 0xbf) . 'I am test data.');
@@ -39,6 +39,7 @@ class FetcherResultTest extends FeedsUnitTestCase {
   }
 
   /**
+   * @covers ::getRaw
    * @expectedException \RuntimeException
    */
   public function testNonExistantFile() {
@@ -47,6 +48,7 @@ class FetcherResultTest extends FeedsUnitTestCase {
   }
 
   /**
+   * @covers ::getRaw
    * @expectedException \RuntimeException
    */
   public function testNonReadableFile() {
@@ -57,6 +59,7 @@ class FetcherResultTest extends FeedsUnitTestCase {
   }
 
   /**
+   * @covers ::getFilePath
    * @expectedException \RuntimeException
    */
   public function testNonWritableFile() {
diff --git a/tests/src/Unit/Result/RawFetcherResultTest.php b/tests/src/Unit/Result/RawFetcherResultTest.php
index 3e4f174..9d324c9 100644
--- a/tests/src/Unit/Result/RawFetcherResultTest.php
+++ b/tests/src/Unit/Result/RawFetcherResultTest.php
@@ -12,17 +12,17 @@ use Drupal\Tests\feeds\Unit\FeedsUnitTestCase;
 class RawFetcherResultTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::getRaw
    */
-  public function testRaw() {
+  public function testGetRaw() {
     $result = new RawFetcherResult('raw text');
     $this->assertSame($result->getRaw(), 'raw text');
   }
 
   /**
-   *
+   * @covers ::getFilePath
    */
-  public function testFilePath() {
+  public function testGetFilePath() {
     $result = new RawFetcherResult('raw text');
     $this->assertSame(file_get_contents($result->getFilePath()), 'raw text');
 
diff --git a/tests/src/Unit/StateTest.php b/tests/src/Unit/StateTest.php
index 7278f82..cf08d41 100644
--- a/tests/src/Unit/StateTest.php
+++ b/tests/src/Unit/StateTest.php
@@ -12,7 +12,7 @@ use Drupal\feeds\StateInterface;
 class StateTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * Tests public progress property.
    */
   public function testProgress() {
     $state = new State();
diff --git a/tests/src/Unit/TargetDefinitionTest.php b/tests/src/Unit/TargetDefinitionTest.php
index d195d6f..f95fcb6 100644
--- a/tests/src/Unit/TargetDefinitionTest.php
+++ b/tests/src/Unit/TargetDefinitionTest.php
@@ -11,7 +11,7 @@ use Drupal\feeds\TargetDefinition;
 class TargetDefinitionTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * Tests several methods of TargetDefinition class.
    */
   public function test() {
     $target_definition = TargetDefinition::create()
diff --git a/tests/src/Unit/Zend/Extension/Georss/EntryTest.php b/tests/src/Unit/Zend/Extension/Georss/EntryTest.php
index b7c2f84..eb8a1d3 100644
--- a/tests/src/Unit/Zend/Extension/Georss/EntryTest.php
+++ b/tests/src/Unit/Zend/Extension/Georss/EntryTest.php
@@ -12,7 +12,9 @@ use Drupal\feeds\Zend\Extension\Georss\Entry;
 class EntryTest extends FeedsUnitTestCase {
 
   /**
-   *
+   * @covers ::setXpath
+   * @covers ::setEntryElement
+   * @covers ::getGeoPoint
    */
   public function test() {
     $text = '<feed xmlns:georss="http://www.georss.org/georss">';