diff --git a/.env.test b/.env.test
new file mode 100644
index 0000000..74aaf42
--- /dev/null
+++ b/.env.test
@@ -0,0 +1,26 @@
+RACK_ENV=development
+RAILS_ENV=development
+APP_SECRET=fe837ea72667ec3d8ecb94cfba1a1bba
+
+DEPLOY_PATH=/var/www
+
+PUMA_WORKERS=1
+PUMA_MIN_THREADS=1
+PUMA_MAX_THREADS=16
+PUMA_PORT=4000
+PUMA_TIMEOUT=30
+
+MYSQL_HOST=db
+MYSQL_DATABASE=ensl
+MYSQL_USERNAME=ensl
+MYSQL_PASSWORD=ensl
+MYSQL_ROOT_PASSWORD=ensl
+MYSQL_CONNECTION_POOL=8
+
+NEW_RELIC_APP_NAME=ENSL
+NEW_RELIC_LICENSE_KEY=
+
+EXCEPTIONAL_API_KEY=
+
+GOOGLE_API_KEY=
+GOOGLE_CALENDAR_ID=
diff --git a/Makefile.dev b/Makefile.dev
new file mode 100644
index 0000000..bb3f616
--- /dev/null
+++ b/Makefile.dev
@@ -0,0 +1,37 @@
+#REGISTRY ?= ensl
+PROJECT  ?= ensl-plugin
+TAG      ?= latest
+
+.PHONY: all test clean build
+
+ifdef REGISTRY
+  IMAGE=$(REGISTRY)/$(PROJECT):$(TAG)
+else
+  IMAGE=$(PROJECT)
+endif
+
+all:
+	@echo "Available targets:"
+	@echo "  * build - build a Docker image for $(IMAGE)"
+	@echo "  * pull  - pull $(IMAGE)"
+	@echo "  * push  - push $(IMAGE)"
+	@echo "  * test  - build and test $(IMAGE)"
+
+build:
+	docker-compose build -f docker-compose.dev.yml
+
+run: build
+	docker-compose up -f docker-compose.dev.yml
+
+pull:
+	docker pull $(IMAGE) || true
+
+push:
+	docker push $(IMAGE)
+
+clean:
+	docker ps -a | awk '{ print $$1,$$2 }' | grep $(IMAGE) |awk '{print $$1 }' |xargs -I {} docker rm {}
+	docker images -a |grep $(IMAGE) |awk '{print $$3}' |xargs -I {} docker rmi {}
+
+test: build
+	@echo "TODO"
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 3fb04c9..197a58f 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -12,9 +12,9 @@ class IssuesController < ApplicationController
            else "created_at DESC"
            end
 
-    @open = Issue.with_status(Issue::STATUS_OPEN).all order: sort
-    @solved = Issue.with_status(Issue::STATUS_SOLVED).all order: sort
-    @rejected = Issue.with_status(Issue::STATUS_REJECTED).all order: sort
+    @open = Issue.with_status(Issue::STATUS_OPEN).order(sort)
+    @solved = Issue.with_status(Issue::STATUS_SOLVED).order(sort)
+    @rejected = Issue.with_status(Issue::STATUS_REJECTED).order(sort)
   end
 
   def show
diff --git a/app/models/ban.rb b/app/models/ban.rb
index 44fa7e1..1b19c30 100644
--- a/app/models/ban.rb
+++ b/app/models/ban.rb
@@ -29,9 +29,9 @@ class Ban < ActiveRecord::Base
   attr_protected :id, :created_at, :updated_at
   attr_accessor :len, :user_name
 
-  scope :ordered, order: "created_at DESC"
-  scope :effective, conditions: "expiry > UTC_TIMESTAMP()"
-  scope :ineffective, conditions: "expiry < UTC_TIMESTAMP()"
+  scope :ordered,  -> {order("created_at DESC")}
+  scope :effective, -> {where("expiry > UTC_TIMESTAMP()")}
+  scope :ineffective, -> {where("expiry < UTC_TIMESTAMP()")}
 
   validate :validate_type
   validate :validate_ventban
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 62c3815..2fce0f4 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -34,7 +34,7 @@ class Issue < ActiveRecord::Base
     lambda { |user| {
     :joins => "LEFT JOIN readings ON readable_type = 'Issue' AND readable_id = issues.id AND readings.user_id = #{user.id}",
     :conditions => "readings.user_id IS NULL"} }
-  scope :with_status, lambda { |s| { :conditions => {:status => s}} }
+  scope :with_status, -> (s) { where(status: s) }
 
   validates_length_of :title, :in => 1..50
   validates_length_of :text, :in => 1..65000
diff --git a/app/models/user.rb b/app/models/user.rb
index 63f51e0..28568fb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -206,7 +206,7 @@ class User < ActiveRecord::Base
   end
 
   def new_messages
-    received_personal_messages.unread_by(self).union(received_team_messages.unread_by(self))
+    received_personal_messages.union(received_team_messages).unread_by(self)
   end
 
   def received_messages
diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index c39a114..f285bbc 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -11,7 +11,7 @@
     </div>
     <div class="fields horizontal">
       <%= f.label :assigned %>
-      <%= f.text_field :assigned_name, {:value => User.first(:conditions => {:id => @issue.assigned})} %>
+      <%= f.text_field :assigned_name, {:value => User.where(id: @issue.assigned)} %>
     </div>
   <% end %>
   <div class="fields horizontal">
diff --git a/app/views/widgets/_logged.html.erb b/app/views/widgets/_logged.html.erb
index 764cabf..3a49932 100644
--- a/app/views/widgets/_logged.html.erb
+++ b/app/views/widgets/_logged.html.erb
@@ -22,8 +22,8 @@
         <%= link_to messages_path do %>
           Messages <%= icon 'envelope' %>
         <% end %>
-        <% if c = cuser.new_messages.num > 0 %>
-          (<%= cuser.new_messages.num %>)
+        <% if c = cuser.new_messages.count > 0 %>
+          (<%= cuser.new_messages.count %>)
         <% end %>
       </li>
       <li>
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
new file mode 100644
index 0000000..88ff2d0
--- /dev/null
+++ b/spec/rails_helper.rb
@@ -0,0 +1,52 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'spec_helper'
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# 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`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# 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
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9a147eb..913e28a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,41 +1,92 @@
-ENV["RAILS_ENV"] ||= "test"
-
-require "codeclimate-test-reporter"
-require "simplecov"
-
-CodeClimate::TestReporter.start
-SimpleCov.start "rails"
-
-require File.expand_path("../../config/environment", __FILE__)
-require "rspec/rails"
-require "capybara/rspec"
-require "capybara/poltergeist"
-
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
-
-Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app,
-    timeout: 30,
-    phantomjs_logger: File.open("/dev/null")
-  )
-end
-
-Capybara.configure do |config|
-  config.default_wait_time = 5
-  config.javascript_driver = :poltergeist
-end
-
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
-  config.include Controllers::JsonHelpers, type: :controller
-  config.include Features::FormHelpers, type: :feature
-  config.include Features::ServerHelpers, type: :feature
-  config.include Features::SessionHelpers, type: :feature
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
 
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # 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
-  config.use_transactional_fixtures = false
-  config.color = true
-  config.formatter = :documentation
-  config.infer_spec_type_from_file_location!
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
 end