diff --git a/Guardfile b/Guardfile
index 97c5763..dac60e0 100644
--- a/Guardfile
+++ b/Guardfile
@@ -1,7 +1,8 @@
-guard 'rspec', cli: '--color' do
+guard 'rspec', cmd: 'bundle exec rspec' do
   watch('spec/spec_helper.rb')                        { 'spec' }
   watch('config/routes.rb')                           { 'spec/controllers' }
   watch('app/controllers/application_controller.rb')  { 'spec/controllers' }
+  watch(%r{^app/views/(.+)})                          { 'spec/controllers' }
   watch(%r{^spec/(.+)_spec\.rb$})                     { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^app/(.+)_decorator\.rb$})                 { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
diff --git a/app/views/spree/shipstation/export.xml.builder b/app/views/spree/shipstation/export.xml.builder
index a1f26c5..945e707 100644
--- a/app/views/spree/shipstation/export.xml.builder
+++ b/app/views/spree/shipstation/export.xml.builder
@@ -29,16 +29,16 @@ xml.Orders(pages: (@shipments.total_count/50.0).ceil) {
         Spree::ExportHelper.address(xml, order, :ship)
       }
       xml.Items {
-        shipment.line_items.each do |line|
-          variant = line.variant
+        shipment.manifest.each do |item|
+          variant = item.variant
           xml.Item {
             xml.SKU         variant.sku
             xml.Name        [variant.product.name, variant.options_text].join(' ')
             xml.ImageUrl    variant.images.first.try(:attachment).try(:url)
             xml.Weight      variant.weight.to_f
             xml.WeightUnits Spree::Config.shipstation_weight_units
-            xml.Quantity    line.quantity
-            xml.UnitPrice   line.price
+            xml.Quantity    item.quantity
+            xml.UnitPrice   item.line_item.price
 
             if variant.option_values.present?
               xml.Options {
diff --git a/solidus_shipstation.gemspec b/solidus_shipstation.gemspec
index 9e1a58f..b150e34 100644
--- a/solidus_shipstation.gemspec
+++ b/solidus_shipstation.gemspec
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'solidus_core', ' >= 1.1', '< 3'
   s.add_dependency 'solidus_support'
 
+  s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'capybara', '~> 2.2'
   s.add_development_dependency 'coffee-rails', '>= 4.1'
   s.add_development_dependency 'factory_bot'
diff --git a/spec/controllers/spree/shipstation_controller_spec.rb b/spec/controllers/spree/shipstation_controller_spec.rb
index d49d078..760b677 100644
--- a/spec/controllers/spree/shipstation_controller_spec.rb
+++ b/spec/controllers/spree/shipstation_controller_spec.rb
@@ -17,8 +17,8 @@
 
     describe '#export' do
       let(:schema) { 'spec/fixtures/shipstation_xml_schema.xsd' }
-      let(:order) { create(:order, state: 'complete', completed_at: Time.now.utc) }
-      let!(:shipments) { create(:shipment, state: 'ready', order: order) }
+      let(:order) { create(:order_ready_to_ship) }
+      let!(:shipments) { order.shipments.to_a }
       let(:params) do
         {
           start_date: 1.day.ago.strftime('%m/%d/%Y %H:%M'),
@@ -32,7 +32,7 @@
       it 'renders successfully', :aggregate_failures do
         expect(response).to be_successful
         expect(response).to render_template(:export)
-        expect(assigns(:shipments)).to match_array([shipments])
+        expect(assigns(:shipments)).to match_array(shipments)
       end
 
       it 'generates valid ShipStation formatted xml' do
diff --git a/spec/fixtures/shipstation_xml_schema.xsd b/spec/fixtures/shipstation_xml_schema.xsd
index ef8fd34..40c6002 100644
--- a/spec/fixtures/shipstation_xml_schema.xsd
+++ b/spec/fixtures/shipstation_xml_schema.xsd
@@ -1,171 +1,309 @@
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
   <xs:element name="Orders">
+
     <xs:complexType>
+
       <xs:sequence>
+
         <xs:element name="Order" maxOccurs="unbounded" minOccurs="0">
+
           <xs:complexType>
+
             <xs:all>
+
               <xs:element type="String50" name="OrderID" minOccurs="0"/>
+
               <xs:element type="String50" name="OrderNumber"/>
+
               <xs:element type="DateTime" name="OrderDate"/>
+
               <xs:element type="String50" name="OrderStatus"/>
+
               <xs:element type="DateTime" name="LastModified"/>
+
               <xs:element type="String100" name="ShippingMethod" minOccurs="0"/>
+
               <xs:element type="String50" name="PaymentMethod" minOccurs="0"/>
-              <xs:element type="xs:float" name="OrderTotal"/>
-              <xs:element type="xs:float" name="TaxAmount" minOccurs="0"/>
-              <xs:element type="xs:float" name="ShippingAmount" minOccurs="0"/>
+
+              <xs:element type="xs:decimal" name="OrderTotal"/>
+
+              <xs:element type="xs:decimal" name="TaxAmount" minOccurs="0"/>
+
+              <xs:element type="xs:decimal" name="ShippingAmount" minOccurs="0"/>
+
               <xs:element type="String1000" name="CustomerNotes" minOccurs="0"/>
+
               <xs:element type="String1000" name="InternalNotes" minOccurs="0"/>
+
               <xs:element type="xs:boolean" name="Gift" minOccurs="0"/>
+
               <xs:element type="String1000" name="GiftMessage" minOccurs="0"/>
+
               <xs:element type="String100" name="CustomField1" minOccurs="0"/>
+
               <xs:element type="String100" name="CustomField2" minOccurs="0"/>
+
               <xs:element type="String100" name="CustomField3" minOccurs="0"/>
+
               <xs:element type="String100" name="RequestedWarehouse" minOccurs="0"/>
+
               <xs:element type="String50" name="Source" minOccurs="0" />
+
               <xs:element name="Customer">
+
                 <xs:complexType>
+
                   <xs:all>
+
                     <xs:element type="String100" name="CustomerCode"/>
+
                     <xs:element name="BillTo">
+
                       <xs:complexType>
+
                         <xs:all>
+
                            <xs:element type="String100" name="Name"/>
+
                            <xs:element type="String100" name="Company" minOccurs="0"/>
+
                            <xs:element type="String50" name="Phone" minOccurs="0"/>
+
                            <xs:element type="Email" name="Email" minOccurs="0"/>
+
                             <xs:element type="String200" name="Address1" minOccurs="0"/>
+
                            <xs:element type="String200" name="Address2" minOccurs="0"/>
+
                            <xs:element type="String100" name="City" minOccurs="0"/>
+
                            <xs:element type="String100" name="State" minOccurs="0"/>
+
                            <xs:element type="String50" name="PostalCode" minOccurs="0"/>
+
 <xs:element type="StringExactly2" name="Country" minOccurs="0"/>
+
                         </xs:all>
+
                       </xs:complexType>
+
                     </xs:element>
+
                     <xs:element name="ShipTo">
+
                       <xs:complexType>
+
                         <xs:all>
+
                           <xs:element type="String100" name="Name"/>
+
                           <xs:element type="String100" name="Company" minOccurs="0"/>
+
                           <xs:element type="String200" name="Address1"/>
+
                           <xs:element type="String200" name="Address2" minOccurs="0"/>
+
                           <xs:element type="String100" name="City"/>
+
                           <xs:element type="String100" name="State" minOccurs="0"/>
+
                           <xs:element type="String50" name="PostalCode" minOccurs="1"/>
+
                           <xs:element type="StringExactly2" name="Country"/>
+
                           <xs:element type="String50" name="Phone" minOccurs="0"/>
+
                         </xs:all>
+
                       </xs:complexType>
+
                     </xs:element>
+
                   </xs:all>
+
                 </xs:complexType>
+
               </xs:element>
+
               <xs:element name="Items">
+
                 <xs:complexType>
+
                   <xs:sequence>
+
                     <xs:element name="Item" maxOccurs="unbounded" minOccurs="0">
+
                       <xs:complexType>
+
                         <xs:all>
+
                           <xs:element type="String50" name="LineItemID" minOccurs="0"/>
+
                           <xs:element type="String100" name="SKU"/>
+
                           <xs:element type="String200" name="Name"/>
+
                           <xs:element type="xs:boolean" name="Adjustment" minOccurs="0"/>
+
                           <xs:element type="xs:anyURI" name="ImageUrl" minOccurs="0"/>
-                          <xs:element type="xs:float" name="Weight" minOccurs="0"/>
+
+                          <xs:element type="xs:decimal" name="Weight" minOccurs="0"/>
+
                           <xs:element name="WeightUnits" minOccurs="0">
+
                             <xs:simpleType>
+
                               <xs:restriction base="xs:string">
-                                <xs:pattern value="|pound|pounds|lb|lbs|gram|grams|gm|oz|ounces|Pound|Pounds|Lb|Lbs|Gram|Grams|Gm|Oz|Ounces|POUND|POUNDS|LB|LBS|GRAM|GRAMS|GM|OZ|OUNCES"/>
+
+                                <xs:pattern value="pound|pounds|lb|lbs|gram|grams|gm|oz|ounces|Pound|Pounds|Lb|Lbs|Gram|Grams|Gm|Oz|Ounces|POUND|POUNDS|LB|LBS|GRAM|GRAMS|GM|OZ|OUNCES"/>
+
                               </xs:restriction>
+
                             </xs:simpleType>
+
                           </xs:element>
-                          <xs:element name="Dimensions" minOccurs="0">
-                            <xs:complexType>
-                              <xs:all>
-                                <xs:element name="DimensionUnits" minOccurs="0">
-                                  <xs:simpleType>
-                                    <xs:restriction base="xs:string">
-                                      <xs:pattern value="|inch|inches|in|centimeter|centimeters|cm|INCH|INCHES|IN|CENTIMETER|CENTIMETERS|CM"/>
-                                    </xs:restriction>
-                                  </xs:simpleType>
-                                </xs:element>
-                                <xs:element type="xs:float" name="Length"/>
-                                <xs:element type="xs:float" name="Width"/>
-                                <xs:element type="xs:float" name="Height"/>
-                              </xs:all>
-                            </xs:complexType>
-                          </xs:element>
+
                           <xs:element type="xs:int" name="Quantity"/>
-                          <xs:element type="xs:float" name="UnitPrice"/>
+
+                          <xs:element type="xs:decimal" name="UnitPrice"/>
+
                           <xs:element type="String100" name="Location" minOccurs="0"/>
+
                           <xs:element name="Options" minOccurs="0">
+
                             <xs:complexType>
+
                               <xs:sequence>
+
                                 <xs:element name="Option" maxOccurs="100" minOccurs="0">
+
                                   <xs:complexType>
+
                                     <xs:all>
+
                                       <xs:element type="String100" name="Name"/>
+
                                       <xs:element type="String100" name="Value"/>
-                                      <xs:element type="xs:float" name="Weight" minOccurs="0"/>
+
+                                      <xs:element type="xs:decimal" name="Weight" minOccurs="0"/>
+
                                     </xs:all>
+
                                   </xs:complexType>
+
                                 </xs:element>
+
                               </xs:sequence>
+
                             </xs:complexType>
+
                           </xs:element>
+
                         </xs:all>
+
                       </xs:complexType>
+
                     </xs:element>
+
                   </xs:sequence>
+
                 </xs:complexType>
+
               </xs:element>
+
             </xs:all>
+
           </xs:complexType>
+
         </xs:element>
+
       </xs:sequence>
+
       <xs:attribute type="xs:short" name="pages"/>
+
     </xs:complexType>
+
   </xs:element>
+
   <xs:simpleType name="DateTime">
+
     <xs:restriction base="xs:string">
+
       <xs:pattern value="[0-9][0-9]?/[0-9][0-9]?/[0-9][0-9][0-9]?[0-9]? [0-9][0-9]?:[0-9][0-9]?:?[0-9]?[0-9]?. ?[aApP]?[mM]?"/>
+
     </xs:restriction>
+
   </xs:simpleType>
+
   <xs:simpleType name="Email">
+
     <xs:restriction base="xs:string">
+
     </xs:restriction>
+
   </xs:simpleType>
+
   <xs:simpleType name="StringExactly2">
+
     <xs:restriction base="xs:string">
+
       <xs:minLength value="2"/>
+
       <xs:maxLength value="2"/>
+
     </xs:restriction>
+
   </xs:simpleType>
+
   <xs:simpleType name="String30">
+
     <xs:restriction base="xs:string">
+
       <xs:maxLength value="30"/>
+
     </xs:restriction>
+
   </xs:simpleType>
+
   <xs:simpleType name="String50">
+
     <xs:restriction base="xs:string">
+
       <xs:maxLength value="50"/>
+
     </xs:restriction>
+
   </xs:simpleType>
+
   <xs:simpleType name="String100">
+
     <xs:restriction base="xs:string">
+
       <xs:maxLength value="100"/>
+
     </xs:restriction>
+
   </xs:simpleType>
+
   <xs:simpleType name="String200">
+
     <xs:restriction base="xs:string">
+
       <xs:maxLength value="200"/>
+
     </xs:restriction>
+
   </xs:simpleType>
+
   <xs:simpleType name="String1000">
+
     <xs:restriction base="xs:string">
+
       <xs:maxLength value="1000"/>
+
     </xs:restriction>
+
   </xs:simpleType>
+
 </xs:schema>
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b17f3ca..25054de 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -14,14 +14,18 @@
 ENV['RAILS_ENV'] = 'test'
 
 require File.expand_path('../dummy/config/environment.rb', __FILE__)
+# dummy initializers
+Spree::Config.shipstation_weight_units = 'grams'
 
 require 'rspec/rails'
 require 'factory_bot'
 require 'ffaker'
 require 'database_cleaner'
 require 'rspec/xsd'
+require 'pry-byebug'
 FactoryBot.find_definitions
 
+
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }