diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Access.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Access.php
index 2efbcd4..5339530 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Access.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Access.php
@@ -49,6 +49,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("access")->fields(array(
       'aid',
@@ -60,4 +61,4 @@ public function load() {
   }
 
 }
-#906d752540b89c65dcab417eeb749669
+#131cb9eb08548867ec92c3373ac67a42
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Actions.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Actions.php
index fd6208a..4913935 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Actions.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Actions.php
@@ -55,6 +55,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("actions")->fields(array(
       'aid',
@@ -133,4 +134,4 @@ public function load() {
   }
 
 }
-#8839ba77a788fdd11f0097242a686408
+#31f375c70c6a362432e25e1256101076
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ActionsAid.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ActionsAid.php
index 46ca561..108b55e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ActionsAid.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ActionsAid.php
@@ -32,6 +32,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("actions_aid")->fields(array(
       'aid',
@@ -40,4 +41,4 @@ public function load() {
   }
 
 }
-#1c907838b8bafd88d0d3141fe32b41f6
+#a58e383f81c657ac36eabc980e148fbd
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorCategory.php b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorCategory.php
index 989ae60..8c0425c 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorCategory.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorCategory.php
@@ -48,6 +48,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("aggregator_category")->fields(array(
       'cid',
@@ -59,4 +60,4 @@ public function load() {
   }
 
 }
-#f9b4a42a7a6c1f7bd027bd95c1a4ef83
+#836a3ecaf192c09b996431f0c4b71fe6
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorFeed.php b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorFeed.php
index 4ac7898..86f6475 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorFeed.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorFeed.php
@@ -89,6 +89,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("aggregator_feed")->fields(array(
       'fid',
@@ -119,4 +120,4 @@ public function load() {
   }
 
 }
-#57eeb4c900631cda398a543689a156cb
+#662f4470777c1bda31d407bb5ba21346
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorItem.php b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorItem.php
index 70fe1002..a0ba9d8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorItem.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/AggregatorItem.php
@@ -70,6 +70,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("aggregator_item")->fields(array(
       'iid',
@@ -94,4 +95,4 @@ public function load() {
   }
 
 }
-#1164613d3b2596dfdfddefdc52da8bc7
+#70ab48fd0f8a2fca2f51df61fdef0443
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Authmap.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Authmap.php
index 6e2e370..0e430f6 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Authmap.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Authmap.php
@@ -50,6 +50,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("authmap")->fields(array(
       'aid',
@@ -61,4 +62,4 @@ public function load() {
   }
 
 }
-#291a74a5eac3448929eccb583ec5b6bb
+#265fd37faf94406aa5ae64f834c0c09c
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Batch.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Batch.php
index 001cb5d..fb258dc 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Batch.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Batch.php
@@ -47,6 +47,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("batch")->fields(array(
       'bid',
@@ -58,4 +59,4 @@ public function load() {
   }
 
 }
-#28b4106c5eefd0a82f2fdc6d870fde78
+#7e3b35a2ee513385c7a63500e1a588c6
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Blocks.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Blocks.php
index e2a872a..ca9d72c 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Blocks.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Blocks.php
@@ -102,6 +102,7 @@ public function load() {
           'default' => '1',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("blocks")->fields(array(
       'bid',
@@ -402,4 +403,4 @@ public function load() {
   }
 
 }
-#1f4dbdf6b524a1b4ddea8cbb306caf19
+#aecc8e1067d73824c43bfaf26f9ebf8c
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/BlocksRoles.php b/core/modules/migrate_drupal/src/Tests/Table/d6/BlocksRoles.php
index 756a58e..8e5abf8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/BlocksRoles.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/BlocksRoles.php
@@ -44,6 +44,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("blocks_roles")->fields(array(
       'module',
@@ -62,4 +63,4 @@ public function load() {
   }
 
 }
-#29243885f79abad280834034dca71856
+#41ed39f4e800ee584535def863835a80
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Book.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Book.php
index 778b08c..a8b4a80 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Book.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Book.php
@@ -47,6 +47,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("book")->fields(array(
       'mlid',
@@ -77,4 +78,4 @@ public function load() {
   }
 
 }
-#a91ece4a284d1ba43d247d623edd7a74
+#6ddf63f063b1bfa617a96764d859a0f1
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Boxes.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Boxes.php
index a6dbec0..14f1d64 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Boxes.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Boxes.php
@@ -49,6 +49,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("boxes")->fields(array(
       'bid',
@@ -70,4 +71,4 @@ public function load() {
   }
 
 }
-#fc7fbf9ec57c0c76fceab84ab55b9da8
+#2210f6e6a50ddd9c00900cc7e54a5b43
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Cache.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Cache.php
index fc233fc..2fb2fa9 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Cache.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Cache.php
@@ -60,6 +60,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache")->fields(array(
       'cid',
@@ -73,4 +74,4 @@ public function load() {
   }
 
 }
-#a2937f7bc1d1a464b3497945341caba4
+#67029a22a76da3708c39edc1ea19e8da
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheBlock.php b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheBlock.php
index 1903eca..25d38ab 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheBlock.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheBlock.php
@@ -60,6 +60,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_block")->fields(array(
       'cid',
@@ -73,4 +74,4 @@ public function load() {
   }
 
 }
-#e14abfc02ee25adc633afe98b414ca08
+#a8cd855bd812efa861fb2b1b16a60c88
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheBootstrap.php b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheBootstrap.php
index 31a742e..d2b87c3 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheBootstrap.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheBootstrap.php
@@ -73,6 +73,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_bootstrap")->fields(array(
       'cid',
@@ -88,4 +89,4 @@ public function load() {
   }
 
 }
-#fca41159793677ed4462364018ae2af2
+#61ee75983133914b8b02a29869f7ced7
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheConfig.php b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheConfig.php
index 8d92d13..ea399af 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheConfig.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheConfig.php
@@ -73,6 +73,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_config")->fields(array(
       'cid',
@@ -88,4 +89,4 @@ public function load() {
   }
 
 }
-#f438fd9400357de86c6fd107fc245404
+#27adbbdaf170149b5b6f3f9d35fa9225
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheContent.php b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheContent.php
index 8a3b928..66c0870 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheContent.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheContent.php
@@ -60,6 +60,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_content")->fields(array(
       'cid',
@@ -73,4 +74,4 @@ public function load() {
   }
 
 }
-#0e3b21ac24050e18a4cc81c2d0bce590
+#156a6b622459d99a430e07e3f88a4952
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheDiscovery.php b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheDiscovery.php
index 8f5cc6d..d437e66 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheDiscovery.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheDiscovery.php
@@ -73,6 +73,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_discovery")->fields(array(
       'cid',
@@ -88,4 +89,4 @@ public function load() {
   }
 
 }
-#f3ada35da76a5f007b180bb4d541ec4a
+#2bea5eb7dd5defc47c3bfb5fe004b0ed
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheFilter.php b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheFilter.php
index 1caaec7..f5158ed 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheFilter.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheFilter.php
@@ -60,6 +60,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_filter")->fields(array(
       'cid',
@@ -73,4 +74,4 @@ public function load() {
   }
 
 }
-#6e167566ed12156e16a618cf6437ae71
+#2af467369782b455803a601b8b0b2ee7
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheForm.php b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheForm.php
index b06a5c9..80a38e1 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheForm.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheForm.php
@@ -60,6 +60,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_form")->fields(array(
       'cid',
@@ -73,4 +74,4 @@ public function load() {
   }
 
 }
-#71bde276580282fc3514e06f974e965a
+#bfd409b58ceabeddabf389a8efe8d332
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheMenu.php b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheMenu.php
index 4825920..fffca57 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheMenu.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheMenu.php
@@ -60,6 +60,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_menu")->fields(array(
       'cid',
@@ -73,4 +74,4 @@ public function load() {
   }
 
 }
-#ce732ace4abb70c89febc7c07f1d7165
+#8619c81798239c1dacaaef75f55ee4be
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/CachePage.php b/core/modules/migrate_drupal/src/Tests/Table/d6/CachePage.php
index 69181ea..acfc575 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/CachePage.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/CachePage.php
@@ -60,6 +60,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_page")->fields(array(
       'cid',
@@ -73,4 +74,4 @@ public function load() {
   }
 
 }
-#145b0053fcccd8c7b5adb09fa1659341
+#79807273423db1b6c053e415f435d597
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheUpdate.php b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheUpdate.php
index b70537f..5f65855 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/CacheUpdate.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/CacheUpdate.php
@@ -60,6 +60,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_update")->fields(array(
       'cid',
@@ -73,4 +74,4 @@ public function load() {
   }
 
 }
-#c9fb9f21289ab5b655d8c4714ef40a83
+#1da5dab9fe3efe5aeb5fabdd1a4fb718
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Cachetags.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Cachetags.php
index a0dd581..24335e1 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Cachetags.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Cachetags.php
@@ -44,6 +44,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cachetags")->fields(array(
       'tag',
@@ -54,4 +55,4 @@ public function load() {
   }
 
 }
-#618a5d0e2f6bb7fbd27a98ec94c37cc5
+#ffd63ebb3a715c44aeb48e88bde508fa
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Comments.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Comments.php
index 553907b..bdc37b5 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Comments.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Comments.php
@@ -105,6 +105,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("comments")->fields(array(
       'cid',
@@ -171,4 +172,4 @@ public function load() {
   }
 
 }
-#8c1753bf890ededa04bcc9ca759d0d01
+#8ee26900ad900de3abde3e74f89d6765
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Config.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Config.php
index 00cffb7..2ac1b92 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Config.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Config.php
@@ -44,6 +44,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("config")->fields(array(
       'collection',
@@ -58,4 +59,4 @@ public function load() {
   }
 
 }
-#c4098c1fa12512d761fcb57f8d540a69
+#9e924a1aaaf751c5b1db9fb69a9fa7dd
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Contact.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Contact.php
index d9e8778..c962153 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Contact.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Contact.php
@@ -60,6 +60,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("contact")->fields(array(
       'cid',
@@ -94,4 +95,4 @@ public function load() {
   }
 
 }
-#e530f86fd4d7ae2251ec4f485ae0e917
+#e97c7fe79e2079e3935c6cde6871fab3
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldImage.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldImage.php
index 3858717..84ede8d 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldImage.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldImage.php
@@ -55,6 +55,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("content_field_image")->fields(array(
       'vid',
@@ -85,4 +86,4 @@ public function load() {
   }
 
 }
-#4e8dc9935bae5fbba4b2364a54cd3cda
+#2db0e7aa8c758996467e5920e6cc888b
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldMultivalue.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldMultivalue.php
index 5a1c0c8..9759b1a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldMultivalue.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldMultivalue.php
@@ -54,6 +54,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("content_field_multivalue")->fields(array(
       'vid',
@@ -75,4 +76,4 @@ public function load() {
   }
 
 }
-#6e171ee9ca107b88bf7395989816972b
+#3c8ab8a4159f22b3d38be702b6eaa647
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTest.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTest.php
index 44a8b27..46ef8ec 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTest.php
@@ -51,6 +51,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("content_field_test")->fields(array(
       'vid',
@@ -82,4 +83,4 @@ public function load() {
   }
 
 }
-#2bb195409b310fb0707508fb07eb6e1e
+#e7860a4b52cecdb1a6d2fed28665d5e4
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTestTwo.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTestTwo.php
index bcd9b24..d907027 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTestTwo.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentFieldTestTwo.php
@@ -53,6 +53,7 @@ public function load() {
           'length' => '11',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("content_field_test_two")->fields(array(
       'vid',
@@ -89,4 +90,4 @@ public function load() {
   }
 
 }
-#4504cbbc74e0d013eb107a371d85275c
+#c4cffd2dbffd6ffdc97ef5b1cb4e0e3a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroup.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroup.php
index f1a09e5..f41f746 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroup.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroup.php
@@ -62,6 +62,7 @@ public function load() {
         'type_name',
         'group_name',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("content_group")->fields(array(
       'group_type',
@@ -75,4 +76,4 @@ public function load() {
   }
 
 }
-#b47ad3b4a122b061a21b30afde0d1a7d
+#7e70933ab00570caa7341dab6424469a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroupFields.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroupFields.php
index dad7c0b..f85d5c4 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroupFields.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentGroupFields.php
@@ -46,6 +46,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("content_group_fields")->fields(array(
       'type_name',
@@ -56,4 +57,4 @@ public function load() {
   }
 
 }
-#e946ecf0b1318185977b9a7b401277a2
+#d27d7713a767febbe851794916fc9b0b
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeField.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeField.php
index 9155c19..1187ac4 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeField.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeField.php
@@ -84,6 +84,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("content_node_field")->fields(array(
       'field_name',
@@ -321,4 +322,4 @@ public function load() {
   }
 
 }
-#09ed2a7b0dd3a17568ba9fc4650b18ce
+#e1fbb3a444896287af59cd6395555fbf
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeFieldInstance.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeFieldInstance.php
index 1ec44a5..d3755ab 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeFieldInstance.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentNodeFieldInstance.php
@@ -84,6 +84,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("content_node_field_instance")->fields(array(
       'field_name',
@@ -332,4 +333,4 @@ public function load() {
   }
 
 }
-#017d067779f912426f8b1c61a06736d7
+#18e0592c55879f37c24ea67f76ade69a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypePage.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypePage.php
index b36dc6d..36859cb 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypePage.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypePage.php
@@ -45,6 +45,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("content_type_page")->fields(array(
       'vid',
@@ -63,4 +64,4 @@ public function load() {
   }
 
 }
-#6452fe645487c928706d25c8299671f2
+#a22194f55d9c79d0c83e97ee7c96714b
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeStory.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeStory.php
index 0122ac6..7287994 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeStory.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeStory.php
@@ -172,6 +172,7 @@ public function load() {
       'primary key' => array(
         'vid',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("content_type_story")->fields(array(
       'nid',
@@ -318,4 +319,4 @@ public function load() {
   }
 
 }
-#9a56fc4e90fa0eecfefb64eeaee69dfd
+#e355803b63e8cbefe404f59e30bbf793
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPage.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPage.php
index 51f888f..2a8225b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPage.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPage.php
@@ -51,6 +51,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("content_type_test_page")->fields(array(
       'vid',
@@ -62,4 +63,4 @@ public function load() {
   }
 
 }
-#dc14376a79c7efc3a0615ef67fa65021
+#cc8cbe99b5941aeb7e2ae8f0a5099945
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPlanet.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPlanet.php
index b28c48d..028b6b4 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPlanet.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ContentTypeTestPlanet.php
@@ -39,6 +39,7 @@ public function load() {
       'primary key' => array(
         'vid',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("content_type_test_planet")->fields(array(
       'nid',
@@ -69,4 +70,4 @@ public function load() {
   }
 
 }
-#2f3598809df1de9649ba0f556886687b
+#d824be8bf53956e1f6e275f010eb1b86
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatLocale.php b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatLocale.php
index b91626e..6de4eb4 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatLocale.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatLocale.php
@@ -42,6 +42,7 @@ public function load() {
         'type',
         'language',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("date_format_locale")->fields(array(
       'format',
@@ -52,4 +53,4 @@ public function load() {
   }
 
 }
-#6e387a5e7422422cef12532b9c153f4b
+#a9092bf2a65e6797eb144166d7a27ddf
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatTypes.php b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatTypes.php
index b251352..827bd14 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatTypes.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormatTypes.php
@@ -42,6 +42,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("date_format_types")->fields(array(
       'type',
@@ -64,4 +65,4 @@ public function load() {
   }
 
 }
-#7c97d55d743dc7b85be8bfec1a62b542
+#8eb9b527c9223036f223beecea90c1e1
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormats.php b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormats.php
index 8d48969..83fe8d0 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormats.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/DateFormats.php
@@ -48,6 +48,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("date_formats")->fields(array(
       'dfid',
@@ -234,4 +235,4 @@ public function load() {
   }
 
 }
-#97e7436f13d688d9192a0bb53af2c44c
+#7b7e1b59dbb8771c5f9dacbfb31bc771
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Event.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Event.php
index 258dff7..e365546 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Event.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Event.php
@@ -73,6 +73,7 @@ public function load() {
           'default' => '1',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("event")->fields(array(
       'nid',
@@ -88,4 +89,4 @@ public function load() {
   }
 
 }
-#9dec797ecb37e0c7c7de1563eb2997eb
+#78a4722634eb7f3ca00a7ced49953072
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/EventTimezones.php b/core/modules/migrate_drupal/src/Tests/Table/d6/EventTimezones.php
index 9d536b4..a69de2f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/EventTimezones.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/EventTimezones.php
@@ -62,6 +62,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("event_timezones")->fields(array(
       'timezone',
@@ -3302,4 +3303,4 @@ public function load() {
   }
 
 }
-#6b7541b69fbd9ffb83e93348c4ba479e
+#5e6c6fb6a7c2da1e9b5a3d940ea00007
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Files.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Files.php
index 476ab0c..cd55fc3 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Files.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Files.php
@@ -77,6 +77,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("files")->fields(array(
       'fid',
@@ -137,4 +138,4 @@ public function load() {
   }
 
 }
-#8f1133f1395422b45b92652531e2456e
+#a36145ffe53b2dd78475b37d99e72612
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/FilterFormats.php b/core/modules/migrate_drupal/src/Tests/Table/d6/FilterFormats.php
index bac2956..1bcb405 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/FilterFormats.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/FilterFormats.php
@@ -49,6 +49,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("filter_formats")->fields(array(
       'format',
@@ -75,4 +76,4 @@ public function load() {
   }
 
 }
-#bc3c85fe411e79820e50f12d39e1e938
+#bbec2c10ac788fac1807d23774b34b49
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Filters.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Filters.php
index 67ab207..57c73f4 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Filters.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Filters.php
@@ -55,6 +55,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("filters")->fields(array(
       'fid',
@@ -133,4 +134,4 @@ public function load() {
   }
 
 }
-#701758e13dac19daf43516e8e4fda93e
+#e4ed25d991f88bc73a10b840dcc1b004
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Flood.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Flood.php
index 186cd58..8df0700 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Flood.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Flood.php
@@ -49,6 +49,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("flood")->fields(array(
       'fid',
@@ -60,4 +61,4 @@ public function load() {
   }
 
 }
-#d2c30c15c28a1c63666a476c2e790efd
+#45aa7dba444d7433ed402ede2f8c3ed4
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/History.php b/core/modules/migrate_drupal/src/Tests/Table/d6/History.php
index ddbfc60..29bf4ad 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/History.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/History.php
@@ -45,6 +45,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("history")->fields(array(
       'uid',
@@ -55,4 +56,4 @@ public function load() {
   }
 
 }
-#0e3dbc6441f7ccb22ba83da817602b7c
+#67ec5e178454878819a02345fabb68fd
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/MenuCustom.php b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuCustom.php
index 3f148a8..03ae765 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/MenuCustom.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuCustom.php
@@ -43,6 +43,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("menu_custom")->fields(array(
       'menu_name',
@@ -65,4 +66,4 @@ public function load() {
   }
 
 }
-#9c671dfb6963883b73f601e2e80739ed
+#64ae8b573b728a37ea2e345106286576
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php
index cfda5b7..d6de491 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuLinks.php
@@ -185,6 +185,7 @@ public function load() {
       'primary key' => array(
         'mlid',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("menu_links")->fields(array(
       'menu_name',
@@ -5157,4 +5158,4 @@ public function load() {
   }
 
 }
-#772778397f0cab72b529312c65596781
+#a594b05a60a1a549e86f4c190c2f2f4e
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/MenuRouter.php b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuRouter.php
index 17a8b4e..d8045d5 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/MenuRouter.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/MenuRouter.php
@@ -140,6 +140,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("menu_router")->fields(array(
       'path',
@@ -7286,4 +7287,4 @@ public function load() {
   }
 
 }
-#19aef86dbdc4dccee05e1871b5587337
+#fb802acc1b7c3aa4152fc3f17c404852
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Node.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Node.php
index d9fc71d..416ace7 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Node.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Node.php
@@ -118,6 +118,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("node")->fields(array(
       'nid',
@@ -268,4 +269,4 @@ public function load() {
   }
 
 }
-#3840cb30566e683edd201fe502399e30
+#42987fa1c890b420098af95ec7c86d00
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/NodeAccess.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeAccess.php
index 74e5fec..092a00d 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/NodeAccess.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeAccess.php
@@ -69,6 +69,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("node_access")->fields(array(
       'nid',
@@ -89,4 +90,4 @@ public function load() {
   }
 
 }
-#ea5aa2d533514421c4f17709b52df802
+#47b68125af5c4b5deaffc0e19fb29dfb
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCommentStatistics.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCommentStatistics.php
index 3d8eede..1628ebf 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCommentStatistics.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCommentStatistics.php
@@ -57,6 +57,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("node_comment_statistics")->fields(array(
       'nid',
@@ -81,4 +82,4 @@ public function load() {
   }
 
 }
-#ef7d3494e2e6e8244b4642db7a6fd80b
+#402ff86fc05564bf2275c27f01c922af
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCounter.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCounter.php
index 4d72172..f1e80b6 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCounter.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeCounter.php
@@ -53,6 +53,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("node_counter")->fields(array(
       'nid',
@@ -64,4 +65,4 @@ public function load() {
   }
 
 }
-#3590d51296a05c25015308dfde590034
+#f1e838ae00ed337fca5d80787d9d0748
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/NodeRevisions.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeRevisions.php
index e60ac0e..3afe93c 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/NodeRevisions.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeRevisions.php
@@ -78,6 +78,7 @@ public function load() {
       'primary key' => array(
         'vid',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("node_revisions")->fields(array(
       'nid',
@@ -204,4 +205,4 @@ public function load() {
   }
 
 }
-#d3c03811fc5ee9b9b9e57ea430ecaa40
+#8448741f18a4f40eec7bf466dcab82c1
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/NodeType.php b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeType.php
index 220abca..2f386da 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/NodeType.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/NodeType.php
@@ -106,6 +106,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("node_type")->fields(array(
       'type',
@@ -292,4 +293,4 @@ public function load() {
   }
 
 }
-#eed184e2169278835cffc9a9284bd8a1
+#ce6e29f5a41cf28d10fe3cf149cda559
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Permission.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Permission.php
index e3fccd5..7619c9e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Permission.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Permission.php
@@ -50,6 +50,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("permission")->fields(array(
       'pid',
@@ -91,4 +92,4 @@ public function load() {
   }
 
 }
-#4b13b70647b513732a91cd7132b08c01
+#c9d81025ccba3af28983d7e3bbe38802
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileFields.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileFields.php
index 77d73c4..6f262b1 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileFields.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileFields.php
@@ -97,6 +97,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("profile_fields")->fields(array(
       'fid',
@@ -215,4 +216,4 @@ public function load() {
   }
 
 }
-#5b52398061f1ff1fd90ffb8fb91059a2
+#59b9afb9195888ed98c5b2dc0c35305c
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileValues.php b/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileValues.php
index ffb6830..0f11178 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileValues.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/ProfileValues.php
@@ -46,6 +46,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("profile_values")->fields(array(
       'fid',
@@ -196,4 +197,4 @@ public function load() {
   }
 
 }
-#b1e19a3e82bda6b4663f322bf2ef354d
+#9d394555277ddc78f6f904b8df99b3c5
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Role.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Role.php
index 8ccaeb3..833346a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Role.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Role.php
@@ -38,6 +38,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("role")->fields(array(
       'rid',
@@ -62,4 +63,4 @@ public function load() {
   }
 
 }
-#fd210b6b350be0cadc42941b1c4af505
+#de28ef60b89f3517fe56e03c4d2c1f95
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Semaphore.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Semaphore.php
index 82ec315..7347049 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Semaphore.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Semaphore.php
@@ -44,6 +44,7 @@ public function load() {
           'scale' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("semaphore")->fields(array(
       'name',
@@ -54,4 +55,4 @@ public function load() {
   }
 
 }
-#706fd357b8d41dbeb42dc8508ee1d6ec
+#8dc0ab3dffca2c2b00141f705dc183a6
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Sessions.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Sessions.php
index 838ef53..70e8811 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Sessions.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Sessions.php
@@ -61,6 +61,7 @@ public function load() {
       'primary key' => array(
         'sid',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("sessions")->fields(array(
       'uid',
@@ -74,4 +75,4 @@ public function load() {
   }
 
 }
-#6a29834b2e78b58e3f7297351782a489
+#b7a70fcb91c8af507894a3593f34b7b4
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/System.php b/core/modules/migrate_drupal/src/Tests/Table/d6/System.php
index 5bf482f9..a684403 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/System.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/System.php
@@ -26,7 +26,7 @@ public function load() {
       ),
       'fields' => array(
         'filename' => array(
-          'type' => 'varchar_ascii',
+          'type' => 'varchar',
           'not null' => TRUE,
           'length' => '255',
           'default' => '',
@@ -85,6 +85,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("system")->fields(array(
       'filename',
@@ -916,4 +917,4 @@ public function load() {
   }
 
 }
-#e15f00f5d9b1c571ee015c40f8fc7b00
+#f48594e66407fef659b575523a75c6e6
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/TermData.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermData.php
index 78c87a8..873b3c4 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/TermData.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermData.php
@@ -56,6 +56,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("term_data")->fields(array(
       'tid',
@@ -104,4 +105,4 @@ public function load() {
   }
 
 }
-#a392bc00314b5ac5a418fb00a52cb821
+#5bd3c3673e6cc04e09db9b3d3f601c73
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/TermHierarchy.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermHierarchy.php
index c21bed5..e92087e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/TermHierarchy.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermHierarchy.php
@@ -41,6 +41,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("term_hierarchy")->fields(array(
       'tid',
@@ -71,4 +72,4 @@ public function load() {
   }
 
 }
-#fe08d615c3ac3c59bd3242c55498dba2
+#4f464394161d2c548911856110c52388
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/TermNode.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermNode.php
index 37a1371..9d07d42 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/TermNode.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermNode.php
@@ -48,6 +48,7 @@ public function load() {
         'vid',
         'tid',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("term_node")->fields(array(
       'nid',
@@ -78,4 +79,4 @@ public function load() {
   }
 
 }
-#73e5dd147f084c8ff3cf2bcd17ce5f97
+#5aba7dc704d20cec864b7ba64af4c48c
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/TermRelation.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermRelation.php
index 92bb56d..b645885 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/TermRelation.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermRelation.php
@@ -45,6 +45,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("term_relation")->fields(array(
       'trid',
@@ -55,4 +56,4 @@ public function load() {
   }
 
 }
-#008e1b937f330389e84d1b5604ed3b95
+#a5ad4b081bfc203e4428bb943e24948a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/TermSynonym.php b/core/modules/migrate_drupal/src/Tests/Table/d6/TermSynonym.php
index 11f3ec9..f15ca8f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/TermSynonym.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/TermSynonym.php
@@ -44,6 +44,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("term_synonym")->fields(array(
       'tsid',
@@ -54,4 +55,4 @@ public function load() {
   }
 
 }
-#aaa34560b144351e9a738a70325d69a6
+#f872b9f69bd357799c9aebbfc65dd736
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Upload.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Upload.php
index 1debffb..a10609b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Upload.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Upload.php
@@ -67,6 +67,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("upload")->fields(array(
       'fid',
@@ -115,4 +116,4 @@ public function load() {
   }
 
 }
-#adb3ab1babf69826197c48bfaa0804ab
+#16d0b4721b6b58f5ac90214e6b508843
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/UrlAlias.php b/core/modules/migrate_drupal/src/Tests/Table/d6/UrlAlias.php
index ed353b5..16d934f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/UrlAlias.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/UrlAlias.php
@@ -50,6 +50,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("url_alias")->fields(array(
       'pid',
@@ -71,4 +72,4 @@ public function load() {
   }
 
 }
-#53edf1a42f14feb4d3281c52486aa03a
+#8aa75592c75220bfb2ad948f7528f943
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php
index 5810d03..099c360 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php
@@ -161,6 +161,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("users")->fields(array(
       'uid',
@@ -311,4 +312,4 @@ public function load() {
   }
 
 }
-#b032f0c73ae282735a94cedc02252629
+#ce6d7264b7ef5ed1ffe854326893e1e0
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/UsersRoles.php b/core/modules/migrate_drupal/src/Tests/Table/d6/UsersRoles.php
index 08cd463..db9ca83 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/UsersRoles.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/UsersRoles.php
@@ -41,6 +41,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("users_roles")->fields(array(
       'uid',
@@ -77,4 +78,4 @@ public function load() {
   }
 
 }
-#160988416b8b1403cc0ad78c4c1e944b
+#6cffea4f67e621d7c498bba3ead7d305
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Variable.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Variable.php
index bb65e1b..83555c7 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Variable.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Variable.php
@@ -37,6 +37,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("variable")->fields(array(
       'name',
@@ -88,9 +89,6 @@ public function load() {
       'name' => 'book_child_type',
       'value' => 's:4:"book";',
     ))->values(array(
-      'name' => 'cache',
-      'value' => 'i:1;',
-    ))->values(array(
       'name' => 'cache_lifetime',
       'value' => 'i:0;',
     ))->values(array(
@@ -478,9 +476,6 @@ public function load() {
       'name' => 'image_toolkit',
       'value' => 's:2:"gd";',
     ))->values(array(
-      'name' => 'javascript_parsed',
-      'value' => 'a:0:{}',
-    ))->values(array(
       'name' => 'locale_cache_strings',
       'value' => 'i:1;',
     ))->values(array(
@@ -730,4 +725,4 @@ public function load() {
   }
 
 }
-#c932701ffe15d70ac72d453e975fee38
+#32b72a0543c243804368c7bc10b05be5
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Vocabulary.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Vocabulary.php
index f69dda5..ff44056 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Vocabulary.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Vocabulary.php
@@ -96,6 +96,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("vocabulary")->fields(array(
       'vid',
@@ -174,4 +175,4 @@ public function load() {
   }
 
 }
-#92bb32cf1586d6e70e769372e30aaba1
+#94130b73f1ac1038218716a57d465163
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/VocabularyNodeTypes.php b/core/modules/migrate_drupal/src/Tests/Table/d6/VocabularyNodeTypes.php
index 39195a3..d4dcf75 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/VocabularyNodeTypes.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/VocabularyNodeTypes.php
@@ -40,6 +40,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("vocabulary_node_types")->fields(array(
       'vid',
@@ -64,4 +65,4 @@ public function load() {
   }
 
 }
-#b427f4114483acbc05cf2e6dff8bfe0f
+#b62db0b4fcc3389a5da405b703632d5a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d6/Watchdog.php b/core/modules/migrate_drupal/src/Tests/Table/d6/Watchdog.php
index 44b00d9..09698e2 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d6/Watchdog.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Watchdog.php
@@ -88,6 +88,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("watchdog")->fields(array(
       'wid',
@@ -106,4 +107,4 @@ public function load() {
   }
 
 }
-#ba51a62a7ab597e9b3cbff8ada36b788
+#9106430c43c9a1d732e1b44bce21781b
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Accesslog.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Accesslog.php
index be3c692..e222955 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Accesslog.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Accesslog.php
@@ -78,6 +78,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("accesslog")->fields(array(
       'aid',
@@ -124,4 +125,4 @@ public function load() {
   }
 
 }
-#3977151b031051142a610811b1e41d20
+#1aaa5fa899c08cfc6607be2b0599ef46
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Actions.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Actions.php
index c7ca658..9e4ee32 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Actions.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Actions.php
@@ -55,6 +55,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("actions")->fields(array(
       'aid',
@@ -139,4 +140,4 @@ public function load() {
   }
 
 }
-#09fca66184126ebbc8455d96a30e1871
+#28b8f51b5608625c77b3d08229fb6a73
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorCategory.php b/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorCategory.php
index 263efda..c54adee 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorCategory.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorCategory.php
@@ -44,10 +44,11 @@ public function load() {
         'block' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("aggregator_category")->fields(array(
       'cid',
@@ -59,4 +60,4 @@ public function load() {
   }
 
 }
-#a246879883d964d75f79e4d130900477
+#36a675168dc6acf7a70dcf73db0ef24f
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorCategoryFeed.php b/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorCategoryFeed.php
index fc37211..990562c 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorCategoryFeed.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorCategoryFeed.php
@@ -39,6 +39,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("aggregator_category_feed")->fields(array(
       'fid',
@@ -48,4 +49,4 @@ public function load() {
   }
 
 }
-#48941399e5752bb924657c87de88d95d
+#b1438209e6c5437928ec638c06bea9f1
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorCategoryItem.php b/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorCategoryItem.php
index 6fcae57..d75eeee 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorCategoryItem.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorCategoryItem.php
@@ -39,6 +39,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("aggregator_category_item")->fields(array(
       'iid',
@@ -48,4 +49,4 @@ public function load() {
   }
 
 }
-#57c5368d780a491fa355b704196b05e6
+#18a56c59bc4bbcf06db0b68ba24b1c49
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorFeed.php b/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorFeed.php
index 04ba02d..d337e7b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorFeed.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorFeed.php
@@ -95,10 +95,11 @@ public function load() {
         'block' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("aggregator_feed")->fields(array(
       'fid',
@@ -119,4 +120,4 @@ public function load() {
   }
 
 }
-#db694861ff0144c032783423b1b2a095
+#8e8447ae5f187d54c5849399ea7f0983
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorItem.php b/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorItem.php
index b2d220c..b694da8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorItem.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/AggregatorItem.php
@@ -69,6 +69,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("aggregator_item")->fields(array(
       'iid',
@@ -84,4 +85,4 @@ public function load() {
   }
 
 }
-#e92145ca6ce34fac4983db361aba0632
+#45d66c3443a69e4c2180a0d653725d10
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Authmap.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Authmap.php
index 8c5e435..08f4984 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Authmap.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Authmap.php
@@ -50,6 +50,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("authmap")->fields(array(
       'aid',
@@ -61,4 +62,4 @@ public function load() {
   }
 
 }
-#d3b53fbf5d22670b0038998db6d6d13e
+#dbc0bc9089ef2058a02d42783ad948e2
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Batch.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Batch.php
index 172f8c0..371ac1b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Batch.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Batch.php
@@ -47,6 +47,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("batch")->fields(array(
       'bid',
@@ -58,4 +59,4 @@ public function load() {
   }
 
 }
-#741ce54d4a3cd8d238e99e032264b2a4
+#83d4e14a851195133d20f9f09a929bbd
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Block.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Block.php
index 2170834..adfd15c 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Block.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Block.php
@@ -51,7 +51,7 @@ public function load() {
         'status' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'weight' => array(
@@ -69,13 +69,13 @@ public function load() {
         'custom' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'visibility' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'pages' => array(
@@ -92,10 +92,11 @@ public function load() {
         'cache' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '1',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("block")->fields(array(
       'bid',
@@ -687,4 +688,4 @@ public function load() {
   }
 
 }
-#50042dc7ad6299c9db8f127565cd40d7
+#74042b5093754da56e33ac51a867f531
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/BlockCustom.php b/core/modules/migrate_drupal/src/Tests/Table/d7/BlockCustom.php
index 870206a..3204cf7 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/BlockCustom.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/BlockCustom.php
@@ -48,6 +48,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("block_custom")->fields(array(
       'bid',
@@ -59,4 +60,4 @@ public function load() {
   }
 
 }
-#d9db7a71db465804d2918e248ee6e194
+#bcecada721307d09075575d51819ab41
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/BlockNodeType.php b/core/modules/migrate_drupal/src/Tests/Table/d7/BlockNodeType.php
index 53eb0f7..4ba4a42 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/BlockNodeType.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/BlockNodeType.php
@@ -43,6 +43,7 @@ public function load() {
           'length' => '32',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("block_node_type")->fields(array(
       'module',
@@ -53,4 +54,4 @@ public function load() {
   }
 
 }
-#ce1a1b08704bfe8d6df7a78d95327ff5
+#2e37638985a1b6e4e9734f60ecd857e5
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/BlockRole.php b/core/modules/migrate_drupal/src/Tests/Table/d7/BlockRole.php
index 29ecae8..55c531c 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/BlockRole.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/BlockRole.php
@@ -44,6 +44,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("block_role")->fields(array(
       'module',
@@ -54,4 +55,4 @@ public function load() {
   }
 
 }
-#3a1c4d0c41c1359cc23f4114311138d1
+#3ac5281aec06873398b6cde3ca21d461
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/BlockedIps.php b/core/modules/migrate_drupal/src/Tests/Table/d7/BlockedIps.php
index 62be228..1c23198 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/BlockedIps.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/BlockedIps.php
@@ -38,6 +38,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("blocked_ips")->fields(array(
       'iid',
@@ -50,4 +51,4 @@ public function load() {
   }
 
 }
-#c9067ecae8a01a9ae2f2e260c258de23
+#745ba653652c85af65809eb2dfb9a9e1
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Book.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Book.php
index fc91aa1..14e2a37 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Book.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Book.php
@@ -47,6 +47,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("book")->fields(array(
       'mlid',
@@ -57,4 +58,4 @@ public function load() {
   }
 
 }
-#1beb26f2dacfd20f487eff98597bd70e
+#6e968781e0397c89e6589d738c8fcc21
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Cache.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Cache.php
index 1543169..a1a7db0 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Cache.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Cache.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#08f145d95d39e32a027c725dc5eec5c0
+#c6b7a610594a8b4fd36d62d69154f2c5
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheBlock.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheBlock.php
index 0ef2673..af7e637 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheBlock.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheBlock.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_block")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#1ccef4e703d0eba13f5ea2bb76ccbec6
+#d024638ddc87fafc2b9ff165072cf5b5
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheBootstrap.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheBootstrap.php
index 98917ca..308bd4a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheBootstrap.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheBootstrap.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_bootstrap")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#a181fb630f0306dfbd12822f146587be
+#bce318334cd67a6b2ae9acb5d6375e86
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheField.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheField.php
index 7fdd2f5..15613f0 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheField.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheField.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_field")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#8d11721a72fefb47ce12042d73bdfb61
+#1d540d71bfaac8c084b0ba9f8ef2fdee
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheFilter.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheFilter.php
index a9e0db3..e4991ac 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheFilter.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheFilter.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_filter")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#fbe86d7806627ea6c2017f5ea88ba7b9
+#be9484fabd472f2deb008a7f3face1e7
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheForm.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheForm.php
index 5a4c574..ae0a4bc 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheForm.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheForm.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_form")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#01b2dd3cbb61fc97f2d1d9f24ffc58fa
+#6367344b44c244f02dfb6a31981c3ff9
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheImage.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheImage.php
index 5a82eac..b15d098 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheImage.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheImage.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_image")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#57ffeedbabeae7bfcd93e3c3b3d4eb37
+#2e1bdb0edde7fb364ccf6968e45c0d14
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheMenu.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheMenu.php
index 8a11b56..69f38ae 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheMenu.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheMenu.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_menu")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#bbe25bcf75b334c7173ae71ae457e5e6
+#70192163835ea6bf4f773a8145bd4808
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CachePage.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CachePage.php
index de858df..e3a08e9 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CachePage.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CachePage.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_page")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#63f141668969e909792a022ca6ce3df3
+#10dc9b8e587fb6f256a34741267fc168
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CachePath.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CachePath.php
index 9b21878..a76286a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CachePath.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CachePath.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_path")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#477fe1973a4ecd3c6c822e5e79ff6d4e
+#df048fd5e208226ed75f14e4b6be8e17
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheUpdate.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheUpdate.php
index 57d5632..b10fd59 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheUpdate.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheUpdate.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_update")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#f775a73481d97ef0a9c463e67b6de439
+#1ff7e31d22a9b98e29a1a85c6c33f63b
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheViews.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheViews.php
index 3700370..3d27952 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheViews.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheViews.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_views")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#b87151e3b44aec1cc49111c873bbb92a
+#7575324d7b73a48957111368eeec292a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheViewsData.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheViewsData.php
index a405233..7a0f64b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CacheViewsData.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CacheViewsData.php
@@ -51,10 +51,11 @@ public function load() {
         'serialized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '1',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("cache_views_data")->fields(array(
       'cid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#f77e8f16bdd13efe2d0c6169b6021e2a
+#31b91a79165c60367b295312f6d9a27d
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Comment.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Comment.php
index 4ecb128..8b189f2 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Comment.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Comment.php
@@ -75,7 +75,7 @@ public function load() {
         'status' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '3',
+          'length' => '10',
           'default' => '1',
           'unsigned' => TRUE,
         ),
@@ -106,6 +106,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("comment")->fields(array(
       'cid',
@@ -142,4 +143,4 @@ public function load() {
   }
 
 }
-#a4c31706927b4da91d649feee8242c65
+#4b150a65a3b6d7fce31a6d2673085e13
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Contact.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Contact.php
index 819d690..1b6f0fa 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Contact.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Contact.php
@@ -56,10 +56,11 @@ public function load() {
         'selected' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("contact")->fields(array(
       'cid',
@@ -80,4 +81,4 @@ public function load() {
   }
 
 }
-#04f57d5c840ff51e75617ce50b184b81
+#27579d49086a502aa85c5daae22b3a61
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CtoolsCssCache.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CtoolsCssCache.php
index dedaa8c..cf78248 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CtoolsCssCache.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CtoolsCssCache.php
@@ -43,9 +43,10 @@ public function load() {
         'filter' => array(
           'type' => 'int',
           'not null' => FALSE,
-          'length' => '4',
+          'length' => '11',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("ctools_css_cache")->fields(array(
       'cid',
@@ -57,4 +58,4 @@ public function load() {
   }
 
 }
-#3a1f1b6c213289483ef89e7562f0124a
+#1287287b2278e94ff6fe63c141cfc3de
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/CtoolsObjectCache.php b/core/modules/migrate_drupal/src/Tests/Table/d7/CtoolsObjectCache.php
index 5131058..3aea0da 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/CtoolsObjectCache.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/CtoolsObjectCache.php
@@ -55,6 +55,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("ctools_object_cache")->fields(array(
       'sid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#ffb2022818224704fc2119666a2f0646
+#01ce463b43b947d78749d7d8456f768a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/DateFormatLocale.php b/core/modules/migrate_drupal/src/Tests/Table/d7/DateFormatLocale.php
index b1f044e..1b2d1d8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/DateFormatLocale.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/DateFormatLocale.php
@@ -42,6 +42,7 @@ public function load() {
         'type',
         'language',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("date_format_locale")->fields(array(
       'format',
@@ -52,4 +53,4 @@ public function load() {
   }
 
 }
-#4c27250f4901da2ee5c69485e52865b0
+#ab698cb5d5222f9ff2c86447281e1af4
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/DateFormatType.php b/core/modules/migrate_drupal/src/Tests/Table/d7/DateFormatType.php
index 9e76b42..84566fa 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/DateFormatType.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/DateFormatType.php
@@ -38,10 +38,11 @@ public function load() {
         'locked' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("date_format_type")->fields(array(
       'type',
@@ -64,4 +65,4 @@ public function load() {
   }
 
 }
-#6dea95587332bbefb15bbb41e27c8a44
+#b98dd4bc95a628f170a74f088f5a0d5c
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/DateFormats.php b/core/modules/migrate_drupal/src/Tests/Table/d7/DateFormats.php
index 36c9681..3f2fe23 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/DateFormats.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/DateFormats.php
@@ -44,10 +44,11 @@ public function load() {
         'locked' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("date_formats")->fields(array(
       'dfid',
@@ -239,4 +240,4 @@ public function load() {
   }
 
 }
-#1d122c89840ce1e640a464043314c4ce
+#7edb993525a2561721b1b5af0f140cb7
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldConfig.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldConfig.php
index 610fb06..fc6c66e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldConfig.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldConfig.php
@@ -49,7 +49,7 @@ public function load() {
         'active' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'storage_type' => array(
@@ -66,13 +66,13 @@ public function load() {
         'storage_active' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'locked' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'data' => array(
@@ -83,22 +83,23 @@ public function load() {
         'cardinality' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'translatable' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_config")->fields(array(
       'id',
@@ -399,4 +400,4 @@ public function load() {
   }
 
 }
-#fcabbf0d86874983e6fdc8bf74d051dd
+#73e7228808dbee3c78a696d6dc299e8a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldConfigInstance.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldConfigInstance.php
index bf92ffc..5e846c3 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldConfigInstance.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldConfigInstance.php
@@ -61,10 +61,11 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_config_instance")->fields(array(
       'id',
@@ -327,4 +328,4 @@ public function load() {
   }
 
 }
-#edb455536fc9c336da2b6caaa2e5b52f
+#ea8328aa1c61b4b70488ffec419d0b0e
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataBody.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataBody.php
index 97ebe70..301d9d6 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataBody.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataBody.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -87,6 +87,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_body")->fields(array(
       'entity_type',
@@ -104,4 +105,4 @@ public function load() {
   }
 
 }
-#3f6f29484eb92e2b2ec4b9c42bd55cd3
+#58f5b8a4637fcf4163189ea05cf087f7
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataCommentBody.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataCommentBody.php
index cc7cb5c..d0c38f0 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataCommentBody.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataCommentBody.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -82,6 +82,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_comment_body")->fields(array(
       'entity_type',
@@ -108,4 +109,4 @@ public function load() {
   }
 
 }
-#313262182d98146f9b2209e767d6203e
+#706dc70c9b8aeae86a0d723c0a76f089
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldBoolean.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldBoolean.php
index 56e173f..23b4db3 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldBoolean.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldBoolean.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -77,6 +77,7 @@ public function load() {
           'length' => '11',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_boolean")->fields(array(
       'entity_type',
@@ -101,4 +102,4 @@ public function load() {
   }
 
 }
-#1b1a17e53267098d8155b608c6e4b8b6
+#1f4a0a75e3ee7dfbb50d05bc88b11ba2
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldDate.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldDate.php
index eb129d5..1824024 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldDate.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldDate.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -77,6 +77,7 @@ public function load() {
           'length' => '100',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_date")->fields(array(
       'entity_type',
@@ -101,4 +102,4 @@ public function load() {
   }
 
 }
-#58f839d311cfb07b3330ee13794c8dfd
+#d38bdfa344cb3c6b0750c6be42f0af9e
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldDateWithEndTime.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldDateWithEndTime.php
index d32771a..25bfedb 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldDateWithEndTime.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldDateWithEndTime.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -82,6 +82,7 @@ public function load() {
           'length' => '11',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_date_with_end_time")->fields(array(
       'entity_type',
@@ -108,4 +109,4 @@ public function load() {
   }
 
 }
-#4e2bea2cfa0c14c5d0220b48e8a862d2
+#93c47bd3fbf7f21a429ed2a472f34617
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldEmail.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldEmail.php
index 2619d6c..47b3599 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldEmail.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldEmail.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -77,6 +77,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_email")->fields(array(
       'entity_type',
@@ -110,4 +111,4 @@ public function load() {
   }
 
 }
-#9f58f910f072f4fa81c462c79934ce9f
+#62a1492fb44a25096a74e38632ac952a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldFile.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldFile.php
index cd2417f..28831c8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldFile.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldFile.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -80,7 +80,7 @@ public function load() {
         'field_file_display' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '3',
+          'length' => '10',
           'default' => '1',
           'unsigned' => TRUE,
         ),
@@ -90,6 +90,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_file")->fields(array(
       'entity_type',
@@ -107,4 +108,4 @@ public function load() {
   }
 
 }
-#1aaddda3b8a128af343595d750bd3502
+#5b4f01cbd8c2bdba462a4899dc2ea6b7
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldFloat.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldFloat.php
index f4ef921..0972b08 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldFloat.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldFloat.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -74,9 +74,11 @@ public function load() {
         'field_float_value' => array(
           'type' => 'numeric',
           'not null' => FALSE,
-          'length' => 100,
+          'precision' => '10',
+          'scale' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_float")->fields(array(
       'entity_type',
@@ -96,9 +98,9 @@ public function load() {
       'revision_id' => '1',
       'language' => 'und',
       'delta' => '0',
-      'field_float_value' => '1.2',
+      'field_float_value' => '1',
     ))->execute();
   }
 
 }
-#099854befef1b9e7fd22e294181313f0
+#5d7f9e708e357b3f15e5d5eb55cb2366
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldImage.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldImage.php
index 4080afd..1cd258a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldImage.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldImage.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -100,6 +100,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_image")->fields(array(
       'entity_type',
@@ -119,4 +120,4 @@ public function load() {
   }
 
 }
-#aeac4c5233be08e500b15d54bbd19d3f
+#94218b4078939e740248ae3c2324354e
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldImages.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldImages.php
index 7b69402..c3ea644 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldImages.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldImages.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -100,6 +100,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_images")->fields(array(
       'entity_type',
@@ -132,4 +133,4 @@ public function load() {
   }
 
 }
-#d7c0fedc16aa6101a7a58ba488491554
+#8d75fe3a77c7a4b9b02a997c960c4114
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldInteger.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldInteger.php
index 0225a02..d5fcb0c 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldInteger.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldInteger.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -77,6 +77,7 @@ public function load() {
           'length' => '11',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_integer")->fields(array(
       'entity_type',
@@ -101,4 +102,4 @@ public function load() {
   }
 
 }
-#b5c813614de7e622be84aec3e9a10ea3
+#216fa7f54876d42ec80a9e6b2aa53991
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldIntegerList.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldIntegerList.php
index 3007c50..7093af8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldIntegerList.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldIntegerList.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -77,6 +77,7 @@ public function load() {
           'length' => '11',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_integer_list")->fields(array(
       'entity_type',
@@ -101,4 +102,4 @@ public function load() {
   }
 
 }
-#b7e032248c4d25ed7be9763ba3df476d
+#ad81b13a9866a7a5e304c0ad260c7865
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldLink.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldLink.php
index 11d0cf4..d765fcb 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldLink.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldLink.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -87,6 +87,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_link")->fields(array(
       'entity_type',
@@ -115,4 +116,4 @@ public function load() {
   }
 
 }
-#34821b2528b8037ca3189302a3e62e31
+#42a36f1848e88c2f215633df201ebb94
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldLongText.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldLongText.php
index 3068d2b..b01cea3 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldLongText.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldLongText.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -87,6 +87,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_long_text")->fields(array(
       'entity_type',
@@ -104,4 +105,4 @@ public function load() {
   }
 
 }
-#6e1393a871785e2caa910a6cfb895938
+#0509fba3d28ba62eda0384f770170567
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldPhone.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldPhone.php
index 50bfbf2..ff6401e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldPhone.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldPhone.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -77,6 +77,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_phone")->fields(array(
       'entity_type',
@@ -101,4 +102,4 @@ public function load() {
   }
 
 }
-#ef95a41d41ada8bc1f985eeb693e7730
+#cbed59f2783b244b73cb8f8d044b672d
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldTags.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldTags.php
index 3ba8a17..7b55a6f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldTags.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldTags.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -78,6 +78,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_tags")->fields(array(
       'entity_type',
@@ -93,4 +94,4 @@ public function load() {
   }
 
 }
-#47fae1cae2e87753c7cf27d43e884edd
+#9e0f85739f8ae8d2c27054edb43f388d
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldTermReference.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldTermReference.php
index 1324be4..d40e484 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldTermReference.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldTermReference.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -78,6 +78,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_term_reference")->fields(array(
       'entity_type',
@@ -102,4 +103,4 @@ public function load() {
   }
 
 }
-#bd6a1e3b400e5d54d9414f069e9ffd78
+#f33077a408305fb71bf8c18542882cd6
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldText.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldText.php
index a98b819..f857465 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldText.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldText.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -82,6 +82,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_text")->fields(array(
       'entity_type',
@@ -108,4 +109,4 @@ public function load() {
   }
 
 }
-#cfb7d740c711dc050717366d391db11e
+#c7e1eeb7e890b88fab60d4b1db01bad4
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldTextList.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldTextList.php
index 738e439..c34dc9f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldTextList.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataFieldTextList.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -77,6 +77,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_field_text_list")->fields(array(
       'entity_type',
@@ -101,4 +102,4 @@ public function load() {
   }
 
 }
-#41a168e47293f1d00b3849f9784a912d
+#6e567afd2a7ab2baa69d9b9732bdcac2
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataTaxonomyForums.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataTaxonomyForums.php
index 201a636..4445dd8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataTaxonomyForums.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldDataTaxonomyForums.php
@@ -44,7 +44,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -78,6 +78,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_data_taxonomy_forums")->fields(array(
       'entity_type',
@@ -93,4 +94,4 @@ public function load() {
   }
 
 }
-#ef9f9f600a41e494fbd71867dd916279
+#2c9b0464383ed785dd3d5b2bbc263d13
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionBody.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionBody.php
index c4e6657..c6c343b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionBody.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionBody.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -88,6 +88,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_body")->fields(array(
       'entity_type',
@@ -105,4 +106,4 @@ public function load() {
   }
 
 }
-#8e47b561c056facbf41ffd22facd6632
+#088085ffa6940ff7b87442b920d39de3
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionCommentBody.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionCommentBody.php
index a68c817..748e30c 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionCommentBody.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionCommentBody.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -83,6 +83,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_comment_body")->fields(array(
       'entity_type',
@@ -109,4 +110,4 @@ public function load() {
   }
 
 }
-#6f0d3a06aebbd3dddfa962163249bd8e
+#c3196f37793be4c3a67a5fabbe96d638
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldBoolean.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldBoolean.php
index 52b2553..18b1206 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldBoolean.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldBoolean.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -78,6 +78,7 @@ public function load() {
           'length' => '11',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_boolean")->fields(array(
       'entity_type',
@@ -102,4 +103,4 @@ public function load() {
   }
 
 }
-#33c7cfb7956140a5e30a4ab65c94c968
+#714689a7cd3018aca920b2545fecca3f
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldDate.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldDate.php
index 2a3c6f8..c6a14bc 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldDate.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldDate.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -78,6 +78,7 @@ public function load() {
           'length' => '100',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_date")->fields(array(
       'entity_type',
@@ -102,4 +103,4 @@ public function load() {
   }
 
 }
-#9a10cb625cbfdb87b0d8e7ba2f6e363a
+#7a496d6829348725dd37aaa48989ba36
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldDateWithEndTime.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldDateWithEndTime.php
index 3457189..acdde7a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldDateWithEndTime.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldDateWithEndTime.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -83,6 +83,7 @@ public function load() {
           'length' => '11',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_date_with_end_time")->fields(array(
       'entity_type',
@@ -109,4 +110,4 @@ public function load() {
   }
 
 }
-#b718d97ffca3feca611e4b64546c01a2
+#2cf39b7ef226459966b7bee448ec5123
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldEmail.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldEmail.php
index 7bcebde..2b91291 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldEmail.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldEmail.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -78,6 +78,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_email")->fields(array(
       'entity_type',
@@ -111,4 +112,4 @@ public function load() {
   }
 
 }
-#92a57f1f49bf3413e02aa5d68fd6f294
+#e84fd6f7a1b5c2004e5e5e086fdd7718
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldFile.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldFile.php
index 4995627..adebc61 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldFile.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldFile.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -81,7 +81,7 @@ public function load() {
         'field_file_display' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '3',
+          'length' => '10',
           'default' => '1',
           'unsigned' => TRUE,
         ),
@@ -91,6 +91,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_file")->fields(array(
       'entity_type',
@@ -108,4 +109,4 @@ public function load() {
   }
 
 }
-#e341b310bb60da3fcc916f0bdd290e3f
+#5cf9c6ff7da8c55d1c4da2f44bc43001
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldFloat.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldFloat.php
index 4ff3809..34bfd89 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldFloat.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldFloat.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -75,9 +75,11 @@ public function load() {
         'field_float_value' => array(
           'type' => 'numeric',
           'not null' => FALSE,
-          'length' => 100,
+          'precision' => '10',
+          'scale' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_float")->fields(array(
       'entity_type',
@@ -97,9 +99,9 @@ public function load() {
       'revision_id' => '1',
       'language' => 'und',
       'delta' => '0',
-      'field_float_value' => '1.2',
+      'field_float_value' => '1',
     ))->execute();
   }
 
 }
-#fb85abbb328da2ca702af8c27697d67a
+#02ee7dce1bc725eb9596a78a0d123f00
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldImage.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldImage.php
index c7810e4..0134052 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldImage.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldImage.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -101,6 +101,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_image")->fields(array(
       'entity_type',
@@ -120,4 +121,4 @@ public function load() {
   }
 
 }
-#a544da1e4f40a1c4bc865dc5a14dc6f6
+#f79a72a32b1944ed709480b52fcf0bd1
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldImages.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldImages.php
index b9ff4d6..8d46b70 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldImages.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldImages.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -101,6 +101,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_images")->fields(array(
       'entity_type',
@@ -133,4 +134,4 @@ public function load() {
   }
 
 }
-#ce6e1446592d032fbb8403dd0355c2a1
+#c1e6e7e6f3bf3ba14750169d98743ac2
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldInteger.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldInteger.php
index 8a03303..c236595 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldInteger.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldInteger.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -78,6 +78,7 @@ public function load() {
           'length' => '11',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_integer")->fields(array(
       'entity_type',
@@ -102,4 +103,4 @@ public function load() {
   }
 
 }
-#e8e41f2e62bbb822a90794d0e7e6eb90
+#75fce538f2e8202830e30771132bde34
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldIntegerList.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldIntegerList.php
index d77c4b4..590c9fd 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldIntegerList.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldIntegerList.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -78,6 +78,7 @@ public function load() {
           'length' => '11',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_integer_list")->fields(array(
       'entity_type',
@@ -102,4 +103,4 @@ public function load() {
   }
 
 }
-#68916e070db26cf14055d3e6cdfc20ea
+#7541af29f7455fc16c4be9c9055f4eba
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldLink.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldLink.php
index 67abbdd..7d2e950 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldLink.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldLink.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -88,6 +88,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_link")->fields(array(
       'entity_type',
@@ -116,4 +117,4 @@ public function load() {
   }
 
 }
-#d8e901785d58770e29e1c9d2192cbd2b
+#8bd85e5a9460172be79c50b43a35e68b
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldLongText.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldLongText.php
index 3ff58d4..406303d 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldLongText.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldLongText.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -88,6 +88,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_long_text")->fields(array(
       'entity_type',
@@ -105,4 +106,4 @@ public function load() {
   }
 
 }
-#e41dce27189106ce9230e05df73ee15f
+#757f5413cdc1a81b7b549d2465d36a49
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldPhone.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldPhone.php
index 5c1f035..b40ec03 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldPhone.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldPhone.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -78,6 +78,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_phone")->fields(array(
       'entity_type',
@@ -102,4 +103,4 @@ public function load() {
   }
 
 }
-#8a859b5a165d1ec2ad1fa31deb35090b
+#3cbf4ed3ee645516201d03a888f6d6ca
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldTags.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldTags.php
index 80608a0..efc5a19 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldTags.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldTags.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -79,6 +79,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_tags")->fields(array(
       'entity_type',
@@ -94,4 +95,4 @@ public function load() {
   }
 
 }
-#bc90f8964e53c82d8a56e0f3422a8310
+#16ce847952ff261838323685dcf2dbc3
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldTermReference.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldTermReference.php
index 2fc5525..a1c4dbb 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldTermReference.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldTermReference.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -79,6 +79,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_term_reference")->fields(array(
       'entity_type',
@@ -103,4 +104,4 @@ public function load() {
   }
 
 }
-#6fd310903897f308904bfd55c6f3b68c
+#492aa5a961744d90efa307e3d881c462
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldText.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldText.php
index 36b1113..7cba15f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldText.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldText.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -83,6 +83,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_text")->fields(array(
       'entity_type',
@@ -109,4 +110,4 @@ public function load() {
   }
 
 }
-#f148c24300f722fc7df5f7e1f1d8b67d
+#f599a2f583796923e7e8005ef98daa9f
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldTextList.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldTextList.php
index fc1c39b..d87a151 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldTextList.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionFieldTextList.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -78,6 +78,7 @@ public function load() {
           'length' => '255',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_field_text_list")->fields(array(
       'entity_type',
@@ -102,4 +103,4 @@ public function load() {
   }
 
 }
-#2882f6e15d23ce65477789922039ebee
+#2796d3ff2cb7fa661d9fbdec572d9231
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionTaxonomyForums.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionTaxonomyForums.php
index 813d136..1d50025 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionTaxonomyForums.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FieldRevisionTaxonomyForums.php
@@ -45,7 +45,7 @@ public function load() {
         'deleted' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'entity_id' => array(
@@ -79,6 +79,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("field_revision_taxonomy_forums")->fields(array(
       'entity_type',
@@ -94,4 +95,4 @@ public function load() {
   }
 
 }
-#4a583f60169a3042a49b60aa6e673147
+#fc1db70f1760d8c865dce486428a7395
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FileManaged.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FileManaged.php
index 3d32b4c..6f2306b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FileManaged.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FileManaged.php
@@ -59,14 +59,14 @@ public function load() {
         'filesize' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '20',
+          'length' => '10',
           'default' => '0',
           'unsigned' => TRUE,
         ),
         'status' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'timestamp' => array(
@@ -77,6 +77,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("file_managed")->fields(array(
       'fid',
@@ -101,4 +102,4 @@ public function load() {
   }
 
 }
-#230395ef69d748c973a4f2d421856fcf
+#56e60ddebedd173968ca05c1c87b0f20
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FileUsage.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FileUsage.php
index 32b4d1a..9df8f9b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FileUsage.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FileUsage.php
@@ -61,6 +61,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("file_usage")->fields(array(
       'fid',
@@ -79,4 +80,4 @@ public function load() {
   }
 
 }
-#9487016b893e8c923d60d751a1875230
+#718d3fda4b0b3593c7ee6b1bef93e229
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Filter.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Filter.php
index 26305b7..29fa2ba 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Filter.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Filter.php
@@ -61,6 +61,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("filter")->fields(array(
       'format',
@@ -214,4 +215,4 @@ public function load() {
   }
 
 }
-#e6349349e505a04f97f17e2080d68135
+#26810a92f8dcd637a67b91e218441083
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/FilterFormat.php b/core/modules/migrate_drupal/src/Tests/Table/d7/FilterFormat.php
index 0c8c154..d852621 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/FilterFormat.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/FilterFormat.php
@@ -39,13 +39,13 @@ public function load() {
         'cache' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'status' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '3',
+          'length' => '10',
           'default' => '1',
           'unsigned' => TRUE,
         ),
@@ -56,6 +56,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("filter_format")->fields(array(
       'format',
@@ -92,4 +93,4 @@ public function load() {
   }
 
 }
-#c3939c079f4350bcd12ab892829af761
+#1e6fc650aec40ccdac7d9290778b5708
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Flood.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Flood.php
index ee37818..10c388e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Flood.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Flood.php
@@ -55,6 +55,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("flood")->fields(array(
       'fid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#90426e8b3bbb0a5bd176c505ef4e1f9c
+#4bf085cae9355726345ae89e6936da9c
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Forum.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Forum.php
index 2819943..5b5aded 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Forum.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Forum.php
@@ -47,6 +47,7 @@ public function load() {
       'primary key' => array(
         'vid',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("forum")->fields(array(
       'nid',
@@ -57,4 +58,4 @@ public function load() {
   }
 
 }
-#bc8e99796f2ec3d9244d12adcbf448d9
+#7cf66382d8b9f4f02726d56bf0068911
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/ForumIndex.php b/core/modules/migrate_drupal/src/Tests/Table/d7/ForumIndex.php
index 64528eb..c2a6432 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/ForumIndex.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/ForumIndex.php
@@ -45,7 +45,7 @@ public function load() {
         'sticky' => array(
           'type' => 'int',
           'not null' => FALSE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'created' => array(
@@ -69,6 +69,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("forum_index")->fields(array(
       'nid',
@@ -83,4 +84,4 @@ public function load() {
   }
 
 }
-#1f59c5b563ba76fa2c75495f33f57e11
+#a1a3b65a0b88c88bd22e60963cffe5a2
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/History.php b/core/modules/migrate_drupal/src/Tests/Table/d7/History.php
index fa9b8b7..f49487f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/History.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/History.php
@@ -45,6 +45,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("history")->fields(array(
       'uid',
@@ -59,4 +60,4 @@ public function load() {
   }
 
 }
-#890d204157205453cc9ca99486c64c99
+#4b9ec8e019d7f6733105db7bc8167268
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/ImageEffects.php b/core/modules/migrate_drupal/src/Tests/Table/d7/ImageEffects.php
index 2da2b4c..d5337e1 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/ImageEffects.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/ImageEffects.php
@@ -55,6 +55,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("image_effects")->fields(array(
       'ieid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#a9ad7344cf818347e8074c68c88f882b
+#02b95b18fd065377d10d2eb5db756894
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/ImageStyles.php b/core/modules/migrate_drupal/src/Tests/Table/d7/ImageStyles.php
index 1c407a0..908548d 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/ImageStyles.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/ImageStyles.php
@@ -43,6 +43,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("image_styles")->fields(array(
       'isid',
@@ -53,4 +54,4 @@ public function load() {
   }
 
 }
-#7ecb9ebd26f1483f745e63add7af334f
+#64077dfb27e8f49e53f6d40a40b6d36d
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Languages.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Languages.php
index 3d52c1e..89c28bf 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Languages.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Languages.php
@@ -92,6 +92,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("languages")->fields(array(
       'language',
@@ -122,4 +123,4 @@ public function load() {
   }
 
 }
-#21577acb7a0204018673c292983e0f57
+#458e20ce6a713188fcd8d1efb9e82c3d
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/LocalesSource.php b/core/modules/migrate_drupal/src/Tests/Table/d7/LocalesSource.php
index e67d659..0b44531 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/LocalesSource.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/LocalesSource.php
@@ -59,6 +59,7 @@ public function load() {
           'default' => 'none',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("locales_source")->fields(array(
       'lid',
@@ -401,4 +402,4 @@ public function load() {
   }
 
 }
-#3b418678e7648675fd7523e614a45274
+#b7f4cb34968312ad989a50d27f42ccbf
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/LocalesTarget.php b/core/modules/migrate_drupal/src/Tests/Table/d7/LocalesTarget.php
index 0307d00..f7477a6 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/LocalesTarget.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/LocalesTarget.php
@@ -57,6 +57,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("locales_target")->fields(array(
       'lid',
@@ -69,4 +70,4 @@ public function load() {
   }
 
 }
-#a8df04af5270adb1ba16a8a007d5fb01
+#7ff0b157a9ff000fdf8ebd77dcda662a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/MenuCustom.php b/core/modules/migrate_drupal/src/Tests/Table/d7/MenuCustom.php
index 293cd36..ef94737 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/MenuCustom.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/MenuCustom.php
@@ -43,6 +43,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("menu_custom")->fields(array(
       'menu_name',
@@ -73,4 +74,4 @@ public function load() {
   }
 
 }
-#30a060ea29d6a994ac920f8c24bf2fb5
+#9544551cfc40d1dfb5de91c3036238e8
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/MenuLinks.php b/core/modules/migrate_drupal/src/Tests/Table/d7/MenuLinks.php
index 1eb69d1..0a4c29f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/MenuLinks.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/MenuLinks.php
@@ -73,25 +73,25 @@ public function load() {
         'hidden' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
         'external' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
         'has_children' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
         'expanded' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
         'weight' => array(
@@ -103,13 +103,13 @@ public function load() {
         'depth' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
         'customized' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
         'p1' => array(
@@ -178,13 +178,14 @@ public function load() {
         'updated' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
       ),
       'primary key' => array(
         'mlid',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("menu_links")->fields(array(
       'menu_name',
@@ -9967,4 +9968,4 @@ public function load() {
   }
 
 }
-#ca122da186154af8876df1b67e92d2d7
+#8e0b0e21959e36a659b7ac2c4206fecd
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/MenuRouter.php b/core/modules/migrate_drupal/src/Tests/Table/d7/MenuRouter.php
index 61e53ed..6cd37d4 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/MenuRouter.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/MenuRouter.php
@@ -78,7 +78,7 @@ public function load() {
         'number_parts' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '0',
         ),
         'context' => array(
@@ -158,6 +158,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("menu_router")->fields(array(
       'path',
@@ -9908,4 +9909,4 @@ public function load() {
   }
 
 }
-#68f846a4afde2ccaa71b38c1d46bb496
+#1b135a6057e274275fb7392b6fe6b19e
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Node.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Node.php
index c39c45a..9227d91 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Node.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Node.php
@@ -111,6 +111,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("node")->fields(array(
       'nid',
@@ -147,4 +148,4 @@ public function load() {
   }
 
 }
-#8de631972a15be4dd8adca896abf0909
+#ad72334d15f155644075803c26757ee5
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/NodeAccess.php b/core/modules/migrate_drupal/src/Tests/Table/d7/NodeAccess.php
index 7cb9328..80df940 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/NodeAccess.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/NodeAccess.php
@@ -50,25 +50,26 @@ public function load() {
         'grant_view' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '3',
+          'length' => '10',
           'default' => '0',
           'unsigned' => TRUE,
         ),
         'grant_update' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '3',
+          'length' => '10',
           'default' => '0',
           'unsigned' => TRUE,
         ),
         'grant_delete' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '3',
+          'length' => '10',
           'default' => '0',
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("node_access")->fields(array(
       'nid',
@@ -89,4 +90,4 @@ public function load() {
   }
 
 }
-#b6bdd1c18807874da0ebd2e93eba4ed3
+#2677e6dc730eb5cf3f1c9346d6233b21
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/NodeCommentStatistics.php b/core/modules/migrate_drupal/src/Tests/Table/d7/NodeCommentStatistics.php
index 0ea8ee8..bb4f41d 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/NodeCommentStatistics.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/NodeCommentStatistics.php
@@ -63,6 +63,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("node_comment_statistics")->fields(array(
       'nid',
@@ -83,4 +84,4 @@ public function load() {
   }
 
 }
-#d57f3f8c93bd4e0a53feea8e9480b091
+#e98845f037e6af4ef34c957ffd2d4f94
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/NodeCounter.php b/core/modules/migrate_drupal/src/Tests/Table/d7/NodeCounter.php
index d1ce200..bba6422 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/NodeCounter.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/NodeCounter.php
@@ -34,14 +34,14 @@ public function load() {
         'totalcount' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '20',
+          'length' => '10',
           'default' => '0',
           'unsigned' => TRUE,
         ),
         'daycount' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '8',
+          'length' => '10',
           'default' => '0',
           'unsigned' => TRUE,
         ),
@@ -53,6 +53,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("node_counter")->fields(array(
       'nid',
@@ -69,4 +70,4 @@ public function load() {
   }
 
 }
-#0005dc0257e2c4a3fc4f44469ba70274
+#f2d6ef67cb9e076d80baa83d50c00d45
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/NodeRevision.php b/core/modules/migrate_drupal/src/Tests/Table/d7/NodeRevision.php
index 8118ce9..70a9fc8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/NodeRevision.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/NodeRevision.php
@@ -86,6 +86,7 @@ public function load() {
       'primary key' => array(
         'vid',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("node_revision")->fields(array(
       'nid',
@@ -114,4 +115,4 @@ public function load() {
   }
 
 }
-#903cc4ad46a15d52515a89def967ae0f
+#02a3aed2de9a2df056ef6b81d329213e
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/NodeType.php b/core/modules/migrate_drupal/src/Tests/Table/d7/NodeType.php
index 6b77ae5..bbf0a4a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/NodeType.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/NodeType.php
@@ -59,7 +59,7 @@ public function load() {
         'has_title' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '3',
+          'length' => '10',
           'unsigned' => TRUE,
         ),
         'title_label' => array(
@@ -71,25 +71,25 @@ public function load() {
         'custom' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'modified' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'locked' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'disabled' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'orig_type' => array(
@@ -99,6 +99,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("node_type")->fields(array(
       'type',
@@ -203,4 +204,4 @@ public function load() {
   }
 
 }
-#15fbbd92f266d6c9c10eb9c0ba9346b2
+#c3cc0500356b35e3e6b106aabf2c7aac
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Queue.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Queue.php
index 9223be9..e7f1ed2 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Queue.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Queue.php
@@ -55,6 +55,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("queue")->fields(array(
       'item_id',
@@ -79,4 +80,4 @@ public function load() {
   }
 
 }
-#eecf98cbf23da768edfd6590f4f93a5a
+#1041c7ebc45ffcc5952a6a089ff29e65
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/RdfMapping.php b/core/modules/migrate_drupal/src/Tests/Table/d7/RdfMapping.php
index 56bafdd..d35da5c 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/RdfMapping.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/RdfMapping.php
@@ -42,6 +42,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("rdf_mapping")->fields(array(
       'type',
@@ -72,4 +73,4 @@ public function load() {
   }
 
 }
-#88175bf8e5264ca22749e0539a9a40dd
+#ed8a8cd42f79b6dfd27bb9d2cd617ed2
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Registry.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Registry.php
index 1c64dd3..71f81a8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Registry.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Registry.php
@@ -56,6 +56,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("registry")->fields(array(
       'name',
@@ -4832,4 +4833,4 @@ public function load() {
   }
 
 }
-#295b783603e1bc54a6b6991a35712737
+#2077b4198fa9daf33a05eca8820c25a1
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/RegistryFile.php b/core/modules/migrate_drupal/src/Tests/Table/d7/RegistryFile.php
index e938b8d..227a142 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/RegistryFile.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/RegistryFile.php
@@ -36,6 +36,7 @@ public function load() {
           'length' => '64',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("registry_file")->fields(array(
       'filename',
@@ -882,4 +883,4 @@ public function load() {
   }
 
 }
-#f31c4b35f9f220844db24b8a67b06dd5
+#1ac8dbfd83515be9880101dbf6939b62
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Role.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Role.php
index 8ecf8dd..4588de4 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Role.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Role.php
@@ -44,6 +44,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("role")->fields(array(
       'rid',
@@ -66,4 +67,4 @@ public function load() {
   }
 
 }
-#d09ac267302832e11a9b70c9d03dc112
+#10cbe2aaa809316e790c573d67ef9950
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/RolePermission.php b/core/modules/migrate_drupal/src/Tests/Table/d7/RolePermission.php
index 0764957..72d43fc 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/RolePermission.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/RolePermission.php
@@ -45,6 +45,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("role_permission")->fields(array(
       'rid',
@@ -415,4 +416,4 @@ public function load() {
   }
 
 }
-#250f49f0121123b59282926cbe8b7d00
+#f2497ea0a9b301afa3b03fea57bcf71a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/SearchDataset.php b/core/modules/migrate_drupal/src/Tests/Table/d7/SearchDataset.php
index 7dd481f..6ae206c 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/SearchDataset.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/SearchDataset.php
@@ -51,6 +51,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("search_dataset")->fields(array(
       'sid',
@@ -67,4 +68,4 @@ public function load() {
   }
 
 }
-#1347bb4f56e9cdf19e54efc2f8837783
+#a0b45149240219877fea6a4c421dc266
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/SearchIndex.php b/core/modules/migrate_drupal/src/Tests/Table/d7/SearchIndex.php
index 4a68ea1..22d66f4 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/SearchIndex.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/SearchIndex.php
@@ -48,9 +48,11 @@ public function load() {
         'score' => array(
           'type' => 'numeric',
           'not null' => FALSE,
-          'length' => 100,
+          'precision' => '10',
+          'scale' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("search_index")->fields(array(
       'word',
@@ -182,7 +184,7 @@ public function load() {
       'word' => 'register',
       'sid' => '1',
       'type' => 'node',
-      'score' => '2.2',
+      'score' => '2',
     ))->values(array(
       'word' => 'some',
       'sid' => '1',
@@ -217,4 +219,4 @@ public function load() {
   }
 
 }
-#0e6123f2a2fffe419965e1e7bc51fb63
+#1373fb71f1f3a2652a1d5b7dc76c9a77
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/SearchNodeLinks.php b/core/modules/migrate_drupal/src/Tests/Table/d7/SearchNodeLinks.php
index 71a4048..c1cf408 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/SearchNodeLinks.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/SearchNodeLinks.php
@@ -53,6 +53,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("search_node_links")->fields(array(
       'sid',
@@ -64,4 +65,4 @@ public function load() {
   }
 
 }
-#df80aaa3c30f6070f6cf85c15416cfb5
+#abf1aa9d6fa48042800c0f61eab16902
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/SearchTotal.php b/core/modules/migrate_drupal/src/Tests/Table/d7/SearchTotal.php
index b306810..07a2891 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/SearchTotal.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/SearchTotal.php
@@ -34,9 +34,11 @@ public function load() {
         'count' => array(
           'type' => 'numeric',
           'not null' => FALSE,
-          'length' => 100,
+          'precision' => '10',
+          'scale' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("search_total")->fields(array(
       'word',
@@ -44,99 +46,99 @@ public function load() {
     ))
     ->values(array(
       'word' => '1',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => '1192015',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => '19',
-      'count' => '0.176091',
+      'count' => '0',
     ))->values(array(
       'word' => '2015',
-      'count' => '0.176091',
+      'count' => '0',
     ))->values(array(
       'word' => '2215',
-      'count' => '0.176091',
+      'count' => '0',
     ))->values(array(
       'word' => '2218',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => '9',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => '99999999',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => 'abc5xyz',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => 'admin',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => 'another',
-      'count' => '0.0377886',
+      'count' => '0',
     ))->values(array(
       'word' => 'click',
-      'count' => '0.0377886',
+      'count' => '0',
     ))->values(array(
       'word' => 'comment',
-      'count' => '0.0157943',
+      'count' => '0',
     ))->values(array(
       'word' => 'comments',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => 'default',
-      'count' => '0.0377886',
+      'count' => '0',
     ))->values(array(
       'word' => 'examplecom',
-      'count' => '0.0193052',
+      'count' => '0',
     ))->values(array(
       'word' => 'here',
-      'count' => '0.0377886',
+      'count' => '0',
     ))->values(array(
       'word' => 'january',
-      'count' => '0.176091',
+      'count' => '0',
     ))->values(array(
       'word' => 'monday',
-      'count' => '0.176091',
+      'count' => '0',
     ))->values(array(
       'word' => 'more',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => 'node',
-      'count' => '0.0163904',
+      'count' => '0',
     ))->values(array(
       'word' => 'permalink',
-      'count' => '0.0377886',
+      'count' => '0',
     ))->values(array(
       'word' => 'post',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => 'prefix',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => 'register',
-      'count' => '0.162727',
+      'count' => '0',
     ))->values(array(
       'word' => 'some',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => 'submitted',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => 'text',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => 'this',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => 'value',
-      'count' => '0.30103',
+      'count' => '0',
     ))->values(array(
       'word' => 'value120suffix',
-      'count' => '0.30103',
+      'count' => '0',
     ))->execute();
   }
 
 }
-#b0a1f9cd3e748132f5861416093877cf
+#7ef964179b2e8308418e09f4ef322854
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Semaphore.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Semaphore.php
index 528ca20..4dbf64a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Semaphore.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Semaphore.php
@@ -40,9 +40,11 @@ public function load() {
         'expire' => array(
           'type' => 'numeric',
           'not null' => TRUE,
-          'length' => 100,
+          'precision' => '10',
+          'scale' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("semaphore")->fields(array(
       'name',
@@ -53,4 +55,4 @@ public function load() {
   }
 
 }
-#2a687fbf97f600464a9297e3b027312d
+#d0b2a55e7780f49f970dd2b3e73cafe0
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Sequences.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Sequences.php
index 20d4013..510da98 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Sequences.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Sequences.php
@@ -32,6 +32,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("sequences")->fields(array(
       'value',
@@ -42,4 +43,4 @@ public function load() {
   }
 
 }
-#70fff22240dc6fb1391da11b38b60bd1
+#09fb20ca43790e7429303f3ae35779b0
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Sessions.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Sessions.php
index 20a3be0..774b1a0 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Sessions.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Sessions.php
@@ -67,6 +67,7 @@ public function load() {
         'sid',
         'ssid',
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("sessions")->fields(array(
       'uid',
@@ -81,4 +82,4 @@ public function load() {
   }
 
 }
-#207a95011fb0c0efb42e7a823cae19e7
+#1241f5d5478b391673139c7061f64d16
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/ShortcutSet.php b/core/modules/migrate_drupal/src/Tests/Table/d7/ShortcutSet.php
index 5a26e1f..0324a14 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/ShortcutSet.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/ShortcutSet.php
@@ -38,6 +38,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("shortcut_set")->fields(array(
       'set_name',
@@ -50,4 +51,4 @@ public function load() {
   }
 
 }
-#8d5940dd6f1121e12799ffb19e0ac2ba
+#b3fff732e065eff0eff212928ce45a0c
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/ShortcutSetUsers.php b/core/modules/migrate_drupal/src/Tests/Table/d7/ShortcutSetUsers.php
index 5560d26..6eff21e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/ShortcutSetUsers.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/ShortcutSetUsers.php
@@ -39,6 +39,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("shortcut_set_users")->fields(array(
       'uid',
@@ -48,4 +49,4 @@ public function load() {
   }
 
 }
-#29056f57d584c37c6a0691aa5b5a0465
+#56b71631616c8eae6cc71b0ae443426a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Simpletest.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Simpletest.php
index 4845f23..7c3646b 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Simpletest.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Simpletest.php
@@ -78,6 +78,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("simpletest")->fields(array(
       'message_id',
@@ -94,4 +95,4 @@ public function load() {
   }
 
 }
-#429a47cf9df8c04272ca64ddeece0da4
+#88369dad7154203ce0fa1eee7f392942
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/SimpletestTestId.php b/core/modules/migrate_drupal/src/Tests/Table/d7/SimpletestTestId.php
index d981658..348db21 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/SimpletestTestId.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/SimpletestTestId.php
@@ -37,6 +37,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("simpletest_test_id")->fields(array(
       'test_id',
@@ -46,4 +47,4 @@ public function load() {
   }
 
 }
-#21eab8b1e116cf2cb8633ddc1a9ce170
+#8ee6808713104a181d069645521d0ca5
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/System.php b/core/modules/migrate_drupal/src/Tests/Table/d7/System.php
index 795aed5..e480551 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/System.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/System.php
@@ -64,7 +64,7 @@ public function load() {
         'schema_version' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '6',
+          'length' => '11',
           'default' => '-1',
         ),
         'weight' => array(
@@ -79,6 +79,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("system")->fields(array(
       'filename',
@@ -1375,4 +1376,4 @@ public function load() {
   }
 
 }
-#615353765db4ea118faf01e7e3ff1bff
+#e7dc5c5dd785541f0628f2d5b9e57978
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyIndex.php b/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyIndex.php
index ef7cb22..aafd310 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyIndex.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyIndex.php
@@ -39,7 +39,7 @@ public function load() {
         'sticky' => array(
           'type' => 'int',
           'not null' => FALSE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'created' => array(
@@ -49,6 +49,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("taxonomy_index")->fields(array(
       'nid',
@@ -65,4 +66,4 @@ public function load() {
   }
 
 }
-#b4d7ca5b3adaf8e6e3938a7a6f43bd33
+#8204d7c1b294ccb506b5106f410bfa37
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyTermData.php b/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyTermData.php
index 5f5abe1..9a5d722 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyTermData.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyTermData.php
@@ -61,6 +61,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("taxonomy_term_data")->fields(array(
       'tid',
@@ -130,4 +131,4 @@ public function load() {
   }
 
 }
-#f076457dafa9a438fa258458d507546b
+#77a4e5089be7384cbdf2b8c42efc2707
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyTermHierarchy.php b/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyTermHierarchy.php
index fb49240..9afd709 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyTermHierarchy.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyTermHierarchy.php
@@ -41,6 +41,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("taxonomy_term_hierarchy")->fields(array(
       'tid',
@@ -74,4 +75,4 @@ public function load() {
   }
 
 }
-#a623d83a32b1d6b859052f16d295666f
+#ea3220ca740097f9251ba194e9bd736d
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyVocabulary.php b/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyVocabulary.php
index c8dc128..4c6c981 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyVocabulary.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/TaxonomyVocabulary.php
@@ -51,7 +51,7 @@ public function load() {
         'hierarchy' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '3',
+          'length' => '10',
           'default' => '0',
           'unsigned' => TRUE,
         ),
@@ -68,6 +68,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("taxonomy_vocabulary")->fields(array(
       'vid',
@@ -106,4 +107,4 @@ public function load() {
   }
 
 }
-#3e939a42e961bc13f4cc5688b2c06b4b
+#1125d5a340e10ab0abc40880a92fd366
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/TrackerNode.php b/core/modules/migrate_drupal/src/Tests/Table/d7/TrackerNode.php
index 5ccaa48..0155036 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/TrackerNode.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/TrackerNode.php
@@ -35,7 +35,7 @@ public function load() {
         'published' => array(
           'type' => 'int',
           'not null' => FALSE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'changed' => array(
@@ -46,6 +46,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("tracker_node")->fields(array(
       'nid',
@@ -60,4 +61,4 @@ public function load() {
   }
 
 }
-#315c7b27e9e15f6954f59b858fb22fcd
+#64524b94e5b88c9e2be2d4db8b98155d
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/TrackerUser.php b/core/modules/migrate_drupal/src/Tests/Table/d7/TrackerUser.php
index f33c4ed..e6c92e2 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/TrackerUser.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/TrackerUser.php
@@ -42,7 +42,7 @@ public function load() {
         'published' => array(
           'type' => 'int',
           'not null' => FALSE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'changed' => array(
@@ -53,6 +53,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("tracker_user")->fields(array(
       'nid',
@@ -69,4 +70,4 @@ public function load() {
   }
 
 }
-#be294122e162b08491a204fc40bc1978
+#6fb17f49221d202409a1298360628d70
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/TriggerAssignments.php b/core/modules/migrate_drupal/src/Tests/Table/d7/TriggerAssignments.php
index 568792f..96f3b3e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/TriggerAssignments.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/TriggerAssignments.php
@@ -45,6 +45,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("trigger_assignments")->fields(array(
       'hook',
@@ -59,4 +60,4 @@ public function load() {
   }
 
 }
-#5d757148ffae33413bb7681a38cccb04
+#ded4156a5c9b777c9008a952ce666ca4
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/UrlAlias.php b/core/modules/migrate_drupal/src/Tests/Table/d7/UrlAlias.php
index 8047119..312a1ec 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/UrlAlias.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/UrlAlias.php
@@ -50,6 +50,7 @@ public function load() {
           'default' => '',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("url_alias")->fields(array(
       'pid',
@@ -66,4 +67,4 @@ public function load() {
   }
 
 }
-#7eebd79d7656166f11ac27e974c942d7
+#13b4d67819660960304623cb5b30d2a5
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Users.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Users.php
index 33d7f59..e14c767 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Users.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Users.php
@@ -88,7 +88,7 @@ public function load() {
         'status' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '4',
+          'length' => '11',
           'default' => '0',
         ),
         'timezone' => array(
@@ -120,6 +120,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("users")->fields(array(
       'uid',
@@ -143,4 +144,4 @@ public function load() {
   }
 
 }
-#bb60d488e9420b75be9bb507fc35df8b
+#c4f52bf31f5fe27b4742639dea21039a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/UsersRoles.php b/core/modules/migrate_drupal/src/Tests/Table/d7/UsersRoles.php
index 995e714..5410855 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/UsersRoles.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/UsersRoles.php
@@ -41,6 +41,7 @@ public function load() {
           'unsigned' => TRUE,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("users_roles")->fields(array(
       'uid',
@@ -53,4 +54,4 @@ public function load() {
   }
 
 }
-#a02e273463ff074f34cd9819f90a8332
+#f85dd2dda1a860f0c2a963cbe784458a
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
index c66d152..f6faf11 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
@@ -37,6 +37,7 @@ public function load() {
           'length' => 100,
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("variable")->fields(array(
       'name',
@@ -418,4 +419,4 @@ public function load() {
   }
 
 }
-#d17f3e6a80f5f51c105acf809f1b4851
+#dfc4cdd451a6575677b8c10442893d26
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Watchdog.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Watchdog.php
index b537d16..57edb2f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Watchdog.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Watchdog.php
@@ -55,7 +55,7 @@ public function load() {
         'severity' => array(
           'type' => 'int',
           'not null' => TRUE,
-          'length' => '3',
+          'length' => '10',
           'default' => '0',
           'unsigned' => TRUE,
         ),
@@ -88,6 +88,7 @@ public function load() {
           'default' => '0',
         ),
       ),
+      'mysql_character_set' => 'utf8',
     ));
     $this->database->insert("watchdog")->fields(array(
       'wid',
@@ -106,4 +107,4 @@ public function load() {
   }
 
 }
-#e8807b7c6ca7a78911a580d318a8e752
+#4ed44ad720c25fedd451c16c0dafd6ab
diff --git a/core/scripts/migrate-db.sh b/core/scripts/migrate-db.sh
index 6514266..9adddbc 100755
--- a/core/scripts/migrate-db.sh
+++ b/core/scripts/migrate-db.sh
@@ -101,6 +101,10 @@ public function load() {
   // Generate a list of tables.
   $tables = $connection->query('SHOW TABLES')->fetchCol();
 
+  // Get all character sets, keyed by table name.
+  $character_sets = $connection->query('SELECT T.TABLE_NAME, CCSA.CHARACTER_SET_NAME FROM information_schema.TABLES T INNER JOIN information_schema.COLLATION_CHARACTER_SET_APPLICABILITY CCSA ON CCSA.COLLATION_NAME = T.TABLE_COLLATION WHERE T.TABLE_SCHEMA = \'' . $connection_info['database'] . '\'')
+  ->fetchAllKeyed();
+
   foreach ($tables as $table) {
     // Generate the class name.
     $class = Inflector::classify($table);
@@ -183,6 +187,9 @@ public function load() {
 
     }
     $fields = Variable::export(array_keys($definition['fields']), '    ');
+    if ($connection->driver() == 'mysql') {
+      $definition['mysql_character_set'] = $character_sets[$table];
+    }
     $definition = Variable::export($definition, '    ');
 
     // Do our substitutions.