diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
index ed19178387f7f7babf7e3cb2de6ab94d1c37f4cd..4d4df032e4a26a19d82d1fff4810b488e1d9475b 100644
--- a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
@@ -40,7 +40,7 @@ protected function setUp() {
       ),
     ));
     $this->executeMigrations([
-      'd7_node:test_content_type',
+      'd7_node',
       'd7_comment_type',
       'd7_comment',
     ]);
diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
index bbc8088271fa50d978513db81cfd4b1a66678b2b..a02d12f57ca91182aa9822ab82344091942c4813 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -3835,6 +3835,18 @@
   'body_summary' => '',
   'body_format' => 'filtered_html',
 ))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'article',
+  'deleted' => '0',
+  'entity_id' => '3',
+  'revision_id' => '3',
+  'language' => 'und',
+  'delta' => '0',
+  'body_value' => "is - ...is that it's the absolute best show ever. Trust me, I would know.",
+  'body_summary' => '',
+  'body_format' => 'filtered_html',
+))
 ->execute();
 
 $connection->schema()->createTable('field_data_comment_body', array(
@@ -4930,6 +4942,18 @@
   'field_link_title' => 'Home',
   'field_link_attributes' => 'a:0:{}',
 ))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'article',
+  'deleted' => '0',
+  'entity_id' => '3',
+  'revision_id' => '3',
+  'language' => 'und',
+  'delta' => '0',
+  'field_link_url' => '<front>',
+  'field_link_title' => 'Home',
+  'field_link_attributes' => 'a:1:{s:5:"title";s:0:"";}',
+))
 ->execute();
 
 $connection->schema()->createTable('field_data_field_long_text', array(
@@ -5167,6 +5191,16 @@
   'delta' => '0',
   'field_tags_tid' => '9',
 ))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'article',
+  'deleted' => '0',
+  'entity_id' => '3',
+  'revision_id' => '3',
+  'language' => 'und',
+  'delta' => '0',
+  'field_tags_tid' => '9',
+))
 ->values(array(
   'entity_type' => 'node',
   'bundle' => 'article',
@@ -5177,6 +5211,16 @@
   'delta' => '1',
   'field_tags_tid' => '14',
 ))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'article',
+  'deleted' => '0',
+  'entity_id' => '3',
+  'revision_id' => '3',
+  'language' => 'und',
+  'delta' => '1',
+  'field_tags_tid' => '14',
+))
 ->values(array(
   'entity_type' => 'node',
   'bundle' => 'article',
@@ -5187,6 +5231,16 @@
   'delta' => '2',
   'field_tags_tid' => '17',
 ))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'article',
+  'deleted' => '0',
+  'entity_id' => '3',
+  'revision_id' => '3',
+  'language' => 'und',
+  'delta' => '2',
+  'field_tags_tid' => '17',
+))
 ->execute();
 
 $connection->schema()->createTable('field_data_field_term_reference', array(
@@ -5603,6 +5657,18 @@
   'body_summary' => '',
   'body_format' => 'filtered_html',
 ))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'article',
+  'deleted' => '0',
+  'entity_id' => '3',
+  'revision_id' => '3',
+  'language' => 'und',
+  'delta' => '0',
+  'body_value' => "is - ...is that it's the absolute best show ever. Trust me, I would know.",
+  'body_summary' => '',
+  'body_format' => 'filtered_html',
+))
 ->execute();
 
 $connection->schema()->createTable('field_revision_comment_body', array(
@@ -6710,6 +6776,18 @@
   'field_link_title' => 'Home',
   'field_link_attributes' => 'a:0:{}',
 ))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'article',
+  'deleted' => '0',
+  'entity_id' => '3',
+  'revision_id' => '3',
+  'language' => 'und',
+  'delta' => '0',
+  'field_link_url' => '<front>',
+  'field_link_title' => 'Home',
+  'field_link_attributes' => 'a:1:{s:5:"title";s:0:"";}',
+))
 ->execute();
 
 $connection->schema()->createTable('field_revision_field_long_text', array(
@@ -6950,6 +7028,16 @@
   'delta' => '0',
   'field_tags_tid' => '9',
 ))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'article',
+  'deleted' => '0',
+  'entity_id' => '3',
+  'revision_id' => '3',
+  'language' => 'und',
+  'delta' => '0',
+  'field_tags_tid' => '9',
+))
 ->values(array(
   'entity_type' => 'node',
   'bundle' => 'article',
@@ -6960,6 +7048,16 @@
   'delta' => '1',
   'field_tags_tid' => '14',
 ))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'article',
+  'deleted' => '0',
+  'entity_id' => '3',
+  'revision_id' => '3',
+  'language' => 'und',
+  'delta' => '1',
+  'field_tags_tid' => '14',
+))
 ->values(array(
   'entity_type' => 'node',
   'bundle' => 'article',
@@ -6970,6 +7068,16 @@
   'delta' => '2',
   'field_tags_tid' => '17',
 ))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'article',
+  'deleted' => '0',
+  'entity_id' => '3',
+  'revision_id' => '3',
+  'language' => 'und',
+  'delta' => '2',
+  'field_tags_tid' => '17',
+))
 ->execute();
 
 $connection->schema()->createTable('field_revision_field_term_reference', array(
@@ -29674,7 +29782,23 @@
   'comment' => '2',
   'promote' => '1',
   'sticky' => '0',
-  'tnid' => '0',
+  'tnid' => '2',
+  'translate' => '0',
+))
+->values(array(
+  'nid' => '3',
+  'vid' => '3',
+  'type' => 'article',
+  'language' => 'is',
+  'title' => 'is - The thing about Deep Space 9',
+  'uid' => '1',
+  'status' => '1',
+  'created' => '1471428152',
+  'changed' => '1471428152',
+  'comment' => '2',
+  'promote' => '1',
+  'sticky' => '0',
+  'tnid' => '2',
   'translate' => '0',
 ))
 ->execute();
@@ -29813,6 +29937,14 @@
   'last_comment_uid' => '1',
   'comment_count' => '1',
 ))
+->values(array(
+  'nid' => '3',
+  'cid' => '0',
+  'last_comment_timestamp' => '1471428152',
+  'last_comment_name' => NULL,
+  'last_comment_uid' => '1',
+  'comment_count' => '0',
+))
 ->execute();
 
 $connection->schema()->createTable('node_counter', array(
@@ -29864,6 +29996,18 @@
   'daycount' => '0',
   'timestamp' => '1421727536',
 ))
+->values(array(
+  'nid' => '2',
+  'totalcount' => '1',
+  'daycount' => '1',
+  'timestamp' => '1471428059',
+))
+->values(array(
+  'nid' => '3',
+  'totalcount' => '1',
+  'daycount' => '1',
+  'timestamp' => '1471428153',
+))
 ->execute();
 
 $connection->schema()->createTable('node_revision', array(
@@ -29972,6 +30116,18 @@
   'promote' => '1',
   'sticky' => '0',
 ))
+->values(array(
+  'nid' => '3',
+  'vid' => '3',
+  'uid' => '1',
+  'title' => 'is - The thing about Deep Space 9',
+  'log' => '',
+  'timestamp' => '1471428152',
+  'status' => '1',
+  'comment' => '2',
+  'promote' => '1',
+  'sticky' => '0',
+))
 ->execute();
 
 $connection->schema()->createTable('node_type', array(
@@ -40112,6 +40268,24 @@
   'sticky' => '0',
   'created' => '1441306772',
 ))
+->values(array(
+  'nid' => '3',
+  'tid' => '9',
+  'sticky' => '0',
+  'created' => '1471428152',
+))
+->values(array(
+  'nid' => '3',
+  'tid' => '14',
+  'sticky' => '0',
+  'created' => '1471428152',
+))
+->values(array(
+  'nid' => '3',
+  'tid' => '17',
+  'sticky' => '0',
+  'created' => '1471428152',
+))
 ->execute();
 
 $connection->schema()->createTable('taxonomy_term_data', array(
@@ -41342,7 +41516,7 @@
 ))
 ->values(array(
   'name' => 'language_content_type_article',
-  'value' => 's:1:"0";',
+  'value' => 's:1:"2";',
 ))
 ->values(array(
   'name' => 'language_content_type_blog',
@@ -41442,7 +41616,7 @@
 ))
 ->values(array(
   'name' => 'menu_override_parent_selector',
-  'value' => 'b:1;',
+  'value' => 'b:0;',
 ))
 ->values(array(
   'name' => 'menu_parent_article',
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
index 6b30adea50b4ff678c310462d222e30d8636b81c..2769b4431821ddc738e2cd9df92a25c46f913aca 100644
--- a/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
+++ b/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
@@ -48,9 +48,9 @@ protected function getEntityCounts() {
       'file' => 1,
       'filter_format' => 7,
       'image_style' => 6,
-      'language_content_settings' => 1,
+      'language_content_settings' => 2,
       'migration' => 59,
-      'node' => 2,
+      'node' => 3,
       'node_type' => 6,
       'rdf_mapping' => 5,
       'search_page' => 2,
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
index cb752576d3790723c4cbe8a46d574b27248cafe3..404e358102202eab6e8ca4ecbdd931f1c9c52790 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
@@ -47,7 +47,7 @@ protected function setUp() {
       'd7_taxonomy_vocabulary',
       'd7_field',
       'd7_field_instance',
-      'd7_node:test_content_type',
+      'd7_node',
       'd7_node:article',
     ]);
   }
diff --git a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
index 1b6a4edd6ea6eedabbdb8d5ea4f55bb92483b3c9..d72f13dc000b8dea440004343e9e56eec94f8d44 100644
--- a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
+++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
@@ -36,7 +36,7 @@ protected function setUp() {
       'd7_user_role',
       'd7_user',
       'd7_node_type',
-      'd7_node:test_content_type',
+      'd7_node',
       'd7_tracker_node',
     ]);
   }
diff --git a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
index 8e679c4e3b1df5094682f7cfff9311e355be1ce4..e3ed88e9cc7eff8d803095c10e2b5955a16c3c9d 100644
--- a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
+++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
@@ -36,7 +36,7 @@ protected function setUp() {
       'd7_user_role',
       'd7_user',
       'd7_node_type',
-      'd7_node:test_content_type',
+      'd7_node',
       'd7_tracker_node',
     ]);
   }