diff --git a/Gemfile b/Gemfile
index 9467905c1..6732e758c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,7 +112,7 @@ group :development do
   # improved errors
   gem 'better_errors',     '~> 2.1.1' # webconsole replacement
   gem 'binding_of_caller', '~> 0.7.2'
-  gem 'traceroute',        '~> 0.4.0' # for finding dead routes and unused actions
+  gem 'traceroute',        '~> 0.5.0' # for finding dead routes and unused actions
 
   # deploy
   gem 'mina', '~> 0.3.1' # for fast deployment
@@ -125,7 +125,7 @@ group :development, :test do
   gem 'phantomjs-binaries', '~> 1.9.2.4'
   gem 'poltergeist',        '~> 1.5.1'  # We are using PhantomJS instead
   gem 'phantomjs',          '~> 1.9.7.1'
-  gem 'fabrication',        '~> 2.12.2' # Replacement for fixtures
+  gem 'fabrication',        '~> 2.13.2' # Replacement for fixtures
   gem 'shoulda-matchers',   '~> 2.6.1', require: false # Additional matchers for RSpec
   gem 'launchy',            '~> 2.4.3' # for opening browser automatically
 
@@ -137,8 +137,8 @@ group :development, :test do
   gem 'pry', '~> 0.10.1'
 
   # code review
-  gem 'simplecov',     '~> 0.9.1', require: false
-  gem 'rubycritic',    '~> 1.1.1'
+  gem 'simplecov',     '~> 0.10.0', require: false
+  gem 'rubycritic',    '~> 1.4.0'
   gem 'bullet',        '~> 4.14.4' # for finding database optimizations
   gem 'bundler-audit', 
     github: 'rubysec/bundler-audit',
diff --git a/Gemfile.lock b/Gemfile.lock
index d6bee0f96..3e67d909c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,6 +45,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
+    abstract_type (0.0.7)
     actionmailer (4.2.3)
       actionpack (= 4.2.3)
       actionview (= 4.2.3)
@@ -82,6 +83,9 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    adamantium (0.2.0)
+      ice_nine (~> 0.11.0)
+      memoizable (~> 0.4.0)
     addressable (2.3.8)
     akami (1.3.1)
       gyoku (>= 0.4.0)
@@ -148,6 +152,9 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.9.1.1)
+    concord (0.1.5)
+      adamantium (~> 0.2.0)
+      equalizer (~> 0.0.9)
     countries (0.10.0)
       currencies (~> 0.4.2)
     crack (0.4.2)
@@ -180,7 +187,7 @@ GEM
     equalizer (0.0.11)
     erubis (2.7.0)
     execjs (2.5.2)
-    fabrication (2.12.2)
+    fabrication (2.13.2)
     faker (1.3.0)
       i18n (~> 0.5)
     fastercsv (1.5.5)
@@ -279,6 +286,8 @@ GEM
     lumberjack (1.0.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
     mime-types (2.6.1)
     mina (0.3.4)
@@ -319,6 +328,7 @@ GEM
     polyamorous (1.2.0)
       activerecord (>= 3.0)
     powerpack (0.1.1)
+    procto (0.0.2)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -377,11 +387,10 @@ GEM
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdoc (4.2.0)
-    reek (1.3.8)
+    reek (1.6.5)
+      parser (~> 2.2.0.pre.7)
       rainbow (>= 1.99, < 3.0)
-      ruby2ruby (>= 2.0.8, < 3.0)
-      ruby_parser (~> 3.3)
-      sexp_processor
+      unparser (~> 0.2.2)
     ref (1.0.5)
     request_store (1.1.0)
     responders (2.1.0)
@@ -418,12 +427,11 @@ GEM
       sexp_processor (~> 4.0)
     ruby_parser (3.7.0)
       sexp_processor (~> 4.1)
-    rubycritic (1.1.1)
+    rubycritic (1.4.0)
       flay (= 2.4.0)
       flog (= 4.2.1)
-      parser (~> 2.1)
-      reek (= 1.3.8)
-      ruby2ruby (>= 2.1.1, < 3.0)
+      parser (>= 2.2.0, < 3.0)
+      reek (= 1.6.5)
       virtus (~> 1.0)
     safe_yaml (1.0.4)
     sass (3.4.15)
@@ -450,11 +458,11 @@ GEM
     sexp_processor (4.6.0)
     shoulda-matchers (2.6.2)
       activesupport (>= 3.0.0)
-    simplecov (0.9.2)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     simpleidn (0.0.5)
     sinatra (1.4.6)
       rack (~> 1.4)
@@ -481,7 +489,7 @@ GEM
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
-    traceroute (0.4.0)
+    traceroute (0.5.0)
       rails (>= 3.0.0)
     turbolinks (2.5.3)
       coffee-rails
@@ -495,6 +503,14 @@ GEM
       rack
       raindrops (~> 0.7)
     uniform_notifier (1.9.0)
+    unparser (0.2.4)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.2.5)
+      equalizer (~> 0.0.9)
+      parser (~> 2.2.2)
+      procto (~> 0.0.2)
     uuidtools (2.1.5)
     virtus (1.0.5)
       axiom-types (~> 0.1)
@@ -539,7 +555,7 @@ DEPENDENCIES
   digidoc_client (~> 0.2.1)
   epp (~> 1.4.2)!
   epp-xml (~> 1.0.3)
-  fabrication (~> 2.12.2)
+  fabrication (~> 2.13.2)
   faker (~> 1.3.0)
   figaro (~> 1.1.0)
   grape (~> 0.10.1)
@@ -580,19 +596,19 @@ DEPENDENCIES
   ransack (~> 1.5.1)
   rspec-rails (~> 3.0.2)
   rubocop (~> 0.32.1)
-  rubycritic (~> 1.1.1)
+  rubycritic (~> 1.4.0)
   sass-rails (~> 5.0.3)
   sdoc (~> 0.4.0)
   select2-rails (~> 3.5.9.3)
   selectize-rails (~> 0.12.1)
   shoulda-matchers (~> 2.6.1)
-  simplecov (~> 0.9.1)
+  simplecov (~> 0.10.0)
   simpleidn (~> 0.0.5)
   spring (~> 1.3.6)
   spring-commands-rspec (~> 1.0.4)
   spring-watcher-listen!
   therubyracer (~> 0.12.2)
-  traceroute (~> 0.4.0)
+  traceroute (~> 0.5.0)
   turbolinks (~> 2.5.3)
   uglifier (~> 2.7.1)
   unicorn