diff --git a/includes/mutation/class-order-create.php b/includes/mutation/class-order-create.php
index 72f06548..ffe6b277 100644
--- a/includes/mutation/class-order-create.php
+++ b/includes/mutation/class-order-create.php
@@ -20,193 +20,202 @@
 /**
  * Class Order_Create
  */
-class Order_Create {
-	/**
-	 * Registers mutation
-	 *
-	 * @return void
-	 */
-	public static function register_mutation() {
-		register_graphql_mutation(
-			'createOrder',
-			[
-				'inputFields'         => self::get_input_fields(),
-				'outputFields'        => self::get_output_fields(),
-				'mutateAndGetPayload' => self::mutate_and_get_payload(),
-			]
-		);
-	}
-
-	/**
-	 * Defines the mutation input field configuration
-	 *
-	 * @return array
-	 */
-	public static function get_input_fields() {
-		return [
-			'parentId'           => [
-				'type'        => 'Int',
-				'description' => __( 'Parent order ID.', 'wp-graphql-woocommerce' ),
-			],
-			'currency'           => [
-				'type'        => 'CurrencyEnum',
-				'description' => __( 'Currency the order was created with, in ISO format.', 'wp-graphql-woocommerce' ),
-			],
-			'customerId'         => [
-				'type'        => 'Int',
-				'description' => __( 'Order customer ID', 'wp-graphql-woocommerce' ),
-			],
-			'customerNote'       => [
-				'type'        => 'String',
-				'description' => __( 'Note left by customer during checkout.', 'wp-graphql-woocommerce' ),
-			],
-			'coupons'            => [
-				'type'        => [ 'list_of' => 'String' ],
-				'description' => __( 'Coupons codes to be applied to order', 'wp-graphql-woocommerce' ),
-			],
-			'status'             => [
-				'type'        => 'OrderStatusEnum',
-				'description' => __( 'Order status', 'wp-graphql-woocommerce' ),
-			],
-			'paymentMethod'      => [
-				'type'        => 'String',
-				'description' => __( 'Payment method ID.', 'wp-graphql-woocommerce' ),
-			],
-			'paymentMethodTitle' => [
-				'type'        => 'String',
-				'description' => __( 'Payment method title.', 'wp-graphql-woocommerce' ),
-			],
-			'transactionId'      => [
-				'type'        => 'String',
-				'description' => __( 'Order transaction ID', 'wp-graphql-woocommerce' ),
-			],
-			'billing'            => [
-				'type'        => 'CustomerAddressInput',
-				'description' => __( 'Order billing address', 'wp-graphql-woocommerce' ),
-			],
-			'shipping'           => [
-				'type'        => 'CustomerAddressInput',
-				'description' => __( 'Order shipping address', 'wp-graphql-woocommerce' ),
-			],
-			'lineItems'          => [
-				'type'        => [ 'list_of' => 'LineItemInput' ],
-				'description' => __( 'Order line items', 'wp-graphql-woocommerce' ),
-			],
-			'shippingLines'      => [
-				'type'        => [ 'list_of' => 'ShippingLineInput' ],
-				'description' => __( 'Order shipping lines', 'wp-graphql-woocommerce' ),
-			],
-			'feeLines'           => [
-				'type'        => [ 'list_of' => 'FeeLineInput' ],
-				'description' => __( 'Order shipping lines', 'wp-graphql-woocommerce' ),
-			],
-			'metaData'           => [
-				'type'        => [ 'list_of' => 'MetaDataInput' ],
-				'description' => __( 'Order meta data', 'wp-graphql-woocommerce' ),
-			],
-			'isPaid'             => [
-				'type'        => 'Boolean',
-				'description' => __( 'Define if the order is paid. It will set the status to processing and reduce stock items.', 'wp-graphql-woocommerce' ),
-			],
-		];
-	}
-
-	/**
-	 * Defines the mutation output field configuration
-	 *
-	 * @return array
-	 */
-	public static function get_output_fields() {
-		return [
-			'order'   => [
-				'type'    => 'Order',
-				'resolve' => static function ( $payload ) {
-					return new Order( $payload['id'] );
-				},
-			],
-			'orderId' => [
-				'type'    => 'Int',
-				'resolve' => static function ( $payload ) {
-					return $payload['id'];
-				},
-			],
-		];
-	}
-
-	/**
-	 * Defines the mutation data modification closure.
-	 *
-	 * @return callable
-	 */
-	public static function mutate_and_get_payload() {
-		return static function ( $input, AppContext $context, ResolveInfo $info ) {
-			// Check if authorized to create this order.
-			if ( ! Order_Mutation::authorized( $input, $context, $info, 'create', null ) ) {
-				throw new UserError( __( 'User does not have the capabilities necessary to create an order.', 'wp-graphql-woocommerce' ) );
-			}
-
-			// Create order.
-			$order = null;
-			try {
-				$order_id = Order_Mutation::create_order( $input, $context, $info );
-				Order_Mutation::add_order_meta( $order_id, $input, $context, $info );
-				Order_Mutation::add_items( $input, $order_id, $context, $info );
-
-				// Apply coupons.
-				if ( ! empty( $input['coupons'] ) ) {
-					Order_Mutation::apply_coupons( $order_id, $input['coupons'] );
-				}
-
-				$order = WC_Order_Factory::get_order( $order_id );
-
-				if ( ! is_object( $order ) ) {
-					throw new UserError( __( 'Order could not be created.', 'wp-graphql-woocommerce' ) );
-				}
-
-				// Make sure gateways are loaded so hooks from gateways fire on save/create.
-				WC()->payment_gateways();
-
-				// Validate customer ID, if set.
-				if ( ! empty( $input['customerId'] ) && ! Order_Mutation::validate_customer( $input['customerId'] ) ) {
-					throw new UserError( __( 'Customer ID is invalid.', 'wp-graphql-woocommerce' ) );
-				}
-
-				$order->set_created_via( 'graphql-api' );
-				$order->set_prices_include_tax( 'yes' === get_option( 'woocommerce_prices_include_tax' ) );
-				$order->calculate_totals( true );
-
-				// Set status.
-				if ( ! empty( $input['status'] ) ) {
-					$order->set_status( $input['status'] );
-				}
-
-				// Actions for after the order is saved.
-				if ( true === $input['isPaid'] ) {
-					$order->payment_complete(
-						! empty( $input['transactionId'] ) ? $input['transactionId'] : ''
-					);
-				}
-
-				/**
-				 * Action called after order is created.
-				 *
-				 * @param \WC_Order    $order   WC_Order instance.
-				 * @param array       $input   Input data describing order.
-				 * @param \WPGraphQL\AppContext  $context Request AppContext instance.
-				 * @param \GraphQL\Type\Definition\ResolveInfo $info    Request ResolveInfo instance.
-				 */
-				do_action( 'graphql_woocommerce_after_order_create', $order, $input, $context, $info );
-
-				return [ 'id' => $order->get_id() ];
-			} catch ( \Throwable $e ) {
-				// Delete order if it was created.
-				if ( is_object( $order ) ) {
-					Order_Mutation::purge( $order );
-				}
-
-				// Throw error.
-				throw new UserError( $e->getMessage() );
-			}//end try
-		};
-	}
+class Order_Create
+{
+    /**
+     * Registers mutation
+     *
+     * @return void
+     */
+    public static function register_mutation()
+    {
+        register_graphql_mutation(
+            'createOrder',
+            [
+                'inputFields'         => self::get_input_fields(),
+                'outputFields'        => self::get_output_fields(),
+                'mutateAndGetPayload' => self::mutate_and_get_payload(),
+            ]
+        );
+    }
+
+    /**
+     * Defines the mutation input field configuration
+     *
+     * @return array
+     */
+    public static function get_input_fields()
+    {
+        return [
+            'parentId'           => [
+                'type'        => 'Int',
+                'description' => __('Parent order ID.', 'wp-graphql-woocommerce'),
+            ],
+            'currency'           => [
+                'type'        => 'CurrencyEnum',
+                'description' => __('Currency the order was created with, in ISO format.', 'wp-graphql-woocommerce'),
+            ],
+            'customerId'         => [
+                'type'        => 'Int',
+                'description' => __('Order customer ID', 'wp-graphql-woocommerce'),
+            ],
+            'customerNote'       => [
+                'type'        => 'String',
+                'description' => __('Note left by customer during checkout.', 'wp-graphql-woocommerce'),
+            ],
+            'coupons'            => [
+                'type'        => ['list_of' => 'String'],
+                'description' => __('Coupons codes to be applied to order', 'wp-graphql-woocommerce'),
+            ],
+            'status'             => [
+                'type'        => 'OrderStatusEnum',
+                'description' => __('Order status', 'wp-graphql-woocommerce'),
+            ],
+            'paymentMethod'      => [
+                'type'        => 'String',
+                'description' => __('Payment method ID.', 'wp-graphql-woocommerce'),
+            ],
+            'paymentMethodTitle' => [
+                'type'        => 'String',
+                'description' => __('Payment method title.', 'wp-graphql-woocommerce'),
+            ],
+            'transactionId'      => [
+                'type'        => 'String',
+                'description' => __('Order transaction ID', 'wp-graphql-woocommerce'),
+            ],
+            'billing'            => [
+                'type'        => 'CustomerAddressInput',
+                'description' => __('Order billing address', 'wp-graphql-woocommerce'),
+            ],
+            'shipping'           => [
+                'type'        => 'CustomerAddressInput',
+                'description' => __('Order shipping address', 'wp-graphql-woocommerce'),
+            ],
+            'lineItems'          => [
+                'type'        => ['list_of' => 'LineItemInput'],
+                'description' => __('Order line items', 'wp-graphql-woocommerce'),
+            ],
+            'shippingLines'      => [
+                'type'        => ['list_of' => 'ShippingLineInput'],
+                'description' => __('Order shipping lines', 'wp-graphql-woocommerce'),
+            ],
+            'feeLines'           => [
+                'type'        => ['list_of' => 'FeeLineInput'],
+                'description' => __('Order shipping lines', 'wp-graphql-woocommerce'),
+            ],
+            'metaData'           => [
+                'type'        => ['list_of' => 'MetaDataInput'],
+                'description' => __('Order meta data', 'wp-graphql-woocommerce'),
+            ],
+            'isPaid'             => [
+                'type'        => 'Boolean',
+                'description' => __('Define if the order is paid. It will set the status to processing and reduce stock items.', 'wp-graphql-woocommerce'),
+            ],
+            'createdVia'         => [
+                'type'        => 'String',
+                'description' => __('Order created via', 'wp-graphql-woocommerce'),
+            ],
+        ];
+    }
+
+    /**
+     * Defines the mutation output field configuration
+     *
+     * @return array
+     */
+    public static function get_output_fields()
+    {
+        return [
+            'order'   => [
+                'type'    => 'Order',
+                'resolve' => static function ($payload) {
+                    return new Order($payload['id']);
+                },
+            ],
+            'orderId' => [
+                'type'    => 'Int',
+                'resolve' => static function ($payload) {
+                    return $payload['id'];
+                },
+            ],
+        ];
+    }
+
+    /**
+     * Defines the mutation data modification closure.
+     *
+     * @return callable
+     */
+    public static function mutate_and_get_payload()
+    {
+        return static function ($input, AppContext $context, ResolveInfo $info) {
+            // Check if authorized to create this order.
+            if (! Order_Mutation::authorized($input, $context, $info, 'create', null)) {
+                throw new UserError(__('User does not have the capabilities necessary to create an order.', 'wp-graphql-woocommerce'));
+            }
+
+            // Create order.
+            $order = null;
+            try {
+                $order_id = Order_Mutation::create_order($input, $context, $info);
+                Order_Mutation::add_order_meta($order_id, $input, $context, $info);
+                Order_Mutation::add_items($input, $order_id, $context, $info);
+
+                // Apply coupons.
+                if (! empty($input['coupons'])) {
+                    Order_Mutation::apply_coupons($order_id, $input['coupons']);
+                }
+
+                $order = WC_Order_Factory::get_order($order_id);
+
+                if (! is_object($order)) {
+                    throw new UserError(__('Order could not be created.', 'wp-graphql-woocommerce'));
+                }
+
+                // Make sure gateways are loaded so hooks from gateways fire on save/create.
+                WC()->payment_gateways();
+
+                // Validate customer ID, if set.
+                if (! empty($input['customerId']) && ! Order_Mutation::validate_customer($input['customerId'])) {
+                    throw new UserError(__('Customer ID is invalid.', 'wp-graphql-woocommerce'));
+                }
+
+                $order->set_created_via(! empty($input['createdVia']) ? $input['createdVia'] : 'graphql-api');
+                $order->set_prices_include_tax('yes' === get_option('woocommerce_prices_include_tax'));
+                $order->calculate_totals(true);
+
+                // Set status.
+                if (! empty($input['status'])) {
+                    $order->set_status($input['status']);
+                }
+
+                // Actions for after the order is saved.
+                if (true === $input['isPaid']) {
+                    $order->payment_complete(
+                        ! empty($input['transactionId']) ? $input['transactionId'] : ''
+                    );
+                }
+
+                /**
+                 * Action called after order is created.
+                 *
+                 * @param \WC_Order    $order   WC_Order instance.
+                 * @param array       $input   Input data describing order.
+                 * @param \WPGraphQL\AppContext  $context Request AppContext instance.
+                 * @param \GraphQL\Type\Definition\ResolveInfo $info    Request ResolveInfo instance.
+                 */
+                do_action('graphql_woocommerce_after_order_create', $order, $input, $context, $info);
+
+                return ['id' => $order->get_id()];
+            } catch (\Throwable $e) {
+                // Delete order if it was created.
+                if (is_object($order)) {
+                    Order_Mutation::purge($order);
+                }
+
+                // Throw error.
+                throw new UserError($e->getMessage());
+            } //end try
+        };
+    }
 }
diff --git a/tests/wpunit/CheckoutMutationTest.php b/tests/wpunit/CheckoutMutationTest.php
index 3ac4b089..d5247938 100644
--- a/tests/wpunit/CheckoutMutationTest.php
+++ b/tests/wpunit/CheckoutMutationTest.php
@@ -84,181 +84,177 @@ static function () {
 		);
 	}
 
-	private function getCheckoutMutation() {
-		return '
-			mutation checkout( $input: CheckoutInput! ) {
-				checkout( input: $input ) {
-					clientMutationId
-					order {
-						id
-						databaseId
-						currency
-						orderVersion
-						date
-						modified
-						status
-						discountTotal
-						discountTax
-						shippingTotal
-						shippingTax
-						cartTax
-						total
-						totalTax
-						subtotal
-						orderNumber
-						orderKey
-						createdVia
-						pricesIncludeTax
-						parent {
-							id
-						}
-						customer {
-							id
-						}
-						customerIpAddress
-						customerUserAgent
-						customerNote
-						billing {
-							firstName
-							lastName
-							company
-							address1
-							address2
-							city
-							state
-							postcode
-							country
-							email
-							phone
-						}
-						shipping {
-							firstName
-							lastName
-							company
-							address1
-							address2
-							city
-							state
-							postcode
-							country
-						}
-						paymentMethod
-						paymentMethodTitle
-						transactionId
-						dateCompleted
-						datePaid
-						cartHash
-						shippingAddressMapUrl
-						hasBillingAddress
-						hasShippingAddress
-						isDownloadPermitted
-						needsShippingAddress
-						hasDownloadableItem
-						downloadableItems {
-							nodes {
-								url
-								accessExpires
-								downloadId
-								downloadsRemaining
-								name
-								product {
-									databaseId
-								}
-								download {
-									downloadId
-								}
-							}
-						}
-						needsPayment
-						needsProcessing
-						metaData {
-							key
-							value
-						}
-						couponLines {
-							nodes {
-								databaseId
-								orderId
-								code
-								discount
-								discountTax
-								coupon {
-									id
-								}
-							}
-						}
-						feeLines {
-							nodes {
-								databaseId
-								orderId
-								amount
-								name
-								taxStatus
-								total
-								totalTax
-								taxClass
-							}
-						}
-						shippingLines {
-							nodes {
-								databaseId
-								orderId
-								methodTitle
-								total
-								totalTax
-								taxClass
-							}
-						}
-						taxLines {
-							nodes {
-								rateCode
-								label
-								taxTotal
-								shippingTaxTotal
-								isCompound
-								taxRate {
-									databaseId
-								}
-							}
-						}
-						lineItems {
-							nodes {
-								productId
-								variationId
-								quantity
-								taxClass
-								subtotal
-								subtotalTax
-								total
-								totalTax
-								taxStatus
-								product {
-									node {
-										... on SimpleProduct {
-											id
-										}
-										... on VariableProduct {
-											id
-										}
-									}
-								}
-								variation {
-									node {
-										id
-									}
-								}
-							}
-						}
-					}
-					customer {
-						id
-					}
-					result
-					redirect
-				}
-			}
-		';
-	}
+	private function checkout( $input, $mutation = null ) {
+		if ( ! $mutation ) {
+			$mutation = '
+                mutation checkout( $input: CheckoutInput! ) {
+                    checkout( input: $input ) {
+                        clientMutationId
+                        order {
+                            id
+                            databaseId
+                            currency
+                            orderVersion
+                            date
+                            modified
+                            status
+                            discountTotal
+                            discountTax
+                            shippingTotal
+                            shippingTax
+                            cartTax
+                            total
+                            totalTax
+                            subtotal
+                            orderNumber
+                            orderKey
+                            pricesIncludeTax
+                            parent {
+                                id
+                            }
+                            customer {
+                                id
+                            }
+                            customerIpAddress
+                            customerUserAgent
+                            customerNote
+                            billing {
+                                firstName
+                                lastName
+                                company
+                                address1
+                                address2
+                                city
+                                state
+                                postcode
+                                country
+                                email
+                                phone
+                            }
+                            shipping {
+                                firstName
+                                lastName
+                                company
+                                address1
+                                address2
+                                city
+                                state
+                                postcode
+                                country
+                            }
+                            paymentMethod
+                            paymentMethodTitle
+                            transactionId
+                            dateCompleted
+                            datePaid
+                            cartHash
+                            shippingAddressMapUrl
+                            hasBillingAddress
+                            hasShippingAddress
+                            isDownloadPermitted
+                            needsShippingAddress
+                            hasDownloadableItem
+                            downloadableItems {
+                                nodes {
+                                    url
+                                    accessExpires
+                                    downloadId
+                                    downloadsRemaining
+                                    name
+                                    product {
+                                        databaseId
+                                    }
+                                    download {
+                                        downloadId
+                                    }
+                                }
+                            }
+                            needsPayment
+                            needsProcessing
+                            metaData {
+                                key
+                                value
+                            }
+                            couponLines {
+                                nodes {
+                                    databaseId
+                                    orderId
+                                    code
+                                    discount
+                                    discountTax
+                                    coupon {
+                                        id
+                                    }
+                                }
+                            }
+                            feeLines {
+                                nodes {
+                                    databaseId
+                                    orderId
+                                    amount
+                                    name
+                                    taxStatus
+                                    total
+                                    totalTax
+                                    taxClass
+                                }
+                            }
+                            shippingLines {
+                                nodes {
+                                    databaseId
+                                    orderId
+                                    methodTitle
+                                    total
+                                    totalTax
+                                    taxClass
+                                }
+                            }
+                            taxLines {
+                                nodes {
+                                    rateCode
+                                    label
+                                    taxTotal
+                                    shippingTaxTotal
+                                    isCompound
+                                    taxRate {
+                                        databaseId
+                                    }
+                                }
+                            }
+                            lineItems {
+                                nodes {
+                                    productId
+                                    variationId
+                                    quantity
+                                    taxClass
+                                    subtotal
+                                    subtotalTax
+                                    total
+                                    totalTax
+                                    taxStatus
+                                    product {
+                                        ... on SimpleProduct {
+                                            id
+                                        }
+                                        ... on VariableProduct {
+                                            id
+                                        }
+                                    }
+                                    variation {
+                                        id
+                                    }
+                                }
+                            }
+                        }
+                        customer {
+                            id
+                        }
+                        result
+                        redirect
+                    }
+                }
+            ';
+		}
 
 	private function getCartQuery() {
 		return '
diff --git a/tests/wpunit/OrderMutationsTest.php b/tests/wpunit/OrderMutationsTest.php
index b3977f82..041a538d 100644
--- a/tests/wpunit/OrderMutationsTest.php
+++ b/tests/wpunit/OrderMutationsTest.php
@@ -104,6 +104,7 @@ private function orderMutation( $input, $operation_name = 'createOrder', $input_
                         transactionId
                         dateCompleted
                         datePaid
+						createdVia
                         cartHash
                         shippingAddressMapUrl
                         hasBillingAddress