diff --git a/app/models/spree/calculator/digital_delivery.rb b/app/models/spree/calculator/digital_delivery.rb
index 0befa3a..e3a4de6 100644
--- a/app/models/spree/calculator/digital_delivery.rb
+++ b/app/models/spree/calculator/digital_delivery.rb
@@ -4,7 +4,7 @@ require_dependency 'spree/calculator'
 module Spree
   class Calculator::DigitalDelivery < Calculator::FlatRate
     def self.description
-      I18n.t(:digital_delivery)
+      Spree.t(:digital_delivery)
     end
 
     def compute(object=nil)
diff --git a/app/views/spree/admin/digitals/_digital.html.erb b/app/views/spree/admin/digitals/_digital.html.erb
index c68a94b..15ca2b4 100644
--- a/app/views/spree/admin/digitals/_digital.html.erb
+++ b/app/views/spree/admin/digitals/_digital.html.erb
@@ -1,5 +1,5 @@
 <% if digital.attachment_file_name.present? %>
   <%= digital.attachment_file_name %> (<%= number_to_human_size(digital.attachment_file_size) %>)
 <% else %>
-  <%=t 'broken_file' %>
+  <%=Spree.t 'broken_file' %>
 <% end %>
diff --git a/app/views/spree/admin/digitals/_form.html.erb b/app/views/spree/admin/digitals/_form.html.erb
index 4c982ce..8fcd139 100644
--- a/app/views/spree/admin/digitals/_form.html.erb
+++ b/app/views/spree/admin/digitals/_form.html.erb
@@ -5,30 +5,30 @@
       <legend><%= Spree::Variant.model_name.human %> "<%= variant.options_text %>"</legend>
       
       <%= f.field_container :current_file do %>
-      <strong><%=t 'files' %>:</strong>
+      <strong><%=Spree.t 'files' %>:</strong>
       <% if variant.digital? %>
       <ul>
         <% variant.digitals.each do |digital| %>
         <li>
          <%= render digital %>&nbsp;&nbsp;
-         <%= link_to t("delete_file"), admin_product_digital_url(@product, digital), :confirm => t('delete_file_cofirmation', :filename => digital.attachment_file_name), :method => :delete %>
+         <%= link_to Spree.t("delete_file"), admin_product_digital_url(@product, digital), :confirm => Spree.t('delete_file_cofirmation', :filename => digital.attachment_file_name), :method => :delete %>
        </li>
        <% end %>
      </ul>
      <% else %>
-     <%=t 'none' %>
+     <%=Spree.t 'none' %>
      <% end %>
      <% end %>
 
      <p class="form-buttons">
       <%= f.field_container :file do %>
-      <%= f.label :file, t("new_file") %> <span class="required">*</span><br/>
+      <%= f.label :file, Spree.t("new_file") %> <span class="required">*</span><br/>
       <%= f.file_field :attachment %>
       <% end %>
 
       <%= hidden_field_tag 'digital[variant_id]', variant.id %>
 
-      <%= button t('spree_digital.upload') %>
+      <%= button Spree.t('spree_digital.upload') %>
     </p>
 
   </fieldset>
diff --git a/app/views/spree/digitals/_digital.html.erb b/app/views/spree/digitals/_digital.html.erb
index c68a94b..15ca2b4 100644
--- a/app/views/spree/digitals/_digital.html.erb
+++ b/app/views/spree/digitals/_digital.html.erb
@@ -1,5 +1,5 @@
 <% if digital.attachment_file_name.present? %>
   <%= digital.attachment_file_name %> (<%= number_to_human_size(digital.attachment_file_size) %>)
 <% else %>
-  <%=t 'broken_file' %>
+  <%=Spree.t 'broken_file' %>
 <% end %>
diff --git a/lib/spree_digital/factories.rb b/lib/spree_digital/factories.rb
index 99d914c..d7008a6 100644
--- a/lib/spree_digital/factories.rb
+++ b/lib/spree_digital/factories.rb
@@ -18,7 +18,7 @@ FactoryGirl.define do
   end
 
   factory :digital_shipping_calculator, class: Spree::Calculator::DigitalDelivery do |c|
-    after_create { |c| c.set_preference(:amount, 0) }
+    after(:create) { |c| c.set_preference(:amount, 0) }
   end
 
   factory :digital_shipping_method, parent: :shipping_method do |f|
diff --git a/spec/models/order_spec.rb b/spec/models/order_spec.rb
index aa6e780..3fa1fdf 100644
--- a/spec/models/order_spec.rb
+++ b/spec/models/order_spec.rb
@@ -4,9 +4,9 @@ describe Spree::Order do
   context "#add_variant" do
     it "should add digital Variants of quantity 1 to an order" do
       order = FactoryGirl.create(:order)
-      order.add_variant variant1 = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)])
-      order.add_variant variant2 = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)])
-      order.add_variant variant3 = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)])
+      order.contents.add variant1 = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 1
+      order.contents.add variant2 = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 1
+      order.contents.add variant3 = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 1
       order.line_items.first.variant.should == variant1
       order.line_items.second.variant.should == variant2
       order.line_items.third.variant.should == variant3
@@ -15,9 +15,9 @@ describe Spree::Order do
     it "should handle quantity higher than 1 when adding one specific digital Variant" do
       order = FactoryGirl.create(:order)
       digital_variant = FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)])
-      order.add_variant digital_variant, 3
+      order.contents.add digital_variant, 3
       order.line_items.first.quantity.should == 3
-      order.add_variant digital_variant, 2
+      order.contents.add digital_variant, 2
       order.line_items.first.quantity.should == 5
     end
   end
@@ -26,21 +26,21 @@ describe Spree::Order do
     it "should understand that all products are digital" do
       order = FactoryGirl.create(:order)
       3.times do
-        order.add_variant FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)])
+        order.contents.add FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 1
       end
       order.digital?.should be_true
-      order.add_variant FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 4
+      order.contents.add FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 4
       order.digital?.should be_true
     end
     
     it "should understand that not all products are digital" do
       order = FactoryGirl.create(:order)
       3.times do
-        order.add_variant FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)])
+        order.contents.add FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 1
       end
-      order.add_variant FactoryGirl.create(:variant) # this is the analog product
+      order.contents.add FactoryGirl.create(:variant), 1 # this is the analog product
       order.digital?.should be_false
-      order.add_variant FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 4
+      order.contents.add FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 4
       order.digital?.should be_false
     end
   end
@@ -53,7 +53,7 @@ describe Spree::Order do
       @order.bill_address = FactoryGirl.create :address
       @order.save!
 
-      3.times { @order.add_variant FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]) }
+      3.times { @order.contents.add FactoryGirl.create(:variant, :digitals => [FactoryGirl.create(:digital)]), 1 }
 
       FactoryGirl.create :digital_shipping_method
       s = FactoryGirl.create :shipping_method
@@ -64,14 +64,15 @@ describe Spree::Order do
 
     it "should only offer digital shipping if all items are digital" do
       order.digital?.should be_true
-      order.rate_hash.count.should == 1
-      order.rate_hash.first.shipping_method.calculator.class.should == Spree::Calculator::DigitalDelivery
-      order.rate_hash.first.cost.should == 0.0
+      order.create_proposed_shipments
+      order.shipping_rates.count.should == 1
+      order.shipping_rates.first.shipping_method.calculator.class.should == Spree::Calculator::DigitalDelivery
+      order.shipping_rates.first.cost.should == 0.0
     end
 
     it "should not offer digital shipping if only some items are digital" do
       order.digital?.should be_true
-      order.add_variant FactoryGirl.create(:variant) # this is the analog product
+      order.contents.add FactoryGirl.create(:variant), 1 # this is the analog product
       order.digital?.should be_false
 
       order.rate_hash.count.should == 1