diff --git a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6DumpBase.php b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6DumpBase.php
index c340f4c..e40bf2b 100644
--- a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6DumpBase.php
+++ b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6DumpBase.php
@@ -42,7 +42,9 @@ protected function createTable($name, $table = NULL) {
     // This must be on the database connection to be shared among classes.
     if (empty($this->database->migrateTables[$name])) {
       $this->database->migrateTables[$name] = TRUE;
-      $this->database->schema()->createTable($name, $table ?: $this->tableDefinitions()[$name]);
+      if (!$this->database->schema()->tableExists($name)) {
+        $this->database->schema()->createTable($name, $table ?: $this->tableDefinitions()[$name]);
+      }
     }
   }
 
diff --git a/core/modules/migrate_drupal/src/Tests/Table/AggregatorFeed.php b/core/modules/migrate_drupal/src/Tests/Table/AggregatorFeed.php
index 197760e..c527166 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/AggregatorFeed.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/AggregatorFeed.php
@@ -14,11 +14,74 @@
  */
 class AggregatorFeed extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("aggregator_feed");
+    $this->createTable("aggregator_feed", array(
+  'aggregator_feed' => array(
+    'fields' => array(
+      'fid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+      ),
+      'title' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'url' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'refresh' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'checked' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'link' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'description' => array(
+        'type' => 'longtext',
+        'not null' => TRUE,
+      ),
+      'image' => array(
+        'type' => 'longtext',
+        'not null' => TRUE,
+      ),
+      'etag' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'modified' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'block' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("aggregator_feed")->fields(array(
   'fid',
   'title',
@@ -33,19 +96,17 @@ public function load() {
   'block',
 ))
     ->values(array(
-  array(
-    'fid' => '5',
-    'title' => 'Know Your Meme',
-    'url' => 'http://knowyourmeme.com/newsfeed.rss',
-    'refresh' => '900',
-    'checked' => '1387659487',
-    'link' => 'http://knowyourmeme.com',
-    'description' => 'New items added to the News Feed',
-    'image' => 'http://b.thumbs.redditmedia.com/harEHsUUZVajabtC.png',
-    'etag' => '"213cc1365b96c310e92053c5551f0504"',
-    'modified' => '0',
-    'block' => '5',
-  ),
+  'fid' => '5',
+  'title' => 'Know Your Meme',
+  'url' => 'http://knowyourmeme.com/newsfeed.rss',
+  'refresh' => '900',
+  'checked' => '1387659487',
+  'link' => 'http://knowyourmeme.com',
+  'description' => 'New items added to the News Feed',
+  'image' => 'http://b.thumbs.redditmedia.com/harEHsUUZVajabtC.png',
+  'etag' => '"213cc1365b96c310e92053c5551f0504"',
+  'modified' => '0',
+  'block' => '5',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/AggregatorItem.php b/core/modules/migrate_drupal/src/Tests/Table/AggregatorItem.php
index d25aa7d..6639989 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/AggregatorItem.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/AggregatorItem.php
@@ -14,11 +14,56 @@
  */
 class AggregatorItem extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("aggregator_item");
+    $this->createTable("aggregator_item", array(
+  'aggregator_item' => array(
+    'fields' => array(
+      'iid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+      ),
+      'fid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'title' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'link' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'author' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'description' => array(
+        'type' => 'longtext',
+        'not null' => TRUE,
+      ),
+      'timestamp' => array(
+        'type' => 'int',
+        'not null' => FALSE,
+        'length' => '11',
+      ),
+      'guid' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '255',
+      ),
+    ),
+  ),
+));
     $this->database->insert("aggregator_item")->fields(array(
   'iid',
   'fid',
@@ -30,27 +75,14 @@ public function load() {
   'guid',
 ))
     ->values(array(
-  'fid',
-  'title',
-  'url',
-  'refresh',
-  'checked',
-  'link',
-  'description',
-  'image',
-  'etag',
-  'modified',
-  'block',
-  array(
-    'iid' => '1',
-    'fid' => '5',
-    'title' => 'This (three) weeks in Drupal Core - January 10th 2014',
-    'link' => 'https://groups.drupal.org/node/395218',
-    'author' => 'larowlan',
-    'description' => "<h2 id='new'>What's new with Drupal 8?</h2>",
-    'timestamp' => '1389297196',
-    'guid' => '395218 at https://groups.drupal.org',
-  ),
+  'iid' => '1',
+  'fid' => '5',
+  'title' => 'This (three) weeks in Drupal Core - January 10th 2014',
+  'link' => 'https://groups.drupal.org/node/395218',
+  'author' => 'larowlan',
+  'description' => "<h2 id='new'>What's new with Drupal 8?</h2>",
+  'timestamp' => '1389297196',
+  'guid' => '395218 at https://groups.drupal.org',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Blocks.php b/core/modules/migrate_drupal/src/Tests/Table/Blocks.php
index 9095754..d31e179 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Blocks.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Blocks.php
@@ -14,11 +14,88 @@
  */
 class Blocks extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("blocks");
+    $this->createTable("blocks", array(
+  'blocks' => array(
+    'fields' => array(
+      'bid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+      ),
+      'module' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '64',
+        'default' => '',
+      ),
+      'delta' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '32',
+        'default' => '0',
+      ),
+      'theme' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '64',
+        'default' => '',
+      ),
+      'status' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'weight' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'region' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '64',
+        'default' => '',
+      ),
+      'custom' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'throttle' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'visibility' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'pages' => array(
+        'type' => 'text',
+        'not null' => TRUE,
+      ),
+      'title' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '64',
+        'default' => '',
+      ),
+      'cache' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '1',
+      ),
+    ),
+  ),
+));
     $this->database->insert("blocks")->fields(array(
   'bid',
   'module',
@@ -35,209 +112,187 @@ public function load() {
   'cache',
 ))
     ->values(array(
-  'iid',
-  'fid',
-  'title',
-  'link',
-  'author',
-  'description',
-  'timestamp',
-  'guid',
-  array(
-    'bid' => '1',
-    'module' => 'user',
-    'delta' => '0',
-    'theme' => 'garland',
-    'status' => '1',
-    'weight' => '0',
-    'region' => 'left',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '0',
-    'pages' => '',
-    'title' => '',
-    'cache' => '-1',
-  ),
-  array(
-    'bid' => '2',
-    'module' => 'user',
-    'delta' => '1',
-    'theme' => 'garland',
-    'status' => '1',
-    'weight' => '0',
-    'region' => 'left',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '0',
-    'pages' => '',
-    'title' => '',
-    'cache' => '-1',
-  ),
-  array(
-    'bid' => '3',
-    'module' => 'system',
-    'delta' => '0',
-    'theme' => 'garland',
-    'status' => '1',
-    'weight' => '-5',
-    'region' => 'footer',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '0',
-    'pages' => '',
-    'title' => '',
-    'cache' => '-1',
-  ),
-  array(
-    'bid' => '4',
-    'module' => 'comment',
-    'delta' => '0',
-    'theme' => 'garland',
-    'status' => '0',
-    'weight' => '-6',
-    'region' => '',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '0',
-    'pages' => '',
-    'title' => '',
-    'cache' => '1',
-  ),
-  array(
-    'bid' => '5',
-    'module' => 'menu',
-    'delta' => 'primary-links',
-    'theme' => 'garland',
-    'status' => '1',
-    'weight' => '-5',
-    'region' => 'header',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '0',
-    'pages' => '',
-    'title' => '',
-    'cache' => '-1',
-  ),
-  array(
-    'bid' => '6',
-    'module' => 'menu',
-    'delta' => 'secondary-links',
-    'theme' => 'garland',
-    'status' => '0',
-    'weight' => '-5',
-    'region' => '',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '0',
-    'pages' => '',
-    'title' => '',
-    'cache' => '-1',
-  ),
-  array(
-    'bid' => '7',
-    'module' => 'node',
-    'delta' => '0',
-    'theme' => 'garland',
-    'status' => '0',
-    'weight' => '-4',
-    'region' => '',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '0',
-    'pages' => '',
-    'title' => '',
-    'cache' => '-1',
-  ),
-  array(
-    'bid' => '8',
-    'module' => 'user',
-    'delta' => '2',
-    'theme' => 'garland',
-    'status' => '0',
-    'weight' => '-3',
-    'region' => '',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '0',
-    'pages' => '',
-    'title' => '',
-    'cache' => '1',
-  ),
-  array(
-    'bid' => '9',
-    'module' => 'user',
-    'delta' => '3',
-    'theme' => 'garland',
-    'status' => '0',
-    'weight' => '-1',
-    'region' => '',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '0',
-    'pages' => '',
-    'title' => '',
-    'cache' => '-1',
-  ),
-  array(
-    'bid' => '10',
-    'module' => 'block',
-    'delta' => '1',
-    'theme' => 'garland',
-    'status' => '1',
-    'weight' => '0',
-    'region' => 'content',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '1',
-    'pages' => '<front>',
-    'title' => 'Static Block',
-    'cache' => '-1',
-  ),
-  array(
-    'bid' => '11',
-    'module' => 'block',
-    'delta' => '2',
-    'theme' => 'bluemarine',
-    'status' => '1',
-    'weight' => '-4',
-    'region' => 'right',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '1',
-    'pages' => 'node',
-    'title' => 'Another Static Block',
-    'cache' => '-1',
-  ),
-  array(
-    'bid' => '12',
-    'module' => 'block',
-    'delta' => '1',
-    'theme' => 'test_theme',
-    'status' => '1',
-    'weight' => '-7',
-    'region' => 'right',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '0',
-    'pages' => '',
-    'title' => '',
-    'cache' => '-1',
-  ),
-  array(
-    'bid' => '13',
-    'module' => 'block',
-    'delta' => '2',
-    'theme' => 'test_theme',
-    'status' => '1',
-    'weight' => '-2',
-    'region' => 'left',
-    'custom' => '0',
-    'throttle' => '0',
-    'visibility' => '0',
-    'pages' => '',
-    'title' => '',
-    'cache' => '-1',
-  ),
+  'bid' => '1',
+  'module' => 'user',
+  'delta' => '0',
+  'theme' => 'garland',
+  'status' => '1',
+  'weight' => '0',
+  'region' => 'left',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '-1',
+))->values(array(
+  'bid' => '2',
+  'module' => 'user',
+  'delta' => '1',
+  'theme' => 'garland',
+  'status' => '1',
+  'weight' => '0',
+  'region' => 'left',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '-1',
+))->values(array(
+  'bid' => '3',
+  'module' => 'system',
+  'delta' => '0',
+  'theme' => 'garland',
+  'status' => '1',
+  'weight' => '-5',
+  'region' => 'footer',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '-1',
+))->values(array(
+  'bid' => '4',
+  'module' => 'comment',
+  'delta' => '0',
+  'theme' => 'garland',
+  'status' => '0',
+  'weight' => '-6',
+  'region' => '',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '1',
+))->values(array(
+  'bid' => '5',
+  'module' => 'menu',
+  'delta' => 'primary-links',
+  'theme' => 'garland',
+  'status' => '1',
+  'weight' => '-5',
+  'region' => 'header',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '-1',
+))->values(array(
+  'bid' => '6',
+  'module' => 'menu',
+  'delta' => 'secondary-links',
+  'theme' => 'garland',
+  'status' => '0',
+  'weight' => '-5',
+  'region' => '',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '-1',
+))->values(array(
+  'bid' => '7',
+  'module' => 'node',
+  'delta' => '0',
+  'theme' => 'garland',
+  'status' => '0',
+  'weight' => '-4',
+  'region' => '',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '-1',
+))->values(array(
+  'bid' => '8',
+  'module' => 'user',
+  'delta' => '2',
+  'theme' => 'garland',
+  'status' => '0',
+  'weight' => '-3',
+  'region' => '',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '1',
+))->values(array(
+  'bid' => '9',
+  'module' => 'user',
+  'delta' => '3',
+  'theme' => 'garland',
+  'status' => '0',
+  'weight' => '-1',
+  'region' => '',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '-1',
+))->values(array(
+  'bid' => '10',
+  'module' => 'block',
+  'delta' => '1',
+  'theme' => 'garland',
+  'status' => '1',
+  'weight' => '0',
+  'region' => 'content',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '1',
+  'pages' => '<front>',
+  'title' => 'Static Block',
+  'cache' => '-1',
+))->values(array(
+  'bid' => '11',
+  'module' => 'block',
+  'delta' => '2',
+  'theme' => 'bluemarine',
+  'status' => '1',
+  'weight' => '-4',
+  'region' => 'right',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '1',
+  'pages' => 'node',
+  'title' => 'Another Static Block',
+  'cache' => '-1',
+))->values(array(
+  'bid' => '12',
+  'module' => 'block',
+  'delta' => '1',
+  'theme' => 'test_theme',
+  'status' => '1',
+  'weight' => '-7',
+  'region' => 'right',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '-1',
+))->values(array(
+  'bid' => '13',
+  'module' => 'block',
+  'delta' => '2',
+  'theme' => 'test_theme',
+  'status' => '1',
+  'weight' => '-2',
+  'region' => 'left',
+  'custom' => '0',
+  'throttle' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '-1',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/BlocksRoles.php b/core/modules/migrate_drupal/src/Tests/Table/BlocksRoles.php
index 6b49e5e..ab19203 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/BlocksRoles.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/BlocksRoles.php
@@ -14,31 +14,34 @@
  */
 class BlocksRoles extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("blocks_roles");
+    $this->createTable("blocks_roles", array(
+  'blocks_roles' => array(
+    'fields' => array(
+      'module' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '64',
+      ),
+      'delta' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '32',
+      ),
+      'rid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+    ),
+  ),
+));
     $this->database->insert("blocks_roles")->fields(array(
   'module',
   'delta',
   'rid',
 ))
-    ->values(array(
-  'bid',
-  'module',
-  'delta',
-  'theme',
-  'status',
-  'weight',
-  'region',
-  'custom',
-  'throttle',
-  'visibility',
-  'pages',
-  'title',
-  'cache',
-))
+    
     ->execute();
   }
 
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Book.php b/core/modules/migrate_drupal/src/Tests/Table/Book.php
index f729559..0a619ae 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Book.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Book.php
@@ -14,45 +14,56 @@
  */
 class Book extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("book");
+    $this->createTable("book", array(
+  'book' => array(
+    'fields' => array(
+      'mlid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'bid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("book")->fields(array(
   'mlid',
   'nid',
   'bid',
 ))
     ->values(array(
-  'module',
-  'delta',
-  'rid',
-  array(
-    'mlid' => '1',
-    'nid' => '4',
-    'bid' => '4',
-  ),
-  array(
-    'mlid' => '2',
-    'nid' => '5',
-    'bid' => '4',
-  ),
-  array(
-    'mlid' => '3',
-    'nid' => '6',
-    'bid' => '4',
-  ),
-  array(
-    'mlid' => '4',
-    'nid' => '7',
-    'bid' => '4',
-  ),
-  array(
-    'mlid' => '5',
-    'nid' => '8',
-    'bid' => '8',
-  ),
+  'mlid' => '1',
+  'nid' => '4',
+  'bid' => '4',
+))->values(array(
+  'mlid' => '2',
+  'nid' => '5',
+  'bid' => '4',
+))->values(array(
+  'mlid' => '3',
+  'nid' => '6',
+  'bid' => '4',
+))->values(array(
+  'mlid' => '4',
+  'nid' => '7',
+  'bid' => '4',
+))->values(array(
+  'mlid' => '5',
+  'nid' => '8',
+  'bid' => '8',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Boxes.php b/core/modules/migrate_drupal/src/Tests/Table/Boxes.php
index a09f4f0..4648b5f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Boxes.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Boxes.php
@@ -14,11 +14,34 @@
  */
 class Boxes extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("boxes");
+    $this->createTable("boxes", array(
+  'boxes' => array(
+    'fields' => array(
+      'bid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'body' => array(
+        'type' => 'longtext',
+        'not null' => FALSE,
+      ),
+      'info' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '128',
+        'default' => '',
+      ),
+      'format' => array(
+        'type' => 'smallint',
+        'not null' => TRUE,
+        'length' => '6',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("boxes")->fields(array(
   'bid',
   'body',
@@ -26,21 +49,15 @@ public function load() {
   'format',
 ))
     ->values(array(
-  'mlid',
-  'nid',
-  'bid',
-  array(
-    'bid' => '1',
-    'body' => '<h3>My first custom block body</h3>',
-    'info' => 'My block 1',
-    'format' => '2',
-  ),
-  array(
-    'bid' => '2',
-    'body' => '<h3>My second custom block body</h3>',
-    'info' => 'My block 2',
-    'format' => '2',
-  ),
+  'bid' => '1',
+  'body' => '<h3>My first custom block body</h3>',
+  'info' => 'My block 1',
+  'format' => '2',
+))->values(array(
+  'bid' => '2',
+  'body' => '<h3>My second custom block body</h3>',
+  'info' => 'My block 2',
+  'format' => '2',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Comments.php b/core/modules/migrate_drupal/src/Tests/Table/Comments.php
index df9441e..0b29eab 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Comments.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Comments.php
@@ -14,11 +14,90 @@
  */
 class Comments extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("comments");
+    $this->createTable("comments", array(
+  'comments' => array(
+    'fields' => array(
+      'cid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+      ),
+      'pid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'uid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'subject' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '64',
+        'default' => '',
+      ),
+      'comment' => array(
+        'type' => 'longtext',
+        'not null' => TRUE,
+      ),
+      'hostname' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '128',
+        'default' => '',
+      ),
+      'timestamp' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'status' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '3',
+        'default' => '0',
+      ),
+      'format' => array(
+        'type' => 'smallint',
+        'not null' => TRUE,
+        'length' => '6',
+        'default' => '0',
+      ),
+      'thread' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+      ),
+      'name' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '60',
+      ),
+      'mail' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '64',
+      ),
+      'homepage' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '255',
+      ),
+    ),
+  ),
+));
     $this->database->insert("comments")->fields(array(
   'cid',
   'pid',
@@ -36,58 +115,50 @@ public function load() {
   'homepage',
 ))
     ->values(array(
-  'bid',
-  'body',
-  'info',
-  'format',
-  array(
-    'cid' => '1',
-    'pid' => '0',
-    'nid' => '1',
-    'uid' => '0',
-    'subject' => 'The first comment.',
-    'comment' => 'The first comment body.',
-    'hostname' => '127.0.0.1',
-    'timestamp' => '1390264918',
-    'status' => '0',
-    'format' => '1',
-    'thread' => '01/',
-    'name' => '1st comment author name',
-    'mail' => 'comment1@example.com',
-    'homepage' => 'http://drupal.org',
-  ),
-  array(
-    'cid' => '2',
-    'pid' => '3',
-    'nid' => '1',
-    'uid' => '0',
-    'subject' => 'The response to the second comment.',
-    'comment' => 'The second comment response body.',
-    'hostname' => '127.0.0.1',
-    'timestamp' => '1390264938',
-    'status' => '0',
-    'format' => '1',
-    'thread' => '02/01',
-    'name' => '3rd comment author name',
-    'mail' => 'comment3@example.com',
-    'homepage' => 'http://drupal.org',
-  ),
-  array(
-    'cid' => '3',
-    'pid' => '0',
-    'nid' => '1',
-    'uid' => '0',
-    'subject' => 'The second comment.',
-    'comment' => 'The second comment body.',
-    'hostname' => '127.0.0.1',
-    'timestamp' => '1390264948',
-    'status' => '1',
-    'format' => '1',
-    'thread' => '02/',
-    'name' => '3rd comment author name',
-    'mail' => 'comment3@example.com',
-    'homepage' => 'http://drupal.org',
-  ),
+  'cid' => '1',
+  'pid' => '0',
+  'nid' => '1',
+  'uid' => '0',
+  'subject' => 'The first comment.',
+  'comment' => 'The first comment body.',
+  'hostname' => '127.0.0.1',
+  'timestamp' => '1390264918',
+  'status' => '0',
+  'format' => '1',
+  'thread' => '01/',
+  'name' => '1st comment author name',
+  'mail' => 'comment1@example.com',
+  'homepage' => 'http://drupal.org',
+))->values(array(
+  'cid' => '2',
+  'pid' => '3',
+  'nid' => '1',
+  'uid' => '0',
+  'subject' => 'The response to the second comment.',
+  'comment' => 'The second comment response body.',
+  'hostname' => '127.0.0.1',
+  'timestamp' => '1390264938',
+  'status' => '0',
+  'format' => '1',
+  'thread' => '02/01',
+  'name' => '3rd comment author name',
+  'mail' => 'comment3@example.com',
+  'homepage' => 'http://drupal.org',
+))->values(array(
+  'cid' => '3',
+  'pid' => '0',
+  'nid' => '1',
+  'uid' => '0',
+  'subject' => 'The second comment.',
+  'comment' => 'The second comment body.',
+  'hostname' => '127.0.0.1',
+  'timestamp' => '1390264948',
+  'status' => '1',
+  'format' => '1',
+  'thread' => '02/',
+  'name' => '3rd comment author name',
+  'mail' => 'comment3@example.com',
+  'homepage' => 'http://drupal.org',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Contact.php b/core/modules/migrate_drupal/src/Tests/Table/Contact.php
index a9ad037..729a156 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Contact.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Contact.php
@@ -14,11 +14,44 @@
  */
 class Contact extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("contact");
+    $this->createTable("contact", array(
+  'contact' => array(
+    'fields' => array(
+      'cid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'category' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'recipients' => array(
+        'type' => 'longtext',
+        'not null' => TRUE,
+      ),
+      'reply' => array(
+        'type' => 'longtext',
+        'not null' => TRUE,
+      ),
+      'weight' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'selected' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("contact")->fields(array(
   'cid',
   'category',
@@ -28,44 +61,26 @@ public function load() {
   'selected',
 ))
     ->values(array(
-  'cid',
-  'pid',
-  'nid',
-  'uid',
-  'subject',
-  'comment',
-  'hostname',
-  'timestamp',
-  'status',
-  'format',
-  'thread',
-  'name',
-  'mail',
-  'homepage',
-  array(
-    'cid' => '1',
-    'category' => 'Website feedback',
-    'recipients' => 'admin@example.com',
-    'reply' => '',
-    'weight' => '0',
-    'selected' => '0',
-  ),
-  array(
-    'cid' => '2',
-    'category' => 'Some other category',
-    'recipients' => 'test@example.com',
-    'reply' => 'Thanks for contacting us, we will reply ASAP!',
-    'weight' => '1',
-    'selected' => '1',
-  ),
-  array(
-    'cid' => '3',
-    'category' => 'A category much longer than thirty two characters',
-    'recipients' => 'fortyninechars@example.com',
-    'reply' => '',
-    'weight' => '2',
-    'selected' => '0',
-  ),
+  'cid' => '1',
+  'category' => 'Website feedback',
+  'recipients' => 'admin@example.com',
+  'reply' => '',
+  'weight' => '0',
+  'selected' => '0',
+))->values(array(
+  'cid' => '2',
+  'category' => 'Some other category',
+  'recipients' => 'test@example.com',
+  'reply' => 'Thanks for contacting us, we will reply ASAP!',
+  'weight' => '1',
+  'selected' => '1',
+))->values(array(
+  'cid' => '3',
+  'category' => 'A category much longer than thirty two characters',
+  'recipients' => 'fortyninechars@example.com',
+  'reply' => '',
+  'weight' => '2',
+  'selected' => '0',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldMultivalue.php b/core/modules/migrate_drupal/src/Tests/Table/ContentFieldMultivalue.php
index 200a8c2..94ef56a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldMultivalue.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/ContentFieldMultivalue.php
@@ -14,11 +14,35 @@
  */
 class ContentFieldMultivalue extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("content_field_multivalue");
+    $this->createTable("content_field_multivalue", array(
+  'content_field_multivalue' => array(
+    'fields' => array(
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'field_multivalue_value' => array(
+        'type' => 'decimal',
+        'not null' => FALSE,
+        'length' => '10',
+      ),
+      'delta' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("content_field_multivalue")->fields(array(
   'vid',
   'nid',
@@ -26,24 +50,15 @@ public function load() {
   'delta',
 ))
     ->values(array(
-  'cid',
-  'category',
-  'recipients',
-  'reply',
-  'weight',
-  'selected',
-  array(
-    'vid' => '4',
-    'nid' => '3',
-    'field_multivalue_value' => '33.00',
-    'delta' => '0',
-  ),
-  array(
-    'vid' => '4',
-    'nid' => '3',
-    'field_multivalue_value' => '44.00',
-    'delta' => '1',
-  ),
+  'vid' => '4',
+  'nid' => '3',
+  'field_multivalue_value' => '33.00',
+  'delta' => '0',
+))->values(array(
+  'vid' => '4',
+  'nid' => '3',
+  'field_multivalue_value' => '44.00',
+  'delta' => '1',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTest.php b/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTest.php
index fac8e5f..0a96baf 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTest.php
@@ -14,11 +14,36 @@
  */
 class ContentFieldTest extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("content_field_test");
+    $this->createTable("content_field_test", array(
+  'content_field_test' => array(
+    'fields' => array(
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'field_test_value' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'field_test_format' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("content_field_test")->fields(array(
   'vid',
   'nid',
@@ -26,16 +51,10 @@ public function load() {
   'field_test_format',
 ))
     ->values(array(
-  'vid',
-  'nid',
-  'field_multivalue_value',
-  'delta',
-  array(
-    'vid' => '1',
-    'nid' => '1',
-    'field_test_value' => 'This is a shared text field',
-    'field_test_format' => '1',
-  ),
+  'vid' => '1',
+  'nid' => '1',
+  'field_test_value' => 'This is a shared text field',
+  'field_test_format' => '1',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestExcludeUnset.php b/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestExcludeUnset.php
index ba63627..7f4f3d8 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestExcludeUnset.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestExcludeUnset.php
@@ -14,11 +14,36 @@
  */
 class ContentFieldTestExcludeUnset extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("content_field_test_exclude_unset");
+    $this->createTable("content_field_test_exclude_unset", array(
+  'content_field_test_exclude_unset' => array(
+    'fields' => array(
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'field_test_exclude_unset_value' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'field_test_exclude_unset_format' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("content_field_test_exclude_unset")->fields(array(
   'vid',
   'nid',
@@ -26,16 +51,10 @@ public function load() {
   'field_test_exclude_unset_format',
 ))
     ->values(array(
-  'vid',
-  'nid',
-  'field_test_value',
-  'field_test_format',
-  array(
-    'vid' => '1',
-    'nid' => '1',
-    'field_test_exclude_unset_value' => 'This is a field with exclude unset.',
-    'field_test_exclude_unset_format' => '1',
-  ),
+  'vid' => '1',
+  'nid' => '1',
+  'field_test_exclude_unset_value' => 'This is a field with exclude unset.',
+  'field_test_exclude_unset_format' => '1',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestTwo.php b/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestTwo.php
index aaec338..2a3f0ad 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestTwo.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/ContentFieldTestTwo.php
@@ -14,11 +14,42 @@
  */
 class ContentFieldTestTwo extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("content_field_test_two");
+    $this->createTable("content_field_test_two", array(
+  'content_field_test_two' => array(
+    'fields' => array(
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'field_test_two_value' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'delta' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'field_test_two_format' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("content_field_test_two")->fields(array(
   'vid',
   'nid',
@@ -27,24 +58,17 @@ public function load() {
   'field_test_two_format',
 ))
     ->values(array(
-  'vid',
-  'nid',
-  'field_test_exclude_unset_value',
-  'field_test_exclude_unset_format',
-  array(
-    'vid' => '1',
-    'nid' => '1',
-    'field_test_two_value' => '10',
-    'delta' => '0',
-    'field_test_two_format' => '1',
-  ),
-  array(
-    'vid' => '1',
-    'nid' => '1',
-    'field_test_two_value' => '20',
-    'delta' => '1',
-    'field_test_two_format' => '1',
-  ),
+  'vid' => '1',
+  'nid' => '1',
+  'field_test_two_value' => '10',
+  'delta' => '0',
+  'field_test_two_format' => '1',
+))->values(array(
+  'vid' => '1',
+  'nid' => '1',
+  'field_test_two_value' => '20',
+  'delta' => '1',
+  'field_test_two_format' => '1',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentNodeField.php b/core/modules/migrate_drupal/src/Tests/Table/ContentNodeField.php
index 2d77598..1b8c67a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentNodeField.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/ContentNodeField.php
@@ -14,11 +14,69 @@
  */
 class ContentNodeField extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("content_node_field");
+    $this->createTable("content_node_field", array(
+  'content_node_field' => array(
+    'fields' => array(
+      'field_name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '32',
+        'default' => '',
+      ),
+      'type' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '127',
+        'default' => '',
+      ),
+      'global_settings' => array(
+        'type' => 'mediumtext',
+        'not null' => TRUE,
+      ),
+      'required' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'multiple' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'db_storage' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '1',
+      ),
+      'module' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '127',
+        'default' => '',
+      ),
+      'db_columns' => array(
+        'type' => 'mediumtext',
+        'not null' => TRUE,
+      ),
+      'active' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'locked' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("content_node_field")->fields(array(
   'field_name',
   'type',
@@ -32,251 +90,225 @@ public function load() {
   'locked',
 ))
     ->values(array(
-  'vid',
-  'nid',
-  'field_test_two_value',
-  'delta',
-  'field_test_two_format',
-  array(
-    'field_name' => 'field_multivalue',
-    'type' => 'number_decimal',
-    'global_settings' => 'a:9:{s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:3:"min";s:0:"";s:3:"max";s:0:"";s:14:"allowed_values";s:0:"";s:18:"allowed_values_php";s:0:"";s:9:"precision";s:2:"10";s:5:"scale";s:1:"2";s:7:"decimal";s:1:".";}',
-    'required' => '0',
-    'multiple' => '1',
-    'db_storage' => '0',
-    'module' => 'number',
-    'db_columns' => 'a:1:{s:5:"value";a:5:{s:4:"type";s:7:"numeric";s:9:"precision";s:2:"10";s:5:"scale";s:1:"2";s:8:"not null";b:0;s:8:"sortable";b:1;}}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test',
-    'type' => 'text',
-    'global_settings' => 'a:4:{s:15:"text_processing";s:1:"1";s:10:"max_length";s:0:"";s:14:"allowed_values";s:0:"";s:18:"allowed_values_php";s:0:"";}',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '0',
-    'module' => 'text',
-    'db_columns' => 'a:2:{s:5:"value";a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"big";s:8:"not null";b:0;s:8:"sortable";b:1;s:5:"views";b:1;}s:6:"format";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:1;s:7:"default";i:0;}}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_date',
-    'type' => 'date',
-    'global_settings' => 'a:0:{}',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'date',
-    'db_columns' => 'a:0:{}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_datestamp',
-    'type' => 'datestamp',
-    'global_settings' => 'a:0:{}',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'date',
-    'db_columns' => 'a:0:{}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_datetime',
-    'type' => 'datetime',
-    'global_settings' => 'a:0:{}',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'date',
-    'db_columns' => 'a:0:{}',
-    'active' => '0',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_decimal_radio_buttons',
-    'type' => 'number_decimal',
-    'global_settings' => "a:9:{s:6:\"prefix\";s:0:\"\";s:6:\"suffix\";s:0:\"\";s:3:\"min\";s:0:\"\";s:3:\"max\";s:0:\"\";s:14:\"allowed_values\";s:7:\"1.2\n2.1\";s:18:\"allowed_values_php\";s:0:\"\";s:9:\"precision\";s:2:\"10\";s:5:\"scale\";s:1:\"2\";s:7:\"decimal\";s:1:\".\";}",
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'number',
-    'db_columns' => 'a:0:{}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_email',
-    'type' => 'email',
-    'global_settings' => 'a:0:{}',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'email',
-    'db_columns' => 'a:0:{}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_exclude_unset',
-    'type' => 'text',
-    'global_settings' => 'a:4:{s:15:"text_processing";s:1:"1";s:10:"max_length";s:0:"";s:14:"allowed_values";s:0:"";s:18:"allowed_values_php";s:0:"";}',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '0',
-    'module' => 'text',
-    'db_columns' => 'a:2:{s:5:"value";a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"big";s:8:"not null";b:0;s:8:"sortable";b:1;s:5:"views";b:1;}s:6:"format";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:1;s:7:"default";i:0;}}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_filefield',
-    'type' => 'filefield',
-    'global_settings' => 'a:3:{s:10:"list_field";s:1:"0";s:12:"list_default";i:1;s:17:"description_field";s:1:"1";}',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'filefield',
-    'db_columns' => 'a:0:{}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_float_single_checkbox',
-    'type' => 'number_float',
-    'global_settings' => "a:6:{s:6:\"prefix\";s:0:\"\";s:6:\"suffix\";s:0:\"\";s:3:\"min\";s:0:\"\";s:3:\"max\";s:0:\"\";s:14:\"allowed_values\";s:11:\"3.142\n1.234\";s:18:\"allowed_values_php\";s:0:\"\";}",
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'number',
-    'db_columns' => 'a:0:{}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_four',
-    'type' => 'number_float',
-    'global_settings' => 'a:6:{s:6:"prefix";s:3:"id-";s:6:"suffix";s:0:"";s:3:"min";s:3:"100";s:3:"max";s:3:"200";s:14:"allowed_values";s:0:"";s:18:"allowed_values_php";s:0:"";}',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'number',
-    'db_columns' => '',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_identical1',
-    'type' => 'number_integer',
-    'global_settings' => '',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'number',
-    'db_columns' => 'a:1:{s:5:"value";a:3:{s:4:"type";s:3:"int";s:8:"not null";b:0;s:8:"sortable";b:1;}}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_identical2',
-    'type' => 'number_integer',
-    'global_settings' => '',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'number',
-    'db_columns' => 'a:1:{s:5:"value";a:3:{s:4:"type";s:3:"int";s:8:"not null";b:0;s:8:"sortable";b:1;}}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_imagefield',
-    'type' => 'filefield',
-    'global_settings' => 'a:3:{s:10:"list_field";s:1:"0";s:12:"list_default";i:1;s:17:"description_field";s:1:"0";}',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'filefield',
-    'db_columns' => 'a:0:{}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_integer_selectlist',
-    'type' => 'number_integer',
-    'global_settings' => "a:6:{s:6:\"prefix\";s:0:\"\";s:6:\"suffix\";s:0:\"\";s:3:\"min\";s:0:\"\";s:3:\"max\";s:0:\"\";s:14:\"allowed_values\";s:19:\"1234\n2341\n3412\n4123\";s:18:\"allowed_values_php\";s:0:\"\";}",
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'number',
-    'db_columns' => 'a:1:{s:5:"value";a:3:{s:4:"type";s:3:"int";s:8:"not null";b:0;s:8:"sortable";b:1;}}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_link',
-    'type' => 'link',
-    'global_settings' => 'a:7:{s:10:"attributes";a:4:{s:6:"target";s:7:"default";s:3:"rel";s:8:"nofollow";s:5:"class";s:0:"";s:5:"title";s:10:"Link Title";}s:7:"display";a:1:{s:10:"url_cutoff";s:2:"80";}s:3:"url";i:0;s:5:"title";s:8:"required";s:11:"title_value";s:0:"";s:13:"enable_tokens";s:0:"";s:12:"validate_url";i:1;}',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'link',
-    'db_columns' => 'a:3:{s:3:"url";a:4:{s:4:"type";s:7:"varchar";s:6:"length";i:2048;s:8:"not null";b:0;s:8:"sortable";b:1;}s:5:"title";a:4:{s:4:"type";s:7:"varchar";s:6:"length";i:255;s:8:"not null";b:0;s:8:"sortable";b:1;}s:10:"attributes";a:3:{s:4:"type";s:4:"text";s:4:"size";s:6:"medium";s:8:"not null";b:0;}}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_phone',
-    'type' => 'au_phone',
-    'global_settings' => 'a:1:{s:5:"value";a:3:{s:4:"type";s:7:"varchar";s:6:"length";i:255;s:8:"not null";b:0;}}',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'phone',
-    'db_columns' => 'a:0:{}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_text_single_checkbox',
-    'type' => 'text',
-    'global_settings' => "a:4:{s:15:\"text_processing\";s:1:\"0\";s:10:\"max_length\";s:0:\"\";s:14:\"allowed_values\";s:13:\"Hello\nGoodbye\";s:18:\"allowed_values_php\";s:0:\"\";}",
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'text',
-    'db_columns' => 'a:0:{}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_three',
-    'type' => 'number_decimal',
-    'global_settings' => '',
-    'required' => '0',
-    'multiple' => '0',
-    'db_storage' => '1',
-    'module' => 'number',
-    'db_columns' => 'a:1:{s:5:"value";a:6:{s:4:"type";s:7:"numeric";s:9:"precision";i:10;s:5:"scale";i:2;s:8:"not null";b:0;s:8:"sortable";b:1;s:5:"views";b:1;}}',
-    'active' => '1',
-    'locked' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_two',
-    'type' => 'number_integer',
-    'global_settings' => 'a:6:{s:6:"prefix";s:4:"pref";s:6:"suffix";s:3:"suf";s:3:"min";i:10;s:3:"max";i:100;s:14:"allowed_values";s:0:"";s:18:"allowed_values_php";s:0:"";}',
-    'required' => '0',
-    'multiple' => '1',
-    'db_storage' => '0',
-    'module' => 'number',
-    'db_columns' => 'a:2:{s:5:"value";a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"big";s:8:"not null";b:0;s:8:"sortable";b:1;s:5:"views";b:1;}s:6:"format";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:0;s:5:"views";b:0;}}',
-    'active' => '1',
-    'locked' => '0',
-  ),
+  'field_name' => 'field_multivalue',
+  'type' => 'number_decimal',
+  'global_settings' => 'a:9:{s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:3:"min";s:0:"";s:3:"max";s:0:"";s:14:"allowed_values";s:0:"";s:18:"allowed_values_php";s:0:"";s:9:"precision";s:2:"10";s:5:"scale";s:1:"2";s:7:"decimal";s:1:".";}',
+  'required' => '0',
+  'multiple' => '1',
+  'db_storage' => '0',
+  'module' => 'number',
+  'db_columns' => 'a:1:{s:5:"value";a:5:{s:4:"type";s:7:"numeric";s:9:"precision";s:2:"10";s:5:"scale";s:1:"2";s:8:"not null";b:0;s:8:"sortable";b:1;}}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test',
+  'type' => 'text',
+  'global_settings' => 'a:4:{s:15:"text_processing";s:1:"1";s:10:"max_length";s:0:"";s:14:"allowed_values";s:0:"";s:18:"allowed_values_php";s:0:"";}',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '0',
+  'module' => 'text',
+  'db_columns' => 'a:2:{s:5:"value";a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"big";s:8:"not null";b:0;s:8:"sortable";b:1;s:5:"views";b:1;}s:6:"format";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:1;s:7:"default";i:0;}}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_date',
+  'type' => 'date',
+  'global_settings' => 'a:0:{}',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'date',
+  'db_columns' => 'a:0:{}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_datestamp',
+  'type' => 'datestamp',
+  'global_settings' => 'a:0:{}',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'date',
+  'db_columns' => 'a:0:{}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_datetime',
+  'type' => 'datetime',
+  'global_settings' => 'a:0:{}',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'date',
+  'db_columns' => 'a:0:{}',
+  'active' => '0',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_decimal_radio_buttons',
+  'type' => 'number_decimal',
+  'global_settings' => "a:9:{s:6:\"prefix\";s:0:\"\";s:6:\"suffix\";s:0:\"\";s:3:\"min\";s:0:\"\";s:3:\"max\";s:0:\"\";s:14:\"allowed_values\";s:7:\"1.2\n2.1\";s:18:\"allowed_values_php\";s:0:\"\";s:9:\"precision\";s:2:\"10\";s:5:\"scale\";s:1:\"2\";s:7:\"decimal\";s:1:\".\";}",
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'number',
+  'db_columns' => 'a:0:{}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_email',
+  'type' => 'email',
+  'global_settings' => 'a:0:{}',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'email',
+  'db_columns' => 'a:0:{}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_exclude_unset',
+  'type' => 'text',
+  'global_settings' => 'a:4:{s:15:"text_processing";s:1:"1";s:10:"max_length";s:0:"";s:14:"allowed_values";s:0:"";s:18:"allowed_values_php";s:0:"";}',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '0',
+  'module' => 'text',
+  'db_columns' => 'a:2:{s:5:"value";a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"big";s:8:"not null";b:0;s:8:"sortable";b:1;s:5:"views";b:1;}s:6:"format";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:1;s:7:"default";i:0;}}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_filefield',
+  'type' => 'filefield',
+  'global_settings' => 'a:3:{s:10:"list_field";s:1:"0";s:12:"list_default";i:1;s:17:"description_field";s:1:"1";}',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'filefield',
+  'db_columns' => 'a:0:{}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_float_single_checkbox',
+  'type' => 'number_float',
+  'global_settings' => "a:6:{s:6:\"prefix\";s:0:\"\";s:6:\"suffix\";s:0:\"\";s:3:\"min\";s:0:\"\";s:3:\"max\";s:0:\"\";s:14:\"allowed_values\";s:11:\"3.142\n1.234\";s:18:\"allowed_values_php\";s:0:\"\";}",
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'number',
+  'db_columns' => 'a:0:{}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_four',
+  'type' => 'number_float',
+  'global_settings' => 'a:6:{s:6:"prefix";s:3:"id-";s:6:"suffix";s:0:"";s:3:"min";s:3:"100";s:3:"max";s:3:"200";s:14:"allowed_values";s:0:"";s:18:"allowed_values_php";s:0:"";}',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'number',
+  'db_columns' => '',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_identical1',
+  'type' => 'number_integer',
+  'global_settings' => '',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'number',
+  'db_columns' => 'a:1:{s:5:"value";a:3:{s:4:"type";s:3:"int";s:8:"not null";b:0;s:8:"sortable";b:1;}}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_identical2',
+  'type' => 'number_integer',
+  'global_settings' => '',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'number',
+  'db_columns' => 'a:1:{s:5:"value";a:3:{s:4:"type";s:3:"int";s:8:"not null";b:0;s:8:"sortable";b:1;}}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_imagefield',
+  'type' => 'filefield',
+  'global_settings' => 'a:3:{s:10:"list_field";s:1:"0";s:12:"list_default";i:1;s:17:"description_field";s:1:"0";}',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'filefield',
+  'db_columns' => 'a:0:{}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_integer_selectlist',
+  'type' => 'number_integer',
+  'global_settings' => "a:6:{s:6:\"prefix\";s:0:\"\";s:6:\"suffix\";s:0:\"\";s:3:\"min\";s:0:\"\";s:3:\"max\";s:0:\"\";s:14:\"allowed_values\";s:19:\"1234\n2341\n3412\n4123\";s:18:\"allowed_values_php\";s:0:\"\";}",
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'number',
+  'db_columns' => 'a:1:{s:5:"value";a:3:{s:4:"type";s:3:"int";s:8:"not null";b:0;s:8:"sortable";b:1;}}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_link',
+  'type' => 'link',
+  'global_settings' => 'a:7:{s:10:"attributes";a:4:{s:6:"target";s:7:"default";s:3:"rel";s:8:"nofollow";s:5:"class";s:0:"";s:5:"title";s:10:"Link Title";}s:7:"display";a:1:{s:10:"url_cutoff";s:2:"80";}s:3:"url";i:0;s:5:"title";s:8:"required";s:11:"title_value";s:0:"";s:13:"enable_tokens";s:0:"";s:12:"validate_url";i:1;}',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'link',
+  'db_columns' => 'a:3:{s:3:"url";a:4:{s:4:"type";s:7:"varchar";s:6:"length";i:2048;s:8:"not null";b:0;s:8:"sortable";b:1;}s:5:"title";a:4:{s:4:"type";s:7:"varchar";s:6:"length";i:255;s:8:"not null";b:0;s:8:"sortable";b:1;}s:10:"attributes";a:3:{s:4:"type";s:4:"text";s:4:"size";s:6:"medium";s:8:"not null";b:0;}}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_phone',
+  'type' => 'au_phone',
+  'global_settings' => 'a:1:{s:5:"value";a:3:{s:4:"type";s:7:"varchar";s:6:"length";i:255;s:8:"not null";b:0;}}',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'phone',
+  'db_columns' => 'a:0:{}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_text_single_checkbox',
+  'type' => 'text',
+  'global_settings' => "a:4:{s:15:\"text_processing\";s:1:\"0\";s:10:\"max_length\";s:0:\"\";s:14:\"allowed_values\";s:13:\"Hello\nGoodbye\";s:18:\"allowed_values_php\";s:0:\"\";}",
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'text',
+  'db_columns' => 'a:0:{}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_three',
+  'type' => 'number_decimal',
+  'global_settings' => '',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'number',
+  'db_columns' => 'a:1:{s:5:"value";a:6:{s:4:"type";s:7:"numeric";s:9:"precision";i:10;s:5:"scale";i:2;s:8:"not null";b:0;s:8:"sortable";b:1;s:5:"views";b:1;}}',
+  'active' => '1',
+  'locked' => '0',
+))->values(array(
+  'field_name' => 'field_test_two',
+  'type' => 'number_integer',
+  'global_settings' => 'a:6:{s:6:"prefix";s:4:"pref";s:6:"suffix";s:3:"suf";s:3:"min";i:10;s:3:"max";i:100;s:14:"allowed_values";s:0:"";s:18:"allowed_values_php";s:0:"";}',
+  'required' => '0',
+  'multiple' => '1',
+  'db_storage' => '0',
+  'module' => 'number',
+  'db_columns' => 'a:2:{s:5:"value";a:5:{s:4:"type";s:4:"text";s:4:"size";s:3:"big";s:8:"not null";b:0;s:8:"sortable";b:1;s:5:"views";b:1;}s:6:"format";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:0;s:5:"views";b:0;}}',
+  'active' => '1',
+  'locked' => '0',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentNodeFieldInstance.php b/core/modules/migrate_drupal/src/Tests/Table/ContentNodeFieldInstance.php
index 548ec58..021759d 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentNodeFieldInstance.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/ContentNodeFieldInstance.php
@@ -14,11 +14,67 @@
  */
 class ContentNodeFieldInstance extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("content_node_field_instance");
+    $this->createTable("content_node_field_instance", array(
+  'content_node_field_instance' => array(
+    'fields' => array(
+      'field_name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '32',
+        'default' => '',
+      ),
+      'type_name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '32',
+        'default' => '',
+      ),
+      'weight' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'label' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'widget_type' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '32',
+        'default' => '',
+      ),
+      'widget_settings' => array(
+        'type' => 'mediumtext',
+        'not null' => TRUE,
+      ),
+      'display_settings' => array(
+        'type' => 'mediumtext',
+        'not null' => TRUE,
+      ),
+      'description' => array(
+        'type' => 'mediumtext',
+        'not null' => TRUE,
+      ),
+      'widget_module' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '127',
+        'default' => '',
+      ),
+      'widget_active' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("content_node_field_instance")->fields(array(
   'field_name',
   'type_name',
@@ -32,268 +88,236 @@ public function load() {
   'widget_active',
 ))
     ->values(array(
-  'field_name',
-  'type',
-  'global_settings',
-  'required',
-  'multiple',
-  'db_storage',
-  'module',
-  'db_columns',
-  'active',
-  'locked',
-  array(
-    'field_name' => 'field_multivalue',
-    'type_name' => 'test_planet',
-    'weight' => '2',
-    'label' => 'Decimal Field',
-    'widget_type' => 'number',
-    'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:0:"";s:14:"_error_element";s:48:"default_value_widget][field_multivalue][0][value";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:6:{s:6:"weight";i:2;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}}',
-    'description' => 'An example multi-valued decimal field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test',
-    'type_name' => 'story',
-    'weight' => '1',
-    'label' => 'Text Field',
-    'widget_type' => 'text_textfield',
-    'widget_settings' => 'a:4:{s:4:"rows";i:5;s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:22:"text for default value";s:14:"_error_element";s:42:"default_value_widget][field_test][0][value";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:8:{s:6:"weight";i:1;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}i:1;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:6:"teaser";a:2:{s:6:"format";s:7:"trimmed";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"trimmed";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example text field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test',
-    'type_name' => 'test_page',
-    'weight' => '1',
-    'label' => 'Text Field',
-    'widget_type' => 'text_textfield',
-    'widget_settings' => 'a:4:{s:4:"rows";i:5;s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:22:"text for default value";s:14:"_error_element";s:42:"default_value_widget][field_test][0][value";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:1;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"trimmed";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"trimmed";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example textfield.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_date',
-    'type_name' => 'story',
-    'weight' => '10',
-    'label' => 'Date Field',
-    'widget_type' => 'date_select',
-    'widget_settings' => 'a:10:{s:13:"default_value";s:5:"blank";s:18:"default_value_code";s:0:"";s:14:"default_value2";s:4:"same";s:19:"default_value_code2";s:0:"";s:12:"input_format";s:13:"m/d/Y - H:i:s";s:19:"input_format_custom";s:0:"";s:9:"increment";s:1:"1";s:10:"text_parts";a:0:{}s:10:"year_range";s:5:"-3:+3";s:14:"label_position";s:5:"above";}',
-    'display_settings' => 'a:7:{s:6:"weight";i:10;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"long";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example date field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_datestamp',
-    'type_name' => 'story',
-    'weight' => '11',
-    'label' => 'Date Stamp Field',
-    'widget_type' => 'date_select',
-    'widget_settings' => 'a:10:{s:13:"default_value";s:5:"blank";s:18:"default_value_code";s:0:"";s:14:"default_value2";s:4:"same";s:19:"default_value_code2";s:0:"";s:12:"input_format";s:13:"m/d/Y - H:i:s";s:19:"input_format_custom";s:0:"";s:9:"increment";s:1:"1";s:10:"text_parts";a:0:{}s:10:"year_range";s:5:"-3:+3";s:14:"label_position";s:5:"above";}',
-    'display_settings' => 'a:7:{s:6:"weight";i:11;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:6:"medium";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example date stamp field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_datetime',
-    'type_name' => 'story',
-    'weight' => '12',
-    'label' => 'Datetime Field',
-    'widget_type' => 'date_select',
-    'widget_settings' => 'a:10:{s:13:"default_value";s:5:"blank";s:18:"default_value_code";s:0:"";s:14:"default_value2";s:4:"same";s:19:"default_value_code2";s:0:"";s:12:"input_format";s:13:"m/d/Y - H:i:s";s:19:"input_format_custom";s:0:"";s:9:"increment";s:1:"1";s:10:"text_parts";a:0:{}s:10:"year_range";s:5:"-3:+3";s:14:"label_position";s:5:"above";}',
-    'display_settings' => 'a:7:{s:6:"weight";i:12;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:5:"short";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example datetime field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_decimal_radio_buttons',
-    'type_name' => 'story',
-    'weight' => '13',
-    'label' => 'Decimal Radio Buttons Field',
-    'widget_type' => 'optionwidgets_buttons',
-    'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:1:{s:5:"value";s:0:"";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:13;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_0";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example decimal field using radio buttons.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_email',
-    'type_name' => 'story',
-    'weight' => '4',
-    'label' => 'Email Field',
-    'widget_type' => 'email_textfield',
-    'widget_settings' => 'a:3:{s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:1:{s:5:"email";s:17:"benjy@example.com";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:4;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example email field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_exclude_unset',
-    'type_name' => 'story',
-    'weight' => '1',
-    'label' => 'Text Field',
-    'widget_type' => 'text_textfield',
-    'widget_settings' => 'a:4:{s:4:"rows";i:5;s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:22:"text for default value";s:14:"_error_element";s:42:"default_value_widget][field_test][0][value";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:8:{s:6:"weight";i:1;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}i:1;a:1:{s:6:"format";s:7:"default";}s:6:"teaser";a:1:{s:6:"format";s:7:"trimmed";}s:4:"full";a:1:{s:6:"format";s:7:"default";}i:4;a:1:{s:6:"format";s:7:"trimmed";}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example text field without exclude.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_filefield',
-    'type_name' => 'story',
-    'weight' => '7',
-    'label' => 'File Field',
-    'widget_type' => 'filefield_widget',
-    'widget_settings' => 'a:5:{s:15:"file_extensions";s:11:"txt pdf doc";s:9:"file_path";s:6:"images";s:18:"progress_indicator";s:3:"bar";s:21:"max_filesize_per_file";s:4:"200K";s:21:"max_filesize_per_node";s:3:"20M";}',
-    'display_settings' => 'a:7:{s:6:"weight";i:7;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:9:"url_plain";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example image field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_float_single_checkbox',
-    'type_name' => 'story',
-    'weight' => '14',
-    'label' => 'Float Single Checkbox Field',
-    'widget_type' => 'optionwidgets_onoff',
-    'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:1:{s:5:"value";N;}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:14;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_0";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example float field using a single on/off checkbox.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_four',
-    'type_name' => 'story',
-    'weight' => '3',
-    'label' => 'Float Field',
-    'widget_type' => 'number',
-    'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:3:"101";s:14:"_error_element";s:43:"default_value_widget][field_float][0][value";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:3;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_2";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example float field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_identical1',
-    'type_name' => 'story',
-    'weight' => '2',
-    'label' => 'Integer Field',
-    'widget_type' => 'number',
-    'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:0:"";s:14:"_error_element";s:41:"default_value_widget][field_int][0][value";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:2;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_3";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example integer field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_identical2',
-    'type_name' => 'story',
-    'weight' => '2',
-    'label' => 'Integer Field',
-    'widget_type' => 'number',
-    'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:0:"";s:14:"_error_element";s:41:"default_value_widget][field_int][0][value";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:2;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_3";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example integer field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_imagefield',
-    'type_name' => 'story',
-    'weight' => '8',
-    'label' => 'Image Field',
-    'widget_type' => 'imagefield_widget',
-    'widget_settings' => 'a:14:{s:15:"file_extensions";s:16:"png gif jpg jpeg";s:9:"file_path";s:0:"";s:18:"progress_indicator";s:3:"bar";s:21:"max_filesize_per_file";s:0:"";s:21:"max_filesize_per_node";s:0:"";s:14:"max_resolution";s:1:"0";s:14:"min_resolution";s:1:"0";s:3:"alt";s:8:"Test alt";s:10:"custom_alt";i:0;s:5:"title";s:10:"Test title";s:12:"custom_title";i:0;s:10:"title_type";s:9:"textfield";s:13:"default_image";N;s:17:"use_default_image";i:0;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:8;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:15:"image_imagelink";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:11:"image_plain";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example image field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_integer_selectlist',
-    'type_name' => 'story',
-    'weight' => '15',
-    'label' => 'Integer Select List Field',
-    'widget_type' => 'optionwidgets_select',
-    'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:1:{s:5:"value";s:0:"";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:15;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_3";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example integer field using a select list.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_link',
-    'type_name' => 'story',
-    'weight' => '5',
-    'label' => 'Link Field',
-    'widget_type' => 'link',
-    'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"title";s:18:"default link title";s:3:"url";s:17:"http://drupal.org";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:5;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:8:"absolute";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example link field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_phone',
-    'type_name' => 'story',
-    'weight' => '9',
-    'label' => 'Phone Field',
-    'widget_type' => 'phone_textfield',
-    'widget_settings' => 'a:3:{s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:0:"";s:14:"_error_element";s:43:"default_value_widget][field_phone][0][value";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:9;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example phone field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_text_single_checkbox',
-    'type_name' => 'story',
-    'weight' => '16',
-    'label' => 'Text Single Checkbox Field',
-    'widget_type' => 'optionwidgets_onoff',
-    'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:1:{s:5:"value";N;}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:16;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"trimmed";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"trimmed";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example text field using a single on/off checkbox.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_three',
-    'type_name' => 'story',
-    'weight' => '3',
-    'label' => 'Decimal Field',
-    'widget_type' => 'number',
-    'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:3:"101";s:14:"_error_element";s:45:"default_value_widget][field_decimal][0][value";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:3;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_2";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example decimal field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
-  array(
-    'field_name' => 'field_test_two',
-    'type_name' => 'story',
-    'weight' => '2',
-    'label' => 'Integer Field',
-    'widget_type' => 'number',
-    'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:0:"";s:14:"_error_element";s:41:"default_value_widget][field_int][0][value";}}s:17:"default_value_php";N;}',
-    'display_settings' => 'a:7:{s:6:"weight";i:2;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_3";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
-    'description' => 'An example integer field.',
-    'widget_module' => '',
-    'widget_active' => '0',
-  ),
+  'field_name' => 'field_multivalue',
+  'type_name' => 'test_planet',
+  'weight' => '2',
+  'label' => 'Decimal Field',
+  'widget_type' => 'number',
+  'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:0:"";s:14:"_error_element";s:48:"default_value_widget][field_multivalue][0][value";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:6:{s:6:"weight";i:2;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}}',
+  'description' => 'An example multi-valued decimal field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test',
+  'type_name' => 'story',
+  'weight' => '1',
+  'label' => 'Text Field',
+  'widget_type' => 'text_textfield',
+  'widget_settings' => 'a:4:{s:4:"rows";i:5;s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:22:"text for default value";s:14:"_error_element";s:42:"default_value_widget][field_test][0][value";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:8:{s:6:"weight";i:1;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}i:1;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:6:"teaser";a:2:{s:6:"format";s:7:"trimmed";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"trimmed";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example text field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test',
+  'type_name' => 'test_page',
+  'weight' => '1',
+  'label' => 'Text Field',
+  'widget_type' => 'text_textfield',
+  'widget_settings' => 'a:4:{s:4:"rows";i:5;s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:22:"text for default value";s:14:"_error_element";s:42:"default_value_widget][field_test][0][value";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:1;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"trimmed";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"trimmed";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example textfield.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_date',
+  'type_name' => 'story',
+  'weight' => '10',
+  'label' => 'Date Field',
+  'widget_type' => 'date_select',
+  'widget_settings' => 'a:10:{s:13:"default_value";s:5:"blank";s:18:"default_value_code";s:0:"";s:14:"default_value2";s:4:"same";s:19:"default_value_code2";s:0:"";s:12:"input_format";s:13:"m/d/Y - H:i:s";s:19:"input_format_custom";s:0:"";s:9:"increment";s:1:"1";s:10:"text_parts";a:0:{}s:10:"year_range";s:5:"-3:+3";s:14:"label_position";s:5:"above";}',
+  'display_settings' => 'a:7:{s:6:"weight";i:10;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"long";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example date field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_datestamp',
+  'type_name' => 'story',
+  'weight' => '11',
+  'label' => 'Date Stamp Field',
+  'widget_type' => 'date_select',
+  'widget_settings' => 'a:10:{s:13:"default_value";s:5:"blank";s:18:"default_value_code";s:0:"";s:14:"default_value2";s:4:"same";s:19:"default_value_code2";s:0:"";s:12:"input_format";s:13:"m/d/Y - H:i:s";s:19:"input_format_custom";s:0:"";s:9:"increment";s:1:"1";s:10:"text_parts";a:0:{}s:10:"year_range";s:5:"-3:+3";s:14:"label_position";s:5:"above";}',
+  'display_settings' => 'a:7:{s:6:"weight";i:11;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:6:"medium";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example date stamp field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_datetime',
+  'type_name' => 'story',
+  'weight' => '12',
+  'label' => 'Datetime Field',
+  'widget_type' => 'date_select',
+  'widget_settings' => 'a:10:{s:13:"default_value";s:5:"blank";s:18:"default_value_code";s:0:"";s:14:"default_value2";s:4:"same";s:19:"default_value_code2";s:0:"";s:12:"input_format";s:13:"m/d/Y - H:i:s";s:19:"input_format_custom";s:0:"";s:9:"increment";s:1:"1";s:10:"text_parts";a:0:{}s:10:"year_range";s:5:"-3:+3";s:14:"label_position";s:5:"above";}',
+  'display_settings' => 'a:7:{s:6:"weight";i:12;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:5:"short";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example datetime field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_decimal_radio_buttons',
+  'type_name' => 'story',
+  'weight' => '13',
+  'label' => 'Decimal Radio Buttons Field',
+  'widget_type' => 'optionwidgets_buttons',
+  'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:1:{s:5:"value";s:0:"";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:13;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_0";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example decimal field using radio buttons.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_email',
+  'type_name' => 'story',
+  'weight' => '4',
+  'label' => 'Email Field',
+  'widget_type' => 'email_textfield',
+  'widget_settings' => 'a:3:{s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:1:{s:5:"email";s:17:"benjy@example.com";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:4;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example email field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_exclude_unset',
+  'type_name' => 'story',
+  'weight' => '1',
+  'label' => 'Text Field',
+  'widget_type' => 'text_textfield',
+  'widget_settings' => 'a:4:{s:4:"rows";i:5;s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:22:"text for default value";s:14:"_error_element";s:42:"default_value_widget][field_test][0][value";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:8:{s:6:"weight";i:1;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}i:1;a:1:{s:6:"format";s:7:"default";}s:6:"teaser";a:1:{s:6:"format";s:7:"trimmed";}s:4:"full";a:1:{s:6:"format";s:7:"default";}i:4;a:1:{s:6:"format";s:7:"trimmed";}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example text field without exclude.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_filefield',
+  'type_name' => 'story',
+  'weight' => '7',
+  'label' => 'File Field',
+  'widget_type' => 'filefield_widget',
+  'widget_settings' => 'a:5:{s:15:"file_extensions";s:11:"txt pdf doc";s:9:"file_path";s:6:"images";s:18:"progress_indicator";s:3:"bar";s:21:"max_filesize_per_file";s:4:"200K";s:21:"max_filesize_per_node";s:3:"20M";}',
+  'display_settings' => 'a:7:{s:6:"weight";i:7;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:9:"url_plain";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example image field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_float_single_checkbox',
+  'type_name' => 'story',
+  'weight' => '14',
+  'label' => 'Float Single Checkbox Field',
+  'widget_type' => 'optionwidgets_onoff',
+  'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:1:{s:5:"value";N;}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:14;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_0";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example float field using a single on/off checkbox.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_four',
+  'type_name' => 'story',
+  'weight' => '3',
+  'label' => 'Float Field',
+  'widget_type' => 'number',
+  'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:3:"101";s:14:"_error_element";s:43:"default_value_widget][field_float][0][value";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:3;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_2";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example float field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_identical1',
+  'type_name' => 'story',
+  'weight' => '2',
+  'label' => 'Integer Field',
+  'widget_type' => 'number',
+  'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:0:"";s:14:"_error_element";s:41:"default_value_widget][field_int][0][value";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:2;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_3";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example integer field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_identical2',
+  'type_name' => 'story',
+  'weight' => '2',
+  'label' => 'Integer Field',
+  'widget_type' => 'number',
+  'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:0:"";s:14:"_error_element";s:41:"default_value_widget][field_int][0][value";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:2;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_3";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example integer field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_imagefield',
+  'type_name' => 'story',
+  'weight' => '8',
+  'label' => 'Image Field',
+  'widget_type' => 'imagefield_widget',
+  'widget_settings' => 'a:14:{s:15:"file_extensions";s:16:"png gif jpg jpeg";s:9:"file_path";s:0:"";s:18:"progress_indicator";s:3:"bar";s:21:"max_filesize_per_file";s:0:"";s:21:"max_filesize_per_node";s:0:"";s:14:"max_resolution";s:1:"0";s:14:"min_resolution";s:1:"0";s:3:"alt";s:8:"Test alt";s:10:"custom_alt";i:0;s:5:"title";s:10:"Test title";s:12:"custom_title";i:0;s:10:"title_type";s:9:"textfield";s:13:"default_image";N;s:17:"use_default_image";i:0;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:8;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:15:"image_imagelink";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:11:"image_plain";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example image field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_integer_selectlist',
+  'type_name' => 'story',
+  'weight' => '15',
+  'label' => 'Integer Select List Field',
+  'widget_type' => 'optionwidgets_select',
+  'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:1:{s:5:"value";s:0:"";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:15;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_3";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example integer field using a select list.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_link',
+  'type_name' => 'story',
+  'weight' => '5',
+  'label' => 'Link Field',
+  'widget_type' => 'link',
+  'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"title";s:18:"default link title";s:3:"url";s:17:"http://drupal.org";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:5;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:8:"absolute";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example link field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_phone',
+  'type_name' => 'story',
+  'weight' => '9',
+  'label' => 'Phone Field',
+  'widget_type' => 'phone_textfield',
+  'widget_settings' => 'a:3:{s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:0:"";s:14:"_error_element";s:43:"default_value_widget][field_phone][0][value";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:9;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example phone field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_text_single_checkbox',
+  'type_name' => 'story',
+  'weight' => '16',
+  'label' => 'Text Single Checkbox Field',
+  'widget_type' => 'optionwidgets_onoff',
+  'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:1:{s:5:"value";N;}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:16;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"trimmed";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"trimmed";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example text field using a single on/off checkbox.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_three',
+  'type_name' => 'story',
+  'weight' => '3',
+  'label' => 'Decimal Field',
+  'widget_type' => 'number',
+  'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:3:"101";s:14:"_error_element";s:45:"default_value_widget][field_decimal][0][value";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:3;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_2";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example decimal field.',
+  'widget_module' => '',
+  'widget_active' => '0',
+))->values(array(
+  'field_name' => 'field_test_two',
+  'type_name' => 'story',
+  'weight' => '2',
+  'label' => 'Integer Field',
+  'widget_type' => 'number',
+  'widget_settings' => 'a:2:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:0:"";s:14:"_error_element";s:41:"default_value_widget][field_int][0][value";}}s:17:"default_value_php";N;}',
+  'display_settings' => 'a:7:{s:6:"weight";i:2;s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:4:"us_3";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:11:"unformatted";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:1;}}',
+  'description' => 'An example integer field.',
+  'widget_module' => '',
+  'widget_active' => '0',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeStory.php b/core/modules/migrate_drupal/src/Tests/Table/ContentTypeStory.php
index 6f9cb33..6fad7d4 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeStory.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/ContentTypeStory.php
@@ -14,11 +14,63 @@
  */
 class ContentTypeStory extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("content_type_story");
+    $this->createTable("content_type_story", array(
+  'content_type_story' => array(
+    'fields' => array(
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'uid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'field_test_three_value' => array(
+        'type' => 'decimal',
+        'not null' => FALSE,
+        'length' => '10',
+      ),
+      'field_test_integer_selectlist_value' => array(
+        'type' => 'int',
+        'not null' => FALSE,
+        'length' => '11',
+      ),
+      'field_test_identical1_value' => array(
+        'type' => 'int',
+        'not null' => FALSE,
+        'length' => '10',
+      ),
+      'field_test_identical2_value' => array(
+        'type' => 'int',
+        'not null' => FALSE,
+        'length' => '10',
+      ),
+      'field_test_link_url' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '2048',
+      ),
+      'field_test_link_title' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '255',
+      ),
+      'field_test_link_attributes' => array(
+        'type' => 'text',
+        'not null' => FALSE,
+      ),
+    ),
+  ),
+));
     $this->database->insert("content_type_story")->fields(array(
   'nid',
   'vid',
@@ -32,64 +84,49 @@ public function load() {
   'field_test_link_attributes',
 ))
     ->values(array(
-  'field_name',
-  'type_name',
-  'weight',
-  'label',
-  'widget_type',
-  'widget_settings',
-  'display_settings',
-  'description',
-  'widget_module',
-  'widget_active',
-  array(
-    'nid' => '1',
-    'vid' => '1',
-    'uid' => '1',
-    'field_test_three_value' => '42.42',
-    'field_test_integer_selectlist_value' => '3412',
-    'field_test_identical1_value' => '1',
-    'field_test_identical2_value' => '1',
-    'field_test_link_url' => 'http://drupal.org/project/drupal',
-    'field_test_link_title' => 'Drupal project page',
-    'field_test_link_attributes' => 's:32:"a:1:{s:6:"target";s:6:"_blank";}";";',
-  ),
-  array(
-    'nid' => '1',
-    'vid' => '2',
-    'uid' => '1',
-    'field_test_three_value' => '42.42',
-    'field_test_integer_selectlist_value' => '3412',
-    'field_test_identical1_value' => '1',
-    'field_test_identical2_value' => '1',
-    'field_test_link_url' => 'http://drupal.org/project/drupal',
-    'field_test_link_title' => 'Drupal project page',
-    'field_test_link_attributes' => 's:32:"a:1:{s:6:"target";s:6:"_blank";}";',
-  ),
-  array(
-    'nid' => '2',
-    'vid' => '3',
-    'uid' => '1',
-    'field_test_three_value' => '23.20',
-    'field_test_integer_selectlist_value' => '1244',
-    'field_test_identical1_value' => '1',
-    'field_test_identical2_value' => '1',
-    'field_test_link_url' => 'http://groups.drupal.org/',
-    'field_test_link_title' => 'Drupal Groups',
-    'field_test_link_attributes' => 's:6:"a:0:{}";',
-  ),
-  array(
-    'nid' => '2',
-    'vid' => '5',
-    'uid' => '1',
-    'field_test_three_value' => '23.20',
-    'field_test_integer_selectlist_value' => '1244',
-    'field_test_identical1_value' => '1',
-    'field_test_identical2_value' => '1',
-    'field_test_link_url' => 'http://groups.drupal.org/',
-    'field_test_link_title' => 'Drupal Groups',
-    'field_test_link_attributes' => 's:6:"a:0:{}";',
-  ),
+  'nid' => '1',
+  'vid' => '1',
+  'uid' => '1',
+  'field_test_three_value' => '42.42',
+  'field_test_integer_selectlist_value' => '3412',
+  'field_test_identical1_value' => '1',
+  'field_test_identical2_value' => '1',
+  'field_test_link_url' => 'http://drupal.org/project/drupal',
+  'field_test_link_title' => 'Drupal project page',
+  'field_test_link_attributes' => 's:32:"a:1:{s:6:"target";s:6:"_blank";}";";',
+))->values(array(
+  'nid' => '1',
+  'vid' => '2',
+  'uid' => '1',
+  'field_test_three_value' => '42.42',
+  'field_test_integer_selectlist_value' => '3412',
+  'field_test_identical1_value' => '1',
+  'field_test_identical2_value' => '1',
+  'field_test_link_url' => 'http://drupal.org/project/drupal',
+  'field_test_link_title' => 'Drupal project page',
+  'field_test_link_attributes' => 's:32:"a:1:{s:6:"target";s:6:"_blank";}";',
+))->values(array(
+  'nid' => '2',
+  'vid' => '3',
+  'uid' => '1',
+  'field_test_three_value' => '23.20',
+  'field_test_integer_selectlist_value' => '1244',
+  'field_test_identical1_value' => '1',
+  'field_test_identical2_value' => '1',
+  'field_test_link_url' => 'http://groups.drupal.org/',
+  'field_test_link_title' => 'Drupal Groups',
+  'field_test_link_attributes' => 's:6:"a:0:{}";',
+))->values(array(
+  'nid' => '2',
+  'vid' => '5',
+  'uid' => '1',
+  'field_test_three_value' => '23.20',
+  'field_test_integer_selectlist_value' => '1244',
+  'field_test_identical1_value' => '1',
+  'field_test_identical2_value' => '1',
+  'field_test_link_url' => 'http://groups.drupal.org/',
+  'field_test_link_title' => 'Drupal Groups',
+  'field_test_link_attributes' => 's:6:"a:0:{}";',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPlanet.php b/core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPlanet.php
index 0af1a69..84e2d5e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPlanet.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/ContentTypeTestPlanet.php
@@ -14,54 +14,49 @@
  */
 class ContentTypeTestPlanet extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("content_type_test_planet");
+    $this->createTable("content_type_test_planet", array(
+  'content_type_test_planet' => array(
+    'fields' => array(
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+    ),
+  ),
+));
     $this->database->insert("content_type_test_planet")->fields(array(
   'nid',
   'vid',
 ))
     ->values(array(
-  'nid',
-  'vid',
-  'uid',
-  'field_test_three_value',
-  'field_test_integer_selectlist_value',
-  'field_test_identical1_value',
-  'field_test_identical2_value',
-  'field_test_link_url',
-  'field_test_link_title',
-  'field_test_link_attributes',
-  array(
-    'nid' => '3',
-    'vid' => '4',
-  ),
-  array(
-    'nid' => '4',
-    'vid' => '6',
-  ),
-  array(
-    'nid' => '5',
-    'vid' => '7',
-  ),
-  array(
-    'nid' => '6',
-    'vid' => '8',
-  ),
-  array(
-    'nid' => '7',
-    'vid' => '9',
-  ),
-  array(
-    'nid' => '8',
-    'vid' => '10',
-  ),
-  array(
-    'nid' => '9',
-    'vid' => '11',
-  ),
+  'nid' => '3',
+  'vid' => '4',
+))->values(array(
+  'nid' => '4',
+  'vid' => '6',
+))->values(array(
+  'nid' => '5',
+  'vid' => '7',
+))->values(array(
+  'nid' => '6',
+  'vid' => '8',
+))->values(array(
+  'nid' => '7',
+  'vid' => '9',
+))->values(array(
+  'nid' => '8',
+  'vid' => '10',
+))->values(array(
+  'nid' => '9',
+  'vid' => '11',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/EventTimezones.php b/core/modules/migrate_drupal/src/Tests/Table/EventTimezones.php
index 21e6d7c..73e30ce 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/EventTimezones.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/EventTimezones.php
@@ -14,22 +14,32 @@
  */
 class EventTimezones extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("event_timezones");
+    $this->createTable("event_timezones", array(
+  'event_timezones' => array(
+    'fields' => array(
+      'timezone' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+    ),
+  ),
+));
     $this->database->insert("event_timezones")->fields(array(
   'timezone',
   'name',
 ))
     ->values(array(
-  'nid',
-  'vid',
-  array(
-    'timezone' => '1',
-    'name' => 'Europe/Berlin',
-  ),
+  'timezone' => '1',
+  'name' => 'Europe/Berlin',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Files.php b/core/modules/migrate_drupal/src/Tests/Table/Files.php
index dbdfa48..06dc6c0 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Files.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Files.php
@@ -14,11 +14,60 @@
  */
 class Files extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("files");
+    $this->createTable("files", array(
+  'files' => array(
+    'fields' => array(
+      'fid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'uid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'filename' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'filepath' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'filemime' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'filesize' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'status' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'timestamp' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("files")->fields(array(
   'fid',
   'uid',
@@ -30,38 +79,32 @@ public function load() {
   'timestamp',
 ))
     ->values(array(
-  'timezone',
-  'name',
-  array(
-    'fid' => '1',
-    'uid' => '1',
-    'filename' => 'Image1.png',
-    'filepath' => 'core/modules/simpletest/files/image-1.png',
-    'filemime' => 'image/png',
-    'filesize' => '39325',
-    'status' => '1',
-    'timestamp' => '1388880660',
-  ),
-  array(
-    'fid' => '2',
-    'uid' => '1',
-    'filename' => 'Image2.jpg',
-    'filepath' => 'core/modules/simpletest/files/image-2.jpg',
-    'filemime' => 'image/jpeg',
-    'filesize' => '1831',
-    'status' => '1',
-    'timestamp' => '1388880664',
-  ),
-  array(
-    'fid' => '3',
-    'uid' => '1',
-    'filename' => 'Image-test.gif',
-    'filepath' => 'core/modules/simpletest/files/image-test.gif',
-    'filemime' => 'image/jpeg',
-    'filesize' => '183',
-    'status' => '1',
-    'timestamp' => '1388880668',
-  ),
+  'fid' => '1',
+  'uid' => '1',
+  'filename' => 'Image1.png',
+  'filepath' => 'core/modules/simpletest/files/image-1.png',
+  'filemime' => 'image/png',
+  'filesize' => '39325',
+  'status' => '1',
+  'timestamp' => '1388880660',
+))->values(array(
+  'fid' => '2',
+  'uid' => '1',
+  'filename' => 'Image2.jpg',
+  'filepath' => 'core/modules/simpletest/files/image-2.jpg',
+  'filemime' => 'image/jpeg',
+  'filesize' => '1831',
+  'status' => '1',
+  'timestamp' => '1388880664',
+))->values(array(
+  'fid' => '3',
+  'uid' => '1',
+  'filename' => 'Image-test.gif',
+  'filepath' => 'core/modules/simpletest/files/image-test.gif',
+  'filemime' => 'image/jpeg',
+  'filesize' => '183',
+  'status' => '1',
+  'timestamp' => '1388880668',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/FilterFormats.php b/core/modules/migrate_drupal/src/Tests/Table/FilterFormats.php
index 318a924..85cff5e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/FilterFormats.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/FilterFormats.php
@@ -14,11 +14,36 @@
  */
 class FilterFormats extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("filter_formats");
+    $this->createTable("filter_formats", array(
+  'filter_formats' => array(
+    'fields' => array(
+      'format' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+      ),
+      'name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'roles' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'cache' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("filter_formats")->fields(array(
   'format',
   'name',
@@ -26,32 +51,20 @@ public function load() {
   'cache',
 ))
     ->values(array(
-  'fid',
-  'uid',
-  'filename',
-  'filepath',
-  'filemime',
-  'filesize',
-  'status',
-  'timestamp',
-  array(
-    'format' => '1',
-    'name' => 'Filtered HTML',
-    'roles' => ',1,2,',
-    'cache' => '1',
-  ),
-  array(
-    'format' => '2',
-    'name' => 'Full HTML',
-    'roles' => '3',
-    'cache' => '1',
-  ),
-  array(
-    'format' => '3',
-    'name' => 'Escape HTML Filter',
-    'roles' => '',
-    'cache' => '1',
-  ),
+  'format' => '1',
+  'name' => 'Filtered HTML',
+  'roles' => ',1,2,',
+  'cache' => '1',
+))->values(array(
+  'format' => '2',
+  'name' => 'Full HTML',
+  'roles' => '3',
+  'cache' => '1',
+))->values(array(
+  'format' => '3',
+  'name' => 'Escape HTML Filter',
+  'roles' => '',
+  'cache' => '1',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Filters.php b/core/modules/migrate_drupal/src/Tests/Table/Filters.php
index a873d83..9d46212 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Filters.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Filters.php
@@ -14,11 +14,42 @@
  */
 class Filters extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("filters");
+    $this->createTable("filters", array(
+  'filters' => array(
+    'fields' => array(
+      'fid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+      ),
+      'format' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'module' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '64',
+        'default' => '',
+      ),
+      'delta' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'weight' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("filters")->fields(array(
   'fid',
   'format',
@@ -27,59 +58,47 @@ public function load() {
   'weight',
 ))
     ->values(array(
-  'format',
-  'name',
-  'roles',
-  'cache',
-  array(
-    'fid' => '1',
-    'format' => '1',
-    'module' => 'filter',
-    'delta' => '2',
-    'weight' => '0',
-  ),
-  array(
-    'fid' => '2',
-    'format' => '1',
-    'module' => 'filter',
-    'delta' => '0',
-    'weight' => '1',
-  ),
-  array(
-    'fid' => '3',
-    'format' => '1',
-    'module' => 'filter',
-    'delta' => '1',
-    'weight' => '2',
-  ),
-  array(
-    'fid' => '4',
-    'format' => '1',
-    'module' => 'filter',
-    'delta' => '3',
-    'weight' => '10',
-  ),
-  array(
-    'fid' => '5',
-    'format' => '2',
-    'module' => 'filter',
-    'delta' => '2',
-    'weight' => '0',
-  ),
-  array(
-    'fid' => '6',
-    'format' => '2',
-    'module' => 'filter',
-    'delta' => '1',
-    'weight' => '1',
-  ),
-  array(
-    'fid' => '7',
-    'format' => '2',
-    'module' => 'filter',
-    'delta' => '3',
-    'weight' => '10',
-  ),
+  'fid' => '1',
+  'format' => '1',
+  'module' => 'filter',
+  'delta' => '2',
+  'weight' => '0',
+))->values(array(
+  'fid' => '2',
+  'format' => '1',
+  'module' => 'filter',
+  'delta' => '0',
+  'weight' => '1',
+))->values(array(
+  'fid' => '3',
+  'format' => '1',
+  'module' => 'filter',
+  'delta' => '1',
+  'weight' => '2',
+))->values(array(
+  'fid' => '4',
+  'format' => '1',
+  'module' => 'filter',
+  'delta' => '3',
+  'weight' => '10',
+))->values(array(
+  'fid' => '5',
+  'format' => '2',
+  'module' => 'filter',
+  'delta' => '2',
+  'weight' => '0',
+))->values(array(
+  'fid' => '6',
+  'format' => '2',
+  'module' => 'filter',
+  'delta' => '1',
+  'weight' => '1',
+))->values(array(
+  'fid' => '7',
+  'format' => '2',
+  'module' => 'filter',
+  'delta' => '3',
+  'weight' => '10',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/MenuCustom.php b/core/modules/migrate_drupal/src/Tests/Table/MenuCustom.php
index 18daa13..a1a4b66 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/MenuCustom.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/MenuCustom.php
@@ -14,37 +14,46 @@
  */
 class MenuCustom extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("menu_custom");
+    $this->createTable("menu_custom", array(
+  'menu_custom' => array(
+    'fields' => array(
+      'menu_name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '32',
+        'default' => '',
+      ),
+      'title' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'description' => array(
+        'type' => 'text',
+        'not null' => FALSE,
+      ),
+    ),
+  ),
+));
     $this->database->insert("menu_custom")->fields(array(
   'menu_name',
   'title',
   'description',
 ))
     ->values(array(
-  'fid',
-  'format',
-  'module',
-  'delta',
-  'weight',
-  array(
-    'menu_name' => 'navigation',
-    'title' => 'Navigation',
-    'description' => 'The navigation menu is provided by Drupal and is the main interactive menu for any site. It is usually the only menu that contains personalized links for authenticated users, and is often not even visible to anonymous users.',
-  ),
-  array(
-    'menu_name' => 'primary-links',
-    'title' => 'Primary links',
-    'description' => 'Primary links are often used at the theme layer to show the major sections of a site. A typical representation for primary links would be tabs along the top.',
-  ),
-  array(
-    'menu_name' => 'secondary-links',
-    'title' => 'Secondary links',
-    'description' => 'Secondary links are often used for pages like legal notices, contact details, and other secondary navigation items that play a lesser role than primary links',
-  ),
+  'menu_name' => 'navigation',
+  'title' => 'Navigation',
+  'description' => 'The navigation menu is provided by Drupal and is the main interactive menu for any site. It is usually the only menu that contains personalized links for authenticated users, and is often not even visible to anonymous users.',
+))->values(array(
+  'menu_name' => 'primary-links',
+  'title' => 'Primary links',
+  'description' => 'Primary links are often used at the theme layer to show the major sections of a site. A typical representation for primary links would be tabs along the top.',
+))->values(array(
+  'menu_name' => 'secondary-links',
+  'title' => 'Secondary links',
+  'description' => 'Secondary links are often used for pages like legal notices, contact details, and other secondary navigation items that play a lesser role than primary links',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/MenuLinks.php b/core/modules/migrate_drupal/src/Tests/Table/MenuLinks.php
index a234224..03fbb5a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/MenuLinks.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/MenuLinks.php
@@ -14,11 +14,160 @@
  */
 class MenuLinks extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("menu_links");
+    $this->createTable("menu_links", array(
+  'menu_links' => array(
+    'fields' => array(
+      'menu_name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '32',
+        'default' => '',
+      ),
+      'mlid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'plid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'link_path' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'router_path' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'link_title' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'options' => array(
+        'type' => 'text',
+        'not null' => FALSE,
+      ),
+      'module' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => 'system',
+      ),
+      'hidden' => array(
+        'type' => 'smallint',
+        'not null' => TRUE,
+        'length' => '6',
+        'default' => '0',
+      ),
+      'external' => array(
+        'type' => 'smallint',
+        'not null' => TRUE,
+        'length' => '6',
+        'default' => '0',
+      ),
+      'has_children' => array(
+        'type' => 'smallint',
+        'not null' => TRUE,
+        'length' => '6',
+        'default' => '0',
+      ),
+      'expanded' => array(
+        'type' => 'smallint',
+        'not null' => TRUE,
+        'length' => '6',
+        'default' => '0',
+      ),
+      'weight' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'depth' => array(
+        'type' => 'smallint',
+        'not null' => TRUE,
+        'length' => '6',
+        'default' => '0',
+      ),
+      'customized' => array(
+        'type' => 'smallint',
+        'not null' => TRUE,
+        'length' => '6',
+        'default' => '0',
+      ),
+      'p1' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'p2' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'p3' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'p4' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'p5' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'p6' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'p7' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'p8' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'p9' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'updated' => array(
+        'type' => 'smallint',
+        'not null' => TRUE,
+        'length' => '6',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("menu_links")->fields(array(
   'menu_name',
   'mlid',
@@ -47,225 +196,213 @@ public function load() {
   'updated',
 ))
     ->values(array(
-  'menu_name',
-  'title',
-  'description',
-  array(
-    'menu_name' => 'book-toc-1',
-    'mlid' => '1',
-    'plid' => '0',
-    'link_path' => 'node/4',
-    'router_path' => 'node/%',
-    'link_title' => 'Test top book title',
-    'options' => 'a:0:{}',
-    'module' => 'book',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '1',
-    'expanded' => '0',
-    'weight' => '-10',
-    'depth' => '1',
-    'customized' => '0',
-    'p1' => '1',
-    'p2' => '0',
-    'p3' => '0',
-    'p4' => '0',
-    'p5' => '0',
-    'p6' => '0',
-    'p7' => '0',
-    'p8' => '0',
-    'p9' => '0',
-    'updated' => '0',
-  ),
-  array(
-    'menu_name' => 'book-toc-1',
-    'mlid' => '2',
-    'plid' => '1',
-    'link_path' => 'node/5',
-    'router_path' => 'node/%',
-    'link_title' => 'Test book title child 1',
-    'options' => 'a:0:{}',
-    'module' => 'book',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '1',
-    'expanded' => '0',
-    'weight' => '0',
-    'depth' => '2',
-    'customized' => '0',
-    'p1' => '1',
-    'p2' => '2',
-    'p3' => '0',
-    'p4' => '0',
-    'p5' => '0',
-    'p6' => '0',
-    'p7' => '0',
-    'p8' => '0',
-    'p9' => '0',
-    'updated' => '0',
-  ),
-  array(
-    'menu_name' => 'book-toc-1',
-    'mlid' => '3',
-    'plid' => '2',
-    'link_path' => 'node/6',
-    'router_path' => 'node/%',
-    'link_title' => 'Test book title child 1.1',
-    'options' => 'a:0:{}',
-    'module' => 'book',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '0',
-    'depth' => '3',
-    'customized' => '0',
-    'p1' => '1',
-    'p2' => '2',
-    'p3' => '3',
-    'p4' => '0',
-    'p5' => '0',
-    'p6' => '0',
-    'p7' => '0',
-    'p8' => '0',
-    'p9' => '0',
-    'updated' => '0',
-  ),
-  array(
-    'menu_name' => 'book-toc-1',
-    'mlid' => '4',
-    'plid' => '2',
-    'link_path' => 'node/7',
-    'router_path' => 'node/%',
-    'link_title' => 'Test book title child 1.2',
-    'options' => 'a:0:{}',
-    'module' => 'book',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '0',
-    'depth' => '3',
-    'customized' => '0',
-    'p1' => '1',
-    'p2' => '2',
-    'p3' => '4',
-    'p4' => '0',
-    'p5' => '0',
-    'p6' => '0',
-    'p7' => '0',
-    'p8' => '0',
-    'p9' => '0',
-    'updated' => '0',
-  ),
-  array(
-    'menu_name' => 'book-toc-2',
-    'mlid' => '5',
-    'plid' => '0',
-    'link_path' => 'node/8',
-    'router_path' => 'node/%',
-    'link_title' => 'Test top book 2 title',
-    'options' => 'a:0:{}',
-    'module' => 'book',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '1',
-    'expanded' => '0',
-    'weight' => '-10',
-    'depth' => '1',
-    'customized' => '0',
-    'p1' => '5',
-    'p2' => '0',
-    'p3' => '0',
-    'p4' => '0',
-    'p5' => '0',
-    'p6' => '0',
-    'p7' => '0',
-    'p8' => '0',
-    'p9' => '0',
-    'updated' => '0',
-  ),
-  array(
-    'menu_name' => 'secondary-links',
-    'mlid' => '138',
-    'plid' => '0',
-    'link_path' => 'user/login',
-    'router_path' => 'user/login',
-    'link_title' => 'Test 1',
-    'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:16:"Test menu link 1";}}',
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '1',
-    'expanded' => '0',
-    'weight' => '15',
-    'depth' => '1',
-    'customized' => '1',
-    'p1' => '138',
-    'p2' => '0',
-    'p3' => '0',
-    'p4' => '0',
-    'p5' => '0',
-    'p6' => '0',
-    'p7' => '0',
-    'p8' => '0',
-    'p9' => '0',
-    'updated' => '0',
-  ),
-  array(
-    'menu_name' => 'secondary-links',
-    'mlid' => '139',
-    'plid' => '138',
-    'link_path' => 'admin',
-    'router_path' => 'admin',
-    'link_title' => 'Test 2',
-    'options' => 'a:2:{s:5:"query";s:7:"foo=bar";s:10:"attributes";a:1:{s:5:"title";s:16:"Test menu link 2";}}',
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '1',
-    'weight' => '12',
-    'depth' => '2',
-    'customized' => '1',
-    'p1' => '138',
-    'p2' => '139',
-    'p3' => '0',
-    'p4' => '0',
-    'p5' => '0',
-    'p6' => '0',
-    'p7' => '0',
-    'p8' => '0',
-    'p9' => '0',
-    'updated' => '0',
-  ),
-  array(
-    'menu_name' => 'secondary-links',
-    'mlid' => '140',
-    'plid' => '0',
-    'link_path' => 'http://drupal.org',
-    'router_path' => '',
-    'link_title' => 'Drupal.org',
-    'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:0:"";}}',
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '1',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '0',
-    'depth' => '1',
-    'customized' => '1',
-    'p1' => '0',
-    'p2' => '0',
-    'p3' => '0',
-    'p4' => '0',
-    'p5' => '0',
-    'p6' => '0',
-    'p7' => '0',
-    'p8' => '0',
-    'p9' => '0',
-    'updated' => '0',
-  ),
+  'menu_name' => 'book-toc-1',
+  'mlid' => '1',
+  'plid' => '0',
+  'link_path' => 'node/4',
+  'router_path' => 'node/%',
+  'link_title' => 'Test top book title',
+  'options' => 'a:0:{}',
+  'module' => 'book',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '-10',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))->values(array(
+  'menu_name' => 'book-toc-1',
+  'mlid' => '2',
+  'plid' => '1',
+  'link_path' => 'node/5',
+  'router_path' => 'node/%',
+  'link_title' => 'Test book title child 1',
+  'options' => 'a:0:{}',
+  'module' => 'book',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '2',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))->values(array(
+  'menu_name' => 'book-toc-1',
+  'mlid' => '3',
+  'plid' => '2',
+  'link_path' => 'node/6',
+  'router_path' => 'node/%',
+  'link_title' => 'Test book title child 1.1',
+  'options' => 'a:0:{}',
+  'module' => 'book',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '2',
+  'p3' => '3',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))->values(array(
+  'menu_name' => 'book-toc-1',
+  'mlid' => '4',
+  'plid' => '2',
+  'link_path' => 'node/7',
+  'router_path' => 'node/%',
+  'link_title' => 'Test book title child 1.2',
+  'options' => 'a:0:{}',
+  'module' => 'book',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '2',
+  'p3' => '4',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))->values(array(
+  'menu_name' => 'book-toc-2',
+  'mlid' => '5',
+  'plid' => '0',
+  'link_path' => 'node/8',
+  'router_path' => 'node/%',
+  'link_title' => 'Test top book 2 title',
+  'options' => 'a:0:{}',
+  'module' => 'book',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '-10',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '5',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))->values(array(
+  'menu_name' => 'secondary-links',
+  'mlid' => '138',
+  'plid' => '0',
+  'link_path' => 'user/login',
+  'router_path' => 'user/login',
+  'link_title' => 'Test 1',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:16:"Test menu link 1";}}',
+  'module' => 'menu',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '15',
+  'depth' => '1',
+  'customized' => '1',
+  'p1' => '138',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))->values(array(
+  'menu_name' => 'secondary-links',
+  'mlid' => '139',
+  'plid' => '138',
+  'link_path' => 'admin',
+  'router_path' => 'admin',
+  'link_title' => 'Test 2',
+  'options' => 'a:2:{s:5:"query";s:7:"foo=bar";s:10:"attributes";a:1:{s:5:"title";s:16:"Test menu link 2";}}',
+  'module' => 'menu',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '1',
+  'weight' => '12',
+  'depth' => '2',
+  'customized' => '1',
+  'p1' => '138',
+  'p2' => '139',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))->values(array(
+  'menu_name' => 'secondary-links',
+  'mlid' => '140',
+  'plid' => '0',
+  'link_path' => 'http://drupal.org',
+  'router_path' => '',
+  'link_title' => 'Drupal.org',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:0:"";}}',
+  'module' => 'menu',
+  'hidden' => '0',
+  'external' => '1',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '1',
+  'p1' => '0',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Node.php b/core/modules/migrate_drupal/src/Tests/Table/Node.php
index 01c8130..d38c038 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Node.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Node.php
@@ -14,11 +14,102 @@
  */
 class Node extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("node");
+    $this->createTable("node", array(
+  'node' => array(
+    'fields' => array(
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'type' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '32',
+        'default' => '',
+      ),
+      'language' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '12',
+        'default' => '',
+      ),
+      'title' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'uid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'status' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '1',
+      ),
+      'created' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'changed' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'comment' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'promote' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'moderate' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'sticky' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'tnid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'translate' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("node")->fields(array(
   'nid',
   'vid',
@@ -37,167 +128,133 @@ public function load() {
   'translate',
 ))
     ->values(array(
-  'menu_name',
-  'mlid',
-  'plid',
-  'link_path',
-  'router_path',
-  'link_title',
-  'options',
-  'module',
-  'hidden',
-  'external',
-  'has_children',
-  'expanded',
-  'weight',
-  'depth',
-  'customized',
-  'p1',
-  'p2',
-  'p3',
-  'p4',
-  'p5',
-  'p6',
-  'p7',
-  'p8',
-  'p9',
-  'updated',
-  array(
-    'nid' => '1',
-    'vid' => '1',
-    'type' => 'story',
-    'language' => '',
-    'title' => 'Test title',
-    'uid' => '1',
-    'status' => '1',
-    'created' => '1388271197',
-    'changed' => '1390095701',
-    'comment' => '0',
-    'promote' => '0',
-    'moderate' => '0',
-    'sticky' => '0',
-    'tnid' => '0',
-    'translate' => '0',
-  ),
-  array(
-    'nid' => '2',
-    'vid' => '3',
-    'type' => 'story',
-    'language' => '',
-    'title' => 'Test title 2',
-    'uid' => '1',
-    'status' => '1',
-    'created' => '1388271197',
-    'changed' => '1390095701',
-    'comment' => '0',
-    'promote' => '0',
-    'moderate' => '0',
-    'sticky' => '0',
-    'tnid' => '0',
-    'translate' => '0',
-  ),
-  array(
-    'nid' => '3',
-    'vid' => '4',
-    'type' => 'test_planet',
-    'language' => '',
-    'title' => 'Test planet title 3',
-    'uid' => '1',
-    'status' => '1',
-    'created' => '1388271527',
-    'changed' => '1390096401',
-    'comment' => '0',
-    'promote' => '0',
-    'moderate' => '0',
-    'sticky' => '0',
-    'tnid' => '0',
-    'translate' => '0',
-  ),
-  array(
-    'nid' => '4',
-    'vid' => '6',
-    'type' => 'test_planet',
-    'language' => '',
-    'title' => '',
-    'uid' => '1',
-    'status' => '1',
-    'created' => '1388271527',
-    'changed' => '1390096401',
-    'comment' => '0',
-    'promote' => '0',
-    'moderate' => '0',
-    'sticky' => '0',
-    'tnid' => '0',
-    'translate' => '0',
-  ),
-  array(
-    'nid' => '5',
-    'vid' => '7',
-    'type' => 'test_planet',
-    'language' => '',
-    'title' => '',
-    'uid' => '1',
-    'status' => '1',
-    'created' => '1388271527',
-    'changed' => '1390096401',
-    'comment' => '0',
-    'promote' => '0',
-    'moderate' => '0',
-    'sticky' => '0',
-    'tnid' => '0',
-    'translate' => '0',
-  ),
-  array(
-    'nid' => '6',
-    'vid' => '8',
-    'type' => 'test_planet',
-    'language' => '',
-    'title' => '',
-    'uid' => '1',
-    'status' => '1',
-    'created' => '1388271527',
-    'changed' => '1390096401',
-    'comment' => '0',
-    'promote' => '0',
-    'moderate' => '0',
-    'sticky' => '0',
-    'tnid' => '0',
-    'translate' => '0',
-  ),
-  array(
-    'nid' => '7',
-    'vid' => '9',
-    'type' => 'test_planet',
-    'language' => '',
-    'title' => '',
-    'uid' => '1',
-    'status' => '1',
-    'created' => '1388271527',
-    'changed' => '1390096401',
-    'comment' => '0',
-    'promote' => '0',
-    'moderate' => '0',
-    'sticky' => '0',
-    'tnid' => '0',
-    'translate' => '0',
-  ),
-  array(
-    'nid' => '8',
-    'vid' => '10',
-    'type' => 'test_planet',
-    'language' => '',
-    'title' => '',
-    'uid' => '1',
-    'status' => '1',
-    'created' => '1388271527',
-    'changed' => '1390096401',
-    'comment' => '0',
-    'promote' => '0',
-    'moderate' => '0',
-    'sticky' => '0',
-    'tnid' => '0',
-    'translate' => '0',
-  ),
+  'nid' => '1',
+  'vid' => '1',
+  'type' => 'story',
+  'language' => '',
+  'title' => 'Test title',
+  'uid' => '1',
+  'status' => '1',
+  'created' => '1388271197',
+  'changed' => '1390095701',
+  'comment' => '0',
+  'promote' => '0',
+  'moderate' => '0',
+  'sticky' => '0',
+  'tnid' => '0',
+  'translate' => '0',
+))->values(array(
+  'nid' => '2',
+  'vid' => '3',
+  'type' => 'story',
+  'language' => '',
+  'title' => 'Test title 2',
+  'uid' => '1',
+  'status' => '1',
+  'created' => '1388271197',
+  'changed' => '1390095701',
+  'comment' => '0',
+  'promote' => '0',
+  'moderate' => '0',
+  'sticky' => '0',
+  'tnid' => '0',
+  'translate' => '0',
+))->values(array(
+  'nid' => '3',
+  'vid' => '4',
+  'type' => 'test_planet',
+  'language' => '',
+  'title' => 'Test planet title 3',
+  'uid' => '1',
+  'status' => '1',
+  'created' => '1388271527',
+  'changed' => '1390096401',
+  'comment' => '0',
+  'promote' => '0',
+  'moderate' => '0',
+  'sticky' => '0',
+  'tnid' => '0',
+  'translate' => '0',
+))->values(array(
+  'nid' => '4',
+  'vid' => '6',
+  'type' => 'test_planet',
+  'language' => '',
+  'title' => '',
+  'uid' => '1',
+  'status' => '1',
+  'created' => '1388271527',
+  'changed' => '1390096401',
+  'comment' => '0',
+  'promote' => '0',
+  'moderate' => '0',
+  'sticky' => '0',
+  'tnid' => '0',
+  'translate' => '0',
+))->values(array(
+  'nid' => '5',
+  'vid' => '7',
+  'type' => 'test_planet',
+  'language' => '',
+  'title' => '',
+  'uid' => '1',
+  'status' => '1',
+  'created' => '1388271527',
+  'changed' => '1390096401',
+  'comment' => '0',
+  'promote' => '0',
+  'moderate' => '0',
+  'sticky' => '0',
+  'tnid' => '0',
+  'translate' => '0',
+))->values(array(
+  'nid' => '6',
+  'vid' => '8',
+  'type' => 'test_planet',
+  'language' => '',
+  'title' => '',
+  'uid' => '1',
+  'status' => '1',
+  'created' => '1388271527',
+  'changed' => '1390096401',
+  'comment' => '0',
+  'promote' => '0',
+  'moderate' => '0',
+  'sticky' => '0',
+  'tnid' => '0',
+  'translate' => '0',
+))->values(array(
+  'nid' => '7',
+  'vid' => '9',
+  'type' => 'test_planet',
+  'language' => '',
+  'title' => '',
+  'uid' => '1',
+  'status' => '1',
+  'created' => '1388271527',
+  'changed' => '1390096401',
+  'comment' => '0',
+  'promote' => '0',
+  'moderate' => '0',
+  'sticky' => '0',
+  'tnid' => '0',
+  'translate' => '0',
+))->values(array(
+  'nid' => '8',
+  'vid' => '10',
+  'type' => 'test_planet',
+  'language' => '',
+  'title' => '',
+  'uid' => '1',
+  'status' => '1',
+  'created' => '1388271527',
+  'changed' => '1390096401',
+  'comment' => '0',
+  'promote' => '0',
+  'moderate' => '0',
+  'sticky' => '0',
+  'tnid' => '0',
+  'translate' => '0',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/NodeRevisions.php b/core/modules/migrate_drupal/src/Tests/Table/NodeRevisions.php
index 9b48e99..c40f947 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/NodeRevisions.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/NodeRevisions.php
@@ -14,11 +14,60 @@
  */
 class NodeRevisions extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("node_revisions");
+    $this->createTable("node_revisions", array(
+  'node_revisions' => array(
+    'fields' => array(
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'uid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'title' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'body' => array(
+        'type' => 'longtext',
+        'not null' => TRUE,
+      ),
+      'teaser' => array(
+        'type' => 'longtext',
+        'not null' => TRUE,
+      ),
+      'log' => array(
+        'type' => 'longtext',
+        'not null' => TRUE,
+      ),
+      'timestamp' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'format' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("node_revisions")->fields(array(
   'nid',
   'vid',
@@ -31,142 +80,115 @@ public function load() {
   'format',
 ))
     ->values(array(
-  'nid',
-  'vid',
-  'type',
-  'language',
-  'title',
-  'uid',
-  'status',
-  'created',
-  'changed',
-  'comment',
-  'promote',
-  'moderate',
-  'sticky',
-  'tnid',
-  'translate',
-  array(
-    'nid' => '1',
-    'vid' => '1',
-    'uid' => '1',
-    'title' => 'Test title',
-    'body' => 'test',
-    'teaser' => 'test',
-    'log' => '',
-    'timestamp' => '1390095701',
-    'format' => '1',
-  ),
-  array(
-    'nid' => '1',
-    'vid' => '2',
-    'uid' => '2',
-    'title' => 'Test title rev 2',
-    'body' => 'body test rev 2',
-    'teaser' => 'teaser test rev 2',
-    'log' => 'modified rev 2',
-    'timestamp' => '1390095702',
-    'format' => '1',
-  ),
-  array(
-    'nid' => '2',
-    'vid' => '3',
-    'uid' => '1',
-    'title' => 'Test title rev 3',
-    'body' => 'test rev 3',
-    'teaser' => 'test rev 3',
-    'log' => '',
-    'timestamp' => '1390095701',
-    'format' => '1',
-  ),
-  array(
-    'nid' => '3',
-    'vid' => '4',
-    'uid' => '1',
-    'title' => 'Test page title rev 4',
-    'body' => 'test page body rev 4',
-    'teaser' => 'test page teaser rev 4',
-    'log' => '',
-    'timestamp' => '1390095701',
-    'format' => '0',
-  ),
-  array(
-    'nid' => '1',
-    'vid' => '5',
-    'uid' => '1',
-    'title' => 'Test title rev 3',
-    'body' => 'body test rev 3',
-    'teaser' => 'teaser test rev 3',
-    'log' => 'modified rev 3',
-    'timestamp' => '1390095703',
-    'format' => '1',
-  ),
-  array(
-    'nid' => '4',
-    'vid' => '6',
-    'uid' => '1',
-    'title' => 'Node 4',
-    'body' => 'Node 4 body',
-    'teaser' => 'test for node 4',
-    'log' => '',
-    'timestamp' => '1390095701',
-    'format' => '1',
-  ),
-  array(
-    'nid' => '5',
-    'vid' => '7',
-    'uid' => '1',
-    'title' => 'Node 5',
-    'body' => 'Node 5 body',
-    'teaser' => 'test for node 5',
-    'log' => '',
-    'timestamp' => '1390095701',
-    'format' => '1',
-  ),
-  array(
-    'nid' => '6',
-    'vid' => '8',
-    'uid' => '1',
-    'title' => 'Node 6',
-    'body' => 'Node 6 body',
-    'teaser' => 'test for node 6',
-    'log' => '',
-    'timestamp' => '1390095701',
-    'format' => '1',
-  ),
-  array(
-    'nid' => '7',
-    'vid' => '9',
-    'uid' => '1',
-    'title' => 'Node 7',
-    'body' => 'Node 7 body',
-    'teaser' => 'test for node 7',
-    'log' => '',
-    'timestamp' => '1390095701',
-    'format' => '1',
-  ),
-  array(
-    'nid' => '8',
-    'vid' => '10',
-    'uid' => '1',
-    'title' => 'Node 8',
-    'body' => 'Node 8 body',
-    'teaser' => 'test for node 8',
-    'log' => '',
-    'timestamp' => '1390095701',
-    'format' => '1',
-  ),
-  array(
-    'nid' => '9',
-    'vid' => '11',
-    'uid' => '1',
-    'title' => 'Node 9',
-    'body' => 'Node 9 body',
-    'teaser' => 'test for node 9',
-    'log' => '',
-    'timestamp' => '1390095701',
-    'format' => '1',
-  ),
+  'nid' => '1',
+  'vid' => '1',
+  'uid' => '1',
+  'title' => 'Test title',
+  'body' => 'test',
+  'teaser' => 'test',
+  'log' => '',
+  'timestamp' => '1390095701',
+  'format' => '1',
+))->values(array(
+  'nid' => '1',
+  'vid' => '2',
+  'uid' => '2',
+  'title' => 'Test title rev 2',
+  'body' => 'body test rev 2',
+  'teaser' => 'teaser test rev 2',
+  'log' => 'modified rev 2',
+  'timestamp' => '1390095702',
+  'format' => '1',
+))->values(array(
+  'nid' => '2',
+  'vid' => '3',
+  'uid' => '1',
+  'title' => 'Test title rev 3',
+  'body' => 'test rev 3',
+  'teaser' => 'test rev 3',
+  'log' => '',
+  'timestamp' => '1390095701',
+  'format' => '1',
+))->values(array(
+  'nid' => '3',
+  'vid' => '4',
+  'uid' => '1',
+  'title' => 'Test page title rev 4',
+  'body' => 'test page body rev 4',
+  'teaser' => 'test page teaser rev 4',
+  'log' => '',
+  'timestamp' => '1390095701',
+  'format' => '0',
+))->values(array(
+  'nid' => '1',
+  'vid' => '5',
+  'uid' => '1',
+  'title' => 'Test title rev 3',
+  'body' => 'body test rev 3',
+  'teaser' => 'teaser test rev 3',
+  'log' => 'modified rev 3',
+  'timestamp' => '1390095703',
+  'format' => '1',
+))->values(array(
+  'nid' => '4',
+  'vid' => '6',
+  'uid' => '1',
+  'title' => 'Node 4',
+  'body' => 'Node 4 body',
+  'teaser' => 'test for node 4',
+  'log' => '',
+  'timestamp' => '1390095701',
+  'format' => '1',
+))->values(array(
+  'nid' => '5',
+  'vid' => '7',
+  'uid' => '1',
+  'title' => 'Node 5',
+  'body' => 'Node 5 body',
+  'teaser' => 'test for node 5',
+  'log' => '',
+  'timestamp' => '1390095701',
+  'format' => '1',
+))->values(array(
+  'nid' => '6',
+  'vid' => '8',
+  'uid' => '1',
+  'title' => 'Node 6',
+  'body' => 'Node 6 body',
+  'teaser' => 'test for node 6',
+  'log' => '',
+  'timestamp' => '1390095701',
+  'format' => '1',
+))->values(array(
+  'nid' => '7',
+  'vid' => '9',
+  'uid' => '1',
+  'title' => 'Node 7',
+  'body' => 'Node 7 body',
+  'teaser' => 'test for node 7',
+  'log' => '',
+  'timestamp' => '1390095701',
+  'format' => '1',
+))->values(array(
+  'nid' => '8',
+  'vid' => '10',
+  'uid' => '1',
+  'title' => 'Node 8',
+  'body' => 'Node 8 body',
+  'teaser' => 'test for node 8',
+  'log' => '',
+  'timestamp' => '1390095701',
+  'format' => '1',
+))->values(array(
+  'nid' => '9',
+  'vid' => '11',
+  'uid' => '1',
+  'title' => 'Node 9',
+  'body' => 'Node 9 body',
+  'teaser' => 'test for node 9',
+  'log' => '',
+  'timestamp' => '1390095701',
+  'format' => '1',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/NodeType.php b/core/modules/migrate_drupal/src/Tests/Table/NodeType.php
index cc3ed18..45a531f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/NodeType.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/NodeType.php
@@ -14,11 +14,88 @@
  */
 class NodeType extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("node_type");
+    $this->createTable("node_type", array(
+  'node_type' => array(
+    'fields' => array(
+      'type' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '32',
+      ),
+      'name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'module' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+      ),
+      'description' => array(
+        'type' => 'mediumtext',
+        'not null' => TRUE,
+      ),
+      'help' => array(
+        'type' => 'mediumtext',
+        'not null' => TRUE,
+      ),
+      'has_title' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '3',
+      ),
+      'title_label' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'has_body' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '3',
+      ),
+      'body_label' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'min_word_count' => array(
+        'type' => 'smallint',
+        'not null' => TRUE,
+        'length' => '5',
+      ),
+      'custom' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'modified' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'locked' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'orig_type' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+    ),
+  ),
+));
     $this->database->insert("node_type")->fields(array(
   'type',
   'name',
@@ -36,175 +113,155 @@ public function load() {
   'orig_type',
 ))
     ->values(array(
-  'nid',
-  'vid',
-  'uid',
-  'title',
-  'body',
-  'teaser',
-  'log',
-  'timestamp',
-  'format',
-  array(
-    'type' => 'article',
-    'name' => 'Article',
-    'module' => 'node',
-    'description' => 'An <em>article</em>, content type.',
-    'help' => '',
-    'has_title' => '1',
-    'title_label' => 'Title',
-    'has_body' => '1',
-    'body_label' => 'Body',
-    'min_word_count' => '0',
-    'custom' => '1',
-    'modified' => '1',
-    'locked' => '0',
-    'orig_type' => 'story',
-  ),
-  array(
-    'type' => 'company',
-    'name' => 'Company',
-    'module' => 'node',
-    'description' => 'Company node type',
-    'help' => '',
-    'has_title' => '1',
-    'title_label' => 'Name',
-    'has_body' => '1',
-    'body_label' => 'Description',
-    'min_word_count' => '20',
-    'custom' => '0',
-    'modified' => '0',
-    'locked' => '0',
-    'orig_type' => 'company',
-  ),
-  array(
-    'type' => 'employee',
-    'name' => 'Employee',
-    'module' => 'node',
-    'description' => 'Employee node type',
-    'help' => '',
-    'has_title' => '1',
-    'title_label' => 'Name',
-    'has_body' => '1',
-    'body_label' => 'Bio',
-    'min_word_count' => '20',
-    'custom' => '0',
-    'modified' => '0',
-    'locked' => '0',
-    'orig_type' => 'employee',
-  ),
-  array(
-    'type' => 'page',
-    'name' => 'Page',
-    'module' => 'node',
-    'description' => "A <em>page</em>, similar in form to a <em>story</em>, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a <em>page</em> entry does not allow visitor comments and is not featured on the site's initial home page.",
-    'help' => '',
-    'has_title' => '1',
-    'title_label' => 'Title',
-    'has_body' => '1',
-    'body_label' => 'Body',
-    'min_word_count' => '0',
-    'custom' => '1',
-    'modified' => '1',
-    'locked' => '0',
-    'orig_type' => 'page',
-  ),
-  array(
-    'type' => 'sponsor',
-    'name' => 'Sponsor',
-    'module' => 'node',
-    'description' => 'Sponsor node type',
-    'help' => '',
-    'has_title' => '1',
-    'title_label' => 'Name',
-    'has_body' => '0',
-    'body_label' => 'Body',
-    'min_word_count' => '0',
-    'custom' => '0',
-    'modified' => '0',
-    'locked' => '0',
-    'orig_type' => '',
-  ),
-  array(
-    'type' => 'story',
-    'name' => 'Story',
-    'module' => 'node',
-    'description' => "A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
-    'help' => '',
-    'has_title' => '1',
-    'title_label' => 'Title',
-    'has_body' => '1',
-    'body_label' => 'Body',
-    'min_word_count' => '0',
-    'custom' => '1',
-    'modified' => '1',
-    'locked' => '0',
-    'orig_type' => 'story',
-  ),
-  array(
-    'type' => 'test_event',
-    'name' => 'Migrate test event',
-    'module' => 'node',
-    'description' => 'test event description here',
-    'help' => 'help text here',
-    'has_title' => '1',
-    'title_label' => 'Event Name',
-    'has_body' => '1',
-    'body_label' => 'Body',
-    'min_word_count' => '0',
-    'custom' => '1',
-    'modified' => '1',
-    'locked' => '0',
-    'orig_type' => 'event',
-  ),
-  array(
-    'type' => 'test_page',
-    'name' => 'Migrate test page',
-    'module' => 'node',
-    'description' => "A <em>page</em>, similar in form to a <em>story</em>, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a <em>page</em> entry does not allow visitor comments and is not featured on the site's initial home page.",
-    'help' => '',
-    'has_title' => '1',
-    'title_label' => 'Title',
-    'has_body' => '1',
-    'body_label' => 'This is the body field label',
-    'min_word_count' => '0',
-    'custom' => '1',
-    'modified' => '1',
-    'locked' => '0',
-    'orig_type' => 'page',
-  ),
-  array(
-    'type' => 'test_planet',
-    'name' => 'Migrate test planet',
-    'module' => 'node',
-    'description' => "A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
-    'help' => '',
-    'has_title' => '1',
-    'title_label' => 'Title',
-    'has_body' => '0',
-    'body_label' => 'Body',
-    'min_word_count' => '0',
-    'custom' => '1',
-    'modified' => '1',
-    'locked' => '0',
-    'orig_type' => 'test_planet',
-  ),
-  array(
-    'type' => 'test_story',
-    'name' => 'Migrate test story',
-    'module' => 'node',
-    'description' => "A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
-    'help' => '',
-    'has_title' => '1',
-    'title_label' => 'Title',
-    'has_body' => '0',
-    'body_label' => 'Body',
-    'min_word_count' => '0',
-    'custom' => '1',
-    'modified' => '1',
-    'locked' => '0',
-    'orig_type' => 'story',
-  ),
+  'type' => 'article',
+  'name' => 'Article',
+  'module' => 'node',
+  'description' => 'An <em>article</em>, content type.',
+  'help' => '',
+  'has_title' => '1',
+  'title_label' => 'Title',
+  'has_body' => '1',
+  'body_label' => 'Body',
+  'min_word_count' => '0',
+  'custom' => '1',
+  'modified' => '1',
+  'locked' => '0',
+  'orig_type' => 'story',
+))->values(array(
+  'type' => 'company',
+  'name' => 'Company',
+  'module' => 'node',
+  'description' => 'Company node type',
+  'help' => '',
+  'has_title' => '1',
+  'title_label' => 'Name',
+  'has_body' => '1',
+  'body_label' => 'Description',
+  'min_word_count' => '20',
+  'custom' => '0',
+  'modified' => '0',
+  'locked' => '0',
+  'orig_type' => 'company',
+))->values(array(
+  'type' => 'employee',
+  'name' => 'Employee',
+  'module' => 'node',
+  'description' => 'Employee node type',
+  'help' => '',
+  'has_title' => '1',
+  'title_label' => 'Name',
+  'has_body' => '1',
+  'body_label' => 'Bio',
+  'min_word_count' => '20',
+  'custom' => '0',
+  'modified' => '0',
+  'locked' => '0',
+  'orig_type' => 'employee',
+))->values(array(
+  'type' => 'page',
+  'name' => 'Page',
+  'module' => 'node',
+  'description' => "A <em>page</em>, similar in form to a <em>story</em>, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a <em>page</em> entry does not allow visitor comments and is not featured on the site's initial home page.",
+  'help' => '',
+  'has_title' => '1',
+  'title_label' => 'Title',
+  'has_body' => '1',
+  'body_label' => 'Body',
+  'min_word_count' => '0',
+  'custom' => '1',
+  'modified' => '1',
+  'locked' => '0',
+  'orig_type' => 'page',
+))->values(array(
+  'type' => 'sponsor',
+  'name' => 'Sponsor',
+  'module' => 'node',
+  'description' => 'Sponsor node type',
+  'help' => '',
+  'has_title' => '1',
+  'title_label' => 'Name',
+  'has_body' => '0',
+  'body_label' => 'Body',
+  'min_word_count' => '0',
+  'custom' => '0',
+  'modified' => '0',
+  'locked' => '0',
+  'orig_type' => '',
+))->values(array(
+  'type' => 'story',
+  'name' => 'Story',
+  'module' => 'node',
+  'description' => "A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
+  'help' => '',
+  'has_title' => '1',
+  'title_label' => 'Title',
+  'has_body' => '1',
+  'body_label' => 'Body',
+  'min_word_count' => '0',
+  'custom' => '1',
+  'modified' => '1',
+  'locked' => '0',
+  'orig_type' => 'story',
+))->values(array(
+  'type' => 'test_event',
+  'name' => 'Migrate test event',
+  'module' => 'node',
+  'description' => 'test event description here',
+  'help' => 'help text here',
+  'has_title' => '1',
+  'title_label' => 'Event Name',
+  'has_body' => '1',
+  'body_label' => 'Body',
+  'min_word_count' => '0',
+  'custom' => '1',
+  'modified' => '1',
+  'locked' => '0',
+  'orig_type' => 'event',
+))->values(array(
+  'type' => 'test_page',
+  'name' => 'Migrate test page',
+  'module' => 'node',
+  'description' => "A <em>page</em>, similar in form to a <em>story</em>, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a <em>page</em> entry does not allow visitor comments and is not featured on the site's initial home page.",
+  'help' => '',
+  'has_title' => '1',
+  'title_label' => 'Title',
+  'has_body' => '1',
+  'body_label' => 'This is the body field label',
+  'min_word_count' => '0',
+  'custom' => '1',
+  'modified' => '1',
+  'locked' => '0',
+  'orig_type' => 'page',
+))->values(array(
+  'type' => 'test_planet',
+  'name' => 'Migrate test planet',
+  'module' => 'node',
+  'description' => "A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
+  'help' => '',
+  'has_title' => '1',
+  'title_label' => 'Title',
+  'has_body' => '0',
+  'body_label' => 'Body',
+  'min_word_count' => '0',
+  'custom' => '1',
+  'modified' => '1',
+  'locked' => '0',
+  'orig_type' => 'test_planet',
+))->values(array(
+  'type' => 'test_story',
+  'name' => 'Migrate test story',
+  'module' => 'node',
+  'description' => "A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
+  'help' => '',
+  'has_title' => '1',
+  'title_label' => 'Title',
+  'has_body' => '0',
+  'body_label' => 'Body',
+  'min_word_count' => '0',
+  'custom' => '1',
+  'modified' => '1',
+  'locked' => '0',
+  'orig_type' => 'story',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Permission.php b/core/modules/migrate_drupal/src/Tests/Table/Permission.php
index e29a570..847136d 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Permission.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Permission.php
@@ -14,11 +14,34 @@
  */
 class Permission extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("permission");
+    $this->createTable("permission", array(
+  'permission' => array(
+    'fields' => array(
+      'pid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+      ),
+      'rid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'perm' => array(
+        'type' => 'longtext',
+        'not null' => FALSE,
+      ),
+      'tid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("permission")->fields(array(
   'pid',
   'rid',
@@ -26,44 +49,25 @@ public function load() {
   'tid',
 ))
     ->values(array(
-  'type',
-  'name',
-  'module',
-  'description',
-  'help',
-  'has_title',
-  'title_label',
-  'has_body',
-  'body_label',
-  'min_word_count',
-  'custom',
-  'modified',
-  'locked',
-  'orig_type',
-  array(
-    'pid' => '1',
-    'rid' => '1',
-    'perm' => 'migrate test anonymous permission',
-    'tid' => '0',
-  ),
-  array(
-    'pid' => '2',
-    'rid' => '2',
-    'perm' => 'migrate test authenticated permission',
-    'tid' => '0',
-  ),
-  array(
-    'pid' => '3',
-    'rid' => '3',
-    'perm' => 'migrate test role 1 test permission',
-    'tid' => '0',
-  ),
-  array(
-    'pid' => '4',
-    'rid' => '4',
-    'perm' => 'migrate test role 2 test permission, use PHP for settings, administer contact forms, skip comment approval, edit own blog content, edit any blog content, delete own blog content, delete any blog content, create forum content, delete any forum content, delete own forum content, edit any forum content, edit own forum content, administer nodes',
-    'tid' => '0',
-  ),
+  'pid' => '1',
+  'rid' => '1',
+  'perm' => 'migrate test anonymous permission',
+  'tid' => '0',
+))->values(array(
+  'pid' => '2',
+  'rid' => '2',
+  'perm' => 'migrate test authenticated permission',
+  'tid' => '0',
+))->values(array(
+  'pid' => '3',
+  'rid' => '3',
+  'perm' => 'migrate test role 1 test permission',
+  'tid' => '0',
+))->values(array(
+  'pid' => '4',
+  'rid' => '4',
+  'perm' => 'migrate test role 2 test permission, use PHP for settings, administer contact forms, skip comment approval, edit own blog content, edit any blog content, delete own blog content, delete any blog content, create forum content, delete any forum content, delete own forum content, edit any forum content, edit own forum content, administer nodes',
+  'tid' => '0',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ProfileFields.php b/core/modules/migrate_drupal/src/Tests/Table/ProfileFields.php
index 6a8fe9c..777a9c9 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ProfileFields.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/ProfileFields.php
@@ -14,11 +14,82 @@
  */
 class ProfileFields extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("profile_fields");
+    $this->createTable("profile_fields", array(
+  'profile_fields' => array(
+    'fields' => array(
+      'fid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+      ),
+      'title' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '255',
+      ),
+      'name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '128',
+        'default' => '',
+      ),
+      'explanation' => array(
+        'type' => 'text',
+        'not null' => FALSE,
+      ),
+      'category' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '255',
+      ),
+      'page' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '255',
+      ),
+      'type' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '128',
+      ),
+      'weight' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'required' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'register' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'visibility' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'autocomplete' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'options' => array(
+        'type' => 'text',
+        'not null' => FALSE,
+      ),
+    ),
+  ),
+));
     $this->database->insert("profile_fields")->fields(array(
   'fid',
   'title',
@@ -35,115 +106,103 @@ public function load() {
   'options',
 ))
     ->values(array(
-  'pid',
-  'rid',
-  'perm',
-  'tid',
-  array(
-    'fid' => '8',
-    'title' => 'Favorite color',
-    'name' => 'profile_color',
-    'explanation' => 'List your favorite color',
-    'category' => 'Personal information',
-    'page' => 'Peole whose favorite color is %value',
-    'type' => 'textfield',
-    'weight' => '-10',
-    'required' => '0',
-    'register' => '1',
-    'visibility' => '2',
-    'autocomplete' => '1',
-    'options' => '',
-  ),
-  array(
-    'fid' => '9',
-    'title' => 'Biography',
-    'name' => 'profile_biography',
-    'explanation' => 'Tell people a little bit about yourself',
-    'category' => 'Personal information',
-    'page' => '',
-    'type' => 'textarea',
-    'weight' => '-8',
-    'required' => '0',
-    'register' => '0',
-    'visibility' => '2',
-    'autocomplete' => '0',
-    'options' => '',
-  ),
-  array(
-    'fid' => '10',
-    'title' => 'Sell your email address?',
-    'name' => 'profile_sell_address',
-    'explanation' => "If you check this box, we'll sell your address to spammers to help line the pockets of our shareholders. Thanks!",
-    'category' => 'Communication preferences',
-    'page' => 'People who want us to sell their address',
-    'type' => 'checkbox',
-    'weight' => '-10',
-    'required' => '0',
-    'register' => '1',
-    'visibility' => '1',
-    'autocomplete' => '0',
-    'options' => '',
-  ),
-  array(
-    'fid' => '11',
-    'title' => 'Sales Category',
-    'name' => 'profile_sold_to',
-    'explanation' => "Select the sales categories to which this user's address was sold.",
-    'category' => 'Administrative data',
-    'page' => 'People whose address was sold to %value',
-    'type' => 'selection',
-    'weight' => '-10',
-    'required' => '0',
-    'register' => '0',
-    'visibility' => '4',
-    'autocomplete' => '0',
-    'options' => "Pill spammers\r\nFitness spammers\r\nBack\\slash\r\nForward/slash\r\nDot.in.the.middle",
-  ),
-  array(
-    'fid' => '12',
-    'title' => 'Favorite bands',
-    'name' => 'profile_bands',
-    'explanation' => "Enter your favorite bands. When you've saved your profile, you'll be able to find other people with the same favorites.",
-    'category' => 'Personal information',
-    'page' => '',
-    'type' => 'list',
-    'weight' => '-6',
-    'required' => '0',
-    'register' => '1',
-    'visibility' => '3',
-    'autocomplete' => '1',
-    'options' => '',
-  ),
-  array(
-    'fid' => '14',
-    'title' => 'Birthdate',
-    'name' => 'profile_birthdate',
-    'explanation' => "Enter your birth date and we'll send you a coupon.",
-    'category' => 'Personal information',
-    'page' => '',
-    'type' => 'date',
-    'weight' => '4',
-    'required' => '0',
-    'register' => '0',
-    'visibility' => '2',
-    'autocomplete' => '0',
-    'options' => '',
-  ),
-  array(
-    'fid' => '15',
-    'title' => 'I love migrations',
-    'name' => 'profile_love_migrations',
-    'explanation' => 'If you check this box, you love migrations.',
-    'category' => 'Personal information',
-    'page' => 'People who love migrations',
-    'type' => 'checkbox',
-    'weight' => '-15',
-    'required' => '0',
-    'register' => '0',
-    'visibility' => '2',
-    'autocomplete' => '0',
-    'options' => '',
-  ),
+  'fid' => '8',
+  'title' => 'Favorite color',
+  'name' => 'profile_color',
+  'explanation' => 'List your favorite color',
+  'category' => 'Personal information',
+  'page' => 'Peole whose favorite color is %value',
+  'type' => 'textfield',
+  'weight' => '-10',
+  'required' => '0',
+  'register' => '1',
+  'visibility' => '2',
+  'autocomplete' => '1',
+  'options' => '',
+))->values(array(
+  'fid' => '9',
+  'title' => 'Biography',
+  'name' => 'profile_biography',
+  'explanation' => 'Tell people a little bit about yourself',
+  'category' => 'Personal information',
+  'page' => '',
+  'type' => 'textarea',
+  'weight' => '-8',
+  'required' => '0',
+  'register' => '0',
+  'visibility' => '2',
+  'autocomplete' => '0',
+  'options' => '',
+))->values(array(
+  'fid' => '10',
+  'title' => 'Sell your email address?',
+  'name' => 'profile_sell_address',
+  'explanation' => "If you check this box, we'll sell your address to spammers to help line the pockets of our shareholders. Thanks!",
+  'category' => 'Communication preferences',
+  'page' => 'People who want us to sell their address',
+  'type' => 'checkbox',
+  'weight' => '-10',
+  'required' => '0',
+  'register' => '1',
+  'visibility' => '1',
+  'autocomplete' => '0',
+  'options' => '',
+))->values(array(
+  'fid' => '11',
+  'title' => 'Sales Category',
+  'name' => 'profile_sold_to',
+  'explanation' => "Select the sales categories to which this user's address was sold.",
+  'category' => 'Administrative data',
+  'page' => 'People whose address was sold to %value',
+  'type' => 'selection',
+  'weight' => '-10',
+  'required' => '0',
+  'register' => '0',
+  'visibility' => '4',
+  'autocomplete' => '0',
+  'options' => "Pill spammers\r\nFitness spammers\r\nBack\\slash\r\nForward/slash\r\nDot.in.the.middle",
+))->values(array(
+  'fid' => '12',
+  'title' => 'Favorite bands',
+  'name' => 'profile_bands',
+  'explanation' => "Enter your favorite bands. When you've saved your profile, you'll be able to find other people with the same favorites.",
+  'category' => 'Personal information',
+  'page' => '',
+  'type' => 'list',
+  'weight' => '-6',
+  'required' => '0',
+  'register' => '1',
+  'visibility' => '3',
+  'autocomplete' => '1',
+  'options' => '',
+))->values(array(
+  'fid' => '14',
+  'title' => 'Birthdate',
+  'name' => 'profile_birthdate',
+  'explanation' => "Enter your birth date and we'll send you a coupon.",
+  'category' => 'Personal information',
+  'page' => '',
+  'type' => 'date',
+  'weight' => '4',
+  'required' => '0',
+  'register' => '0',
+  'visibility' => '2',
+  'autocomplete' => '0',
+  'options' => '',
+))->values(array(
+  'fid' => '15',
+  'title' => 'I love migrations',
+  'name' => 'profile_love_migrations',
+  'explanation' => 'If you check this box, you love migrations.',
+  'category' => 'Personal information',
+  'page' => 'People who love migrations',
+  'type' => 'checkbox',
+  'weight' => '-15',
+  'required' => '0',
+  'register' => '0',
+  'visibility' => '2',
+  'autocomplete' => '0',
+  'options' => '',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/ProfileValues.php b/core/modules/migrate_drupal/src/Tests/Table/ProfileValues.php
index 471b626..1294c8a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/ProfileValues.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/ProfileValues.php
@@ -14,205 +14,174 @@
  */
 class ProfileValues extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("profile_values");
+    $this->createTable("profile_values", array(
+  'profile_values' => array(
+    'fields' => array(
+      'fid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'uid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'value' => array(
+        'type' => 'text',
+        'not null' => FALSE,
+      ),
+    ),
+  ),
+));
     $this->database->insert("profile_values")->fields(array(
   'fid',
   'uid',
   'value',
 ))
     ->values(array(
-  'fid',
-  'title',
-  'name',
-  'explanation',
-  'category',
-  'page',
-  'type',
-  'weight',
-  'required',
-  'register',
-  'visibility',
-  'autocomplete',
-  'options',
-  array(
-    'fid' => '8',
-    'uid' => '2',
-    'value' => 'red',
-  ),
-  array(
-    'fid' => '9',
-    'uid' => '2',
-    'value' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nulla sapien, congue nec risus ut, adipiscing aliquet felis. Maecenas quis justo vel nulla varius euismod. Quisque metus metus, cursus sit amet sem non, bibendum vehicula elit. Cras dui nisl, eleifend at iaculis vitae, lacinia ut felis. Nullam aliquam ligula volutpat nulla consectetur accumsan. Maecenas tincidunt molestie diam, a accumsan enim fringilla sit amet. Morbi a tincidunt tellus. Donec imperdiet scelerisque porta. Sed quis sem bibendum eros congue sodales. Vivamus vel fermentum est, at rutrum orci. Nunc consectetur purus ut dolor pulvinar, ut volutpat felis congue. Cras tincidunt odio sed neque sollicitudin, vehicula tempor metus scelerisque.',
-  ),
-  array(
-    'fid' => '10',
-    'uid' => '2',
-    'value' => '1',
-  ),
-  array(
-    'fid' => '11',
-    'uid' => '2',
-    'value' => 'Back\slash',
-  ),
-  array(
-    'fid' => '12',
-    'uid' => '2',
-    'value' => "AC/DC\n,,Eagles\r\nElton John,Lemonheads\r\n\r\nRolling Stones\rQueen\nThe White Stripes",
-  ),
-  array(
-    'fid' => '13',
-    'uid' => '2',
-    'value' => 'http://example.com/blog',
-  ),
-  array(
-    'fid' => '14',
-    'uid' => '2',
-    'value' => 'a:3:{s:5:"month";s:1:"6";s:3:"day";s:1:"2";s:4:"year";s:4:"1974";}',
-  ),
-  array(
-    'fid' => '8',
-    'uid' => '8',
-    'value' => 'brown',
-  ),
-  array(
-    'fid' => '9',
-    'uid' => '8',
-    'value' => 'Nunc condimentum ligula felis, eget lacinia purus accumsan at. Pellentesque eu lobortis felis. Duis at accumsan nisl, vel pulvinar risus. Nullam venenatis, tellus non eleifend hendrerit, augue nulla rhoncus leo, eget convallis enim sem ut velit. Mauris tincidunt enim ut eros volutpat dapibus. Curabitur augue libero, imperdiet eget orci sed, malesuada dapibus tellus. Nam lacus sapien, convallis vitae quam vel, bibendum commodo odio.',
-  ),
-  array(
-    'fid' => '10',
-    'uid' => '8',
-    'value' => '0',
-  ),
-  array(
-    'fid' => '11',
-    'uid' => '8',
-    'value' => 'Forward/slash',
-  ),
-  array(
-    'fid' => '12',
-    'uid' => '8',
-    'value' => "Deep Purple\nWho\nThe Beatles",
-  ),
-  array(
-    'fid' => '13',
-    'uid' => '8',
-    'value' => 'http://blog.example.com',
-  ),
-  array(
-    'fid' => '14',
-    'uid' => '8',
-    'value' => 'a:3:{s:5:"month";s:1:"9";s:3:"day";s:1:"9";s:4:"year";s:4:"1980";}',
-  ),
-  array(
-    'fid' => '8',
-    'uid' => '15',
-    'value' => 'orange',
-  ),
-  array(
-    'fid' => '9',
-    'uid' => '15',
-    'value' => 'Donec a diam volutpat augue fringilla fringilla. Mauris ultricies turpis ut lacus tempus, vitae pharetra lacus mattis. Nulla semper dui euismod sem bibendum, in eleifend nisi malesuada. Vivamus orci mauris, volutpat vitae enim ac, aliquam tempus lectus.',
-  ),
-  array(
-    'fid' => '10',
-    'uid' => '15',
-    'value' => '1',
-  ),
-  array(
-    'fid' => '11',
-    'uid' => '15',
-    'value' => 'Dot.in.the.middle',
-  ),
-  array(
-    'fid' => '12',
-    'uid' => '15',
-    'value' => "ABBA\nBoney M",
-  ),
-  array(
-    'fid' => '13',
-    'uid' => '15',
-    'value' => 'http://example.com/journal',
-  ),
-  array(
-    'fid' => '14',
-    'uid' => '15',
-    'value' => 'a:3:{s:5:"month";s:2:"11";s:3:"day";s:2:"25";s:4:"year";s:4:"1982";}',
-  ),
-  array(
-    'fid' => '8',
-    'uid' => '16',
-    'value' => 'blue',
-  ),
-  array(
-    'fid' => '9',
-    'uid' => '16',
-    'value' => 'Pellentesque sit amet sem et purus pretium consectetuer.',
-  ),
-  array(
-    'fid' => '10',
-    'uid' => '16',
-    'value' => '0',
-  ),
-  array(
-    'fid' => '11',
-    'uid' => '16',
-    'value' => 'Faithful servant',
-  ),
-  array(
-    'fid' => '12',
-    'uid' => '16',
-    'value' => "Van Halen\nDave M",
-  ),
-  array(
-    'fid' => '13',
-    'uid' => '16',
-    'value' => 'http://example.com/monkeys',
-  ),
-  array(
-    'fid' => '14',
-    'uid' => '16',
-    'value' => 'a:3:{s:5:"month";s:1:"9";s:3:"day";s:2:"23";s:4:"year";s:4:"1939";}',
-  ),
-  array(
-    'fid' => '8',
-    'uid' => '17',
-    'value' => 'yellow',
-  ),
-  array(
-    'fid' => '9',
-    'uid' => '17',
-    'value' => 'The quick brown fox jumped over the lazy dog.',
-  ),
-  array(
-    'fid' => '10',
-    'uid' => '17',
-    'value' => '0',
-  ),
-  array(
-    'fid' => '11',
-    'uid' => '17',
-    'value' => 'Anonymous donor',
-  ),
-  array(
-    'fid' => '12',
-    'uid' => '17',
-    'value' => "Toto\nJohn Denver",
-  ),
-  array(
-    'fid' => '13',
-    'uid' => '17',
-    'value' => 'http://example.com/penguins',
-  ),
-  array(
-    'fid' => '14',
-    'uid' => '17',
-    'value' => 'a:3:{s:5:"month";s:2:"12";s:3:"day";s:2:"18";s:4:"year";s:4:"1942";}',
-  ),
+  'fid' => '8',
+  'uid' => '2',
+  'value' => 'red',
+))->values(array(
+  'fid' => '9',
+  'uid' => '2',
+  'value' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nulla sapien, congue nec risus ut, adipiscing aliquet felis. Maecenas quis justo vel nulla varius euismod. Quisque metus metus, cursus sit amet sem non, bibendum vehicula elit. Cras dui nisl, eleifend at iaculis vitae, lacinia ut felis. Nullam aliquam ligula volutpat nulla consectetur accumsan. Maecenas tincidunt molestie diam, a accumsan enim fringilla sit amet. Morbi a tincidunt tellus. Donec imperdiet scelerisque porta. Sed quis sem bibendum eros congue sodales. Vivamus vel fermentum est, at rutrum orci. Nunc consectetur purus ut dolor pulvinar, ut volutpat felis congue. Cras tincidunt odio sed neque sollicitudin, vehicula tempor metus scelerisque.',
+))->values(array(
+  'fid' => '10',
+  'uid' => '2',
+  'value' => '1',
+))->values(array(
+  'fid' => '11',
+  'uid' => '2',
+  'value' => 'Back\slash',
+))->values(array(
+  'fid' => '12',
+  'uid' => '2',
+  'value' => "AC/DC\n,,Eagles\r\nElton John,Lemonheads\r\n\r\nRolling Stones\rQueen\nThe White Stripes",
+))->values(array(
+  'fid' => '13',
+  'uid' => '2',
+  'value' => 'http://example.com/blog',
+))->values(array(
+  'fid' => '14',
+  'uid' => '2',
+  'value' => 'a:3:{s:5:"month";s:1:"6";s:3:"day";s:1:"2";s:4:"year";s:4:"1974";}',
+))->values(array(
+  'fid' => '8',
+  'uid' => '8',
+  'value' => 'brown',
+))->values(array(
+  'fid' => '9',
+  'uid' => '8',
+  'value' => 'Nunc condimentum ligula felis, eget lacinia purus accumsan at. Pellentesque eu lobortis felis. Duis at accumsan nisl, vel pulvinar risus. Nullam venenatis, tellus non eleifend hendrerit, augue nulla rhoncus leo, eget convallis enim sem ut velit. Mauris tincidunt enim ut eros volutpat dapibus. Curabitur augue libero, imperdiet eget orci sed, malesuada dapibus tellus. Nam lacus sapien, convallis vitae quam vel, bibendum commodo odio.',
+))->values(array(
+  'fid' => '10',
+  'uid' => '8',
+  'value' => '0',
+))->values(array(
+  'fid' => '11',
+  'uid' => '8',
+  'value' => 'Forward/slash',
+))->values(array(
+  'fid' => '12',
+  'uid' => '8',
+  'value' => "Deep Purple\nWho\nThe Beatles",
+))->values(array(
+  'fid' => '13',
+  'uid' => '8',
+  'value' => 'http://blog.example.com',
+))->values(array(
+  'fid' => '14',
+  'uid' => '8',
+  'value' => 'a:3:{s:5:"month";s:1:"9";s:3:"day";s:1:"9";s:4:"year";s:4:"1980";}',
+))->values(array(
+  'fid' => '8',
+  'uid' => '15',
+  'value' => 'orange',
+))->values(array(
+  'fid' => '9',
+  'uid' => '15',
+  'value' => 'Donec a diam volutpat augue fringilla fringilla. Mauris ultricies turpis ut lacus tempus, vitae pharetra lacus mattis. Nulla semper dui euismod sem bibendum, in eleifend nisi malesuada. Vivamus orci mauris, volutpat vitae enim ac, aliquam tempus lectus.',
+))->values(array(
+  'fid' => '10',
+  'uid' => '15',
+  'value' => '1',
+))->values(array(
+  'fid' => '11',
+  'uid' => '15',
+  'value' => 'Dot.in.the.middle',
+))->values(array(
+  'fid' => '12',
+  'uid' => '15',
+  'value' => "ABBA\nBoney M",
+))->values(array(
+  'fid' => '13',
+  'uid' => '15',
+  'value' => 'http://example.com/journal',
+))->values(array(
+  'fid' => '14',
+  'uid' => '15',
+  'value' => 'a:3:{s:5:"month";s:2:"11";s:3:"day";s:2:"25";s:4:"year";s:4:"1982";}',
+))->values(array(
+  'fid' => '8',
+  'uid' => '16',
+  'value' => 'blue',
+))->values(array(
+  'fid' => '9',
+  'uid' => '16',
+  'value' => 'Pellentesque sit amet sem et purus pretium consectetuer.',
+))->values(array(
+  'fid' => '10',
+  'uid' => '16',
+  'value' => '0',
+))->values(array(
+  'fid' => '11',
+  'uid' => '16',
+  'value' => 'Faithful servant',
+))->values(array(
+  'fid' => '12',
+  'uid' => '16',
+  'value' => "Van Halen\nDave M",
+))->values(array(
+  'fid' => '13',
+  'uid' => '16',
+  'value' => 'http://example.com/monkeys',
+))->values(array(
+  'fid' => '14',
+  'uid' => '16',
+  'value' => 'a:3:{s:5:"month";s:1:"9";s:3:"day";s:2:"23";s:4:"year";s:4:"1939";}',
+))->values(array(
+  'fid' => '8',
+  'uid' => '17',
+  'value' => 'yellow',
+))->values(array(
+  'fid' => '9',
+  'uid' => '17',
+  'value' => 'The quick brown fox jumped over the lazy dog.',
+))->values(array(
+  'fid' => '10',
+  'uid' => '17',
+  'value' => '0',
+))->values(array(
+  'fid' => '11',
+  'uid' => '17',
+  'value' => 'Anonymous donor',
+))->values(array(
+  'fid' => '12',
+  'uid' => '17',
+  'value' => "Toto\nJohn Denver",
+))->values(array(
+  'fid' => '13',
+  'uid' => '17',
+  'value' => 'http://example.com/penguins',
+))->values(array(
+  'fid' => '14',
+  'uid' => '17',
+  'value' => 'a:3:{s:5:"month";s:2:"12";s:3:"day";s:2:"18";s:4:"year";s:4:"1942";}',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Role.php b/core/modules/migrate_drupal/src/Tests/Table/Role.php
index b07cad6..dc1b439 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Role.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Role.php
@@ -14,39 +14,43 @@
  */
 class Role extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("role");
+    $this->createTable("role", array(
+  'role' => array(
+    'fields' => array(
+      'rid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '64',
+        'default' => '',
+      ),
+    ),
+  ),
+));
     $this->database->insert("role")->fields(array(
   'rid',
   'name',
 ))
     ->values(array(
-  'fid',
-  'uid',
-  'value',
-  array(
-    'rid' => '1',
-    'name' => 'anonymous user',
-  ),
-  array(
-    'rid' => '2',
-    'name' => 'authenticated user',
-  ),
-  array(
-    'rid' => '3',
-    'name' => 'migrate test role 1',
-  ),
-  array(
-    'rid' => '4',
-    'name' => 'migrate test role 2',
-  ),
-  array(
-    'rid' => '5',
-    'name' => 'migrate test role 3 that is longer than thirty two characters',
-  ),
+  'rid' => '1',
+  'name' => 'anonymous user',
+))->values(array(
+  'rid' => '2',
+  'name' => 'authenticated user',
+))->values(array(
+  'rid' => '3',
+  'name' => 'migrate test role 1',
+))->values(array(
+  'rid' => '4',
+  'name' => 'migrate test role 2',
+))->values(array(
+  'rid' => '5',
+  'name' => 'migrate test role 3 that is longer than thirty two characters',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/System.php b/core/modules/migrate_drupal/src/Tests/Table/System.php
index a465212..0fbb96e 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/System.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/System.php
@@ -14,11 +14,71 @@
  */
 class System extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("system");
+    $this->createTable("system", array(
+  'system' => array(
+    'fields' => array(
+      'filename' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'type' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'owner' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'status' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'throttle' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'bootstrap' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'schema_version' => array(
+        'type' => 'smallint',
+        'not null' => TRUE,
+        'length' => '6',
+        'default' => '-1',
+      ),
+      'weight' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'info' => array(
+        'type' => 'text',
+        'not null' => FALSE,
+      ),
+    ),
+  ),
+));
     $this->database->insert("system")->fields(array(
   'filename',
   'name',
@@ -32,104 +92,93 @@ public function load() {
   'info',
 ))
     ->values(array(
-  'rid',
-  'name',
-  array(
-    'filename' => 'modules/aggregator',
-    'name' => 'aggregator',
-    'type' => 'module',
-    'owner' => '',
-    'status' => '1',
-    'throttle' => '0',
-    'bootstrap' => '0',
-    'schema_version' => '6001',
-    'weight' => '0',
-    'info' => NULL,
-  ),
-  array(
-    'filename' => 'modules/comment',
-    'name' => 'comment',
-    'type' => 'module',
-    'owner' => '',
-    'status' => '1',
-    'throttle' => '0',
-    'bootstrap' => '0',
-    'schema_version' => '6001',
-    'weight' => '0',
-    'info' => NULL,
-  ),
-  array(
-    'filename' => 'modules/contact',
-    'name' => 'contact',
-    'type' => 'module',
-    'owner' => '',
-    'status' => '1',
-    'throttle' => '0',
-    'bootstrap' => '0',
-    'schema_version' => '6001',
-    'weight' => '0',
-    'info' => NULL,
-  ),
-  array(
-    'filename' => 'modules/content',
-    'name' => 'content',
-    'type' => 'module',
-    'owner' => '',
-    'status' => '1',
-    'throttle' => '0',
-    'bootstrap' => '0',
-    'schema_version' => '6001',
-    'weight' => '0',
-    'info' => NULL,
-  ),
-  array(
-    'filename' => 'modules/menu',
-    'name' => 'menu',
-    'type' => 'module',
-    'owner' => '',
-    'status' => '1',
-    'throttle' => '0',
-    'bootstrap' => '0',
-    'schema_version' => '6000',
-    'weight' => '0',
-    'info' => NULL,
-  ),
-  array(
-    'filename' => 'modules/profile',
-    'name' => 'profile',
-    'type' => 'module',
-    'owner' => '',
-    'status' => '1',
-    'throttle' => '0',
-    'bootstrap' => '0',
-    'schema_version' => '6001',
-    'weight' => '0',
-    'info' => NULL,
-  ),
-  array(
-    'filename' => 'modules/taxonomy',
-    'name' => 'taxonomy',
-    'type' => 'module',
-    'owner' => '',
-    'status' => '1',
-    'throttle' => '0',
-    'bootstrap' => '0',
-    'schema_version' => '6001',
-    'weight' => '0',
-    'info' => NULL,
-  ),
-  array(
-    'filename' => 'modules/upload',
-    'name' => 'upload',
-    'type' => 'module',
-    'owner' => '',
-    'status' => '1',
-    'throttle' => '0',
-    'bootstrap' => '0',
-    'schema_version' => '6000',
-    'weight' => '0',
-    'info' => NULL,
-  ),
+  'filename' => 'modules/aggregator',
+  'name' => 'aggregator',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6001',
+  'weight' => '0',
+  'info' => NULL,
+))->values(array(
+  'filename' => 'modules/comment',
+  'name' => 'comment',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6001',
+  'weight' => '0',
+  'info' => NULL,
+))->values(array(
+  'filename' => 'modules/contact',
+  'name' => 'contact',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6001',
+  'weight' => '0',
+  'info' => NULL,
+))->values(array(
+  'filename' => 'modules/content',
+  'name' => 'content',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6001',
+  'weight' => '0',
+  'info' => NULL,
+))->values(array(
+  'filename' => 'modules/menu',
+  'name' => 'menu',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6000',
+  'weight' => '0',
+  'info' => NULL,
+))->values(array(
+  'filename' => 'modules/profile',
+  'name' => 'profile',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6001',
+  'weight' => '0',
+  'info' => NULL,
+))->values(array(
+  'filename' => 'modules/taxonomy',
+  'name' => 'taxonomy',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6001',
+  'weight' => '0',
+  'info' => NULL,
+))->values(array(
+  'filename' => 'modules/upload',
+  'name' => 'upload',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6000',
+  'weight' => '0',
+  'info' => NULL,
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermData.php b/core/modules/migrate_drupal/src/Tests/Table/TermData.php
index a8a5bb1..54c8e53 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/TermData.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/TermData.php
@@ -14,11 +14,40 @@
  */
 class TermData extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("term_data");
+    $this->createTable("term_data", array(
+  'term_data' => array(
+    'fields' => array(
+      'tid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'description' => array(
+        'type' => 'longtext',
+        'not null' => FALSE,
+      ),
+      'weight' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("term_data")->fields(array(
   'tid',
   'vid',
@@ -27,58 +56,41 @@ public function load() {
   'weight',
 ))
     ->values(array(
-  'filename',
-  'name',
-  'type',
-  'owner',
-  'status',
-  'throttle',
-  'bootstrap',
-  'schema_version',
-  'weight',
-  'info',
-  array(
-    'tid' => '1',
-    'vid' => '1',
-    'name' => 'term 1 of vocabulary 1',
-    'description' => 'description of term 1 of vocabulary 1',
-    'weight' => '0',
-  ),
-  array(
-    'tid' => '2',
-    'vid' => '2',
-    'name' => 'term 2 of vocabulary 2',
-    'description' => 'description of term 2 of vocabulary 2',
-    'weight' => '3',
-  ),
-  array(
-    'tid' => '3',
-    'vid' => '2',
-    'name' => 'term 3 of vocabulary 2',
-    'description' => 'description of term 3 of vocabulary 2',
-    'weight' => '4',
-  ),
-  array(
-    'tid' => '4',
-    'vid' => '3',
-    'name' => 'term 4 of vocabulary 3',
-    'description' => 'description of term 4 of vocabulary 3',
-    'weight' => '6',
-  ),
-  array(
-    'tid' => '5',
-    'vid' => '3',
-    'name' => 'term 5 of vocabulary 3',
-    'description' => 'description of term 5 of vocabulary 3',
-    'weight' => '7',
-  ),
-  array(
-    'tid' => '6',
-    'vid' => '3',
-    'name' => 'term 6 of vocabulary 3',
-    'description' => 'description of term 6 of vocabulary 3',
-    'weight' => '8',
-  ),
+  'tid' => '1',
+  'vid' => '1',
+  'name' => 'term 1 of vocabulary 1',
+  'description' => 'description of term 1 of vocabulary 1',
+  'weight' => '0',
+))->values(array(
+  'tid' => '2',
+  'vid' => '2',
+  'name' => 'term 2 of vocabulary 2',
+  'description' => 'description of term 2 of vocabulary 2',
+  'weight' => '3',
+))->values(array(
+  'tid' => '3',
+  'vid' => '2',
+  'name' => 'term 3 of vocabulary 2',
+  'description' => 'description of term 3 of vocabulary 2',
+  'weight' => '4',
+))->values(array(
+  'tid' => '4',
+  'vid' => '3',
+  'name' => 'term 4 of vocabulary 3',
+  'description' => 'description of term 4 of vocabulary 3',
+  'weight' => '6',
+))->values(array(
+  'tid' => '5',
+  'vid' => '3',
+  'name' => 'term 5 of vocabulary 3',
+  'description' => 'description of term 5 of vocabulary 3',
+  'weight' => '7',
+))->values(array(
+  'tid' => '6',
+  'vid' => '3',
+  'name' => 'term 6 of vocabulary 3',
+  'description' => 'description of term 6 of vocabulary 3',
+  'weight' => '8',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermHierarchy.php b/core/modules/migrate_drupal/src/Tests/Table/TermHierarchy.php
index 42fd039..8b59690 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/TermHierarchy.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/TermHierarchy.php
@@ -14,49 +14,50 @@
  */
 class TermHierarchy extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("term_hierarchy");
+    $this->createTable("term_hierarchy", array(
+  'term_hierarchy' => array(
+    'fields' => array(
+      'tid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'parent' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("term_hierarchy")->fields(array(
   'tid',
   'parent',
 ))
     ->values(array(
-  'tid',
-  'vid',
-  'name',
-  'description',
-  'weight',
-  array(
-    'tid' => '2',
-    'parent' => '0',
-  ),
-  array(
-    'tid' => '4',
-    'parent' => '0',
-  ),
-  array(
-    'tid' => '1',
-    'parent' => '2',
-  ),
-  array(
-    'tid' => '3',
-    'parent' => '2',
-  ),
-  array(
-    'tid' => '5',
-    'parent' => '4',
-  ),
-  array(
-    'tid' => '6',
-    'parent' => '4',
-  ),
-  array(
-    'tid' => '6',
-    'parent' => '5',
-  ),
+  'tid' => '2',
+  'parent' => '0',
+))->values(array(
+  'tid' => '4',
+  'parent' => '0',
+))->values(array(
+  'tid' => '1',
+  'parent' => '2',
+))->values(array(
+  'tid' => '3',
+  'parent' => '2',
+))->values(array(
+  'tid' => '5',
+  'parent' => '4',
+))->values(array(
+  'tid' => '6',
+  'parent' => '4',
+))->values(array(
+  'tid' => '6',
+  'parent' => '5',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/TermNode.php b/core/modules/migrate_drupal/src/Tests/Table/TermNode.php
index 9e77038..7c35025 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/TermNode.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/TermNode.php
@@ -14,44 +14,56 @@
  */
 class TermNode extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("term_node");
+    $this->createTable("term_node", array(
+  'term_node' => array(
+    'fields' => array(
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'tid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("term_node")->fields(array(
   'nid',
   'vid',
   'tid',
 ))
     ->values(array(
-  'tid',
-  'parent',
-  array(
-    'nid' => '1',
-    'vid' => '1',
-    'tid' => '1',
-  ),
-  array(
-    'nid' => '1',
-    'vid' => '2',
-    'tid' => '4',
-  ),
-  array(
-    'nid' => '1',
-    'vid' => '2',
-    'tid' => '5',
-  ),
-  array(
-    'nid' => '2',
-    'vid' => '3',
-    'tid' => '2',
-  ),
-  array(
-    'nid' => '2',
-    'vid' => '3',
-    'tid' => '3',
-  ),
+  'nid' => '1',
+  'vid' => '1',
+  'tid' => '1',
+))->values(array(
+  'nid' => '1',
+  'vid' => '2',
+  'tid' => '4',
+))->values(array(
+  'nid' => '1',
+  'vid' => '2',
+  'tid' => '5',
+))->values(array(
+  'nid' => '2',
+  'vid' => '3',
+  'tid' => '2',
+))->values(array(
+  'nid' => '2',
+  'vid' => '3',
+  'tid' => '3',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Upload.php b/core/modules/migrate_drupal/src/Tests/Table/Upload.php
index cbbe448..0f3779a 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Upload.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Upload.php
@@ -14,11 +14,49 @@
  */
 class Upload extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("upload");
+    $this->createTable("upload", array(
+  'upload' => array(
+    'fields' => array(
+      'fid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'description' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'list' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '3',
+        'default' => '0',
+      ),
+      'weight' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("upload")->fields(array(
   'fid',
   'nid',
@@ -28,49 +66,40 @@ public function load() {
   'weight',
 ))
     ->values(array(
-  'nid',
-  'vid',
-  'tid',
-  array(
-    'fid' => '1',
-    'nid' => '1',
-    'vid' => '1',
-    'description' => 'file 1-1-1',
-    'list' => '0',
-    'weight' => '5',
-  ),
-  array(
-    'fid' => '2',
-    'nid' => '1',
-    'vid' => '2',
-    'description' => 'file 1-2-2',
-    'list' => '1',
-    'weight' => '4',
-  ),
-  array(
-    'fid' => '3',
-    'nid' => '1',
-    'vid' => '2',
-    'description' => 'file 1-2-3',
-    'list' => '0',
-    'weight' => '3',
-  ),
-  array(
-    'fid' => '2',
-    'nid' => '2',
-    'vid' => '3',
-    'description' => 'file 2-3-2',
-    'list' => '1',
-    'weight' => '2',
-  ),
-  array(
-    'fid' => '3',
-    'nid' => '2',
-    'vid' => '3',
-    'description' => 'file 2-3-3',
-    'list' => '0',
-    'weight' => '1',
-  ),
+  'fid' => '1',
+  'nid' => '1',
+  'vid' => '1',
+  'description' => 'file 1-1-1',
+  'list' => '0',
+  'weight' => '5',
+))->values(array(
+  'fid' => '2',
+  'nid' => '1',
+  'vid' => '2',
+  'description' => 'file 1-2-2',
+  'list' => '1',
+  'weight' => '4',
+))->values(array(
+  'fid' => '3',
+  'nid' => '1',
+  'vid' => '2',
+  'description' => 'file 1-2-3',
+  'list' => '0',
+  'weight' => '3',
+))->values(array(
+  'fid' => '2',
+  'nid' => '2',
+  'vid' => '3',
+  'description' => 'file 2-3-2',
+  'list' => '1',
+  'weight' => '2',
+))->values(array(
+  'fid' => '3',
+  'nid' => '2',
+  'vid' => '3',
+  'description' => 'file 2-3-3',
+  'list' => '0',
+  'weight' => '1',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/UrlAlias.php b/core/modules/migrate_drupal/src/Tests/Table/UrlAlias.php
index 2410a1a..8e7226f 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/UrlAlias.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/UrlAlias.php
@@ -14,11 +14,36 @@
  */
 class UrlAlias extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("url_alias");
+    $this->createTable("url_alias", array(
+  'url_alias' => array(
+    'fields' => array(
+      'pid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'src' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '128',
+        'default' => '',
+      ),
+      'dst' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '128',
+        'default' => '',
+      ),
+      'language' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '12',
+        'default' => '',
+      ),
+    ),
+  ),
+));
     $this->database->insert("url_alias")->fields(array(
   'pid',
   'src',
@@ -26,24 +51,15 @@ public function load() {
   'language',
 ))
     ->values(array(
-  'fid',
-  'nid',
-  'vid',
-  'description',
-  'list',
-  'weight',
-  array(
-    'pid' => '1',
-    'src' => 'node/1',
-    'dst' => 'alias-one',
-    'language' => 'en',
-  ),
-  array(
-    'pid' => '2',
-    'src' => 'node/2',
-    'dst' => 'alias-two',
-    'language' => 'en',
-  ),
+  'pid' => '1',
+  'src' => 'node/1',
+  'dst' => 'alias-one',
+  'language' => 'en',
+))->values(array(
+  'pid' => '2',
+  'src' => 'node/2',
+  'dst' => 'alias-two',
+  'language' => 'en',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Users.php b/core/modules/migrate_drupal/src/Tests/Table/Users.php
index 259d2f2..c34dcd0 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Users.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Users.php
@@ -14,11 +14,146 @@
  */
 class Users extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("users");
+    $this->createTable("users", array(
+  'users' => array(
+    'fields' => array(
+      'uid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '60',
+        'default' => '',
+      ),
+      'pass' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '32',
+        'default' => '',
+      ),
+      'mail' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '64',
+        'default' => '',
+      ),
+      'mode' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'sort' => array(
+        'type' => 'tinyint',
+        'not null' => FALSE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'threshold' => array(
+        'type' => 'tinyint',
+        'not null' => FALSE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'theme' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'signature' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'signature_format' => array(
+        'type' => 'smallint',
+        'not null' => TRUE,
+        'length' => '6',
+        'default' => '0',
+      ),
+      'created' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'access' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'login' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'status' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+      'timezone' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '8',
+      ),
+      'language' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '12',
+        'default' => '',
+      ),
+      'picture' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'init' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '64',
+        'default' => '',
+      ),
+      'data' => array(
+        'type' => 'longtext',
+        'not null' => FALSE,
+      ),
+      'timezone_name' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '50',
+        'default' => '',
+      ),
+      'timezone_id' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '11',
+        'default' => '0',
+      ),
+      'pass_plain' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'expected_timezone' => array(
+        'type' => 'varchar',
+        'not null' => FALSE,
+        'length' => '50',
+      ),
+    ),
+  ),
+));
     $this->database->insert("users")->fields(array(
   'uid',
   'name',
@@ -45,135 +180,125 @@ public function load() {
   'expected_timezone',
 ))
     ->values(array(
-  'pid',
-  'src',
-  'dst',
-  'language',
-  array(
-    'uid' => '2',
-    'name' => 'john.doe',
-    'pass' => '671cc45b3e2c6eb751d6a554dc5a5fe7',
-    'mail' => 'john.doe@example.com',
-    'mode' => '0',
-    'sort' => '0',
-    'threshold' => '0',
-    'theme' => '',
-    'signature' => 'John Doe | john.doe@example.com',
-    'signature_format' => '1',
-    'created' => '1391150052',
-    'access' => '1391259672',
-    'login' => '1391152253',
-    'status' => '1',
-    'timezone' => '3600',
-    'language' => 'fr',
-    'picture' => 'core/modules/simpletest/files/image-test.jpg',
-    'init' => 'doe@example.com',
-    'data' => 'a:1:{s:7:"contact";i:1;}',
-    'timezone_name' => NULL,
-    'timezone_id' => '0',
-    'pass_plain' => '',
-    'expected_timezone' => NULL,
-  ),
-  array(
-    'uid' => '8',
-    'name' => 'joe.roe',
-    'pass' => '93a70546e6c032c135499fed70cfe438',
-    'mail' => 'joe.roe@example.com',
-    'mode' => '0',
-    'sort' => '0',
-    'threshold' => '0',
-    'theme' => '',
-    'signature' => 'JR',
-    'signature_format' => '2',
-    'created' => '1391150053',
-    'access' => '1391259673',
-    'login' => '1391152254',
-    'status' => '1',
-    'timezone' => '7200',
-    'language' => 'ro',
-    'picture' => 'core/modules/simpletest/files/image-test.png',
-    'init' => 'roe@example.com',
-    'data' => 'a:1:{s:7:"contact";i:0;}',
-    'timezone_name' => 'Europe/Helsinki',
-    'timezone_id' => '0',
-    'pass_plain' => '',
-    'expected_timezone' => NULL,
-  ),
-  array(
-    'uid' => '15',
-    'name' => 'joe.bloggs',
-    'pass' => '2ff23139aeb404274dc67cbee8c64fb0',
-    'mail' => 'joe.bloggs@example.com',
-    'mode' => '0',
-    'sort' => '0',
-    'threshold' => '0',
-    'theme' => '',
-    'signature' => 'bloggs',
-    'signature_format' => '1',
-    'created' => '1391150054',
-    'access' => '1391259674',
-    'login' => '1391152255',
-    'status' => '1',
-    'timezone' => '3600',
-    'language' => 'en',
-    'picture' => '',
-    'init' => 'bloggs@example.com',
-    'data' => 'a:0:{}',
-    'timezone_name' => NULL,
-    'timezone_id' => '0',
-    'pass_plain' => '',
-    'expected_timezone' => NULL,
-  ),
-  array(
-    'uid' => '16',
-    'name' => 'sal.saraniti',
-    'pass' => '77404657c8bcd8e9aa8f3147856efb4f',
-    'mail' => 'sal.saraniti@example.com',
-    'mode' => '0',
-    'sort' => '0',
-    'threshold' => '0',
-    'theme' => '',
-    'signature' => '',
-    'signature_format' => '0',
-    'created' => '1391151054',
-    'access' => '1391259574',
-    'login' => '1391162255',
-    'status' => '1',
-    'timezone' => '3600',
-    'language' => 'en',
-    'picture' => '',
-    'init' => 'sal.saraniti@example.com',
-    'data' => 'a:0:{}',
-    'timezone_name' => NULL,
-    'timezone_id' => '0',
-    'pass_plain' => '',
-    'expected_timezone' => NULL,
-  ),
-  array(
-    'uid' => '17',
-    'name' => 'terry.saraniti',
-    'pass' => '8fb310d3ec746d720e0e8efefd0cce5c',
-    'mail' => 'terry.saraniti@example.com',
-    'mode' => '0',
-    'sort' => '0',
-    'threshold' => '0',
-    'theme' => '',
-    'signature' => '',
-    'signature_format' => '0',
-    'created' => '1390151054',
-    'access' => '1390259574',
-    'login' => '1390162255',
-    'status' => '1',
-    'timezone' => '3600',
-    'language' => 'en',
-    'picture' => '',
-    'init' => 'terry.saraniti@example.com',
-    'data' => 'a:0:{}',
-    'timezone_name' => NULL,
-    'timezone_id' => '0',
-    'pass_plain' => '',
-    'expected_timezone' => NULL,
-  ),
+  'uid' => '2',
+  'name' => 'john.doe',
+  'pass' => '671cc45b3e2c6eb751d6a554dc5a5fe7',
+  'mail' => 'john.doe@example.com',
+  'mode' => '0',
+  'sort' => '0',
+  'threshold' => '0',
+  'theme' => '',
+  'signature' => 'John Doe | john.doe@example.com',
+  'signature_format' => '1',
+  'created' => '1391150052',
+  'access' => '1391259672',
+  'login' => '1391152253',
+  'status' => '1',
+  'timezone' => '3600',
+  'language' => 'fr',
+  'picture' => 'core/modules/simpletest/files/image-test.jpg',
+  'init' => 'doe@example.com',
+  'data' => 'a:1:{s:7:"contact";i:1;}',
+  'timezone_name' => NULL,
+  'timezone_id' => '0',
+  'pass_plain' => '',
+  'expected_timezone' => NULL,
+))->values(array(
+  'uid' => '8',
+  'name' => 'joe.roe',
+  'pass' => '93a70546e6c032c135499fed70cfe438',
+  'mail' => 'joe.roe@example.com',
+  'mode' => '0',
+  'sort' => '0',
+  'threshold' => '0',
+  'theme' => '',
+  'signature' => 'JR',
+  'signature_format' => '2',
+  'created' => '1391150053',
+  'access' => '1391259673',
+  'login' => '1391152254',
+  'status' => '1',
+  'timezone' => '7200',
+  'language' => 'ro',
+  'picture' => 'core/modules/simpletest/files/image-test.png',
+  'init' => 'roe@example.com',
+  'data' => 'a:1:{s:7:"contact";i:0;}',
+  'timezone_name' => 'Europe/Helsinki',
+  'timezone_id' => '0',
+  'pass_plain' => '',
+  'expected_timezone' => NULL,
+))->values(array(
+  'uid' => '15',
+  'name' => 'joe.bloggs',
+  'pass' => '2ff23139aeb404274dc67cbee8c64fb0',
+  'mail' => 'joe.bloggs@example.com',
+  'mode' => '0',
+  'sort' => '0',
+  'threshold' => '0',
+  'theme' => '',
+  'signature' => 'bloggs',
+  'signature_format' => '1',
+  'created' => '1391150054',
+  'access' => '1391259674',
+  'login' => '1391152255',
+  'status' => '1',
+  'timezone' => '3600',
+  'language' => 'en',
+  'picture' => '',
+  'init' => 'bloggs@example.com',
+  'data' => 'a:0:{}',
+  'timezone_name' => NULL,
+  'timezone_id' => '0',
+  'pass_plain' => '',
+  'expected_timezone' => NULL,
+))->values(array(
+  'uid' => '16',
+  'name' => 'sal.saraniti',
+  'pass' => '77404657c8bcd8e9aa8f3147856efb4f',
+  'mail' => 'sal.saraniti@example.com',
+  'mode' => '0',
+  'sort' => '0',
+  'threshold' => '0',
+  'theme' => '',
+  'signature' => '',
+  'signature_format' => '0',
+  'created' => '1391151054',
+  'access' => '1391259574',
+  'login' => '1391162255',
+  'status' => '1',
+  'timezone' => '3600',
+  'language' => 'en',
+  'picture' => '',
+  'init' => 'sal.saraniti@example.com',
+  'data' => 'a:0:{}',
+  'timezone_name' => NULL,
+  'timezone_id' => '0',
+  'pass_plain' => '',
+  'expected_timezone' => NULL,
+))->values(array(
+  'uid' => '17',
+  'name' => 'terry.saraniti',
+  'pass' => '8fb310d3ec746d720e0e8efefd0cce5c',
+  'mail' => 'terry.saraniti@example.com',
+  'mode' => '0',
+  'sort' => '0',
+  'threshold' => '0',
+  'theme' => '',
+  'signature' => '',
+  'signature_format' => '0',
+  'created' => '1390151054',
+  'access' => '1390259574',
+  'login' => '1390162255',
+  'status' => '1',
+  'timezone' => '3600',
+  'language' => 'en',
+  'picture' => '',
+  'init' => 'terry.saraniti@example.com',
+  'data' => 'a:0:{}',
+  'timezone_name' => NULL,
+  'timezone_id' => '0',
+  'pass_plain' => '',
+  'expected_timezone' => NULL,
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/UsersRoles.php b/core/modules/migrate_drupal/src/Tests/Table/UsersRoles.php
index e289b46..d3ca026 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/UsersRoles.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/UsersRoles.php
@@ -14,75 +14,56 @@
  */
 class UsersRoles extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("users_roles");
+    $this->createTable("users_roles", array(
+  'users_roles' => array(
+    'fields' => array(
+      'uid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'rid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("users_roles")->fields(array(
   'uid',
   'rid',
 ))
     ->values(array(
-  'uid',
-  'name',
-  'pass',
-  'mail',
-  'mode',
-  'sort',
-  'threshold',
-  'theme',
-  'signature',
-  'signature_format',
-  'created',
-  'access',
-  'login',
-  'status',
-  'timezone',
-  'language',
-  'picture',
-  'init',
-  'data',
-  'timezone_name',
-  'timezone_id',
-  'pass_plain',
-  'expected_timezone',
-  array(
-    'uid' => '2',
-    'rid' => '3',
-  ),
-  array(
-    'uid' => '15',
-    'rid' => '3',
-  ),
-  array(
-    'uid' => '16',
-    'rid' => '3',
-  ),
-  array(
-    'uid' => '8',
-    'rid' => '4',
-  ),
-  array(
-    'uid' => '15',
-    'rid' => '4',
-  ),
-  array(
-    'uid' => '17',
-    'rid' => '4',
-  ),
-  array(
-    'uid' => '8',
-    'rid' => '5',
-  ),
-  array(
-    'uid' => '15',
-    'rid' => '5',
-  ),
-  array(
-    'uid' => '16',
-    'rid' => '5',
-  ),
+  'uid' => '2',
+  'rid' => '3',
+))->values(array(
+  'uid' => '15',
+  'rid' => '3',
+))->values(array(
+  'uid' => '16',
+  'rid' => '3',
+))->values(array(
+  'uid' => '8',
+  'rid' => '4',
+))->values(array(
+  'uid' => '15',
+  'rid' => '4',
+))->values(array(
+  'uid' => '17',
+  'rid' => '4',
+))->values(array(
+  'uid' => '8',
+  'rid' => '5',
+))->values(array(
+  'uid' => '15',
+  'rid' => '5',
+))->values(array(
+  'uid' => '16',
+  'rid' => '5',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Variable.php b/core/modules/migrate_drupal/src/Tests/Table/Variable.php
index e40e483..4f03ce6 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Variable.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Variable.php
@@ -14,562 +14,435 @@
  */
 class Variable extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("variable");
+    $this->createTable("variable", array(
+  'variable' => array(
+    'fields' => array(
+      'name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '128',
+        'default' => '',
+      ),
+      'value' => array(
+        'type' => 'longblob',
+        'not null' => TRUE,
+      ),
+    ),
+  ),
+));
     $this->database->insert("variable")->fields(array(
   'name',
   'value',
 ))
     ->values(array(
-  'uid',
-  'rid',
-  array(
-    'name' => 'actions_max_stack',
-    'value' => 'i:35;',
-  ),
-  array(
-    'name' => 'admin_compact_mode',
-    'value' => 'b:0;',
-  ),
-  array(
-    'name' => 'aggregator_allowed_html_tags',
-    'value' => 's:70:"<a> <b> <br /> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>";',
-  ),
-  array(
-    'name' => 'aggregator_clear',
-    'value' => 's:7:"9676800";',
-  ),
-  array(
-    'name' => 'aggregator_fetcher',
-    'value' => 's:10:"aggregator";',
-  ),
-  array(
-    'name' => 'aggregator_parser',
-    'value' => 's:10:"aggregator";',
-  ),
-  array(
-    'name' => 'aggregator_processors',
-    'value' => 'a:1:{i:0;s:10:"aggregator";}',
-  ),
-  array(
-    'name' => 'aggregator_summary_items',
-    'value' => 's:1:"3";',
-  ),
-  array(
-    'name' => 'aggregator_teaser_length',
-    'value' => 's:3:"600";',
-  ),
-  array(
-    'name' => 'allowed_html_1',
-    'value' => 's:61:"<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>";',
-  ),
-  array(
-    'name' => 'allow_insecure_uploads',
-    'value' => 'i:1;',
-  ),
-  array(
-    'name' => 'anonymous',
-    'value' => 's:5:"Guest";',
-  ),
-  array(
-    'name' => 'book_allowed_types',
-    'value' => 'a:1:{i:0;s:4:"book";}',
-  ),
-  array(
-    'name' => 'book_block_mode',
-    'value' => 's:9:"all pages";',
-  ),
-  array(
-    'name' => 'book_child_type',
-    'value' => 's:4:"book";',
-  ),
-  array(
-    'name' => 'cache',
-    'value' => 'i:1;',
-  ),
-  array(
-    'name' => 'cache_lifetime',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'comment_anonymous_page',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'comment_anonymous_story',
-    'value' => 'i:1;',
-  ),
-  array(
-    'name' => 'comment_controls_page',
-    'value' => 's:1:"3";',
-  ),
-  array(
-    'name' => 'comment_controls_story',
-    'value' => 's:1:"3";',
-  ),
-  array(
-    'name' => 'comment_default_mode_page',
-    'value' => 's:1:"4";',
-  ),
-  array(
-    'name' => 'comment_default_mode_story',
-    'value' => 's:1:"2";',
-  ),
-  array(
-    'name' => 'comment_default_order_page',
-    'value' => 's:1:"1";',
-  ),
-  array(
-    'name' => 'comment_default_order_story',
-    'value' => 's:1:"1";',
-  ),
-  array(
-    'name' => 'comment_default_per_page_page',
-    'value' => 's:2:"50";',
-  ),
-  array(
-    'name' => 'comment_default_per_page_story',
-    'value' => 's:2:"70";',
-  ),
-  array(
-    'name' => 'comment_form_location_page',
-    'value' => 's:1:"0";',
-  ),
-  array(
-    'name' => 'comment_form_location_story',
-    'value' => 's:1:"0";',
-  ),
-  array(
-    'name' => 'comment_page',
-    'value' => 's:1:"0";',
-  ),
-  array(
-    'name' => 'comment_preview_page',
-    'value' => 's:1:"1";',
-  ),
-  array(
-    'name' => 'comment_preview_story',
-    'value' => 's:1:"0";',
-  ),
-  array(
-    'name' => 'comment_story',
-    'value' => 's:1:"2";',
-  ),
-  array(
-    'name' => 'comment_subject_field_page',
-    'value' => 's:1:"1";',
-  ),
-  array(
-    'name' => 'comment_subject_field_story',
-    'value' => 's:1:"0";',
-  ),
-  array(
-    'name' => 'contact_default_status',
-    'value' => 'i:1;',
-  ),
-  array(
-    'name' => 'contact_hourly_threshold',
-    'value' => 'i:3;',
-  ),
-  array(
-    'name' => 'cron_threshold_error',
-    'value' => 'i:1209600;',
-  ),
-  array(
-    'name' => 'cron_threshold_warning',
-    'value' => 'i:172800;',
-  ),
-  array(
-    'name' => 'date_format_long',
-    'value' => 's:24:"\L\O\N\G l, F j, Y - H:i";',
-  ),
-  array(
-    'name' => 'date_format_medium',
-    'value' => 's:27:"\M\E\D\I\U\M D, m/d/Y - H:i";',
-  ),
-  array(
-    'name' => 'date_format_short',
-    'value' => 's:22:"\S\H\O\R\T m/d/Y - H:i";',
-  ),
-  array(
-    'name' => 'dblog_row_limit',
-    'value' => 'i:1000;',
-  ),
-  array(
-    'name' => 'error_level',
-    'value' => 'i:1;',
-  ),
-  array(
-    'name' => 'feed_default_items',
-    'value' => 'i:10;',
-  ),
-  array(
-    'name' => 'feed_item_length',
-    'value' => 's:5:"title";',
-  ),
-  array(
-    'name' => 'file_description_length',
-    'value' => 'i:128;',
-  ),
-  array(
-    'name' => 'file_description_type',
-    'value' => 's:9:"textfield";',
-  ),
-  array(
-    'name' => 'file_directory_path',
-    'value' => 's:29:"core/modules/simpletest/files";',
-  ),
-  array(
-    'name' => 'file_directory_temp',
-    'value' => 's:10:"files/temp";',
-  ),
-  array(
-    'name' => 'file_icon_directory',
-    'value' => 's:25:"sites/default/files/icons";',
-  ),
-  array(
-    'name' => 'filter_allowed_protocols',
-    'value' => 'a:13:{i:0;s:4:"http";i:1;s:5:"https";i:2;s:3:"ftp";i:3;s:4:"news";i:4;s:4:"nntp";i:5;s:3:"tel";i:6;s:6:"telnet";i:7;s:6:"mailto";i:8;s:3:"irc";i:9;s:3:"ssh";i:10;s:4:"sftp";i:11;s:6:"webcal";i:12;s:4:"rtsp";}',
-  ),
-  array(
-    'name' => 'filter_html_help_1',
-    'value' => 'i:1;',
-  ),
-  array(
-    'name' => 'filter_html_nofollow_1',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'filter_url_length_1',
-    'value' => 's:2:"72";',
-  ),
-  array(
-    'name' => 'forum_block_num_0',
-    'value' => 's:1:"5";',
-  ),
-  array(
-    'name' => 'forum_block_num_1',
-    'value' => 's:1:"5";',
-  ),
-  array(
-    'name' => 'forum_hot_topic',
-    'value' => 's:2:"15";',
-  ),
-  array(
-    'name' => 'forum_nav_vocabulary',
-    'value' => 's:1:"1";',
-  ),
-  array(
-    'name' => 'forum_order',
-    'value' => 's:1:"1";',
-  ),
-  array(
-    'name' => 'forum_per_page',
-    'value' => 's:2:"25";',
-  ),
-  array(
-    'name' => 'image_jpeg_quality',
-    'value' => 'i:75;',
-  ),
-  array(
-    'name' => 'image_toolkit',
-    'value' => 's:2:"gd";',
-  ),
-  array(
-    'name' => 'locale_cache_strings',
-    'value' => 'i:1;',
-  ),
-  array(
-    'name' => 'locale_js_directory',
-    'value' => 's:9:"languages";',
-  ),
-  array(
-    'name' => 'menu_override_parent_selector',
-    'value' => 'b:0;',
-  ),
-  array(
-    'name' => 'minimum_word_size',
-    'value' => 's:1:"3";',
-  ),
-  array(
-    'name' => 'node_admin_theme',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'node_options_test_event',
-    'value' => 'a:2:{i:0;s:6:"sticky";i:1;s:8:"revision";}',
-  ),
-  array(
-    'name' => 'node_options_test_page',
-    'value' => 'a:3:{i:0;s:6:"status";i:1;s:7:"promote";i:2;s:6:"sticky";}',
-  ),
-  array(
-    'name' => 'node_options_test_planet',
-    'value' => 'a:2:{i:0;s:6:"sticky";i:1;s:8:"revision";}',
-  ),
-  array(
-    'name' => 'node_options_test_story',
-    'value' => 'a:2:{i:0;s:6:"status";i:1;s:7:"promote";}',
-  ),
-  array(
-    'name' => 'node_preview',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'node_rank_comments',
-    'value' => 's:1:"5";',
-  ),
-  array(
-    'name' => 'node_rank_promote',
-    'value' => 's:1:"0";',
-  ),
-  array(
-    'name' => 'node_rank_recent',
-    'value' => 's:1:"0";',
-  ),
-  array(
-    'name' => 'node_rank_relevance',
-    'value' => 's:1:"2";',
-  ),
-  array(
-    'name' => 'node_rank_sticky',
-    'value' => 's:1:"8";',
-  ),
-  array(
-    'name' => 'node_rank_views',
-    'value' => 's:1:"1";',
-  ),
-  array(
-    'name' => 'overlap_cjk',
-    'value' => 'i:1;',
-  ),
-  array(
-    'name' => 'page_compression',
-    'value' => 's:1:"1";',
-  ),
-  array(
-    'name' => 'preprocess_css',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'preprocess_js',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'search_cron_limit',
-    'value' => 's:3:"100";',
-  ),
-  array(
-    'name' => 'simpletest_clear_results',
-    'value' => 'b:1;',
-  ),
-  array(
-    'name' => 'simpletest_httpauth_method',
-    'value' => 'i:1;',
-  ),
-  array(
-    'name' => 'simpletest_httpauth_password',
-    'value' => 'N;',
-  ),
-  array(
-    'name' => 'simpletest_httpauth_username',
-    'value' => 'N;',
-  ),
-  array(
-    'name' => 'simpletest_verbose',
-    'value' => 'b:1;',
-  ),
-  array(
-    'name' => 'site_403',
-    'value' => 's:4:"user";',
-  ),
-  array(
-    'name' => 'site_404',
-    'value' => 's:14:"page-not-found";',
-  ),
-  array(
-    'name' => 'site_frontpage',
-    'value' => 's:4:"node";',
-  ),
-  array(
-    'name' => 'site_mail',
-    'value' => 's:21:"site_mail@example.com";',
-  ),
-  array(
-    'name' => 'site_name',
-    'value' => 's:9:"site_name";',
-  ),
-  array(
-    'name' => 'site_offline',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'site_offline_message',
-    'value' => 's:94:"Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.";',
-  ),
-  array(
-    'name' => 'site_slogan',
-    'value' => 's:13:"Migrate rocks";',
-  ),
-  array(
-    'name' => 'statistics_block_top_all_num',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'statistics_block_top_day_num',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'statistics_block_top_last_num',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'statistics_count_content_views',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'statistics_enable_access_log',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'statistics_flush_accesslog_timer',
-    'value' => 'i:259200;',
-  ),
-  array(
-    'name' => 'syslog_facility',
-    'value' => 'i:128;',
-  ),
-  array(
-    'name' => 'syslog_identity',
-    'value' => 's:6:"drupal";',
-  ),
-  array(
-    'name' => 'taxonomy_override_selector',
-    'value' => 'b:0;',
-  ),
-  array(
-    'name' => 'taxonomy_terms_per_page_admin',
-    'value' => 'i:100;',
-  ),
-  array(
-    'name' => 'teaser_length',
-    'value' => 'i:456;',
-  ),
-  array(
-    'name' => 'theme_settings',
-    'value' => 'a:22:{s:11:"toggle_logo";i:1;s:11:"toggle_name";i:1;s:13:"toggle_slogan";i:0;s:14:"toggle_mission";i:1;s:24:"toggle_node_user_picture";i:0;s:27:"toggle_comment_user_picture";i:0;s:13:"toggle_search";i:0;s:14:"toggle_favicon";i:1;s:20:"toggle_primary_links";i:1;s:22:"toggle_secondary_links";i:1;s:21:"toggle_node_info_test";i:1;s:26:"toggle_node_info_something";i:1;s:12:"default_logo";i:1;s:9:"logo_path";s:0:"";s:11:"logo_upload";s:0:"";s:15:"default_favicon";i:1;s:12:"favicon_path";s:0:"";s:14:"favicon_upload";s:0:"";s:26:"toggle_node_info_test_page";i:1;s:27:"toggle_node_info_test_story";i:1;s:27:"toggle_node_info_test_event";i:1;s:28:"toggle_node_info_test_planet";i:1;}',
-  ),
-  array(
-    'name' => 'update_check_frequency',
-    'value' => 's:1:"7";',
-  ),
-  array(
-    'name' => 'update_fetch_url',
-    'value' => 's:41:"http://updates.drupal.org/release-history";',
-  ),
-  array(
-    'name' => 'update_max_fetch_attempts',
-    'value' => 'i:2;',
-  ),
-  array(
-    'name' => 'update_notification_threshold',
-    'value' => 's:3:"all";',
-  ),
-  array(
-    'name' => 'update_notify_emails',
-    'value' => 'a:0:{}',
-  ),
-  array(
-    'name' => 'upload_article',
-    'value' => 'b:0;',
-  ),
-  array(
-    'name' => 'upload_page',
-    'value' => 'b:1;',
-  ),
-  array(
-    'name' => 'upload_story',
-    'value' => 'b:1;',
-  ),
-  array(
-    'name' => 'user_email_verification',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'user_mail_password_reset_body',
-    'value' => "s:409:\"!username,\n\nA request to reset the password for your account has been made at !site.\n\nYou may now log in to !uri_brief by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\";",
-  ),
-  array(
-    'name' => 'user_mail_password_reset_subject',
-    'value' => 's:52:"Replacement login information for !username at !site";',
-  ),
-  array(
-    'name' => 'user_mail_register_admin_created_body',
-    'value' => "s:452:\"!username,\n\nA site administrator at !site has created an account for you. You may now log in to !login_uri using the following username and password:\n\nusername: !username\npassword: !password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\n\n\n--  !site team\";",
-  ),
-  array(
-    'name' => 'user_mail_register_admin_created_subject',
-    'value' => 's:52:"An administrator created an account for you at !site";',
-  ),
-  array(
-    'name' => 'user_mail_register_no_approval_required_body',
-    'value' => "s:426:\"!username,\n\nThank you for registering at !site. You may now log in to !login_uri using the following username and password:\n\nusername: !username\npassword: !password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\n\n\n--  !site team\";",
-  ),
-  array(
-    'name' => 'user_mail_register_no_approval_required_subject',
-    'value' => 's:38:"Account details for !username at !site";',
-  ),
-  array(
-    'name' => 'user_mail_status_activated_body',
-    'value' => "s:419:\"!username,\n\nYour account at !site has been activated.\n\nYou may now log in by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\n\nOnce you have set your own password, you will be able to log in to !login_uri in the future using:\n\nusername: !username\n\";",
-  ),
-  array(
-    'name' => 'user_mail_status_activated_notify',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'user_mail_status_activated_subject',
-    'value' => 's:49:"Account details for !username at !site (approved)";',
-  ),
-  array(
-    'name' => 'user_mail_status_blocked_body',
-    'value' => "s:51:\"!username,\n\nYour account on !site has been blocked.\";",
-  ),
-  array(
-    'name' => 'user_mail_status_blocked_notify',
-    'value' => 'i:1;',
-  ),
-  array(
-    'name' => 'user_mail_status_blocked_subject',
-    'value' => 's:48:"Account details for !username at !site (blocked)";',
-  ),
-  array(
-    'name' => 'user_mail_status_deleted_body',
-    'value' => "s:51:\"!username,\n\nYour account on !site has been deleted.\";",
-  ),
-  array(
-    'name' => 'user_mail_status_deleted_subject',
-    'value' => 's:48:"Account details for !username at !site (deleted)";',
-  ),
-  array(
-    'name' => 'user_mail_user_mail_register_pending_approval_body',
-    'value' => "s:267:\"!username,\n\nThank you for registering at !site. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\n\n\n--  !site team\";",
-  ),
-  array(
-    'name' => 'user_mail_user_mail_register_pending_approval_subject',
-    'value' => 's:63:"Account details for !username at !site (pending admin approval)";',
-  ),
-  array(
-    'name' => 'user_register',
-    'value' => 'i:0;',
-  ),
-  array(
-    'name' => 'user_signatures',
-    'value' => 's:1:"1";',
-  ),
+  'name' => 'actions_max_stack',
+  'value' => 'i:35;',
+))->values(array(
+  'name' => 'admin_compact_mode',
+  'value' => 'b:0;',
+))->values(array(
+  'name' => 'aggregator_allowed_html_tags',
+  'value' => 's:70:"<a> <b> <br /> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>";',
+))->values(array(
+  'name' => 'aggregator_clear',
+  'value' => 's:7:"9676800";',
+))->values(array(
+  'name' => 'aggregator_fetcher',
+  'value' => 's:10:"aggregator";',
+))->values(array(
+  'name' => 'aggregator_parser',
+  'value' => 's:10:"aggregator";',
+))->values(array(
+  'name' => 'aggregator_processors',
+  'value' => 'a:1:{i:0;s:10:"aggregator";}',
+))->values(array(
+  'name' => 'aggregator_summary_items',
+  'value' => 's:1:"3";',
+))->values(array(
+  'name' => 'aggregator_teaser_length',
+  'value' => 's:3:"600";',
+))->values(array(
+  'name' => 'allowed_html_1',
+  'value' => 's:61:"<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>";',
+))->values(array(
+  'name' => 'allow_insecure_uploads',
+  'value' => 'i:1;',
+))->values(array(
+  'name' => 'anonymous',
+  'value' => 's:5:"Guest";',
+))->values(array(
+  'name' => 'book_allowed_types',
+  'value' => 'a:1:{i:0;s:4:"book";}',
+))->values(array(
+  'name' => 'book_block_mode',
+  'value' => 's:9:"all pages";',
+))->values(array(
+  '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(
+  'name' => 'comment_anonymous_page',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'comment_anonymous_story',
+  'value' => 'i:1;',
+))->values(array(
+  'name' => 'comment_controls_page',
+  'value' => 's:1:"3";',
+))->values(array(
+  'name' => 'comment_controls_story',
+  'value' => 's:1:"3";',
+))->values(array(
+  'name' => 'comment_default_mode_page',
+  'value' => 's:1:"4";',
+))->values(array(
+  'name' => 'comment_default_mode_story',
+  'value' => 's:1:"2";',
+))->values(array(
+  'name' => 'comment_default_order_page',
+  'value' => 's:1:"1";',
+))->values(array(
+  'name' => 'comment_default_order_story',
+  'value' => 's:1:"1";',
+))->values(array(
+  'name' => 'comment_default_per_page_page',
+  'value' => 's:2:"50";',
+))->values(array(
+  'name' => 'comment_default_per_page_story',
+  'value' => 's:2:"70";',
+))->values(array(
+  'name' => 'comment_form_location_page',
+  'value' => 's:1:"0";',
+))->values(array(
+  'name' => 'comment_form_location_story',
+  'value' => 's:1:"0";',
+))->values(array(
+  'name' => 'comment_page',
+  'value' => 's:1:"0";',
+))->values(array(
+  'name' => 'comment_preview_page',
+  'value' => 's:1:"1";',
+))->values(array(
+  'name' => 'comment_preview_story',
+  'value' => 's:1:"0";',
+))->values(array(
+  'name' => 'comment_story',
+  'value' => 's:1:"2";',
+))->values(array(
+  'name' => 'comment_subject_field_page',
+  'value' => 's:1:"1";',
+))->values(array(
+  'name' => 'comment_subject_field_story',
+  'value' => 's:1:"0";',
+))->values(array(
+  'name' => 'contact_default_status',
+  'value' => 'i:1;',
+))->values(array(
+  'name' => 'contact_hourly_threshold',
+  'value' => 'i:3;',
+))->values(array(
+  'name' => 'cron_threshold_error',
+  'value' => 'i:1209600;',
+))->values(array(
+  'name' => 'cron_threshold_warning',
+  'value' => 'i:172800;',
+))->values(array(
+  'name' => 'date_format_long',
+  'value' => 's:24:"\L\O\N\G l, F j, Y - H:i";',
+))->values(array(
+  'name' => 'date_format_medium',
+  'value' => 's:27:"\M\E\D\I\U\M D, m/d/Y - H:i";',
+))->values(array(
+  'name' => 'date_format_short',
+  'value' => 's:22:"\S\H\O\R\T m/d/Y - H:i";',
+))->values(array(
+  'name' => 'dblog_row_limit',
+  'value' => 'i:1000;',
+))->values(array(
+  'name' => 'error_level',
+  'value' => 'i:1;',
+))->values(array(
+  'name' => 'feed_default_items',
+  'value' => 'i:10;',
+))->values(array(
+  'name' => 'feed_item_length',
+  'value' => 's:5:"title";',
+))->values(array(
+  'name' => 'file_description_length',
+  'value' => 'i:128;',
+))->values(array(
+  'name' => 'file_description_type',
+  'value' => 's:9:"textfield";',
+))->values(array(
+  'name' => 'file_directory_path',
+  'value' => 's:29:"core/modules/simpletest/files";',
+))->values(array(
+  'name' => 'file_directory_temp',
+  'value' => 's:10:"files/temp";',
+))->values(array(
+  'name' => 'file_icon_directory',
+  'value' => 's:25:"sites/default/files/icons";',
+))->values(array(
+  'name' => 'filter_allowed_protocols',
+  'value' => 'a:13:{i:0;s:4:"http";i:1;s:5:"https";i:2;s:3:"ftp";i:3;s:4:"news";i:4;s:4:"nntp";i:5;s:3:"tel";i:6;s:6:"telnet";i:7;s:6:"mailto";i:8;s:3:"irc";i:9;s:3:"ssh";i:10;s:4:"sftp";i:11;s:6:"webcal";i:12;s:4:"rtsp";}',
+))->values(array(
+  'name' => 'filter_html_help_1',
+  'value' => 'i:1;',
+))->values(array(
+  'name' => 'filter_html_nofollow_1',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'filter_url_length_1',
+  'value' => 's:2:"72";',
+))->values(array(
+  'name' => 'forum_block_num_0',
+  'value' => 's:1:"5";',
+))->values(array(
+  'name' => 'forum_block_num_1',
+  'value' => 's:1:"5";',
+))->values(array(
+  'name' => 'forum_hot_topic',
+  'value' => 's:2:"15";',
+))->values(array(
+  'name' => 'forum_nav_vocabulary',
+  'value' => 's:1:"1";',
+))->values(array(
+  'name' => 'forum_order',
+  'value' => 's:1:"1";',
+))->values(array(
+  'name' => 'forum_per_page',
+  'value' => 's:2:"25";',
+))->values(array(
+  'name' => 'image_jpeg_quality',
+  'value' => 'i:75;',
+))->values(array(
+  'name' => 'image_toolkit',
+  'value' => 's:2:"gd";',
+))->values(array(
+  'name' => 'locale_cache_strings',
+  'value' => 'i:1;',
+))->values(array(
+  'name' => 'locale_js_directory',
+  'value' => 's:9:"languages";',
+))->values(array(
+  'name' => 'menu_override_parent_selector',
+  'value' => 'b:0;',
+))->values(array(
+  'name' => 'minimum_word_size',
+  'value' => 's:1:"3";',
+))->values(array(
+  'name' => 'node_admin_theme',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'node_options_test_event',
+  'value' => 'a:2:{i:0;s:6:"sticky";i:1;s:8:"revision";}',
+))->values(array(
+  'name' => 'node_options_test_page',
+  'value' => 'a:3:{i:0;s:6:"status";i:1;s:7:"promote";i:2;s:6:"sticky";}',
+))->values(array(
+  'name' => 'node_options_test_planet',
+  'value' => 'a:2:{i:0;s:6:"sticky";i:1;s:8:"revision";}',
+))->values(array(
+  'name' => 'node_options_test_story',
+  'value' => 'a:2:{i:0;s:6:"status";i:1;s:7:"promote";}',
+))->values(array(
+  'name' => 'node_preview',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'node_rank_comments',
+  'value' => 's:1:"5";',
+))->values(array(
+  'name' => 'node_rank_promote',
+  'value' => 's:1:"0";',
+))->values(array(
+  'name' => 'node_rank_recent',
+  'value' => 's:1:"0";',
+))->values(array(
+  'name' => 'node_rank_relevance',
+  'value' => 's:1:"2";',
+))->values(array(
+  'name' => 'node_rank_sticky',
+  'value' => 's:1:"8";',
+))->values(array(
+  'name' => 'node_rank_views',
+  'value' => 's:1:"1";',
+))->values(array(
+  'name' => 'overlap_cjk',
+  'value' => 'i:1;',
+))->values(array(
+  'name' => 'page_compression',
+  'value' => 's:1:"1";',
+))->values(array(
+  'name' => 'preprocess_css',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'preprocess_js',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'search_cron_limit',
+  'value' => 's:3:"100";',
+))->values(array(
+  'name' => 'simpletest_clear_results',
+  'value' => 'b:1;',
+))->values(array(
+  'name' => 'simpletest_httpauth_method',
+  'value' => 'i:1;',
+))->values(array(
+  'name' => 'simpletest_httpauth_password',
+  'value' => 'N;',
+))->values(array(
+  'name' => 'simpletest_httpauth_username',
+  'value' => 'N;',
+))->values(array(
+  'name' => 'simpletest_verbose',
+  'value' => 'b:1;',
+))->values(array(
+  'name' => 'site_403',
+  'value' => 's:4:"user";',
+))->values(array(
+  'name' => 'site_404',
+  'value' => 's:14:"page-not-found";',
+))->values(array(
+  'name' => 'site_frontpage',
+  'value' => 's:4:"node";',
+))->values(array(
+  'name' => 'site_mail',
+  'value' => 's:21:"site_mail@example.com";',
+))->values(array(
+  'name' => 'site_name',
+  'value' => 's:9:"site_name";',
+))->values(array(
+  'name' => 'site_offline',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'site_offline_message',
+  'value' => 's:94:"Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.";',
+))->values(array(
+  'name' => 'site_slogan',
+  'value' => 's:13:"Migrate rocks";',
+))->values(array(
+  'name' => 'statistics_block_top_all_num',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'statistics_block_top_day_num',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'statistics_block_top_last_num',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'statistics_count_content_views',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'statistics_enable_access_log',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'statistics_flush_accesslog_timer',
+  'value' => 'i:259200;',
+))->values(array(
+  'name' => 'syslog_facility',
+  'value' => 'i:128;',
+))->values(array(
+  'name' => 'syslog_identity',
+  'value' => 's:6:"drupal";',
+))->values(array(
+  'name' => 'taxonomy_override_selector',
+  'value' => 'b:0;',
+))->values(array(
+  'name' => 'taxonomy_terms_per_page_admin',
+  'value' => 'i:100;',
+))->values(array(
+  'name' => 'teaser_length',
+  'value' => 'i:456;',
+))->values(array(
+  'name' => 'theme_settings',
+  'value' => 'a:22:{s:11:"toggle_logo";i:1;s:11:"toggle_name";i:1;s:13:"toggle_slogan";i:0;s:14:"toggle_mission";i:1;s:24:"toggle_node_user_picture";i:0;s:27:"toggle_comment_user_picture";i:0;s:13:"toggle_search";i:0;s:14:"toggle_favicon";i:1;s:20:"toggle_primary_links";i:1;s:22:"toggle_secondary_links";i:1;s:21:"toggle_node_info_test";i:1;s:26:"toggle_node_info_something";i:1;s:12:"default_logo";i:1;s:9:"logo_path";s:0:"";s:11:"logo_upload";s:0:"";s:15:"default_favicon";i:1;s:12:"favicon_path";s:0:"";s:14:"favicon_upload";s:0:"";s:26:"toggle_node_info_test_page";i:1;s:27:"toggle_node_info_test_story";i:1;s:27:"toggle_node_info_test_event";i:1;s:28:"toggle_node_info_test_planet";i:1;}',
+))->values(array(
+  'name' => 'update_check_frequency',
+  'value' => 's:1:"7";',
+))->values(array(
+  'name' => 'update_fetch_url',
+  'value' => 's:41:"http://updates.drupal.org/release-history";',
+))->values(array(
+  'name' => 'update_max_fetch_attempts',
+  'value' => 'i:2;',
+))->values(array(
+  'name' => 'update_notification_threshold',
+  'value' => 's:3:"all";',
+))->values(array(
+  'name' => 'update_notify_emails',
+  'value' => 'a:0:{}',
+))->values(array(
+  'name' => 'upload_article',
+  'value' => 'b:0;',
+))->values(array(
+  'name' => 'upload_page',
+  'value' => 'b:1;',
+))->values(array(
+  'name' => 'upload_story',
+  'value' => 'b:1;',
+))->values(array(
+  'name' => 'user_email_verification',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'user_mail_password_reset_body',
+  'value' => "s:409:\"!username,\n\nA request to reset the password for your account has been made at !site.\n\nYou may now log in to !uri_brief by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\";",
+))->values(array(
+  'name' => 'user_mail_password_reset_subject',
+  'value' => 's:52:"Replacement login information for !username at !site";',
+))->values(array(
+  'name' => 'user_mail_register_admin_created_body',
+  'value' => "s:452:\"!username,\n\nA site administrator at !site has created an account for you. You may now log in to !login_uri using the following username and password:\n\nusername: !username\npassword: !password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\n\n\n--  !site team\";",
+))->values(array(
+  'name' => 'user_mail_register_admin_created_subject',
+  'value' => 's:52:"An administrator created an account for you at !site";',
+))->values(array(
+  'name' => 'user_mail_register_no_approval_required_body',
+  'value' => "s:426:\"!username,\n\nThank you for registering at !site. You may now log in to !login_uri using the following username and password:\n\nusername: !username\npassword: !password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\n\n\n--  !site team\";",
+))->values(array(
+  'name' => 'user_mail_register_no_approval_required_subject',
+  'value' => 's:38:"Account details for !username at !site";',
+))->values(array(
+  'name' => 'user_mail_status_activated_body',
+  'value' => "s:419:\"!username,\n\nYour account at !site has been activated.\n\nYou may now log in by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\n\nOnce you have set your own password, you will be able to log in to !login_uri in the future using:\n\nusername: !username\n\";",
+))->values(array(
+  'name' => 'user_mail_status_activated_notify',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'user_mail_status_activated_subject',
+  'value' => 's:49:"Account details for !username at !site (approved)";',
+))->values(array(
+  'name' => 'user_mail_status_blocked_body',
+  'value' => "s:51:\"!username,\n\nYour account on !site has been blocked.\";",
+))->values(array(
+  'name' => 'user_mail_status_blocked_notify',
+  'value' => 'i:1;',
+))->values(array(
+  'name' => 'user_mail_status_blocked_subject',
+  'value' => 's:48:"Account details for !username at !site (blocked)";',
+))->values(array(
+  'name' => 'user_mail_status_deleted_body',
+  'value' => "s:51:\"!username,\n\nYour account on !site has been deleted.\";",
+))->values(array(
+  'name' => 'user_mail_status_deleted_subject',
+  'value' => 's:48:"Account details for !username at !site (deleted)";',
+))->values(array(
+  'name' => 'user_mail_user_mail_register_pending_approval_body',
+  'value' => "s:267:\"!username,\n\nThank you for registering at !site. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\n\n\n--  !site team\";",
+))->values(array(
+  'name' => 'user_mail_user_mail_register_pending_approval_subject',
+  'value' => 's:63:"Account details for !username at !site (pending admin approval)";',
+))->values(array(
+  'name' => 'user_register',
+  'value' => 'i:0;',
+))->values(array(
+  'name' => 'user_signatures',
+  'value' => 's:1:"1";',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/Vocabulary.php b/core/modules/migrate_drupal/src/Tests/Table/Vocabulary.php
index 6bbab83..6cfd715 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/Vocabulary.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/Vocabulary.php
@@ -14,11 +14,76 @@
  */
 class Vocabulary extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("vocabulary");
+    $this->createTable("vocabulary", array(
+  'vocabulary' => array(
+    'fields' => array(
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+      ),
+      'name' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'description' => array(
+        'type' => 'longtext',
+        'not null' => FALSE,
+      ),
+      'help' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'relations' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '3',
+        'default' => '0',
+      ),
+      'hierarchy' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '3',
+        'default' => '0',
+      ),
+      'multiple' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '3',
+        'default' => '0',
+      ),
+      'required' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '3',
+        'default' => '0',
+      ),
+      'tags' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '3',
+        'default' => '0',
+      ),
+      'module' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '255',
+        'default' => '',
+      ),
+      'weight' => array(
+        'type' => 'tinyint',
+        'not null' => TRUE,
+        'length' => '4',
+        'default' => '0',
+      ),
+    ),
+  ),
+));
     $this->database->insert("vocabulary")->fields(array(
   'vid',
   'name',
@@ -33,73 +98,65 @@ public function load() {
   'weight',
 ))
     ->values(array(
-  'name',
-  'value',
-  array(
-    'vid' => '1',
-    'name' => 'vocabulary 1 (i=0)',
-    'description' => 'description of vocabulary 1 (i=0)',
-    'help' => '',
-    'relations' => '1',
-    'hierarchy' => '0',
-    'multiple' => '0',
-    'required' => '0',
-    'tags' => '0',
-    'module' => 'taxonomy',
-    'weight' => '4',
-  ),
-  array(
-    'vid' => '2',
-    'name' => 'vocabulary 2 (i=1)',
-    'description' => 'description of vocabulary 2 (i=1)',
-    'help' => '',
-    'relations' => '1',
-    'hierarchy' => '1',
-    'multiple' => '1',
-    'required' => '0',
-    'tags' => '0',
-    'module' => 'taxonomy',
-    'weight' => '5',
-  ),
-  array(
-    'vid' => '3',
-    'name' => 'vocabulary 3 (i=2)',
-    'description' => 'description of vocabulary 3 (i=2)',
-    'help' => '',
-    'relations' => '1',
-    'hierarchy' => '2',
-    'multiple' => '0',
-    'required' => '0',
-    'tags' => '0',
-    'module' => 'taxonomy',
-    'weight' => '6',
-  ),
-  array(
-    'vid' => '4',
-    'name' => 'Tags',
-    'description' => 'Tags Vocabulary',
-    'help' => '',
-    'relations' => '1',
-    'hierarchy' => '0',
-    'multiple' => '0',
-    'required' => '0',
-    'tags' => '0',
-    'module' => 'taxonomy',
-    'weight' => '0',
-  ),
-  array(
-    'vid' => '5',
-    'name' => 'vocabulary name much longer than thirty two characters',
-    'description' => 'description of vocabulary name much longer than thirty two characters',
-    'help' => '',
-    'relations' => '1',
-    'hierarchy' => '3',
-    'multiple' => '1',
-    'required' => '0',
-    'tags' => '0',
-    'module' => 'taxonomy',
-    'weight' => '7',
-  ),
+  'vid' => '1',
+  'name' => 'vocabulary 1 (i=0)',
+  'description' => 'description of vocabulary 1 (i=0)',
+  'help' => '',
+  'relations' => '1',
+  'hierarchy' => '0',
+  'multiple' => '0',
+  'required' => '0',
+  'tags' => '0',
+  'module' => 'taxonomy',
+  'weight' => '4',
+))->values(array(
+  'vid' => '2',
+  'name' => 'vocabulary 2 (i=1)',
+  'description' => 'description of vocabulary 2 (i=1)',
+  'help' => '',
+  'relations' => '1',
+  'hierarchy' => '1',
+  'multiple' => '1',
+  'required' => '0',
+  'tags' => '0',
+  'module' => 'taxonomy',
+  'weight' => '5',
+))->values(array(
+  'vid' => '3',
+  'name' => 'vocabulary 3 (i=2)',
+  'description' => 'description of vocabulary 3 (i=2)',
+  'help' => '',
+  'relations' => '1',
+  'hierarchy' => '2',
+  'multiple' => '0',
+  'required' => '0',
+  'tags' => '0',
+  'module' => 'taxonomy',
+  'weight' => '6',
+))->values(array(
+  'vid' => '4',
+  'name' => 'Tags',
+  'description' => 'Tags Vocabulary',
+  'help' => '',
+  'relations' => '1',
+  'hierarchy' => '0',
+  'multiple' => '0',
+  'required' => '0',
+  'tags' => '0',
+  'module' => 'taxonomy',
+  'weight' => '0',
+))->values(array(
+  'vid' => '5',
+  'name' => 'vocabulary name much longer than thirty two characters',
+  'description' => 'description of vocabulary name much longer than thirty two characters',
+  'help' => '',
+  'relations' => '1',
+  'hierarchy' => '3',
+  'multiple' => '1',
+  'required' => '0',
+  'tags' => '0',
+  'module' => 'taxonomy',
+  'weight' => '7',
 ))
     ->execute();
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Table/VocabularyNodeTypes.php b/core/modules/migrate_drupal/src/Tests/Table/VocabularyNodeTypes.php
index ce2a1df..bbc07b1 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/VocabularyNodeTypes.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/VocabularyNodeTypes.php
@@ -14,47 +14,44 @@
  */
 class VocabularyNodeTypes extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("vocabulary_node_types");
+    $this->createTable("vocabulary_node_types", array(
+  'vocabulary_node_types' => array(
+    'fields' => array(
+      'vid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'length' => '10',
+        'default' => '0',
+      ),
+      'type' => array(
+        'type' => 'varchar',
+        'not null' => TRUE,
+        'length' => '32',
+        'default' => '',
+      ),
+    ),
+  ),
+));
     $this->database->insert("vocabulary_node_types")->fields(array(
   'vid',
   'type',
 ))
     ->values(array(
-  'vid',
-  'name',
-  'description',
-  'help',
-  'relations',
-  'hierarchy',
-  'multiple',
-  'required',
-  'tags',
-  'module',
-  'weight',
-  array(
-    'vid' => '1',
-    'type' => 'story',
-  ),
-  array(
-    'vid' => '2',
-    'type' => 'story',
-  ),
-  array(
-    'vid' => '3',
-    'type' => 'story',
-  ),
-  array(
-    'vid' => '4',
-    'type' => 'article',
-  ),
-  array(
-    'vid' => '4',
-    'type' => 'page',
-  ),
+  'vid' => '1',
+  'type' => 'story',
+))->values(array(
+  'vid' => '2',
+  'type' => 'story',
+))->values(array(
+  'vid' => '3',
+  'type' => 'story',
+))->values(array(
+  'vid' => '4',
+  'type' => 'article',
+))->values(array(
+  'vid' => '4',
+  'type' => 'page',
 ))
     ->execute();
   }
diff --git a/core/scripts/dump-database-d6.php b/core/scripts/dump-database-d6.php
index 17985ed..dfe49cf 100644
--- a/core/scripts/dump-database-d6.php
+++ b/core/scripts/dump-database-d6.php
@@ -36,21 +36,20 @@
  */
 class {{CLASS_NAME}} extends Drupal6DumpBase {
 
-  /**
-   * {@inheritdoc}
-   */
   public function load() {
-    $this->createTable("{{TABLE}}");
+    $this->createTable("{{TABLE}}", {{TABLE_DEFINITION}});
     $this->database->insert("{{TABLE}}")->fields({{PHP_FIELDS}})
-    ->values({{PHP_VALUES}})
+    {{PHP_VALUES}}
     ->execute();
   }
 
 }';
 
+
 // Generate a list of tables using the 'migrate' db connection.
 $connection = Database::getConnection('default', 'migrate');
 $tables = $connection->query('SHOW TABLES')->fetchCol();
+
 foreach ($tables as $table) {
 
   // Generate the class name.
@@ -58,20 +57,44 @@ public function load() {
 
   // Generate teh field values.
   $query = $connection->query("SELECT * FROM {$table}");
+  $values = '';
   while(($row = $query->fetchAssoc()) !== FALSE) {
-    $data[] = $row;
+    $values .= '->values(' . Variable::export($row) . ')';
   }
-  $values = Variable::export($data);
 
   // Generate the field names.
-  $data = $connection->query("SHOW COLUMNS FROM {$table}")->fetchCol();
-  $fields = Variable::export($data);
+  $query = $connection->query("SHOW COLUMNS FROM {$table}");
+  $definition = [];
+  $fields = [];
+  while(($row = $query->fetchAssoc()) !== FALSE) {
+    $field_name = $row['Field'];
+    $fields[] = $field_name;
+
+    preg_match('@([a-z]+)(?:\((\d+)(?:,(\d+))?\))?\s*(unsigned)?@', $row['Type'], $matches);
+    list(, $type, $length) = $matches;
+
+    $definition[$table]['fields'][$field_name] = [
+      'type' => $type,
+      'not null' => $row['Null'] === 'NO',
+    ];
+
+    if (isset($length)) {
+      $definition[$table]['fields'][$field_name]['length'] = $length;
+    }
+
+    if (isset($row['Default'])) {
+      $definition[$table]['fields'][$field_name]['default'] = $row['Default'];
+    }
+  }
+  $fields = Variable::export($fields);
+  $definition = Variable::export($definition);
 
   // Do our substitutions.
   $php = str_replace('{{TABLE}}', $table, $class_template);
   $php = str_replace('{{CLASS_NAME}}', $class, $php);
   $php = str_replace('{{PHP_VALUES}}', $values, $php);
   $php = str_replace('{{PHP_FIELDS}}', $fields, $php);
+  $php = str_replace('{{TABLE_DEFINITION}}', $definition, $php);
 
 
   // Save the file.