diff --git a/.rubocop.yml b/.rubocop.yml
index d0eaac7..ed3991c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -44,7 +44,7 @@ Performance/Count:
 Style/RaiseArgs:
   Enabled: false
 
-Style/OpMethod:
+Naming/BinaryOperatorParameterName:
   Enabled: false
 
 # We can use good judgement here
diff --git a/Gemfile b/Gemfile
index 859a420..7dae75b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,8 @@ gem 'solidus', github: 'solidusio/solidus', branch: 'v2.4'
 gem 'solidus_auth_devise', '~> 1.0'
 
 group :test, :development do
-  gem 'rspec-rails', '~> 3.0.0'
+  gem 'rspec-rails'
+  gem 'pry'
 end
 
 gemspec
diff --git a/app/models/odoo/country.rb b/app/models/odoo/country.rb
index a649175..1bef6cb 100644
--- a/app/models/odoo/country.rb
+++ b/app/models/odoo/country.rb
@@ -6,5 +6,3 @@ def self.find(address)
     end
   end
 end
-
-
diff --git a/app/models/odoo/order.rb b/app/models/odoo/order.rb
index 6144044..e78509f 100644
--- a/app/models/odoo/order.rb
+++ b/app/models/odoo/order.rb
@@ -29,4 +29,3 @@ def order_lines
     end
   end
 end
-
diff --git a/app/models/odoo/order_line.rb b/app/models/odoo/order_line.rb
index 9c143af..507b037 100644
--- a/app/models/odoo/order_line.rb
+++ b/app/models/odoo/order_line.rb
@@ -20,6 +20,7 @@ def product
     end
 
     private
+
     def item_information
       {
         name: product.name,
@@ -28,6 +29,5 @@ def item_information
         product_uom_qty: line_item.quantity
       }
     end
-
   end
 end
diff --git a/app/models/odoo/partner.rb b/app/models/odoo/partner.rb
index b8198e4..207996d 100644
--- a/app/models/odoo/partner.rb
+++ b/app/models/odoo/partner.rb
@@ -1,6 +1,5 @@
 module Odoo
   class Partner
-
     attr_accessor :order, :odoo_partner, :invoice_partner, :delivery_partner
 
     def self.find_or_create(order)
@@ -29,6 +28,7 @@ def create_children
     end
 
     private
+
     def partner_attributes(address)
       {
         name: order.name,
@@ -49,8 +49,5 @@ def state(address)
     def country(address)
       Country.find(address)
     end
-
   end
 end
-
-
diff --git a/app/models/odoo/state.rb b/app/models/odoo/state.rb
index 2fdbc68..3506fc4 100644
--- a/app/models/odoo/state.rb
+++ b/app/models/odoo/state.rb
@@ -6,4 +6,3 @@ def self.find(address)
     end
   end
 end
-
diff --git a/lib/odoo_service.rb b/lib/odoo_service.rb
index a5de35d..0a28301 100644
--- a/lib/odoo_service.rb
+++ b/lib/odoo_service.rb
@@ -3,4 +3,3 @@ def self.create_order(order)
     Odoo::Order.create(order)
   end
 end
-
diff --git a/lib/solidus_odoo/factories.rb b/lib/solidus_odoo/factories.rb
index b57337d..a292a62 100644
--- a/lib/solidus_odoo/factories.rb
+++ b/lib/solidus_odoo/factories.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
   #
   # Example adding this to your spec_helper will load these Factories for use:
diff --git a/solidus_odoo.gemspec b/solidus_odoo.gemspec
index 1c5de1f..1de1adc 100644
--- a/solidus_odoo.gemspec
+++ b/solidus_odoo.gemspec
@@ -15,22 +15,24 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", 'LICENSE', 'Rakefile', 'README.md']
   solidus_version = ['>= 1.0', '< 3']
 
-  s.add_dependency 'solidus_core', solidus_version
-  s.add_dependency 'solidus_backend', solidus_version
   s.add_dependency 'solidus_api', solidus_version
-  s.add_dependency 'ooor'
+  s.add_dependency 'solidus_backend', solidus_version
+  s.add_dependency 'solidus_core', solidus_version
   s.add_dependency 'solidus_support'
+  s.add_dependency 'ooor'
 
   s.add_development_dependency 'capybara'
-  s.add_development_dependency 'poltergeist'
   s.add_development_dependency 'coffee-rails'
-  s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'factory_bot_rails'
+  s.add_development_dependency 'poltergeist'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-rails'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'pry-rails'
+  s.add_development_dependency 'ffaker'
 end
diff --git a/spec/models/odoo/country_spec.rb b/spec/models/odoo/country_spec.rb
new file mode 100644
index 0000000..3c00960
--- /dev/null
+++ b/spec/models/odoo/country_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Odoo::Country do
+  let!(:order) { create(:order_with_line_items, state: 'complete') }
+
+  context 'when an order is completed in solidus and Sale Order line is created in Odoo' do
+    before(:each) do
+      @address = order.ship_address.country.name
+      @country = ResCountry.find(['name', '=', @address]).first.name
+    end
+    it 'should have a country' do
+      expect('United States').to eq(@country)
+    end
+  end
+end
diff --git a/spec/models/odoo/order_line_spec.rb b/spec/models/odoo/order_line_spec.rb
new file mode 100644
index 0000000..ea09d6f
--- /dev/null
+++ b/spec/models/odoo/order_line_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Odoo::OrderLine do
+  let(:order) { create(:order_with_line_items, state: 'complete') }
+
+  context 'When a spree order is sent to odoo' do
+    it 'should throw "name" error if product does not exist in odoo' do
+      line_item = order.products.last
+      expect(ProductProduct.find(default_code: line_item.slug)).to be_blank
+    end
+
+    it 'should find product in odoo' do
+      expect(ProductProduct.find(default_code: 'product-3-935')).to be_truthy
+    end
+  end
+end
diff --git a/spec/models/odoo/order_spec.rb b/spec/models/odoo/order_spec.rb
new file mode 100644
index 0000000..c7dc770
--- /dev/null
+++ b/spec/models/odoo/order_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Odoo::Order do
+  let(:order) { create(:order_with_line_items, state: 'complete') }
+
+  context 'When a spree order is sent to odoo' do
+    before(:each) do
+      @product = order.products.last
+      @product.name = "Samsung Tv"
+      @product.save!
+      @product.slug = "samsung-tv"
+      @product.save!
+      @product.reload
+      order.reload
+    end
+
+    it 'should have total sale price in odoo as in solidus' do
+      OdooService.create_order(order)
+
+      expect(SaleOrder.last.amount_total).to eq(order.total - order.ship_total)
+    end
+  end
+end
diff --git a/spec/models/odoo/partner_spec.rb b/spec/models/odoo/partner_spec.rb
new file mode 100644
index 0000000..f1ee927
--- /dev/null
+++ b/spec/models/odoo/partner_spec.rb
@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Odoo::Partner do
+  let!(:order) { create(:order_with_line_items, state: 'complete') }
+
+  context 'when user completes an order' do
+    it 'should not have an account in odoo' do
+      expect(nil).to be(ResPartner.find(email: order.email).first)
+    end
+
+    it 'should create an account in odoo' do
+      address = order.ship_address
+      ResPartner.create(name: order.name,
+                        street: address.address1,
+                        city: address.city,
+                        state_id: address.state.id,
+                        zip: address.zipcode,
+                        country_id: address.country.id,
+                        phone: address.phone,
+                        email: order.email)
+
+      expect(ResPartner.find(email: order.email)).to be_truthy
+    end
+
+    it 'should have an account in odoo' do
+      order.email = 'test@example.com'
+      expect(ResPartner.find(email: order.email)).to be_truthy
+    end
+
+    it 'should have an account with billing/shipping address' do
+      address = order.ship_address
+
+      def partner_attributes(address)
+        {
+          name: order.name,
+          street: address.address1,
+          city: address.city,
+          state_id: address.id,
+          zip: address.zipcode,
+          country_id: address.id,
+          phone: address.phone,
+          email: order.email
+        }
+      end
+
+      @odoo_partner = ResPartner.create partner_attributes(address)
+      @invoice_partner = ResPartner.create partner_attributes(order.bill_address).merge(name: "billing", type: "invoice", parent_id: @odoo_partner.id)
+      @delivery_partner = ResPartner.create partner_attributes(order.ship_address).merge(name: "shipping", type: "delivery", parent_id: @odoo_partner.id)
+      @odoo_partner.save
+
+      expect(@odoo_partner.associations['child_ids']).not_to be_blank
+    end
+  end
+end
diff --git a/spec/models/odoo/state_spec.rb b/spec/models/odoo/state_spec.rb
new file mode 100644
index 0000000..ea8a605
--- /dev/null
+++ b/spec/models/odoo/state_spec.rb
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Odoo::Country do
+  let!(:order) { create(:order_with_line_items, state: 'complete') }
+
+  context 'when an order is completed in solidus and Sale Order line is created in Odoo' do
+    it 'should have a state' do
+      address = order.ship_address.state.name
+      state = ResCountryState.find(['name', '=', address]).first.name
+
+      expect('Alabama').to eq(state)
+    end
+  end
+end
diff --git a/spec/models/spree/order_decorator_spec.rb b/spec/models/spree/order_decorator_spec.rb
new file mode 100644
index 0000000..788ac87
--- /dev/null
+++ b/spec/models/spree/order_decorator_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Spree::Order do
+  let!(:order) { create(:order_with_line_items, state: 'complete') }
+
+  context 'when user finishes filling in payment information' do
+    it 'and order should be generated' do
+      expect(Spree::Order.count).to be(1)
+    end
+
+    it 'should have status as completed' do
+      expect("complete").to eq(order.state)
+    end
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
deleted file mode 100644
index 5d7bd17..0000000
--- a/spec/rails_helper.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-require 'spec_helper'
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-require 'capybara/rails'
-
-# Requires supporting ruby files with custom matchers and macros, etc, in
-# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
-# run as spec files by default. This means that files in spec/support that end
-# in _spec.rb will both be required and run as specs, causing the specs to be
-# run twice. It is recommended that you do not name files matching this glob to
-# end with _spec.rb. You can configure this pattern with the --pattern
-# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
-
-# Checks for pending migrations before tests are run.
-# If you are not using ActiveRecord, you can remove this line.
-ActiveRecord::Migration.maintain_test_schema!
-
-RSpec.configure do |config|
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = true
-
-  # RSpec Rails can automatically mix in different behaviours to your tests
-  # based on their file location, for example enabling you to call `get` and
-  # `post` in specs under `spec/controllers`.
-  #
-  # You can disable this behaviour by removing the line below, and instead
-  # explicitly tag your specs with their type, e.g.:
-  #
-  #     RSpec.describe UsersController, :type => :controller do
-  #       # ...
-  #     end
-  #
-  # The different available types are documented in the features, such as in
-  # https://relishapp.com/rspec/rspec-rails/docs
-  config.infer_spec_type_from_file_location!
-end