diff --git a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
index 2ebcbba..a2c817d 100644
--- a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
@@ -310,7 +310,7 @@ public function next() {
 
       $row_data = $this->getIterator()->current() + $this->configuration;
       $this->getIterator()->next();
-      $row = new Row($row_data, $this->migration->getSourcePlugin()->getIds(), $this->migration->get('destinationIds'));
+      $row = new Row($row_data, $this->getIds(), $this->migration->get('destinationIds'));
 
       // Populate the source key for this row.
       $this->currentSourceIds = $row->getSourceIdValues();
diff --git a/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
index 7a448f0..e940491 100644
--- a/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
@@ -114,18 +114,13 @@ protected function prepareQuery() {
    */
   protected function initializeIterator() {
     $this->prepareQuery();
-    $high_water_property = $this->migration->get('highWaterProperty');
-
-    // Get the key values, for potential use in joining to the map table, or
-    // enforcing idlist.
-    $keys = array();
 
     // The rules for determining what conditions to add to the query are as
     // follows (applying first applicable rule)
     // 1. If idlist is provided, then only process items in that list (AND key
     //    IN (idlist)). Only applicable with single-value keys.
-    if ($id_list = $this->migration->get('idlist')) {
-      $this->query->condition($keys[0], $id_list, 'IN');
+    if (isset($this->configuration['idlist'])) {
+      $this->query->condition(array_keys($this->getIds())[0], $this->configuration['idlist'], 'IN');
     }
     else {
       // 2. If the map is joinable, join it. We will want to accept all rows
@@ -173,14 +168,15 @@ protected function initializeIterator() {
       }
       // 3. If we are using high water marks, also include rows above the mark.
       //    But, include all rows if the high water mark is not set.
-      if (isset($high_water_property['name']) && ($high_water = $this->migration->getHighWater()) !== '') {
+      if (isset($this->configuration['highWaterProperty']) && ($high_water = $this->migration->getHighWater()) !== '') {
+        $high_water_property = $this->configuration['highWaterProperty'];
         if (isset($high_water_property['alias'])) {
-          $high_water = $high_water_property['alias'] . '.' . $high_water_property['name'];
+          $field = $high_water_property['alias'] . '.' . $high_water_property['field'];
         }
         else {
-          $high_water = $high_water_property['name'];
+          $field = $high_water_property['field'];
         }
-        $conditions->condition($high_water, $high_water, '>');
+        $conditions->condition($field, $high_water, '>');
         $condition_added = TRUE;
       }
       if ($condition_added) {
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ActionTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/ActionTest.php
index cc88aef..0250b35 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ActionTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/ActionTest.php
@@ -24,8 +24,6 @@ class ActionTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'test',
-    // Leave it empty for now.
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_action',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorFeedTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorFeedTest.php
index ecb57ba..e0a2aa1 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorFeedTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorFeedTest.php
@@ -20,7 +20,6 @@ class AggregatorFeedTest extends MigrateSqlSourceTestCase {
 
   protected $migrationConfiguration = array(
     'id' => 'test',
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_aggregator_feed',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorItemTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorItemTest.php
index 29c0c0d..ae39e05 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorItemTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorItemTest.php
@@ -22,8 +22,6 @@ class AggregatorItemTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'test',
-    // Leave it empty for now.
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_aggregator_item',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/BlockTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/BlockTest.php
index 79e3344..dd3e87e 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/BlockTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/BlockTest.php
@@ -24,7 +24,6 @@ class BlockTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'test',
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_block',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/BoxTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/BoxTest.php
index fdd33ed..6b2bc8a 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/BoxTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/BoxTest.php
@@ -24,8 +24,6 @@ class BoxTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'test',
-    // Leave it empty for now.
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_boxes',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
index 26a7e51..b51d1bb 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
@@ -20,7 +20,7 @@ class CommentSourceWithHighWaterTest extends CommentTestBase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->migrationConfiguration['highWaterProperty']['field'] = 'timestamp';
+    $this->migrationConfiguration['source']['highWaterProperty']['field'] = 'timestamp';
     array_shift($this->expectedResults);
     parent::setUp();
   }
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentTestBase.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentTestBase.php
index 0b8f403..9baa67d 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentTestBase.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentTestBase.php
@@ -22,8 +22,6 @@
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'test',
-    // Leave it empty for now.
-    'idlist' => array(),
     // This needs to be the identifier of the actual key: cid for comment, nid
     // for node and so on.
     'source' => array(
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ContactCategoryTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/ContactCategoryTest.php
index a3c4055..6973223 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ContactCategoryTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/ContactCategoryTest.php
@@ -20,7 +20,6 @@ class ContactCategoryTest extends MigrateSqlSourceTestCase {
 
   protected $migrationConfiguration = array(
     'id' => 'test',
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_contact_category',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstancePerViewModeTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstancePerViewModeTest.php
index 0bf81f9..bf0ea58 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstancePerViewModeTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstancePerViewModeTest.php
@@ -24,8 +24,6 @@ class FieldInstancePerViewModeTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'view_mode_test',
-    // Leave it empty for now.
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_field_instance_per_view_mode',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstanceTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstanceTest.php
index 22300bf..64480ad 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstanceTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstanceTest.php
@@ -24,8 +24,6 @@ class FieldInstanceTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = [
     // The id of the entity, can be any string.
     'id' => 'test_fieldinstance',
-    // Leave it empty for now.
-    'idlist' => [],
     'source' => [
       'plugin' => 'd6_field_instance',
     ],
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldTest.php
index e95ac4a..2d0a5d9 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldTest.php
@@ -24,8 +24,6 @@ class FieldTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The id of the entity, can be any string.
     'id' => 'test_field',
-    // Leave it empty for now.
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_field',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FileTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/FileTest.php
index 52614c9..570a553 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FileTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/FileTest.php
@@ -22,8 +22,6 @@ class FileTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'test',
-    // Leave it empty for now.
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_file',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php
index 49ec31a..fcfc7b0 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php
@@ -23,10 +23,9 @@ class FilterFormatTest extends MigrateSqlSourceTestCase {
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
     'id' => 'test',
-    'highWaterProperty' => array('field' => 'test'),
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_filter_formats',
+      'highWaterProperty' => array('field' => 'test'),
     ),
   );
 
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuLinkSourceTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuLinkSourceTest.php
index fb9e0e7..69b6651 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuLinkSourceTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuLinkSourceTest.php
@@ -24,8 +24,6 @@ class MenuLinkSourceTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'mlid',
-    // Leave it empty for now.
-    'idlist' => array(),
     // This needs to be the identifier of the actual key: cid for comment, nid
     // for node and so on.
     'source' => array(
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuTest.php
index 4ec45b4..b448ed2 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuTest.php
@@ -24,8 +24,6 @@ class MenuTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'test',
-    // Leave it empty for now.
-    'idlist' => array(),
     // This needs to be the identifier of the actual key: cid for comment, nid
     // for node and so on.
     'source' => array(
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeByNodeTypeTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeByNodeTypeTest.php
index 2370bd8..c283bc6 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeByNodeTypeTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeByNodeTypeTest.php
@@ -21,8 +21,6 @@ class NodeByNodeTypeTest extends MigrateSqlSourceTestCase {
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
     'id' => 'test',
-    // Leave it empty for now.
-    'idlist' => array(),
     // The fake configuration for the source.
     'source' => array(
       'plugin' => 'd6_node',
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionByNodeTypeTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionByNodeTypeTest.php
index e4e7acb..54db37e 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionByNodeTypeTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionByNodeTypeTest.php
@@ -21,8 +21,6 @@ class NodeRevisionByNodeTypeTest extends MigrateSqlSourceTestCase {
   // The fake Migration configuration entity.
   protected $migrationConfiguration = [
     'id' => 'test',
-    // Leave it empty for now.
-    'idlist' => [],
     // The fake configuration for the source.
     'source' => [
       'plugin' => 'd6_node_revision',
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionTest.php
index 4dde4b1..1bd0520 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionTest.php
@@ -21,8 +21,6 @@ class NodeRevisionTest extends MigrateSqlSourceTestCase {
   // The fake Migration configuration entity.
   protected $migrationConfiguration = [
     'id' => 'test',
-    // Leave it empty for now.
-    'idlist' => [],
     // The fake configuration for the source.
     'source' => [
       'plugin' => 'd6_node_revision',
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php
index a108f61..24c9049 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php
@@ -21,8 +21,6 @@ class NodeTest extends MigrateSqlSourceTestCase {
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
     'id' => 'test',
-    // Leave it empty for now.
-    'idlist' => array(),
     // The fake configuration for the source.
     'source' => array(
       'plugin' => 'd6_node',
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTypeTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTypeTest.php
index 5d80aca..530414e 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTypeTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTypeTest.php
@@ -24,8 +24,6 @@ class NodeTypeTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'test_nodetypes',
-    // Leave it empty for now.
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_nodetype',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ProfileFieldTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/ProfileFieldTest.php
index 4a8609e..51cabb0 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ProfileFieldTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/ProfileFieldTest.php
@@ -24,8 +24,6 @@ class ProfileFieldTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = [
     // The id of the entity, can be any string.
     'id' => 'test_profile_fields',
-    // Leave it empty for now.
-    'idlist' => [],
     'source' => [
       'plugin' => 'd6_profile_field',
     ],
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/RoleTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/RoleTest.php
index e9311d7..8f3c08c 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/RoleTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/RoleTest.php
@@ -24,8 +24,6 @@ class RoleTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'test',
-    // Leave it empty for now.
-    'idlist' => array(),
     // This needs to be the identifier of the actual key: cid for comment, nid
     // for node and so on.
     'source' => array(
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTestBase.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTestBase.php
index ba8129c..9fcf6f9 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTestBase.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTestBase.php
@@ -18,10 +18,9 @@
 
   protected $migrationConfiguration = array(
     'id' => 'test',
-    'highWaterProperty' => array('field' => 'test'),
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_taxonomy_term',
+      'highWaterProperty' => array('field' => 'test'),
     ),
   );
 
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TestComment.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/TestComment.php
deleted file mode 100644
index 158780a..0000000
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TestComment.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\TestComment.
- */
-
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\migrate_drupal\Plugin\migrate\source\d6\Comment;
-
-class TestComment extends Comment {
-  public function setDatabase(Connection $database) {
-    $this->database = $database;
-  }
-  public function setModuleHandler(ModuleHandlerInterface $module_handler) {
-    $this->moduleHandler = $module_handler;
-  }
-}
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TestNode.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/TestNode.php
deleted file mode 100644
index 471416e..0000000
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TestNode.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\TestNode.
- */
-
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\migrate_drupal\Plugin\migrate\source\d6\Node;
-
-/**
- * Provides a node source plugin used for unit testing.
- */
-class TestNode extends Node {
-
-  /**
-   * Sets the database connection for this source plugin.
-   *
-   * @param \Drupal\Core\Database\Connection $database
-   */
-  public function setDatabase(Connection $database) {
-    $this->database = $database;
-  }
-
-  /**
-   * Sets the module handler for this source plugin.
-   *
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   */
-  public function setModuleHandler(ModuleHandlerInterface $module_handler) {
-    $this->moduleHandler = $module_handler;
-  }
-
-}
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TestNodeRevision.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/TestNodeRevision.php
deleted file mode 100644
index 77e5ac6..0000000
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TestNodeRevision.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\TestNodeRevision.
- */
-
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeRevision;
-
-/**
- * Provides a node revision source plugin used for unit testing.
- */
-class TestNodeRevision extends NodeRevision {
-
-  /**
-   * Sets the database connection for this source plugin.
-   *
-   * @param \Drupal\Core\Database\Connection $database
-   */
-  public function setDatabase(Connection $database) {
-    $this->database = $database;
-  }
-
-  /**
-   * Sets the module handler for this source plugin.
-   *
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   */
-  public function setModuleHandler(ModuleHandlerInterface $module_handler) {
-    $this->moduleHandler = $module_handler;
-  }
-
-}
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TestTerm.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/TestTerm.php
deleted file mode 100644
index 6cf73e4..0000000
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TestTerm.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\TestTerm.
- */
-
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\migrate_drupal\Plugin\migrate\source\d6\Term;
-
-class TestTerm extends Term {
-  public function setDatabase(Connection $database) {
-    $this->database = $database;
-  }
-  public function setModuleHandler(ModuleHandlerInterface $module_handler) {
-    $this->moduleHandler = $module_handler;
-  }
-}
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UrlAliasTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/UrlAliasTest.php
index 780ed0b..f385626 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UrlAliasTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/UrlAliasTest.php
@@ -20,10 +20,9 @@ class UrlAliasTest extends MigrateSqlSourceTestCase {
 
   protected $migrationConfiguration = array(
     'id' => 'test',
-    'highWaterProperty' => array('field' => 'test'),
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_url_alias',
+      'highWaterProperty' => array('field' => 'test'),
     ),
   );
 
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserPictureTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserPictureTest.php
index de70385..5f7b6fe 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserPictureTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserPictureTest.php
@@ -20,7 +20,6 @@ class UserPictureTest extends MigrateSqlSourceTestCase {
 
   protected $migrationConfiguration = array(
     'id' => 'test_user_picture',
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_user_picture',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserTest.php
index 36d4b67..29a4c10 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/UserTest.php
@@ -20,7 +20,6 @@ class UserTest extends MigrateSqlSourceTestCase {
 
   protected $migrationConfiguration = array(
     'id' => 'test',
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_user',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ViewModeTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/ViewModeTest.php
index 250549f..d285dcd 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ViewModeTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/ViewModeTest.php
@@ -24,8 +24,6 @@ class ViewModeTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = array(
     // The ID of the entity, can be any string.
     'id' => 'view_mode_test',
-    // Leave it empty for now.
-    'idlist' => array(),
     'source' => array(
       'plugin' => 'd6_field_instance_view_mode',
     ),
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/VocabularyTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/VocabularyTest.php
index 2c0d5e6..f5e273a 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/VocabularyTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/VocabularyTest.php
@@ -22,8 +22,6 @@ class VocabularyTest extends MigrateSqlSourceTestCase {
   protected $migrationConfiguration = [
     // The ID of the entity, can be any string.
     'id' => 'test',
-    // Leave it empty for now.
-    'idlist' => [],
     'source' => [
       'plugin' => 'd6_vocabulary',
     ],