diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
index c13d023..265ef3d 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
@@ -57,38 +57,42 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
    */
   static $migrations = array(
     'd6_action_settings',
-    'd6_aggregator_settings',
     'd6_aggregator_feed',
     'd6_aggregator_item',
+    'd6_aggregator_settings',
     'd6_block',
+    'd6_book',
     'd6_book_settings',
-    'd6_cck_field_values:*',
     'd6_cck_field_revision:*',
-    'd6_comment_type',
+    'd6_cck_field_values:*',
     'd6_comment',
     'd6_comment_entity_display',
     'd6_comment_entity_form_display',
     'd6_comment_entity_form_display_subject',
     'd6_comment_field',
     'd6_comment_field_instance',
+    'd6_comment_type',
     'd6_contact_category',
     'd6_contact_settings',
     'd6_custom_block',
     'd6_date_formats',
     'd6_dblog_settings',
     'd6_field',
+    'd6_field_formatter_settings',
     'd6_field_instance',
     'd6_field_instance_widget_settings',
-    'd6_field_formatter_settings',
-    'd6_file_settings',
     'd6_file',
+    'd6_file_settings',
     'd6_filter_format',
     'd6_forum_settings',
     'd6_locale_settings',
-    'd6_menu_settings',
     'd6_menu',
-    'd6_node_revision',
+    'd6_menu_settings',
     'd6_node',
+    'd6_node_revision',
+    'd6_node_setting_promote',
+    'd6_node_setting_status',
+    'd6_node_setting_sticky',
     'd6_node_settings',
     'd6_node_type',
     'd6_profile_values:user',
@@ -102,6 +106,7 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
     'd6_system_filter',
     'd6_system_image',
     'd6_system_image_gd',
+    'd6_system_logging',
     'd6_system_maintenance',
     'd6_system_performance',
     'd6_system_rss',
@@ -109,33 +114,34 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
     'd6_taxonomy_settings',
     'd6_taxonomy_term',
     'd6_taxonomy_vocabulary',
-    'd6_term_node_revision:*',
     'd6_term_node:*',
+    'd6_term_node_revision:*',
     'd6_text_settings',
     'd6_update_settings',
+    'd6_upload',
     'd6_upload_entity_display',
     'd6_upload_entity_form_display',
     'd6_upload_field',
     'd6_upload_field_instance',
-    'd6_upload',
     'd6_url_alias',
+    'd6_user',
+    'd6_user_contact_settings',
     'd6_user_mail',
-    'd6_user_profile_field_instance',
-    'd6_user_profile_entity_display',
-    'd6_user_profile_entity_form_display',
-    'd6_user_profile_field',
     'd6_user_picture_entity_display',
     'd6_user_picture_entity_form_display',
-    'd6_user_picture_field_instance',
     'd6_user_picture_field',
+    'd6_user_picture_field_instance',
     'd6_user_picture_file',
+    'd6_user_profile_entity_display',
+    'd6_user_profile_entity_form_display',
+    'd6_user_profile_field',
+    'd6_user_profile_field_instance',
     'd6_user_role',
-    'd6_user',
     'd6_view_modes',
     'd6_vocabulary_entity_display',
     'd6_vocabulary_entity_form_display',
-    'd6_vocabulary_field_instance',
     'd6_vocabulary_field',
+    'd6_vocabulary_field_instance',
   );
 
   /**
@@ -160,6 +166,7 @@ protected function getDumps() {
       $tests_path . '/Drupal6AggregatorItem.php',
       $tests_path . '/Drupal6AggregatorSettings.php',
       $tests_path . '/Drupal6Block.php',
+      $tests_path . '/Drupal6Book.php',
       $tests_path . '/Drupal6BookSettings.php',
       $tests_path . '/Drupal6Box.php',
       $tests_path . '/Drupal6Comment.php',
@@ -176,8 +183,8 @@ protected function getDumps() {
       $tests_path . '/Drupal6LocaleSettings.php',
       $tests_path . '/Drupal6Menu.php',
       $tests_path . '/Drupal6MenuSettings.php',
-      $tests_path . '/Drupal6NodeBodyInstance.php',
       $tests_path . '/Drupal6Node.php',
+      $tests_path . '/Drupal6NodeBodyInstance.php',
       $tests_path . '/Drupal6NodeRevision.php',
       $tests_path . '/Drupal6NodeSettings.php',
       $tests_path . '/Drupal6NodeType.php',
@@ -191,8 +198,9 @@ protected function getDumps() {
       // where the files are.
       $tests_path . '/Drupal6SystemFile.php',
       $tests_path . '/Drupal6SystemFilter.php',
-      $tests_path . '/Drupal6SystemImageGd.php',
       $tests_path . '/Drupal6SystemImage.php',
+      $tests_path . '/Drupal6SystemImageGd.php',
+      $tests_path . '/Drupal6SystemLogging.php',
       $tests_path . '/Drupal6SystemMaintenance.php',
       $tests_path . '/Drupal6SystemPerformance.php',
       $tests_path . '/Drupal6SystemRss.php',
@@ -203,11 +211,12 @@ protected function getDumps() {
       $tests_path . '/Drupal6TermNode.php',
       $tests_path . '/Drupal6TextSettings.php',
       $tests_path . '/Drupal6UpdateSettings.php',
-      $tests_path . '/Drupal6UploadInstance.php',
       $tests_path . '/Drupal6Upload.php',
+      $tests_path . '/Drupal6UploadField.php',
+      $tests_path . '/Drupal6UploadInstance.php',
       $tests_path . '/Drupal6UrlAlias.php',
-      $tests_path . '/Drupal6UserMail.php',
       $tests_path . '/Drupal6User.php',
+      $tests_path . '/Drupal6UserMail.php',
       $tests_path . '/Drupal6UserProfileFields.php',
       $tests_path . '/Drupal6UserRole.php',
       $tests_path . '/Drupal6VocabularyField.php',
@@ -225,25 +234,26 @@ protected function getTestClassesList() {
       __NAMESPACE__ . '\MigrateAggregatorConfigsTest',
       __NAMESPACE__ . '\MigrateAggregatorFeedTest',
       __NAMESPACE__ . '\MigrateAggregatorItemTest',
+      __NAMESPACE__ . '\MigrateBlockContentTest',
       __NAMESPACE__ . '\MigrateBlockTest',
       __NAMESPACE__ . '\MigrateBookConfigsTest',
-      __NAMESPACE__ . '\MigrateCckFieldValuesTest',
+      __NAMESPACE__ . '\MigrateBookTest',
       __NAMESPACE__ . '\MigrateCckFieldRevisionTest',
-      __NAMESPACE__ . '\MigrateCommentTypeTest',
+      __NAMESPACE__ . '\MigrateCckFieldValuesTest',
       __NAMESPACE__ . '\MigrateCommentTest',
+      __NAMESPACE__ . '\MigrateCommentTypeTest',
       __NAMESPACE__ . '\MigrateCommentVariableEntityDisplayTest',
-      __NAMESPACE__ . '\MigrateCommentVariableEntityFormDisplayTest',
       __NAMESPACE__ . '\MigrateCommentVariableEntityFormDisplaySubjectTest',
+      __NAMESPACE__ . '\MigrateCommentVariableEntityFormDisplayTest',
       __NAMESPACE__ . '\MigrateCommentVariableFieldTest',
       __NAMESPACE__ . '\MigrateCommentVariableInstanceTest',
       __NAMESPACE__ . '\MigrateContactCategoryTest',
       __NAMESPACE__ . '\MigrateContactConfigsTest',
-      __NAMESPACE__ . '\MigrateBlockContentTest',
       __NAMESPACE__ . '\MigrateDateFormatTest',
       __NAMESPACE__ . '\MigrateDblogConfigsTest',
-      __NAMESPACE__ . '\MigrateFieldTest',
-      __NAMESPACE__ . '\MigrateFieldInstanceTest',
       __NAMESPACE__ . '\MigrateFieldFormatterSettingsTest',
+      __NAMESPACE__ . '\MigrateFieldInstanceTest',
+      __NAMESPACE__ . '\MigrateFieldTest',
       __NAMESPACE__ . '\MigrateFieldWidgetSettingsTest',
       __NAMESPACE__ . '\MigrateFileConfigsTest',
       __NAMESPACE__ . '\MigrateFileTest',
@@ -252,6 +262,7 @@ protected function getTestClassesList() {
       __NAMESPACE__ . '\MigrateLocaleConfigsTest',
       __NAMESPACE__ . '\MigrateMenuConfigsTest',
       __NAMESPACE__ . '\MigrateMenuTest',
+      __NAMESPACE__ . '\MigrateNodeBundleSettingsTest',
       __NAMESPACE__ . '\MigrateNodeConfigsTest',
       __NAMESPACE__ . '\MigrateNodeRevisionTest',
       __NAMESPACE__ . '\MigrateNodeTest',
@@ -267,6 +278,7 @@ protected function getTestClassesList() {
       __NAMESPACE__ . '\MigrateSystemFilterTest',
       __NAMESPACE__ . '\MigrateSystemImageGdTest',
       __NAMESPACE__ . '\MigrateSystemImageTest',
+      __NAMESPACE__ . '\MigrateSystemLoggingTest',
       __NAMESPACE__ . '\MigrateSystemMaintenanceTest',
       __NAMESPACE__ . '\MigrateSystemPerformanceTest',
       __NAMESPACE__ . '\MigrateSystemRssTest',
@@ -285,15 +297,16 @@ protected function getTestClassesList() {
       __NAMESPACE__ . '\MigrateUploadTest',
       __NAMESPACE__ . '\MigrateUrlAliasTest',
       __NAMESPACE__ . '\MigrateUserConfigsTest',
-      __NAMESPACE__ . '\MigrateUserProfileEntityDisplayTest',
-      __NAMESPACE__ . '\MigrateUserProfileEntityFormDisplayTest',
-      __NAMESPACE__ . '\MigrateUserProfileFieldTest',
-      __NAMESPACE__ . '\MigrateUserProfileFieldInstanceTest',
+      __NAMESPACE__ . '\MigrateUserContactSettingsTest',
       __NAMESPACE__ . '\MigrateUserPictureEntityDisplayTest',
       __NAMESPACE__ . '\MigrateUserPictureEntityFormDisplayTest',
-      __NAMESPACE__ . '\MigrateUserPictureFileTest',
       __NAMESPACE__ . '\MigrateUserPictureFieldTest',
+      __NAMESPACE__ . '\MigrateUserPictureFileTest',
       __NAMESPACE__ . '\MigrateUserPictureInstanceTest',
+      __NAMESPACE__ . '\MigrateUserProfileEntityDisplayTest',
+      __NAMESPACE__ . '\MigrateUserProfileEntityFormDisplayTest',
+      __NAMESPACE__ . '\MigrateUserProfileFieldInstanceTest',
+      __NAMESPACE__ . '\MigrateUserProfileFieldTest',
       __NAMESPACE__ . '\MigrateUserRoleTest',
       __NAMESPACE__ . '\MigrateUserTest',
       __NAMESPACE__ . '\MigrateViewModesTest',