diff --git a/app/models/organization.rb b/app/models/organization.rb
index b94a668..190d253 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -116,6 +116,7 @@ class Organization < Profile
     tag_list
     template_id
     district
+    address_line2
     address_reference
   ]
 
@@ -136,7 +137,7 @@ class Organization < Profile
   end
 
   N_('Display name'); N_('Description'); N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Tag list'); N_('District'); N_('Address reference')
-  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :district, :address_reference
+  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :district, :address_line2, :address_reference
 
   settings_items :zip_code, :city, :state, :country
 
diff --git a/app/models/person.rb b/app/models/person.rb
index 3f20f37..db49f9f 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -210,6 +210,7 @@ class Person < Profile
   district
   zip_code
   address
+  address_line2
   address_reference
   cell_phone
   comercial_phone
@@ -275,7 +276,7 @@ class Person < Profile
   settings_items :formation, :custom_formation, :custom_area_of_study
 
   N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code'); N_('District'); N_('Address reference')
-  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code, :district, :address_reference
+  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code, :district, :address_line2, :address_reference
 
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
diff --git a/plugins/delivery/test/test_helper.rb b/plugins/delivery/test/test_helper.rb
deleted file mode 100644
index cca1fd3..0000000
--- a/plugins/delivery/test/test_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.dirname(__FILE__) + '/../../../test/test_helper'
diff --git a/plugins/delivery/test/unit/delivery_plugin/method_test.rb b/plugins/delivery/test/unit/delivery_plugin/method_test.rb
deleted file mode 100644
index 9dec65e..0000000
--- a/plugins/delivery/test/unit/delivery_plugin/method_test.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
-
-class DeliveryPlugin::MethodTest < ActiveSupport::TestCase
-
-  def setup
-    @profile = build(Profile)
-  end
-
-  attr_accessor :profile
-
-  should 'have a name and a delivery type' do
-    dm = DeliveryPlugin::Method.new :name => 'Delivery Deluxe', :delivery_type => 'deliver', :profile => profile
-    assert dm.valid?
-    dm = DeliveryPlugin::Method.new :profile => profile
-    assert !dm.valid?
-  end
-
-  should 'accept only pickup and deliver as delivery types' do
-    dm = build(DeliveryPlugin::Method, :name => 'Delivery Deluxe', :delivery_type => 'unkown', :profile => profile)
-    assert !dm.valid?
-    dm = build(DeliveryPlugin::Method, :name => 'Delivery Deluxe', :delivery_type => 'pickup', :profile => profile)
-    assert dm.valid?
-    dm = build(DeliveryPlugin::Method, :name => 'Delivery Deluxe', :delivery_type => 'deliver', :profile => profile)
-    assert dm.valid?
-  end
-
-  should 'filter by delivery types' do
-    dm_deliver = create(DeliveryPlugin::Method, :name => 'Delivery Deluxe', :delivery_type => 'deliver', :profile => profile)
-    dm_pickup = create(DeliveryPlugin::Method, :name => 'Delivery Deluxe', :delivery_type => 'pickup', :profile => profile)
-    assert_equal [dm_deliver], DeliveryPlugin::Method.delivery
-    assert_equal [dm_pickup], DeliveryPlugin::Method.pickup
-  end
-
-  should 'have many delivery options' do
-    dm = create(DeliveryPlugin::Method, :name => 'Delivery Deluxe', :delivery_type => 'deliver', :profile => profile)
-    cycle = build(OrdersCyclePlugin::Cycle, :name => 'cycle name', :profile => profile)
-    option = create(DeliveryPlugin::Option, :cycle => cycle, :delivery_method => dm)
-
-    assert_equal [option], dm.reload.delivery_options
-  end
-
-end
diff --git a/plugins/delivery/test/unit/delivery_plugin/option_test.rb b/plugins/delivery/test/unit/delivery_plugin/option_test.rb
deleted file mode 100644
index f8a3617..0000000
--- a/plugins/delivery/test/unit/delivery_plugin/option_test.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
-
-class DeliveryPlugin::OptionTest < ActiveSupport::TestCase
-
-  def setup
-    @profile = build(Profile)
-    @cycle = build(OrdersCyclePluginCycle, :profile => @profile)
-    @delivery_method = build(OrdersCyclePluginMethod, :profile => @profile)
-  end
-
-  attr_accessor :profile
-  attr_accessor :cycle
-  attr_accessor :delivery_method
-
-  should 'be associated with a cycle and a delivery method' do
-    option = OrdersCyclePluginOption.new :cycle => @cycle, :delivery_method => @delivery_method
-    assert option.valid?
-    option = OrdersCyclePluginOption.new
-    :wa
-
-    assert !option.valid?
-  end
-
-end
diff --git a/plugins/orders/orders b/plugins/orders/orders
deleted file mode 120000
index cd47dfd..0000000
--- a/plugins/orders/orders
+++ /dev/null
@@ -1 +0,0 @@
-/home/braulio/Projects/noosfero-ecosol/noosfero/plugins/orders
\ No newline at end of file
diff --git a/plugins/orders/public/public b/plugins/orders/public/public
deleted file mode 120000
index 20e6770..0000000
--- a/plugins/orders/public/public
+++ /dev/null
@@ -1 +0,0 @@
-/home/braulio/Projects/noosfero-ecosol/noosfero/config/plugins/orders/public
\ No newline at end of file
diff --git a/plugins/orders/test/test_helper.rb b/plugins/orders/test/test_helper.rb
deleted file mode 100644
index cca1fd3..0000000
--- a/plugins/orders/test/test_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.dirname(__FILE__) + '/../../../test/test_helper'
diff --git a/plugins/orders/test/unit/orders_plugin/item_test.rb b/plugins/orders/test/unit/orders_plugin/item_test.rb
deleted file mode 100644
index b96de82..0000000
--- a/plugins/orders/test/unit/orders_plugin/item_test.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-
-class OrdersPlugin::ItemTest < ActiveSupport::TestCase
-
-  def setup
-    @item = build(OrdersPlugin::Item,
-     :quantity_shipped => 1.0, :quantity_consumer_ordered => 2.0, :quantity_accepted => 3.0,
-     :price_shipped => 10.0, :price_consumer_ordered => 20.0, :price_accepted => 30.0)
-  end
-
-  should 'calculate prices' do
-  end
-
-end
diff --git a/plugins/orders/test/unit/orders_plugin/order_test.rb b/plugins/orders/test/unit/orders_plugin/order_test.rb
deleted file mode 100644
index bd771b2..0000000
--- a/plugins/orders/test/unit/orders_plugin/order_test.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-require "test_helper"
-
-class OrdersPlugin::OrderTest < ActiveSupport::TestCase
-
-  def setup
-    @order = build(OrdersPlugin::Order)
-  end
-
-  should 'report supplier products when distributing aggregate products' do
-    env = Environment.create! name: 'megacoop'
-    supplier = Enterprise.create! identifier: 'supplier', name: 'supplier', environment: env
-    p1 = supplier.products.create! product_category: ProductCategory.create!(name: 'banana', environment: env)
-    p2 = supplier.products.create! product_category: ProductCategory.create!(name: 'aipim', environment: env)
-
-    coop = Community.create! identifier: 'blah', name: 'blah', environment: env
-    coop.suppliers.create! profile: supplier, consumer: coop
-    aggregate_product = SuppliersPlugin::DistributedProduct.new profile: coop
-    aggregate_product.sources_from_products.build quantity: 1, from_product: p1, to_product: aggregate_product
-    aggregate_product.sources_from_products.build quantity: 5, from_product: p2, to_product: aggregate_product
-    aggregate_product.save!
-
-    # hack
-    person = coop
-
-    # this also create offered products
-    cycle = OrdersCyclePlugin::Cycle.create! name: 'blah', profile: coop, start: Time.now, finish: Time.now+1.day, delivery_start: Time.now+2.days, delivery_finish: Time.now+3.days, status: 'orders'
-    sale = cycle.sales.create! profile: person
-    sale.items.create! quantity_consumer_ordered: 3, product: aggregate_product
-
-    r = OrdersPlugin::Order.supplier_products_by_suppliers [sale]
-    quantities = r.first.last.map(&:quantity_ordered).map(&:to_i)
-    assert_equal [3*1,3*5], quantities
-  end
-
-  should 'format code with cycle code' do
-    @order.save!
-    assert_equal "#{@order.cycle.code}.#{@order.attributes['code']}", @order.code
-  end
-
-  should 'use as draft default status' do
-    @order = create(OrdersPlugin::Order, status: nil)
-    assert_equal 'draft', @order.status
-  end
-
-  ###
-  # Status
-  ###
-
-  should 'define and validate list of statuses' do
-    @order.status = 'blah'
-    @order.valid?
-    assert @order.errors.invalid?('status')
-
-    ['draft', 'planned', 'ordered', 'cancelled'].each do |i|
-      @order.status = i
-      @order.valid?
-      assert !@order.errors.invalid?('status')
-    end
-  end
-
-  should 'define status question methods' do
-    ['draft', 'planned', 'ordered', 'cancelled'].each do |i|
-      @order.status = i
-      assert @order.send("#{@order.status}?")
-    end
-  end
-
-  should 'define forgotten and open status' do
-    @order.status = 'draft'
-    assert @order.draft?
-    assert @order.cycle.orders?
-    assert @order.open?
-    @order.cycle.status = 'closed'
-    assert !@order.open?
-    assert @order.forgotten?
-  end
-
-  should 'return current status using forgotten and open too' do
-    @order.status = 'draft'
-    assert @order.open?
-    assert_equal 'open', @order.current_status
-    @order.cycle.status = 'closed'
-    assert @order.forgotten?
-    assert_equal 'forgotten', @order.current_status
-  end
-
-  should 'define status_message method' do
-    assert @order.respond_to?(:status_message)
-  end
-
-  ###
-  # Delivery
-  ###
-
-  should 'give default value to supplier delivery if not present' do
-    @order.save!
-    @order.profile.save!
-
-    @order.cycle.delivery_methods = []
-    @order.supplier_delivery = nil
-    assert_nil @order.supplier_delivery
-
-    default = @order.cycle.delivery_methods.create! profile: @order.profile, name: 'method', delivery_type: 'deliver'
-    assert_equal default, @order.supplier_delivery
-    assert_equal default.id, @order.supplier_delivery_id
-  end
-
-  ###
-  # Totals
-  ###
-
-  should 'give total price and quantity asked' do
-    @order.cycle.profile.save!
-    product = create(SuppliersPlugin::DistributedProduct, price: 2.0, profile: @order.cycle.profile, supplier: @order.cycle.profile.self_supplier)
-    @order.save!
-    @order.item.create! product: @order.cycle.products.first, quantity_consumer_ordered: 2.0
-    assert_equal 2.0, @order.total_quantity_consumer_ordered
-    assert_equal 4.0, @order.total_price_consumer_ordered
-  end
-
-end
diff --git a/plugins/orders_cycle/test/factories.rb b/plugins/orders_cycle/test/factories.rb
deleted file mode 100644
index 021fdaf..0000000
--- a/plugins/orders_cycle/test/factories.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-module OrdersCyclePlugin::Factory
-
-  def defaults_for_suppliers_plugin_supplier
-    {:profile => build(Profile),
-     :consumer => build(Profile)}
-  end
-
-  def defaults_for_suppliers_plugin_distributed_product attrs = {}
-    profile = attrs[:profile] || build(Profile)
-    {:profile => profile, :name => "product-#{factory_num_seq}", :price => 2.0,
-     :product => build(Product, :enterprise => profile.profile, :price => 2.0),
-     :supplier => build(SuppliersPlugin::Supplier, :profile => profile, :consumer => profile)}
-  end
-
-  def defaults_for_orders_cycle_plugin_offered_product attrs = {}
-    hash = defaults_for_orders_cycle_plugin_product(attrs)
-    profile = hash[:profile]
-    hash.merge({
-      :from_products => [build(SuppliersPlugin::DistributedProduct, :profile => profile)]})
-  end
-
-  def defaults_for_delivery_plugin_method
-    {:profile => build(OrdersCyclePlugin::Profile),
-     :name => "My delivery #{factory_num_seq.to_s}",
-     :delivery_type => 'deliver'}
-  end
-
-  def defaults_for_delivery_plugin_option
-    {:cycle => build(OrdersCyclePlugin::Cycle),
-     :delivery_method => build(DeliveryPlugin::Method)}
-  end
-
-  def defaults_for_orders_plugin_order attrs = {}
-    profile = attrs[:profile] || build(OrdersCyclePlugin::Profile)
-    {:status => 'ordered',
-     :cycle => build(OrdersCyclePlugin::Cycle, :profile => profile),
-     :consumer => build(OrdersCyclePlugin::Profile),
-     :supplier_delivery => build(DeliveryPlugin::Method, :profile => profile),
-     :consumer_delivery => build(DeliveryPlugin::Method, :profile => profile)}
-  end
-
-  def defaults_for_orders_plugin_items
-    {:order => build(OrdersPlugin::Order),
-     :product => build(OrdersCyclePlugin::OfferedProduct),
-     :quantity_shipped => 1.0, :quantity_ordered => 2.0, :quantity_accepted => 3.0,
-     :price_shipped => 10.0, :price_ordered => 20.0, :price_accepted => 30.0}
-  end
-
-  def defaults_for_orders_cycle_plugin_cycle
-    {:profile => build(OrdersCyclePlugin::Profile), :status => 'orders',
-     :name => 'weekly', :start => Time.now, :finish => Time.now+1.days}
-  end
-
-end
-
-Noosfero::Factory.register_extension OrdersCyclePlugin::Factory
-
diff --git a/plugins/orders_cycle/test/functional/orders_cycle_plugin/order_controller_test.rb b/plugins/orders_cycle/test/functional/orders_cycle_plugin/order_controller_test.rb
deleted file mode 100644
index 9a93fce..0000000
--- a/plugins/orders_cycle/test/functional/orders_cycle_plugin/order_controller_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
-
-class OrdersCyclePlugin::OrderControllerTest < Test::Unit::TestCase
-
-  def setup
-    @controller = OrdersCyclePluginOrderController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
-
-end
diff --git a/plugins/orders_cycle/test/functional/orders_cycle_plugin/session_controller_test.rb b/plugins/orders_cycle/test/functional/orders_cycle_plugin/session_controller_test.rb
deleted file mode 100644
index 7ab2402..0000000
--- a/plugins/orders_cycle/test/functional/orders_cycle_plugin/session_controller_test.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
-
-class OrdersCyclePlugin::CycleControllerTest < Test::Unit::TestCase
-
-  def setup
-    @controller = OrdersCyclePluginCycleController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
-  should 'create a new cycle' do
-  end
-
-end
diff --git a/plugins/orders_cycle/test/test_helper.rb b/plugins/orders_cycle/test/test_helper.rb
deleted file mode 100644
index 3f0b088..0000000
--- a/plugins/orders_cycle/test/test_helper.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require File.dirname(__FILE__) + '/../../../test/test_helper'
-require 'spec'
-
-class ActiveRecord::TestCase < ActiveSupport::TestCase
-  include OrdersCyclePluginFactory
-end
diff --git a/plugins/orders_cycle/test/unit/orders_cycle_plugin/cycle_test.rb b/plugins/orders_cycle/test/unit/orders_cycle_plugin/cycle_test.rb
deleted file mode 100644
index 7c09b02..0000000
--- a/plugins/orders_cycle/test/unit/orders_cycle_plugin/cycle_test.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
-
-class OrdersCyclePlugin::CycleTest < ActiveSupport::TestCase
-
-  def setup
-    @profile = Enterprise.create!(:name => "trocas verdes", :identifier => "trocas-verdes")
-    @pc = ProductCategory.create!(:name => 'frutas', :environment_id => 1)
-    @profile.products = [Product.create!(:name => 'banana', :product_category => @pc),
-      Product.new(:name => 'mandioca', :product_category => @pc), Product.new(:name => 'alface', :product_category => @pc)]
-
-    profile.offered_products = @profile.products.map{ |p| OrdersCyclePlugin::OfferedProduct.create!(:product => p) }
-    DeliveryPlugin::Method.create! :name => 'at home', :delivery_type => 'pickup', :profile => @profile
-    @cycle = OrdersCyclePlugin::Cycle.create!(:profile => @profile)
-  end
-
-  should 'add products from profile after create' do
-    assert_equal @cycle.products.collect(&:product_id), @profile.products.collect(&:id)
-  end
-
-  should 'have at least one delivery method unless in edition status' do
-    cycle = OrdersCyclePlugin::Cycle.create! :profile => @profile, :name => "Testes batidos", :start => DateTime.now, :status => 'edition'
-    assert cycle
-    cycle.status = 'orders'
-    assert_nil cycle.save!
-  end
-
-end
diff --git a/plugins/orders_cycle/test/unit/orders_cycle_plugin/offered_product_test.rb b/plugins/orders_cycle/test/unit/orders_cycle_plugin/offered_product_test.rb
deleted file mode 100644
index 7a92fde..0000000
--- a/plugins/orders_cycle/test/unit/orders_cycle_plugin/offered_product_test.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
-
-class OrdersCyclePlugin::OfferedProductTest < ActiveSupport::TestCase
-
-
-end
diff --git a/plugins/orders_cycle/test/unit/profile_test.rb b/plugins/orders_cycle/test/unit/profile_test.rb
deleted file mode 100644
index 2d656fb..0000000
--- a/plugins/orders_cycle/test/unit/profile_test.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
-
-class OrdersCyclePlugin::ProfileTest < ActiveRecord::TestCase
-
-  def setup
-    @profile = build(Profile)
-    @invisible_profile = build(Enterprise, :visible => false)
-    @other_profile = build(Enterprise)
-    @profile = build(OrdersCyclePlugin::profile, :profile => @profile)
-    @self_supplier = build(OrdersCyclePlugin::Supplier, :consumer => @profile, :profile => @profile)
-    @dummy_supplier = build(OrdersCyclePlugin::Supplier, :consumer => @profile, :profile => @dummy_profile)
-    @other_supplier = build(OrdersCyclePlugin::Supplier, :consumer => @profile, :profile => @other_profile)
-  end
-
-  attr_accessor :profile, :invisible_profile, :other_profile,
-    :self_supplier, :dummy_supplier, :other_supplier
-
-  should 'respond to name methods' do
-    profile.expects(:name).returns('name')
-    assert_equal 'name', profile.name
-  end
-
-  should 'respond to dummy methods' do
-    profile.dummy = true
-    assert_equal true, profile.dummy?
-    profile.dummy = false
-    assert_equal false, profile.dummy
-  end
-
-  should "return closed cycles' date range" do
-    DateTime.expects(:now).returns(1).at_least_once
-    assert_equal 1..1, profile.orders_cycles_closed_date_range
-    s1 = create(OrdersCyclePlugin::Cycle, :profile => profile, :start => Time.now-1.days, :finish => nil)
-    s2 = create(OrdersCyclePlugin::Cycle, :profile => profile, :finish => Time.now+1.days, :start => Time.now)
-    assert_equal (s1.start.to_date..s2.finish.to_date), profile.orders_cycles_closed_date_range
-  end
-
-  should 'return abbreviation or the name' do
-    profile.name_abbreviation = 'coll.'
-    profile.profile.name = 'collective'
-    assert_equal 'coll.', profile.abbreviation_or_name
-    profile.name_abbreviation = nil
-    assert_equal 'collective', profile.abbreviation_or_name
-  end
-
-  ###
-  # Products
-  ###
-
-  should "default products's margins when asked" do
-    profile.update! :margin_percentage => 10
-    product = create(SuppliersPlugin::DistributedProduct, :profile => profile, :supplier => profile.self_supplier,
-                     :price => 10, :default_margin_percentage => false)
-    cycle = create(OrdersCyclePlugin::Cycle, :profile => profile)
-    sproduct = cycle.products.first
-    sproduct.update! :margin_percentage => 5
-    cycleclosed = create(OrdersCyclePlugin::Cycle, :profile => profile, :status => 'closed')
-
-    profile.orders_cycles_products_default_margins
-    product.reload
-    sproduct.reload
-    assert_equal true, product.default_margin_percentage
-    assert_equal sproduct.margin_percentage, profile.margin_percentage
-  end
-
-  should 'return not yet distributed products' do
-    profile.save!
-    other_profile.save!
-    other_supplier.save!
-    product = create(SuppliersPlugin::DistributedProduct, :profile => other_profile, :supplier => other_profile.self_supplier)
-    profile.add_supplier_products other_supplier
-    product2 = create(SuppliersPlugin::DistributedProduct, :profile => other_profile, :supplier => other_profile.self_supplier)
-    assert_equal [product2], profile.not_distributed_products(other_supplier)
-  end
-
-  ###
-  # Suppliers
-  ###
-
-  should 'add supplier' do
-    @profile.save!
-    @other_profile.save!
-
-    assert_difference OrdersCyclePlugin::Supplier, :count do
-      @profile.add_supplier @other_profile
-    end
-    assert @profile.suppliers_profiles.include?(@other_profile)
-    assert @other_profile.consumers_profiles.include?(@profile)
-  end
-
-  should "add all supplier's products when supplier is added" do
-    @profile.save!
-    @other_profile.save!
-    product = create(SuppliersPlugin::DistributedProduct, :profile => @other_profile)
-    @profile.add_supplier @other_profile
-    assert_equal [product], @profile.from_products
-  end
-
-  should 'remove supplier' do
-    @profile.save!
-    @other_profile.save!
-
-    @profile.add_supplier @other_profile
-    assert_difference OrdersCyclePlugin::Supplier, :count, -1 do
-      assert_difference RoleAssignment, :count, -1 do
-        @profile.remove_supplier @other_profile
-      end
-    end
-    assert !@profile.suppliers_profiles.include?(@other_profile)
-  end
-
-  should "archive supplier's products when supplier is removed" do
-    @profile.save!
-    @other_profile.save!
-    product = create(SuppliersPlugin::DistributedProduct, :profile => @other_profile)
-    @profile.add_supplier @other_profile
-    @profile.remove_supplier @other_profile
-    assert_equal [product], @profile.from_products
-    assert_equal 1, @profile.distributed_products.archived.count
-  end
-
-  should 'create self supplier automatically' do
-    profile = create(OrdersCyclePlugin::profile, :profile => @profile)
-    assert_equal 1, profile.suppliers.count
-  end
-
-end
diff --git a/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb b/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
index 107c6db..305f7d4 100644
--- a/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
+++ b/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
@@ -334,12 +334,11 @@ class ShoppingCartPluginController < OrdersPluginController
   def save_cookie
     if @cart.nil?
       # cookie.delete does not work, set to empty value
-      cookies[cookie_key] = {value: '', path: '/plugin/shopping_cart', expires: Time.at(0)}
+      cookies.permanent[cookie_key] = {value: '', path: '/plugin/shopping_cart'}
     else
-      cookies[cookie_key] = {
+      cookies.permanent[cookie_key] = {
         value: Base64.encode64(@cart.to_yaml),
         path: "/plugin/shopping_cart",
-        expires: Time.at(0),
       }
     end
   end
diff --git a/plugins/shopping_cart/features/delivery_admin.feature b/plugins/shopping_cart/features/delivery_admin.feature
index 091ba5a..00d1b5b 100644
--- a/plugins/shopping_cart/features/delivery_admin.feature
+++ b/plugins/shopping_cart/features/delivery_admin.feature
@@ -37,7 +37,7 @@ Feature: delivery administration
     And I select "Deliver" from "Type"
     And I fill in "Name" with "Bike"
     And I fill in "Fixed cost" with "8.00"
-    And I fill in "Order's minimum price for free delivery" with "35.50"
+    And I fill in "delivery_method_free_over_price" with "35.50"
     When I press "Add"
     Then I should see "Bike" within ".delivery-method"
 
diff --git a/plugins/shopping_cart/features/features b/plugins/shopping_cart/features/features
deleted file mode 120000
index 68471f0..0000000
--- a/plugins/shopping_cart/features/features
+++ /dev/null
@@ -1 +0,0 @@
-/home/braulio/Projects/noosfero-ecosol/noosfero/config/plugins/shopping_cart/features
\ No newline at end of file
diff --git a/plugins/shopping_cart/features/purchases.feature b/plugins/shopping_cart/features/purchases.feature
index cb8b414..a4019e5 100644
--- a/plugins/shopping_cart/features/purchases.feature
+++ b/plugins/shopping_cart/features/purchases.feature
@@ -61,7 +61,7 @@ Feature: purchases
     And I follow "Purchases made"
     And I should see "Accepted" within any ".situation"
     And I should see "Delivered" within any ".situation"
-    And I select "Delivered" from "Status"
+    And I select "Delivered" from "status"
     When I press "Filter"
     Then I should not see "Accepted" within any ".situation"
     And I should see "Delivered" within any ".situation"
@@ -78,7 +78,7 @@ Feature: purchases
     And I follow "Purchases made"
     And I should see "1" within any ".code"
     And I should see "2" within any ".code"
-    And I fill in "Code" with "2"
+    And I fill in "code" with "2"
     When I press "Filter"
     Then I should not see "1" within any ".code"
     Then I should see "2" within any ".code"
@@ -108,7 +108,7 @@ Feature: purchases
     And I follow "Purchases made"
     And I should see "Moes Tavern" within any ".actor-name"
     And I should see "First Church of Springfield" within any ".actor-name"
-    And I select "Moes Tavern" from "Supplier"
+    And I select "Moes Tavern" from "supplier"
     When I press "Filter"
     Then I should see "Moes Tavern" within any ".actor-name"
     And I should not see "First Church of Springfield" within any ".actor-name"
@@ -132,8 +132,8 @@ Feature: purchases
     When I follow "Purchases made"
     Then I should see "Moes Tavern" within any ".actor-name"
 
-
-  @selenium
+  # FIXME: repeat only appear on the new catalog
+  @selenium-fixme
   Scenario: repeat order
     Given "moes-tavern" has the following delivery methods
       | delivery_type    | name | description                  | fixed_cost   | free_over_price |
@@ -147,7 +147,6 @@ Feature: purchases
     And I follow "Add to basket"
     And I follow "Add to basket"
     And I follow "Show basket"
-    And I follow "Clean basket"
     And I follow "Hide basket"
     When I follow "checkout"
     Then I should see "Shopping checkout"
diff --git a/plugins/shopping_cart/features/sales.feature b/plugins/shopping_cart/features/sales.feature
index e5803fd..c850e31 100644
--- a/plugins/shopping_cart/features/sales.feature
+++ b/plugins/shopping_cart/features/sales.feature
@@ -61,7 +61,7 @@ Feature: sales
     And I follow "Purchases and Sales"
     And I should see "Accepted" within any ".situation"
     And I should see "Delivered" within any ".situation"
-    And I select "Delivered" from "Status"
+    And I select "Delivered" from "status"
     When I press "Filter"
     Then I should not see "Accepted" within any ".situation"
     And I should see "Delivered" within any ".situation"
@@ -78,7 +78,7 @@ Feature: sales
     And I follow "Purchases and Sales"
     And I should see "1" within any ".code"
     And I should see "2" within any ".code"
-    And I fill in "Code" with "2"
+    And I fill in "code" with "2"
     When I press "Filter"
     Then I should not see "1" within any ".code"
     Then I should see "2" within any ".code"
@@ -98,7 +98,7 @@ Feature: sales
     And I follow "Purchases and Sales"
     And I should see "Homer" within any ".actor-name"
     And I should see "Reverend Lovejoy" within any ".actor-name"
-    And I select "Homer" from "Consumer"
+    And I select "Homer" from "consumer"
     When I press "Filter"
     Then I should see "Homer" within any ".actor-name"
     And I should not see "Reverend Lovejoy" within any ".actor-name"
diff --git a/plugins/shopping_cart/public/public b/plugins/shopping_cart/public/public
deleted file mode 120000
index 72c6701..0000000
--- a/plugins/shopping_cart/public/public
+++ /dev/null
@@ -1 +0,0 @@
-/home/braulio/Projects/noosfero-ecosol/noosfero/config/plugins/shopping_cart/public
\ No newline at end of file
diff --git a/plugins/shopping_cart/shopping_cart b/plugins/shopping_cart/shopping_cart
deleted file mode 120000
index 8d62156..0000000
--- a/plugins/shopping_cart/shopping_cart
+++ /dev/null
@@ -1 +0,0 @@
-/home/braulio/Projects/noosfero-ecosol/noosfero/plugins/shopping_cart
\ No newline at end of file
diff --git a/plugins/suppliers/test/test_helper.rb b/plugins/suppliers/test/test_helper.rb
deleted file mode 100644
index cca1fd3..0000000
--- a/plugins/suppliers/test/test_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.dirname(__FILE__) + '/../../../test/test_helper'
diff --git a/plugins/suppliers/test/unit/code_numbering_test.rb b/plugins/suppliers/test/unit/code_numbering_test.rb
deleted file mode 100644
index 0fcb79a..0000000
--- a/plugins/suppliers/test/unit/code_numbering_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-
-class CodeNumberingTest < ActiveSupport::TestCase
-
-
-end
-
diff --git a/plugins/suppliers/test/unit/default_delegate_test.rb b/plugins/suppliers/test/unit/default_delegate_test.rb
deleted file mode 100644
index 525796d..0000000
--- a/plugins/suppliers/test/unit/default_delegate_test.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'test_helper'
-
-class DefaultDelegateTest < ActiveSupport::TestCase
-
-
-end
diff --git a/plugins/suppliers/test/unit/suppliers_plugin/distributed_product_test.rb b/plugins/suppliers/test/unit/suppliers_plugin/distributed_product_test.rb
deleted file mode 100644
index ddcd396..0000000
--- a/plugins/suppliers/test/unit/suppliers_plugin/distributed_product_test.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
-
-class SuppliersPlugin::DistributedProductTest < ActiveSupport::TestCase
-
-  def setup
-    @product_category = create(ProductCategory, :name => 'parent')
-    @profile = build(Enterprise)
-    @invisible_profile = build(Enterprise, :visible => false)
-    @other_profile = build(Enterprise)
-    @self_supplier = build(SuppliersPlugin::Supplier, :consumer => @profile, :profile => @profile)
-    @dummy_supplier = build(SuppliersPlugin::Supplier, :consumer => @profile, :profile => @dummy_profile)
-    @other_supplier = build(SuppliersPlugin::Supplier, :consumer => @profile, :profile => @other_profile)
-  end
-
-  attr_accessor :product_category,
-    :profile, :invisible_profile, :other_profile,
-    :profile, :dummy_profile, :other_profile, :self_supplier, :dummy_supplier, :other_supplier
-
-  should 'return default settings considering dummy supplier' do
-    product = build(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @dummy_supplier)
-    assert_equal nil, product.default_name
-    assert_equal nil, product.default_description
-    product = build(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @other_supplier)
-    assert_equal true, product.default_name
-    assert_equal true, product.default_description
-  end
-
-  should 'return price without margins if it is own product' do
-    product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :profile => @profile, :supplier => @self_supplier)
-    assert_equal 10.0, product.price.to_f
-  end
-
-  should 'return price without margins if supplier product has no price' do
-    supplier_product = build(SuppliersPlugin::DistributedProduct, :profile => @other_profile, :supplier => @other_profile.self_supplier)
-    product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :profile => @profile, :supplier => @other_supplier)
-    assert_equal 10.0, product.price.to_f
-  end
-
-  should 'return price with margins' do
-    supplier_product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :profile => @other_profile, :supplier => @other_profile.self_supplier)
-    product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :supplier_product => supplier_product, :profile => @profile, :supplier => @other_supplier)
-
-    product.default_margin_percentage = false
-    assert_equal 11.0, product.price.to_f
-    profile.margin_percentage = 20
-    product.default_margin_percentage = true
-    assert_equal 12.0, product.price.to_f
-  end
-
-  should 'allow set of supplier product' do
-    product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :profile => @profile, :supplier => @self_supplier)
-
-    product.from_product = build(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @self_supplier)
-    assert_nothing_raised do
-      product.supplier_product = {:price => 10, :margin_percentage => 10}
-      product.supplier_product = SuppliersPlugin::DistributedProduct.new :price => 5
-    end
-  end
-
-  should 'create a supplier product for a dummy supplier' do
-    product = build(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @dummy_supplier)
-    assert product.supplier_product
-    # negative assertion
-    product = build(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @other_supplier)
-    assert !product.supplier_product
-  end
-
-  should 'respond to supplier_product_id setter and getter' do
-    product = create(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @dummy_supplier)
-    assert_equal product.supplier_product.id, product.supplier_product_id
-    product.expects(:distribute_from)
-    product.supplier_product_id = 1
-  end
-
-  should 'respond to distribute_from' do
-    product = create(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @profile.self_supplier)
-
-    assert_raise RuntimeError do
-      supplier_product = build(SuppliersPlugin::DistributedProduct, :profile => @other_profile)
-      product.distribute_from(supplier_product)
-    end
-
-    supplier_product = create(SuppliersPlugin::DistributedProduct, :profile => @other_profile)
-    product.profile.add_supplier @other_profile
-    product.distribute_from supplier_product
-    assert_equal product.supplier.profile, supplier_product.profile
-    assert_equal product.supplier.profile, supplier_product.profile
-  end
-
-  should 'return json for category hierarchy' do
-    grandparent = create(ProductCategory, :name => 'grand parent')
-    parent = create(ProductCategory, :name => 'parent')
-    child = product_category
-
-    product = SuppliersPlugin::DistributedProduct.new :category => parent
-    hash = {:own_name => "parent", :id => "2", :subcats => [], :name => "parent",
-            :hierarchy => [{:own_name => "parent", :subcats => [], :name => "parent", :id => "2"}]}
-    assert_equal hash, product.json_for_category
-  end
-
-  should 'block own product distribution' do
-    product = Product.create :enterprise => @profile, :product_category => product_category
-    distributed = SuppliersPlugin::DistributedProduct.new :enterprise => @profile, :from_products => [product]
-
-    assert distributed.invalid?
-  end
-
-end
diff --git a/plugins/suppliers/test/unit/suppliers_plugin/product_test.rb b/plugins/suppliers/test/unit/suppliers_plugin/product_test.rb
deleted file mode 100644
index 947ba74..0000000
--- a/plugins/suppliers/test/unit/suppliers_plugin/product_test.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require "test_helper"
-
-class SuppliersPlugin::ProductTest < ActiveSupport::TestCase
-
-  def setup
-    @product = build(SuppliersPlugin::BaseProduct)
-  end
-
-  should 'return first from product as supplier product' do
-    fp = build(SuppliersPlugin::BaseProduct, :profile => @product.profile)
-    @product.from_products = [fp]
-    assert_equal fp, @product.from_product
-    assert_equal fp, @product.supplier_product
-  end
-
-  should 'respond to dummy and own' do
-    assert !@product.dummy?
-    assert @product.own?
-  end
-
-  should 'return price with margins' do
-    supplier_product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :profile => @product.profile, :supplier => @product.profile.self_supplier)
-    product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :supplier_product => supplier_product, :profile => @product.profile, :supplier => @product.profile.self_supplier)
-
-    product.default_margin_percentage = false
-    assert_equal 11.0, product.price_with_margins
-    @product.profile.margin_percentage = 20
-    product.default_margin_percentage = true
-    assert_equal 12.0, product.price_with_margins
-  end
-
-  should 'build default unit if none exists' do
-    assert_equal 0, Unit.count
-    assert 'unit', @product.unit.singular
-  end
-
-  should 'avoid destroy by raising an exception' do
-    assert_raise RuntimeError do
-      @product.destroy
-    end
-  end
-
-  should 'accept price in different formats' do
-    @product.price = '2,45'
-    assert_equal 2.45, @product.price
-  end
-
-
-end
diff --git a/plugins/suppliers/test/unit/suppliers_plugin/source_product_test.rb b/plugins/suppliers/test/unit/suppliers_plugin/source_product_test.rb
deleted file mode 100644
index a043536..0000000
--- a/plugins/suppliers/test/unit/suppliers_plugin/source_product_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
-
-class SuppliersPlugin::SourceProductTest < ActiveSupport::TestCase
-
-  def setup
-  end
-
-end
diff --git a/plugins/suppliers/test/unit/suppliers_plugin/supplier_test.rb b/plugins/suppliers/test/unit/suppliers_plugin/supplier_test.rb
deleted file mode 100644
index f3d53c9..0000000
--- a/plugins/suppliers/test/unit/suppliers_plugin/supplier_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require "#{File.dirname(__FILE__)}/../../test_helper"
-
-class SuppliersPlugin::SupplierTest < ActiveSupport::TestCase
-
-  def setup
-  end
-
-end
--
libgit2 0.21.2