diff --git a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6FieldInstance.php b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6FieldInstance.php
index 25e5910..d764b98 100644
--- a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6FieldInstance.php
+++ b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6FieldInstance.php
@@ -90,6 +90,8 @@ public function load() {
       'widget_settings',
       'display_settings',
       'description',
+      'widget_module',
+      'widget_active',
     ))
     ->values(array(
       'field_name' => 'field_test',
@@ -136,6 +138,8 @@ public function load() {
         ),
       )),
       'description' => 'An example text field.',
+      'widget_module' => 'text',
+      'widget_active' => 1,
     ))
     ->values(array(
       'field_name' => 'field_test',
@@ -178,6 +182,8 @@ public function load() {
         ),
       )),
       'description' => 'An example textfield.',
+      'widget_module' => 'text',
+      'widget_active' => 1,
     ))
     ->values(array(
       'field_name' => 'field_test_two',
@@ -210,6 +216,8 @@ public function load() {
         ),
       )),
       'description' => 'An example integer field.',
+      'widget_module' => 'number',
+      'widget_active' => 1,
     ))
     ->values(array(
       'field_name' => 'field_test_three',
@@ -250,6 +258,8 @@ public function load() {
         ),
       )),
       'description' => 'An example decimal field.',
+      'widget_module' => 'number',
+      'widget_active' => 1,
     ))
     ->values(array(
       'field_name' => 'field_test_four',
@@ -290,6 +300,8 @@ public function load() {
         ),
       )),
       'description' => 'An example float field.',
+      'widget_module' => 'number',
+      'widget_active' => 1,
     ))
     ->values(array(
       'field_name' => 'field_test_email',
@@ -330,6 +342,8 @@ public function load() {
         ),
       )),
       'description' => 'An example email field.',
+      'widget_module' => 'text',
+      'widget_active' => 1,
     ))
     ->values(array(
       'field_name' => 'field_test_link',
@@ -370,6 +384,8 @@ public function load() {
         ),
       )),
       'description' => 'An example link field.',
+      'widget_module' => 'text',
+      'widget_active' => 1,
     ))
     ->values(array(
       'field_name' => 'field_test_filefield',
@@ -408,6 +424,8 @@ public function load() {
         ),
       )),
       'description' => 'An example image field.',
+      'widget_module' => 'filefield',
+      'widget_active' => 1,
     ))
     ->values(array(
       'field_name' => 'field_test_imagefield',
@@ -455,6 +473,8 @@ public function load() {
         ),
       )),
       'description' => 'An example image field.',
+      'widget_module' => 'filefield',
+      'widget_active' => 1,
     ))
     ->values(array(
       'field_name' => 'field_test_phone',
@@ -496,6 +516,8 @@ public function load() {
         ),
       )),
       'description' => 'An example phone field.',
+      'widget_module' => 'text',
+      'widget_active' => 1,
     ))
     ->values(array(
       'field_name' => 'field_test_date',
@@ -539,6 +561,8 @@ public function load() {
         ),
       )),
       'description' => 'An example date field.',
+      'widget_module' => 'date',
+      'widget_active' => 1,
     ))
     ->values(array(
       'field_name' => 'field_test_datestamp',
@@ -582,6 +606,8 @@ public function load() {
         ),
       )),
       'description' => 'An example date stamp field.',
+      'widget_module' => 'date',
+      'widget_active' => 1,
     ))
     ->values(array(
       'field_name' => 'field_test_datetime',
@@ -625,6 +651,8 @@ public function load() {
         ),
       )),
       'description' => 'An example datetime field.',
+      'widget_module' => 'date',
+      'widget_active' => 1,
     ))
     ->execute();
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
index 1d5c3ce..b80a01c 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\migrate\MigrateExecutable;
+use Drupal\node\Entity\Node;
 
 /**
  * Test cck field migration from Drupal 6 to 8.
@@ -96,7 +97,7 @@ protected function setUp() {
    * Test CCK migration from Drupal 6 to 8.
    */
   public function testCckFields() {
-    $node = node_load(1);
+    $node = Node::load(1);
     $this->assertEqual($node->field_test->value, 'This is a shared text field', "Shared field storage field is correct.");
     $this->assertEqual($node->field_test->format, 1, "Shared field storage field with multiple columns is correct.");
     $this->assertEqual($node->field_test_two->value, 10, 'Multi field storage field is correct');