diff --git a/shipping/uc_fulfillment/src/Form/NewShipmentForm.php b/shipping/uc_fulfillment/src/Form/NewShipmentForm.php
index 07119ef..aac4e8e 100644
--- a/shipping/uc_fulfillment/src/Form/NewShipmentForm.php
+++ b/shipping/uc_fulfillment/src/Form/NewShipmentForm.php
@@ -29,7 +29,7 @@ class NewShipmentForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, OrderInterface $uc_order = NULL, Request $request = NULL) {
-    $checked_pkgs = $request->query->has('pkgs') ? $request->query->get('pkgs') : array();
+    $checked_pkgs = $request->query->has('pkgs') ? (array) $request->query->get('pkgs') : array();
     $form['#tree'] = TRUE;
     $form['#attached']['library'][] = 'uc_fulfillment/uc_fulfillment.scripts';
 
diff --git a/shipping/uc_fulfillment/src/Tests/PackageTest.php b/shipping/uc_fulfillment/src/Tests/PackageTest.php
new file mode 100644
index 0000000..1d1fbb8
--- /dev/null
+++ b/shipping/uc_fulfillment/src/Tests/PackageTest.php
@@ -0,0 +1,336 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\uc_fulfillment\Tests\PackageTest.
+ */
+
+namespace Drupal\uc_fulfillment\Tests;
+
+use Drupal\uc_order\Entity\Order;
+use Drupal\uc_order\Entity\OrderProduct;
+use Drupal\uc_store\Tests\UbercartTestBase;
+
+/**
+ * Tests creating new packages from purchased products.
+ *
+ * @group Ubercart
+ */
+class PackageTest extends UbercartTestBase {
+
+  public static $modules = array('uc_payment', 'uc_payment_pack', 'uc_fulfillment');
+  public static $adminPermissions = array('fulfill orders');
+
+  public function testPackagingUI() {
+    $this->drupalLogin($this->adminUser);
+    $method = $this->createPaymentMethod('other');
+
+    // Process an anonymous, shippable order.
+    $order = Order::create([
+      'uid' => 0,
+      'primary_email' => $this->randomString() . '@example.org',
+      'payment_method' => $method['id'],
+    ]);
+
+    // Add three more products to use for our tests.
+    $products = array();
+    for ($i = 1; $i <= 4; $i++) {
+      $product = $this->createProduct(array('uid' => $this->adminUser->id(), 'promote' => 0));
+      $order->products[$i] = OrderProduct::create(array(
+        'nid' => $product->nid->target_id,
+        'title' => $product->title->value,
+        'model' => $product->model,
+        'qty' => 1,
+        'cost' => $product->cost->value,
+        'price' => $product->price->value,
+        'weight' => $product->weight,
+        'data' => [],
+      ));
+      $order->products[$i]->data->shippable = 1;
+    }
+    $order->save();
+    $order = Order::load($order->id());
+    uc_payment_enter($order->id(), $method['id'], $order->getTotal());
+
+// Order with 4 products shippable products. (where do we test not-shippable?)
+// Check all, make one package, verify we're on packages page with only one packge.
+// Try create package link, should see there are no products message.
+// Delete package.
+
+// Check all, make shipment, verify we're on packages page with N packages.
+// Delete packages.
+
+// How does Sep work? how does making 2 packages out of 4 products work?
+
+// Check all, cancel, verify we're on order page.
+
+// After packages made and check for # (check make one and make shipment, use sep. as well)
+// Can use edit/delete actions to package then start over with the same order.
+// and check for full table at /packages and check for action on /packages page,
+// goto shipments tab and look for No shipments have been made for this order.  as well as a list of all the packages.
+
+    //
+    // Test presence and operation of package operation on order admin View.
+    //
+    $this->drupalGet('admin/store/orders/view');
+    $this->assertLinkByHref('admin/store/orders/' . $order->id() . '/packages');
+    // Test action.
+    $this->clickLink(t('Package'));
+    $this->assertResponse(200);
+    $this->assertText(
+      'This order\'s products have not been organized into packages.',
+      'Package action found.'
+    );
+
+    // Now package the products in this order.
+    $this->drupalGet('admin/store/orders/' . $order->id() . '/packages');
+    $this->assertUrl('admin/store/orders/' . $order->id() . '/packages/new');
+    // First time through we'll be verbose - skip this on subsequent tests.
+    foreach ($order->products as $sequence => $item) {
+      $this->assertText(
+        $item->title->value,
+        'Product title found.'
+      );
+      $this->assertText(
+        $item->model->value,
+        'Product SKU found.'
+      );
+      $this->assertFieldByName(
+        'shipping_types[small_package][table][' . $sequence . '][checked]',
+        0,
+        'Product is available for packaging.'
+      );
+    }
+
+    // Select all products and test the "Cancel" button.
+    $this->drupalPostForm(
+      NULL,
+      array(
+        'shipping_types[small_package][table][1][checked]' => 1,
+        'shipping_types[small_package][table][2][checked]' => 1,
+        'shipping_types[small_package][table][3][checked]' => 1,
+        'shipping_types[small_package][table][4][checked]' => 1,
+      ),
+      t('Cancel')
+    );
+    // Go back to Packages tab and try something else.
+    $this->assertUrl('admin/store/orders/' . $order->id());
+    $this->clickLink(t('Packages'));
+    $this->assertUrl('admin/store/orders/' . $order->id() . '/packages/new');
+    $this->assertText(
+      'This order\'s products have not been organized into packages.',
+      'Package action found.'
+    );
+
+    // Now test the "Create one package" button without selecting anything.
+    $this->drupalPostForm(NULL, array(), t('Create one package'));
+    $this->assertUrl('admin/store/orders/' . $order->id() . '/packages/new');
+    $this->assertText(
+      'Packages must contain at least one product.',
+      'Validation that there must be products in a package.'
+    );
+
+    // Now test the "Create one package" button with all products selected.
+    $this->drupalPostForm(
+      NULL,
+      array(
+        'shipping_types[small_package][table][1][checked]' => 1,
+        'shipping_types[small_package][table][2][checked]' => 1,
+        'shipping_types[small_package][table][3][checked]' => 1,
+        'shipping_types[small_package][table][4][checked]' => 1,
+      ),
+      t('Create one package')
+    );
+
+    // Check that we're now on the package list page.
+    $this->assertUrl('admin/store/orders/' . $order->id() . '/packages');
+    foreach ($order->products as $sequence => $item) {
+      $this->assertText(
+        $item->qty->value . ' x ' . $item->model->value,
+        'Product quantity x SKU found.'
+      );
+    }
+
+    // The "Create packages" local action should now be available too.
+    $this->assertLink(t('Create packages'));
+    $this->clickLink(t('Create packages'));
+    $this->assertUrl('admin/store/orders/' . $order->id() . '/packages/new');
+    // But we've already packaged everything...
+    $this->assertText(
+      'There are no products available for this type of package.',
+      'Create packages local action found.'
+    );
+
+    //
+    // Test "Ship", "Edit", and "Delete" operations for this package.
+    //
+
+    // First "Ship".
+    $this->drupalGet('admin/store/orders/' . $order->id() . '/packages');
+    $this->assertLink(t('Ship'));
+    $this->clickLink(t('Ship'));
+    $this->assertUrl('admin/store/orders/' . $order->id() . '/shipments/new?pkgs=1');
+    foreach ($order->products as $sequence => $item) {
+      $this->assertText(
+        $item->qty->value . ' x ' . $item->model->value,
+        'Product quantity x SKU found.'
+      );
+// Test for weight here too? How do we compute this?
+    }
+
+    // Second, "Edit".
+    $this->drupalGet('admin/store/orders/' . $order->id() . '/packages');
+    // (Use Href to distinguish Edit operation from Edit tab.)
+    $this->assertLinkByHref('admin/store/orders/' . $order->id() . '/packages/1/edit');
+    $this->drupalGet('admin/store/orders/' . $order->id() . '/packages/1/edit');
+    // We're editing the package we already made, so all the
+    // products should be checked.
+    foreach ($order->products as $sequence => $item) {
+      $this->assertFieldByName(
+        'products[' . $sequence . '][checked]',
+        1,
+        'Product is available for packaging.'
+      );
+    }
+
+    // Third, "Delete".
+    $this->drupalGet('admin/store/orders/' . $order->id() . '/packages');
+    $this->assertLink(t('Delete'));
+    $this->clickLink(t('Delete'));
+    // Delete takes us to confirm page.
+    $this->assertUrl('admin/store/orders/' . $order->id() . '/packages/1/delete');
+    $this->assertText(
+      'The products it contains will be available for repackaging.',
+      'Deletion confirm question found.'
+    );
+    // "Cancel" returns to the package list page.
+    $this->clickLink(t('Cancel'));
+    $this->assertLinkByHref('admin/store/orders/' . $order->id() . '/packages');
+
+    // Again with the "Delete".
+    $this->clickLink(t('Delete'));
+    $this->drupalPostForm(NULL, array(), t('Delete'));
+    // Delete returns to new packages page with all packages unchecked.
+    $this->assertUrl('admin/store/orders/' . $order->id() . '/packages/new');
+    $this->assertText(
+      'Package 1 has been deleted.',
+      'Package deleted message found.'
+    );
+    foreach ($order->products as $sequence => $item) {
+      $this->assertFieldByName(
+        'shipping_types[small_package][table][' . $sequence . '][checked]',
+        0,
+        'Product is available for packaging.'
+      );
+    }
+
+    // Back to no packages. Now test making more than one package.
+    // Now test the "Create one package" button with all products selected.
+    $this->drupalPostForm(
+      NULL,
+      array(
+        'shipping_types[small_package][table][1][checked]' => 1,
+        'shipping_types[small_package][table][2][checked]' => 1,
+      ),
+      t('Create one package')
+    );
+
+    // Check that we're now on the package list page.
+    $this->assertUrl('admin/store/orders/' . $order->id() . '/packages');
+    $this->assertText(
+      $order->products[1]->qty->value . ' x ' . $order->products[1]->model->value,
+      'Product quantity x SKU found.'
+    );
+    $this->assertText(
+      $order->products[2]->qty->value . ' x ' . $order->products[2]->model->value,
+      'Product quantity x SKU found.'
+    );
+    $this->assertNoText(
+      $order->products[3]->qty->value . ' x ' . $order->products[3]->model->value,
+      'Product quantity x SKU not found.'
+    );
+    $this->assertNoText(
+      $order->products[4]->qty->value . ' x ' . $order->products[4]->model->value,
+      'Product quantity x SKU not found.'
+    );
+
+    // Use "Create packages" to create a second package.
+    $this->assertLink(t('Create packages'));
+    $this->clickLink(t('Create packages'));
+    $this->assertUrl('admin/store/orders/' . $order->id() . '/packages/new');
+    $this->assertNoText(
+      $order->products[1]->model->value,
+      'Product SKU not found.'
+    );
+    $this->assertNoText(
+      $order->products[2]->model->value,
+      'Product SKU not found.'
+    );
+    $this->assertText(
+      $order->products[3]->model->value,
+      'Product SKU found.'
+    );
+    $this->assertText(
+      $order->products[4]->model->value,
+      'Product SKU found.'
+    );
+    $this->drupalPostForm(
+      NULL,
+      array(
+        'shipping_types[small_package][table][3][checked]' => 1,
+        'shipping_types[small_package][table][4][checked]' => 1,
+      ),
+      t('Create one package')
+    );
+    $this->assertLinkByHref('admin/store/orders/' . $order->id() . '/packages');
+    foreach ($order->products as $sequence => $item) {
+      $this->assertText(
+        $item->qty->value . ' x ' . $item->model->value,
+        'Product quantity x SKU found.'
+      );
+    }
+
+    // How do we test for two packages? Look for two "Ship" links
+    $this->assertLinkByHref('admin/store/orders/' . $order->id() . '/shipments/new?pkgs=2');
+    $this->assertLinkByHref('admin/store/orders/' . $order->id() . '/shipments/new?pkgs=3');
+
+    // Now delete both packages.
+    $this->clickLink(t('Delete'));
+    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->assertText(
+      'Package 2 has been deleted.',
+      'Package deleted message found.'
+    );
+    // There's still one left to delete...
+    $this->clickLink(t('Delete'));
+    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->assertUrl('admin/store/orders/' . $order->id() . '/packages/new');
+    $this->assertText(
+      'Package 3 has been deleted.',
+      'Package deleted message found.'
+    );
+
+    // Back to no packages. Now test "Make packages" button.
+    $this->drupalPostForm(
+      NULL,
+      array(
+        'shipping_types[small_package][table][1][checked]' => 1,
+        'shipping_types[small_package][table][2][checked]' => 1,
+        'shipping_types[small_package][table][3][checked]' => 1,
+        'shipping_types[small_package][table][4][checked]' => 1,
+      ),
+      t('Make packages')
+    );
+
+    // Check that we're now on the package list page.
+    $this->assertUrl('admin/store/orders/' . $order->id() . '/packages');
+    foreach ($order->products as $sequence => $item) {
+      $this->assertText(
+        $item->qty->value . ' x ' . $item->model->value,
+        'Product quantity x SKU found.'
+      );
+    }
+
+  }
+
+}
diff --git a/shipping/uc_fulfillment/uc_fulfillment.info.yml b/shipping/uc_fulfillment/uc_fulfillment.info.yml
index 8a45b36..2a72847 100644
--- a/shipping/uc_fulfillment/uc_fulfillment.info.yml
+++ b/shipping/uc_fulfillment/uc_fulfillment.info.yml
@@ -4,5 +4,5 @@ description: 'Handles order fulfillment.'
 package: Ubercart - core (optional)
 core: 8.x
 dependencies:
-  - not_yet_ported
+  - uc_order
   - uc_quote