diff --git a/modules/order/src/Tests/OrderAdminTest.php b/modules/order/src/Tests/OrderAdminTest.php
index e35edc4..340a2f5 100644
--- a/modules/order/src/Tests/OrderAdminTest.php
+++ b/modules/order/src/Tests/OrderAdminTest.php
@@ -28,6 +28,7 @@ class OrderAdminTest extends OrderTestBase {
     parent::setUp();
     \Drupal::service('module_installer')->install(['profile']);
 
+    // Create a billing profile.
     $profile_values = [
       'type' => 'billing',
       'uid' => 1,
@@ -38,7 +39,8 @@ class OrderAdminTest extends OrderTestBase {
   }
 
   /**
-   * Tests creating a Order programaticaly and through the add form.
+   * Tests creating/editing an Order.
+   * The edit form is part of creating a new order.
    */
   public function testCreateOrder() {
     // Create a order through the add form.
@@ -46,25 +48,49 @@ class OrderAdminTest extends OrderTestBase {
     $this->clickLink('Create a new order');
 
     $user = $this->loggedInUser->getAccountName() . ' (' . $this->loggedInUser->id() . ')';
-    $values = [
+    $edit = [
       'customer_type' => 'existing',
       'uid' => $user,
     ];
-    $this->drupalPostForm(NULL, $values, 'Create');
+    $this->drupalPostForm(NULL, $edit, t('Create'));
 
+    // Check the integrity of the edit form.
+    $this->assertFieldByName('billing_profile', NULL, 'Billing profile field is present');
+    $this->assertFieldByName('line_items[form][inline_entity_form][purchased_entity][0][target_id]', NULL, 'Purchased entity field is present');
+    $this->assertFieldByName('line_items[form][inline_entity_form][quantity][0][value]', NULL, 'Quantity field is present');
+    $this->assertFieldByName('line_items[form][inline_entity_form][unit_price][0][amount]', NULL, 'Unit price field is present');
+    $this->assertFieldsByValue(t('Create line item'), NULL, 'Create line item button is present');
+
+    // Submit line item values.
     $entity = $this->variation->getSku() . ' (' . $this->variation->id() . ')';
-    $values = [
+    $edit = [
       'line_items[form][inline_entity_form][purchased_entity][0][target_id]' => $entity,
       'line_items[form][inline_entity_form][quantity][0][value]' => 1,
       'line_items[form][inline_entity_form][unit_price][0][amount]' => '9.99',
     ];
-    $this->drupalPostForm(NULL, $values, 'Create line item');
+    $this->drupalPostForm(NULL, $edit, t('Create line item'));
+
+    // Check the line item edit form.
+    $this->drupalPostForm(NULL, [], t('Edit'));
+    $this->assertFieldByName('line_items[form][inline_entity_form][entities][0][form][purchased_entity][0][target_id]', NULL, 'SKU field is present');
+    $this->assertFieldByName('line_items[form][inline_entity_form][entities][0][form][quantity][0][value]', NULL, 'Price field is present');
+    $this->assertFieldByName('line_items[form][inline_entity_form][entities][0][form][unit_price][0][amount]', NULL, 'Status field is present');
+    $this->assertFieldsByValue(t('Update line item'), NULL, 'Update line item button is present');
+
+    // Update/edit line item.
+    $edit = [
+      'line_items[form][inline_entity_form][entities][0][form][quantity][0][value]' => 3,
+      'line_items[form][inline_entity_form][entities][0][form][unit_price][0][amount]' => '1.11',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Update line item'));
 
-    $values = [
+    // Submit order values.
+    $edit = [
       'billing_profile' => $this->billingProfile->id(),
     ];
-    $this->drupalPostForm(NULL, $values, t('Save'));
+    $this->drupalPostForm(NULL, $edit, t('Save'));
 
+    // Test results.
     $order_number = $this->cssSelect('tr td.views-field-order-number');
     $this->assertEqual(count($order_number), 1, 'Order exists in the table.');
   }
@@ -81,15 +107,18 @@ class OrderAdminTest extends OrderTestBase {
     $order_exists = (bool) Order::load($order->id());
     $this->assertTrue($order_exists, 'The order has been created in the database.');
 
+    // Delete the order created.
     $this->drupalGet('admin/commerce/orders/' . $order->id() . '/delete');
     $this->assertRaw(t('Are you sure you want to delete the order %label?', [
       '%label' => $order->label(),
     ]));
     $this->assertText(t('This action cannot be undone.'), 'The order deletion confirmation form is available');
     $this->drupalPostForm(NULL, NULL, t('Delete'));
+
     // Remove the entity from cache and check if the order is deleted.
     \Drupal::service('entity_type.manager')->getStorage('commerce_order')->resetCache([$order->id()]);
     $order_exists = (bool) Order::load('commerce_order', $order->id());
     $this->assertFalse($order_exists, 'The order has been deleted from the database.');
   }
+
 }