diff --git a/Gemfile b/Gemfile
index 1d9089c..e4cf337 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,25 +88,6 @@ group :development do
 end
 
 group :test do
-  #  gem 'spring'
-  gem 'capybara'
-  gem 'codeclimate-test-reporter', require: nil
-  # FIXME: Downgraded b/c of deprecations, fix static attributes
-  gem 'factory_bot_rails', '4.10.0'
-  gem 'phantomjs', require: 'phantomjs/poltergeist'
-  gem 'poltergeist'
-  gem 'selenium-webdriver'
-  # Fix FF issue
-  gem 'geckodriver-helper'
-  # Fix legacy issue
-  gem 'rails-controller-testing'
-  gem 'simplecov', require: false
-  gem 'test-unit'
-  gem 'timecop'
-
-  # FOr JS test
-  gem 'mime-types'
-
   # Use dev versions because of rspec bug
   gem 'rspec-core', git: 'https://github.com/rspec/rspec-core'
   gem 'rspec-expectations', git: 'https://github.com/rspec/rspec-expectations'
@@ -114,15 +95,44 @@ group :test do
   gem 'rspec-rails', git: 'https://github.com/rspec/rspec-rails'
   gem 'rspec-support', git: 'https://github.com/rspec/rspec-support'
 
+  # FIXME: Downgraded b/c of deprecations, fix static attributes
+  gem 'factory_bot_rails', '4.10.0'
+
+  gem 'capybara'
+  gem 'phantomjs', require: 'phantomjs/poltergeist'
+  gem 'poltergeist'
+  gem 'selenium-webdriver'
+
+  # Fix FF issue
+  gem 'geckodriver-helper'
+  # Fix legacy issue
+  gem 'rails-controller-testing'
+
+  # Goverage
+  gem 'simplecov', require: false
+  gem 'timecop'
+
+  # Do I need this?
+  gem 'test-unit'
+
+  # For JS test
+  gem 'mime-types'
+
   # Database cleaner
   gem 'database_cleaner-active_record'
   gem 'database_cleaner-redis'
 
-  # For circle ci
+  # For circle ci + CC
   gem 'rspec_junit_formatter'
+  gem 'codeclimate-test-reporter', require: nil
 end
 
 group :development, :test do
   gem 'pry-rails'
   gem 'pry-byebug'
+
+  #  gem 'spring'
+
+  # For n+1 uqeries
+  gem 'bullet'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 38407b1..8853a6b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -132,6 +132,9 @@ GEM
       sass (>= 3.2.0)
       thor
     builder (3.2.4)
+    bullet (6.1.0)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.11)
     byebug (11.1.1)
     capybara (3.31.0)
       addressable
@@ -427,6 +430,7 @@ GEM
       json (>= 1.8.0)
     unicode-display_width (1.6.1)
     unicode_utils (1.4.0)
+    uniform_notifier (1.13.0)
     unread (0.11.0)
       activerecord (>= 3)
     web-console (3.7.0)
@@ -454,6 +458,7 @@ DEPENDENCIES
   binding_of_caller
   bluecloth
   bourbon (~> 3.1.8)
+  bullet
   capybara
   carrierwave
   codeclimate-test-reporter