diff --git a/lib/Drupal/migrate/DrupalMessage.php b/lib/Drupal/migrate/DrupalMessage.php
index 4d2490c..dfc7766 100644
--- a/lib/Drupal/migrate/DrupalMessage.php
+++ b/lib/Drupal/migrate/DrupalMessage.php
@@ -7,8 +7,17 @@
 
 namespace Drupal\migrate;
 
+/**
+ * Class DrupalMessage
+ *
+ * @package Drupal\migrate
+ */
 class DrupalMessage implements MigrateMessageInterface {
 
+  /**
+   * @param $message
+   * @param string $type
+   */
   function display($message, $type = 'status') {
     drupal_set_message($message, $type);
   }
diff --git a/lib/Drupal/migrate/MigrateException.php b/lib/Drupal/migrate/MigrateException.php
index c7611bc..3224e15 100644
--- a/lib/Drupal/migrate/MigrateException.php
+++ b/lib/Drupal/migrate/MigrateException.php
@@ -16,6 +16,10 @@ class MigrateException extends \Exception {
    * @var int
    */
   protected $level;
+
+  /**
+   * @return int
+   */
   public function getLevel() {
     return $this->level;
   }
diff --git a/lib/Drupal/migrate/MigrateExecutable.php b/lib/Drupal/migrate/MigrateExecutable.php
index 968725d..789d2f3 100644
--- a/lib/Drupal/migrate/MigrateExecutable.php
+++ b/lib/Drupal/migrate/MigrateExecutable.php
@@ -8,6 +8,7 @@
 namespace Drupal\migrate;
 
 use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 
 class MigrateExecutable {
@@ -59,8 +60,18 @@ class MigrateExecutable {
    * @var array
    */
   protected $sourceIdValues;
+
+  /**
+   * @var int
+   */
   protected $processed_since_feedback = 0;
 
+  /**
+   * @param MigrationInterface $migration
+   * @param MigrateMessageInterface $message
+   *
+   * @throws \Exception
+   */
   public function __construct(MigrationInterface $migration, MigrateMessageInterface $message) {
     $this->migration = $migration;
     $this->message = $message;
@@ -98,7 +109,9 @@ class MigrateExecutable {
       $this->source = new Source($this->migration);
     }
     return $this->source;
-  }
+  }/**
+   * Provide meta information about this battery of tests.
+   */
 
   /**
    * The rollback action to be saved for the current row.
@@ -178,7 +191,7 @@ class MigrateExecutable {
           }
         }
       }
-      catch (\MigrateException $e) {
+      catch (MigrateException $e) {
         $this->migration->getIdMap()->saveIDMapping($row, array(), $e->getStatus(), $this->rollbackAction);
         $this->saveMessage($e->getMessage(), $e->getLevel());
         $this->message->display($e->getMessage());
diff --git a/lib/Drupal/migrate/MigrateMessageInterface.php b/lib/Drupal/migrate/MigrateMessageInterface.php
index 6553ea7..bcf3753 100644
--- a/lib/Drupal/migrate/MigrateMessageInterface.php
+++ b/lib/Drupal/migrate/MigrateMessageInterface.php
@@ -9,5 +9,11 @@ namespace Drupal\migrate;
 
 interface MigrateMessageInterface {
 
+  /**
+   * @param $message
+   * @param string $type
+   *
+   * @return mixed
+   */
   function display($message, $type = 'status');
 }
diff --git a/lib/Drupal/migrate/Plugin/MigrateIdMapInterface.php b/lib/Drupal/migrate/Plugin/MigrateIdMapInterface.php
index 4c0bc65..92112f4 100644
--- a/lib/Drupal/migrate/Plugin/MigrateIdMapInterface.php
+++ b/lib/Drupal/migrate/Plugin/MigrateIdMapInterface.php
@@ -89,6 +89,9 @@ interface MigrateIdMapInterface {
    * Delete the map and message entries for a given source record
    *
    * @param array $source_key
+   * @param bool $messages_only
+   *
+   * @return
    */
   public function delete(array $source_key, $messages_only = FALSE);
 
@@ -115,6 +118,13 @@ interface MigrateIdMapInterface {
    * Retrieve map data for a given source or destination item
    */
   public function getRowBySource(array $source_id);
+
+
+  /**
+   * @param array $destination_id
+   *
+   * @return mixed
+   */
   public function getRowByDestination(array $destination_id);
 
   /**
diff --git a/lib/Drupal/migrate/Plugin/MigrateProcessBag.php b/lib/Drupal/migrate/Plugin/MigrateProcessBag.php
index d519920..ba5622d 100644
--- a/lib/Drupal/migrate/Plugin/MigrateProcessBag.php
+++ b/lib/Drupal/migrate/Plugin/MigrateProcessBag.php
@@ -21,6 +21,11 @@ class MigrateProcessBag extends DefaultPluginBag {
 
   protected $pluginKey = 'plugin';
 
+  /**
+   * @param PluginManagerInterface $manager
+   * @param array $configurations
+   * @param MigrationInterface $migration
+   */
   public function __construct(PluginManagerInterface $manager, array $configurations = array(), MigrationInterface $migration) {
     parent::__construct($manager, $configurations);
     $this->migration = $migration;
diff --git a/lib/Drupal/migrate/Plugin/migrate/destination/Config.php b/lib/Drupal/migrate/Plugin/migrate/destination/Config.php
index 361eb40..6a31912 100644
--- a/lib/Drupal/migrate/Plugin/migrate/destination/Config.php
+++ b/lib/Drupal/migrate/Plugin/migrate/destination/Config.php
@@ -10,6 +10,7 @@ use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\Entity\Migration;
 use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Config\Config as ConfigObject;
@@ -28,6 +29,12 @@ class Config extends DestinationBase implements ContainerFactoryPluginInterface
    */
   protected $config;
 
+  /**
+   * @param array $configuration
+   * @param string $plugin_id
+   * @param array $plugin_definition
+   * @param ConfigObject $config
+   */
   public function __construct(array $configuration, $plugin_id, array $plugin_definition, ConfigObject $config) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->config = $config;
@@ -51,10 +58,27 @@ class Config extends DestinationBase implements ContainerFactoryPluginInterface
       ->save();
   }
 
+  /**
+   * @param array $destination_keys
+   *
+   * @throws \Drupal\migrate\MigrateException
+   */
   public function rollbackMultiple(array $destination_keys) {
-    throw new \MigrateException('Configuration can not be rolled back');
+    throw new MigrateException('Configuration can not be rolled back');
   }
 
+  /**
+   * Derived classes must implement fields(), returning a list of available
+   * destination fields.
+   *
+   * @todo Review the cases where we need the Migration parameter, can we avoid that?
+   *
+   * @param Migration $migration
+   *   Optionally, the migration containing this destination.
+   * @return array
+   *  - Keys: machine names of the fields
+   *  - Values: Human-friendly descriptions of the fields.
+   */
   public function fields(Migration $migration = NULL) {
     // @todo Dynamically fetch fields using Config Schema API.
   }
diff --git a/lib/Drupal/migrate/Plugin/migrate/id_map/Sql.php b/lib/Drupal/migrate/Plugin/migrate/id_map/Sql.php
index e93566d..765b0ba 100644
--- a/lib/Drupal/migrate/Plugin/migrate/id_map/Sql.php
+++ b/lib/Drupal/migrate/Plugin/migrate/id_map/Sql.php
@@ -260,7 +260,10 @@ class Sql extends PluginBase implements MigrateIdMapInterface {
   /**
    * Retrieve a row from the map table, given a destination ID
    *
-   * @param array $source_id
+   * @param array $destination_id
+   *
+   * @return mixed
+   *   The row(s) of data
    */
   public function getRowByDestination(array $destination_id) {
     $query = $this->getDatabase()->select($this->mapTable, 'map')
@@ -338,7 +341,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface {
    * to the destination key. Also may be called, setting the third parameter to
    * NEEDS_UPDATE, to signal an existing record should be remigrated.
    *
-   * @param stdClass $row
+   * @param Row $row
    *  The raw source data. We use the key map derived from the source object
    *  to get the source key values.
    * @param array $dest_ids
diff --git a/lib/Drupal/migrate/Plugin/migrate/source/D6Variable.php b/lib/Drupal/migrate/Plugin/migrate/source/D6Variable.php
index 4c96d71..3160d53 100644
--- a/lib/Drupal/migrate/Plugin/migrate/source/D6Variable.php
+++ b/lib/Drupal/migrate/Plugin/migrate/source/D6Variable.php
@@ -24,6 +24,9 @@ class D6Variable extends Drupal6SqlBase {
    */
   protected $variables;
 
+  /**
+   * {@inheritdoc}
+   */
   function __construct(array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $migration);
     $this->variables = $this->configuration['variables'];
diff --git a/lib/Drupal/migrate/Plugin/migrate/source/d7/Fields.php b/lib/Drupal/migrate/Plugin/migrate/source/d7/Fields.php
index 8d13c86..1e3870f 100644
--- a/lib/Drupal/migrate/Plugin/migrate/source/d7/Fields.php
+++ b/lib/Drupal/migrate/Plugin/migrate/source/d7/Fields.php
@@ -43,6 +43,9 @@ class Fields {
    * @param $entity_type
    * @param $bundle
    * @param $include_body
+   *
+   * @return array
+   *   An array that provides source field information.
    */
   protected function getSourceFieldInfo() {
     if (empty($this->sourceFieldInfo)) {
diff --git a/lib/Drupal/migrate/Row.php b/lib/Drupal/migrate/Row.php
index be45ebf..2218b74 100644
--- a/lib/Drupal/migrate/Row.php
+++ b/lib/Drupal/migrate/Row.php
@@ -116,6 +116,7 @@ class Row {
     if (isset($this->source[$property])) {
       return $this->source[$property];
     }
+    return NULL;
   }
 
   /**
diff --git a/lib/Drupal/migrate/Source.php b/lib/Drupal/migrate/Source.php
index 839e716..e532a1c 100644
--- a/lib/Drupal/migrate/Source.php
+++ b/lib/Drupal/migrate/Source.php
@@ -8,6 +8,8 @@
 namespace Drupal\migrate;
 
 use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use MigrateMap;
 
 /**
  * A base class for migrate sources.
@@ -388,7 +390,7 @@ class Source implements \Iterator, \Countable {
       $this->migration->getIdMap()->delete($this->currentIds, TRUE);
       $this->migration->saveQueuedMessages();
       $this->migration->getIdMap()->saveIDMapping($row, array(),
-        \MigrateMap::STATUS_IGNORED, $this->migration->rollbackAction);
+        MigrateIdMapInterface::STATUS_IGNORED, $this->migration->rollbackAction);
       $this->numIgnored++;
       $this->currentRow = NULL;
       $this->currentIds = NULL;
diff --git a/lib/Drupal/migrate/Tests/Dump/Drupal6SystemSite.php b/lib/Drupal/migrate/Tests/Dump/Drupal6SystemSite.php
index 749652b..b9084dd 100644
--- a/lib/Drupal/migrate/Tests/Dump/Drupal6SystemSite.php
+++ b/lib/Drupal/migrate/Tests/Dump/Drupal6SystemSite.php
@@ -4,8 +4,16 @@ namespace Drupal\migrate\Tests\Dump;
 
 use Drupal\Core\Database\Connection;
 
+/**
+ * Class Drupal6SystemSite
+ *
+ * @package Drupal\migrate\Tests\Dump
+ */
 class Drupal6SystemSite {
 
+  /**
+   * @param Connection $database
+   */
   public static function load(Connection $database) {
     $database->schema()->createTable('variable', array(
       'fields' => array(
diff --git a/lib/Drupal/migrate/Tests/MigrateSystemConfigsTest.php b/lib/Drupal/migrate/Tests/MigrateSystemConfigsTest.php
index 3ad7e7f..ee6bdd8 100644
--- a/lib/Drupal/migrate/Tests/MigrateSystemConfigsTest.php
+++ b/lib/Drupal/migrate/Tests/MigrateSystemConfigsTest.php
@@ -12,6 +12,9 @@ use Drupal\migrate\MigrateExecutable;
 
 class MigrateSystemConfigsTest extends MigrateTestBase {
 
+  /**
+   * @inheritdoc
+   */
   public static function getInfo() {
     return array(
       'name'  => 'Migrate variables to system.site.yml',
diff --git a/lib/Drupal/migrate/Tests/MigrateTestBase.php b/lib/Drupal/migrate/Tests/MigrateTestBase.php
index f45d520..97540ee 100644
--- a/lib/Drupal/migrate/Tests/MigrateTestBase.php
+++ b/lib/Drupal/migrate/Tests/MigrateTestBase.php
@@ -23,6 +23,12 @@ class MigrateTestBase extends WebTestBase {
 
   public static $modules = array('migrate');
 
+  /**
+   * @param MigrationInterface $migration
+   * @param array $files
+   *
+   * @return \Drupal\Core\Database\Connection
+   */
   protected function prepare(MigrationInterface $migration, array $files = array()) {
     $databasePrefix = 'simpletest_m_' . mt_rand(1000, 1000000);
     $connection_info = Database::getConnectionInfo('default');
diff --git a/tests/Drupal/migrate/Tests/ConfigDestinationTest.php b/tests/Drupal/migrate/Tests/ConfigDestinationTest.php
index 0a56c19..6ca5902 100644
--- a/tests/Drupal/migrate/Tests/ConfigDestinationTest.php
+++ b/tests/Drupal/migrate/Tests/ConfigDestinationTest.php
@@ -40,7 +40,7 @@ class ConfigDestinationTest extends UnitTestCase {
   }
 
   /**
-   * Provide meta information about this battery of tests.
+   * @inheritdoc
    */
   public static function getInfo() {
     return array(
diff --git a/tests/Drupal/migrate/Tests/D6ActionSourceTest.php b/tests/Drupal/migrate/Tests/D6ActionSourceTest.php
index 4595e54..750d517 100644
--- a/tests/Drupal/migrate/Tests/D6ActionSourceTest.php
+++ b/tests/Drupal/migrate/Tests/D6ActionSourceTest.php
@@ -77,6 +77,9 @@ class D6ActionSourceTest extends MigrateSqlSourceTestCase {
     ),
   );
 
+  /**
+   * @inheritdoc
+   */
   public static function getInfo() {
     return array(
       'name' => 'D6 action source functionality',
diff --git a/tests/Drupal/migrate/Tests/D6BoxesSourceTest.php b/tests/Drupal/migrate/Tests/D6BoxesSourceTest.php
index d144316..de82554 100644
--- a/tests/Drupal/migrate/Tests/D6BoxesSourceTest.php
+++ b/tests/Drupal/migrate/Tests/D6BoxesSourceTest.php
@@ -74,7 +74,7 @@ class D6BoxesSourceTest extends MigrateSqlSourceTestCase {
   }
 
   /**
-   * Provide meta information about this battery of tests.
+   * @inheritdoc
    */
   public static function getInfo() {
     return array(
diff --git a/tests/Drupal/migrate/Tests/D6CommentSourceTest.php b/tests/Drupal/migrate/Tests/D6CommentSourceTest.php
index 57dddcd..cb610b2 100644
--- a/tests/Drupal/migrate/Tests/D6CommentSourceTest.php
+++ b/tests/Drupal/migrate/Tests/D6CommentSourceTest.php
@@ -83,6 +83,9 @@ class D6CommentSourceTest extends MigrateSqlSourceTestCase {
     ),
   );
 
+  /**
+   * @inheritdoc
+   */
   public static function getInfo() {
     return array(
       'name' => 'D6 comment source functionality',
diff --git a/tests/Drupal/migrate/Tests/D6CommentSourceWithHighwaterTest.php b/tests/Drupal/migrate/Tests/D6CommentSourceWithHighwaterTest.php
index f285800..4551d3c 100644
--- a/tests/Drupal/migrate/Tests/D6CommentSourceWithHighwaterTest.php
+++ b/tests/Drupal/migrate/Tests/D6CommentSourceWithHighwaterTest.php
@@ -14,6 +14,9 @@ namespace Drupal\migrate\Tests;
  */
 class D6CommentSourceWithHighwaterTest extends D6CommentSourceTest {
 
+  /**
+   * @inheritdoc
+   */
   public static function getInfo() {
     return array(
       'name' => 'D6 comment source + highwater',
diff --git a/tests/Drupal/migrate/Tests/D6ContactCategorySourceTest.php b/tests/Drupal/migrate/Tests/D6ContactCategorySourceTest.php
index 7f0d271..d11da79 100644
--- a/tests/Drupal/migrate/Tests/D6ContactCategorySourceTest.php
+++ b/tests/Drupal/migrate/Tests/D6ContactCategorySourceTest.php
@@ -51,6 +51,9 @@ class D6ContactCategorySourceTest extends MigrateSqlSourceTestCase {
     ),
   );
 
+  /**
+   * @inheritdoc
+   */
   public static function getInfo() {
     return array(
       'name' => 'D6 contact category source functionality',
@@ -59,6 +62,9 @@ class D6ContactCategorySourceTest extends MigrateSqlSourceTestCase {
     );
   }
 
+  /**
+   * @inheritdoc
+   */
   public function setUp() {
     foreach ($this->results as $k => $row) {
       $this->databaseContents['contact'][$k] = $row;
diff --git a/tests/Drupal/migrate/Tests/D6FileSourceTest.php b/tests/Drupal/migrate/Tests/D6FileSourceTest.php
index 476b738..6e09f72 100644
--- a/tests/Drupal/migrate/Tests/D6FileSourceTest.php
+++ b/tests/Drupal/migrate/Tests/D6FileSourceTest.php
@@ -62,6 +62,9 @@ class D6FileSourceTest extends MigrateSqlSourceTestCase {
     ),
   );
 
+  /**
+   * @inheritdoc
+   */
   public static function getInfo() {
     return array(
       'name' => 'D6 file source functionality',
@@ -70,6 +73,9 @@ class D6FileSourceTest extends MigrateSqlSourceTestCase {
     );
   }
 
+  /**
+   * @inheritdoc
+   */
   public function setUp() {
     $this->databaseContents['files'] = $this->results;
     parent::setUp();
diff --git a/tests/Drupal/migrate/Tests/D6FilterFormatsTest.php b/tests/Drupal/migrate/Tests/D6FilterFormatsTest.php
index fba275a..ebb0ff2 100644
--- a/tests/Drupal/migrate/Tests/D6FilterFormatsTest.php
+++ b/tests/Drupal/migrate/Tests/D6FilterFormatsTest.php
@@ -108,6 +108,9 @@ class D6FilterFormatsSourceTest extends MigrateSqlSourceTestCase {
     ),
   );
 
+  /**
+   * @inheritdoc
+   */
   public static function getInfo() {
     return array(
       'name' => 'D6 Filter Formats source functionality',
@@ -116,6 +119,9 @@ class D6FilterFormatsSourceTest extends MigrateSqlSourceTestCase {
     );
   }
 
+  /**
+   * @inheritdoc
+   */
   public function setUp() {
     foreach ($this->results as $k => $row) {
       foreach ($row['filters'] as $filter) {
diff --git a/tests/Drupal/migrate/Tests/D6MenuSourceTest.php b/tests/Drupal/migrate/Tests/D6MenuSourceTest.php
index 04129aa..ed41d9a 100644
--- a/tests/Drupal/migrate/Tests/D6MenuSourceTest.php
+++ b/tests/Drupal/migrate/Tests/D6MenuSourceTest.php
@@ -59,6 +59,9 @@ class D6MenuSourceTest extends MigrateSqlSourceTestCase {
     ),
   );
 
+  /**
+   * @inheritdoc
+   */
   public static function getInfo() {
     return array(
       'name' => 'D6 menu source functionality',
@@ -67,6 +70,9 @@ class D6MenuSourceTest extends MigrateSqlSourceTestCase {
     );
   }
 
+  /**
+   * @inheritdoc
+   */
   public function setUp() {
     // This array stores the database.
     foreach ($this->results as $k => $row) {
diff --git a/tests/Drupal/migrate/Tests/D6NodeTypeSourceTest.php b/tests/Drupal/migrate/Tests/D6NodeTypeSourceTest.php
index e5b7d54..81c07d2 100644
--- a/tests/Drupal/migrate/Tests/D6NodeTypeSourceTest.php
+++ b/tests/Drupal/migrate/Tests/D6NodeTypeSourceTest.php
@@ -90,7 +90,7 @@ class D6NodeTypesSourceTest extends MigrateSqlSourceTestCase {
   }
 
   /**
-   * Provide meta information about this battery of tests.
+   * @inheritdoc
    */
   public static function getInfo() {
     return array(
diff --git a/tests/Drupal/migrate/Tests/D6NodeWithoutFieldsSourceTest.php b/tests/Drupal/migrate/Tests/D6NodeWithoutFieldsSourceTest.php
index 7f5f43a..898a3f2 100644
--- a/tests/Drupal/migrate/Tests/D6NodeWithoutFieldsSourceTest.php
+++ b/tests/Drupal/migrate/Tests/D6NodeWithoutFieldsSourceTest.php
@@ -85,6 +85,9 @@ class D6NodeWithoutFieldsSourceTest extends MigrateSqlSourceTestCase {
     ),
   );
 
+  /**
+   * @inheritdoc
+   */
   public static function getInfo() {
     return array(
       'name' => 'D6 node source functionality',
@@ -93,6 +96,9 @@ class D6NodeWithoutFieldsSourceTest extends MigrateSqlSourceTestCase {
     );
   }
 
+  /**
+   * @inheritdoc
+   */
   public function setUp() {
     foreach ($this->results as $k => $row) {
       $this->databaseContents['node_revisions'][$k]['nid'] = $row['nid'];
diff --git a/tests/Drupal/migrate/Tests/D6RoleSourceTest.php b/tests/Drupal/migrate/Tests/D6RoleSourceTest.php
index ea0364b..871dd5c 100644
--- a/tests/Drupal/migrate/Tests/D6RoleSourceTest.php
+++ b/tests/Drupal/migrate/Tests/D6RoleSourceTest.php
@@ -98,6 +98,9 @@ class D6RoleSourceTest extends MigrateSqlSourceTestCase {
     ),
   );
 
+  /**
+   * @inheritdoc
+   */
   public static function getInfo() {
     return array(
       'name' => 'D6 role source functionality',
@@ -106,6 +109,9 @@ class D6RoleSourceTest extends MigrateSqlSourceTestCase {
     );
   }
 
+  /**
+   * @inheritdoc
+   */
   public function setUp() {
     foreach ($this->results as $k => $row) {
       foreach ($row['permissions'] as $perm) {
diff --git a/tests/Drupal/migrate/Tests/D6TermSourceTest.php b/tests/Drupal/migrate/Tests/D6TermSourceTest.php
index 3cc8f34..cd6add0 100644
--- a/tests/Drupal/migrate/Tests/D6TermSourceTest.php
+++ b/tests/Drupal/migrate/Tests/D6TermSourceTest.php
@@ -84,6 +84,9 @@ class D6TermSourceTest extends MigrateSqlSourceTestCase {
     ),
   );
 
+  /**
+   * @inheritdoc
+   */
   public static function getInfo() {
     return array(
       'name' => 'D6 taxonomy term source functionality',
@@ -92,6 +95,9 @@ class D6TermSourceTest extends MigrateSqlSourceTestCase {
     );
   }
 
+  /**
+   * @inheritdoc
+   */
   public function setUp() {
     foreach ($this->results as $k => $row) {
       foreach ($row['parents'] as $parent) {
diff --git a/tests/Drupal/migrate/Tests/D6TermSourceWithVocabularyFilterTest.php b/tests/Drupal/migrate/Tests/D6TermSourceWithVocabularyFilterTest.php
index 2a69281..ce0aa0d 100644
--- a/tests/Drupal/migrate/Tests/D6TermSourceWithVocabularyFilterTest.php
+++ b/tests/Drupal/migrate/Tests/D6TermSourceWithVocabularyFilterTest.php
@@ -13,6 +13,9 @@ namespace Drupal\migrate\Tests;
  */
 class D6TermSourceWithVocabularyFilterTest extends D6TermSourceTest {
 
+  /**
+   * @inheritdoc
+   */
   public static function getInfo() {
     return array(
       'name' => 'D6 taxonomy term source with vocabulary filter functionality',
@@ -21,6 +24,9 @@ class D6TermSourceWithVocabularyFilterTest extends D6TermSourceTest {
     );
   }
 
+  /**
+   * @inheritdoc
+   */
   public function setUp() {
     $this->migrationConfiguration['source']['vocabulary'] = array(5);
     parent::setUp();
diff --git a/tests/Drupal/migrate/Tests/FakeDatabaseSchema.php b/tests/Drupal/migrate/Tests/FakeDatabaseSchema.php
index 82ee22a..1072b80 100644
--- a/tests/Drupal/migrate/Tests/FakeDatabaseSchema.php
+++ b/tests/Drupal/migrate/Tests/FakeDatabaseSchema.php
@@ -142,7 +142,7 @@ class FakeDatabaseSchema extends Schema {
   }
 
   /**
-   * Provide meta information about this battery of tests.
+   * @inheritdoc
    */
   public static function getInfo() {
     return array(
diff --git a/tests/Drupal/migrate/Tests/FakeSelect.php b/tests/Drupal/migrate/Tests/FakeSelect.php
index 9ae6f30..a1b9447 100644
--- a/tests/Drupal/migrate/Tests/FakeSelect.php
+++ b/tests/Drupal/migrate/Tests/FakeSelect.php
@@ -289,6 +289,9 @@ class FakeSelect extends Select {
    *
    * @return bool
    *   TRUE if the condition matches.
+   *
+   * @throws \Exception
+   *
    */
   protected function matchSingle(array $row, array $condition) {
     $field_info = $this->getFieldInfo($condition['field']);
@@ -527,7 +530,7 @@ class FakeSelect extends Select {
   }
 
   /**
-   * Provide meta information about this battery of tests.
+   * @inheritdoc
    */
   public static function getInfo() {
     return array(
diff --git a/tests/Drupal/migrate/Tests/MigrateTestCase.php b/tests/Drupal/migrate/Tests/MigrateTestCase.php
index 84204ce..c24d6f2 100644
--- a/tests/Drupal/migrate/Tests/MigrateTestCase.php
+++ b/tests/Drupal/migrate/Tests/MigrateTestCase.php
@@ -26,7 +26,7 @@ abstract class MigrateTestCase extends UnitTestCase {
   /**
    * Retrieve a mocked migration.
    *
-   * @return \PHPUnit_Framework_MockObject_MockObject
+   * @return \PHPUnit_Framework_MockObject_MockObject|\Drupal\migrate\Entity\MigrationInterface
    *   The mocked migration.
    */
   protected function getMigration() {