diff --git a/Gemfile b/Gemfile
index e637596..19ca9b1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,41 +1,42 @@
 source 'https://rubygems.org'
 
 group :development, :test do
   gem 'pry-byebug'
 end
 
 group :development do
   gem 'rubocop', '0.35', require: false
   gem 'guard-minitest', require: false
   gem 'guard', require: false
   gem 'capistrano', '3.2.1', require: false # pkg:capistrano
 end
 
 # Lock jessie versions
 #
 
 gem 'rails', '4.1.8'
 gem 'i18n', '0.6.9'
 gem 'json', '1.8.1'
 gem 'mail', '2.6.1'
 gem 'mime-types', '1.25'
 gem 'minitest', '5.4.2'
 gem 'rack', '1.5.2'
 gem 'rack-test', '0.6.2'
 gem 'rake', '10.3.2'
 gem 'sprockets', '2.12.3'
 gem 'sprockets-rails', '2.1.3'
 gem 'thread_safe', '0.3.3'
 gem 'tzinfo', '1.1.0'
 
 gem 'mysql2', '0.3.16'
 gem 'jquery-rails', '3.1.2'
 gem 'beaneater', '1.0.0'
 
 gem 'net-scp', '1.2.1'
 gem 'state_machine', '1.2.0'
 
 group :test do
   gem 'factory_girl_rails', '4.4.1' # pkg:ruby-factory-girl-rails
   gem 'rspec-rails', '2.14.2'
+  gem 'database_cleaner', '1.3.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 643ef42..51f0559 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,194 +1,196 @@
 GEM
   remote: https://rubygems.org/
   specs:
     actionmailer (4.1.8)
       actionpack (= 4.1.8)
       actionview (= 4.1.8)
       mail (~> 2.5, >= 2.5.4)
     actionpack (4.1.8)
       actionview (= 4.1.8)
       activesupport (= 4.1.8)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     actionview (4.1.8)
       activesupport (= 4.1.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
     activemodel (4.1.8)
       activesupport (= 4.1.8)
       builder (~> 3.1)
     activerecord (4.1.8)
       activemodel (= 4.1.8)
       activesupport (= 4.1.8)
       arel (~> 5.0.0)
     activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
     beaneater (1.0.0)
     builder (3.2.2)
     byebug (8.0.0)
     capistrano (3.2.1)
       i18n
       rake (>= 10.0.0)
       sshkit (~> 1.3)
     coderay (1.1.0)
     colorize (0.7.7)
+    database_cleaner (1.3.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
     ffi (1.9.10)
     formatador (0.2.5)
     guard (2.13.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
     guard-minitest (2.4.4)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
     hike (1.2.3)
     i18n (0.6.9)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
     listen (3.0.4)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     mail (2.6.1)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (1.25)
     minitest (5.4.2)
     multi_json (1.11.2)
     mysql2 (0.3.16)
     nenv (0.2.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.0.1)
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
     parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     pry-byebug (3.3.0)
       byebug (~> 8.0)
       pry (~> 0.10)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
     rails (4.1.8)
       actionmailer (= 4.1.8)
       actionpack (= 4.1.8)
       actionview (= 4.1.8)
       activemodel (= 4.1.8)
       activerecord (= 4.1.8)
       activesupport (= 4.1.8)
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.1.8)
       sprockets-rails (~> 2.0)
     railties (4.1.8)
       actionpack (= 4.1.8)
       activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
     rake (10.3.2)
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     rspec-rails (2.14.2)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rubocop (0.35.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.3.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
     ruby-progressbar (1.7.5)
     shellany (0.0.1)
     slop (3.6.0)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sprockets-rails (2.1.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     sshkit (1.7.1)
       colorize (>= 0.7.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     state_machine (1.2.0)
     thor (0.19.1)
     thread_safe (0.3.3)
     tilt (1.4.1)
     tzinfo (1.1.0)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   beaneater (= 1.0.0)
   capistrano (= 3.2.1)
+  database_cleaner (= 1.3.0)
   factory_girl_rails (= 4.4.1)
   guard
   guard-minitest
   i18n (= 0.6.9)
   jquery-rails (= 3.1.2)
   json (= 1.8.1)
   mail (= 2.6.1)
   mime-types (= 1.25)
   minitest (= 5.4.2)
   mysql2 (= 0.3.16)
   net-scp (= 1.2.1)
   pry-byebug
   rack (= 1.5.2)
   rack-test (= 0.6.2)
   rails (= 4.1.8)
   rake (= 10.3.2)
   rspec-rails (= 2.14.2)
   rubocop (= 0.35)
   sprockets (= 2.12.3)
   sprockets-rails (= 2.1.3)
   state_machine (= 1.2.0)
   thread_safe (= 0.3.3)
   tzinfo (= 1.1.0)
 
 BUNDLED WITH
    1.10.6
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d98e9a3..f6e8c77 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,53 +1,53 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 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|
   # ## Mock Framework
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
   #
   # config.mock_with :mocha
   # config.mock_with :flexmock
   # config.mock_with :rr
-
   config.before(:suite) do
-    puts 'Cleaning up sql'
-
-    connection = ActiveRecord::Base.establish_connection(Baas::settings[:local_db]).
-      connection
-    connection.execute("truncate users")
-    connection.execute("truncate hosts")
-    connection.execute("truncate schedules")
-    connection.execute("truncate filesets")
-    connection.execute("truncate job_templates")
+    puts "cleaning sql..."
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
   end
+
   # 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
+#  config.use_transactional_fixtures = true
 
   # If true, the base class of anonymous controllers will be inferred
   # automatically. This will be the default behavior in future versions of
   # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = "random"
 end