diff --git a/.rspec b/.rspec
new file mode 100644
index 00000000..83e16f80
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--color
+--require spec_helper
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
new file mode 100644
index 00000000..53365a50
--- /dev/null
+++ b/spec/rails_helper.rb
@@ -0,0 +1,48 @@
+# 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 }
+
+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
new file mode 100644
index 00000000..913e28a6
--- /dev/null
+++ b/spec/spec_helper.rb
@@ -0,0 +1,92 @@
+# 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|
+  # 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
+
+  # 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
+
+  # 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
diff --git a/test/functional/.gitkeep b/test/functional/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/functional/in_metacode_sets_controller_test.rb b/test/functional/in_metacode_sets_controller_test.rb
deleted file mode 100644
index f78ad458..00000000
--- a/test/functional/in_metacode_sets_controller_test.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'test_helper'
-
-class InMetacodeSetsControllerTest < ActionController::TestCase
-  setup do
-    @in_metacode_set = in_metacode_sets(:one)
-  end
-
-  test "should get index" do
-    get :index
-    assert_response :success
-    assert_not_nil assigns(:in_metacode_sets)
-  end
-
-  test "should get new" do
-    get :new
-    assert_response :success
-  end
-
-  test "should create in_metacode_set" do
-    assert_difference('InMetacodeSet.count') do
-      post :create, in_metacode_set: {  }
-    end
-
-    assert_redirected_to in_metacode_set_path(assigns(:in_metacode_set))
-  end
-
-  test "should show in_metacode_set" do
-    get :show, id: @in_metacode_set
-    assert_response :success
-  end
-
-  test "should get edit" do
-    get :edit, id: @in_metacode_set
-    assert_response :success
-  end
-
-  test "should update in_metacode_set" do
-    put :update, id: @in_metacode_set, in_metacode_set: {  }
-    assert_redirected_to in_metacode_set_path(assigns(:in_metacode_set))
-  end
-
-  test "should destroy in_metacode_set" do
-    assert_difference('InMetacodeSet.count', -1) do
-      delete :destroy, id: @in_metacode_set
-    end
-
-    assert_redirected_to in_metacode_sets_path
-  end
-end
diff --git a/test/functional/main_controller_test.rb b/test/functional/main_controller_test.rb
deleted file mode 100644
index b7ec6bfc..00000000
--- a/test/functional/main_controller_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class MainControllerTest < ActionController::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/functional/mapping_controller_test.rb b/test/functional/mapping_controller_test.rb
deleted file mode 100644
index 59fc534a..00000000
--- a/test/functional/mapping_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class MappingControllerTest < ActionController::TestCase
-  test "should get new" do
-    get :new
-    assert_response :success
-  end
-
-end
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
deleted file mode 100644
index 9517ea55..00000000
--- a/test/functional/maps_controller_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class MapsControllerTest < ActionController::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/functional/metacode_sets_controller_test.rb b/test/functional/metacode_sets_controller_test.rb
deleted file mode 100644
index ec06c1e4..00000000
--- a/test/functional/metacode_sets_controller_test.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'test_helper'
-
-class MetacodeSetsControllerTest < ActionController::TestCase
-  setup do
-    @metacode_set = metacode_sets(:one)
-  end
-
-  test "should get index" do
-    get :index
-    assert_response :success
-    assert_not_nil assigns(:metacode_sets)
-  end
-
-  test "should get new" do
-    get :new
-    assert_response :success
-  end
-
-  test "should create metacode_set" do
-    assert_difference('MetacodeSet.count') do
-      post :create, metacode_set: { desc: @metacode_set.desc, mapperContributed: @metacode_set.mapperContributed, name: @metacode_set.name }
-    end
-
-    assert_redirected_to metacode_set_path(assigns(:metacode_set))
-  end
-
-  test "should show metacode_set" do
-    get :show, id: @metacode_set
-    assert_response :success
-  end
-
-  test "should get edit" do
-    get :edit, id: @metacode_set
-    assert_response :success
-  end
-
-  test "should update metacode_set" do
-    put :update, id: @metacode_set, metacode_set: { desc: @metacode_set.desc, mapperContributed: @metacode_set.mapperContributed, name: @metacode_set.name }
-    assert_redirected_to metacode_set_path(assigns(:metacode_set))
-  end
-
-  test "should destroy metacode_set" do
-    assert_difference('MetacodeSet.count', -1) do
-      delete :destroy, id: @metacode_set
-    end
-
-    assert_redirected_to metacode_sets_path
-  end
-end
diff --git a/test/functional/metacodes_controller_test.rb b/test/functional/metacodes_controller_test.rb
deleted file mode 100644
index c15d468f..00000000
--- a/test/functional/metacodes_controller_test.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'test_helper'
-
-class MetacodesControllerTest < ActionController::TestCase
-  setup do
-    @metacode = metacodes(:one)
-  end
-
-  test "should get index" do
-    get :index
-    assert_response :success
-    assert_not_nil assigns(:metacodes)
-  end
-
-  test "should get new" do
-    get :new
-    assert_response :success
-  end
-
-  test "should create metacode" do
-    assert_difference('Metacode.count') do
-      post :create, metacode: { icon: @metacode.icon, name: @metacode.name }
-    end
-
-    assert_redirected_to metacode_path(assigns(:metacode))
-  end
-
-  test "should show metacode" do
-    get :show, id: @metacode
-    assert_response :success
-  end
-
-  test "should get edit" do
-    get :edit, id: @metacode
-    assert_response :success
-  end
-
-  test "should update metacode" do
-    put :update, id: @metacode, metacode: { icon: @metacode.icon, name: @metacode.name }
-    assert_redirected_to metacode_path(assigns(:metacode))
-  end
-
-  test "should destroy metacode" do
-    assert_difference('Metacode.count', -1) do
-      delete :destroy, id: @metacode
-    end
-
-    assert_redirected_to metacodes_path
-  end
-end
diff --git a/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb
deleted file mode 100644
index d30ebc38..00000000
--- a/test/functional/sessions_controller_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class SessionsControllerTest < ActionController::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/functional/synapses_controller_test.rb b/test/functional/synapses_controller_test.rb
deleted file mode 100644
index 42d864b0..00000000
--- a/test/functional/synapses_controller_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class SynapsesControllerTest < ActionController::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/functional/topics_controller_test.rb b/test/functional/topics_controller_test.rb
deleted file mode 100644
index dd41edd9..00000000
--- a/test/functional/topics_controller_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class TopicsControllerTest < ActionController::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
deleted file mode 100644
index d23f1829..00000000
--- a/test/functional/users_controller_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class UsersControllerTest < ActionController::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/integration/.gitkeep b/test/integration/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb
deleted file mode 100644
index 3fea27b9..00000000
--- a/test/performance/browsing_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'test_helper'
-require 'rails/performance_test_help'
-
-class BrowsingTest < ActionDispatch::PerformanceTest
-  # Refer to the documentation for all available options
-  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
-  #                          :output => 'tmp/performance', :formats => [:flat] }
-
-  def test_homepage
-    get '/'
-  end
-end
diff --git a/test/test_helper.rb b/test/test_helper.rb
deleted file mode 100644
index 8bf1192f..00000000
--- a/test/test_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-
-class ActiveSupport::TestCase
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
-
-  # Add more helper methods to be used by all tests here...
-end
diff --git a/test/unit/.gitkeep b/test/unit/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/unit/helpers/in_metacode_sets_helper_test.rb b/test/unit/helpers/in_metacode_sets_helper_test.rb
deleted file mode 100644
index 64eb689a..00000000
--- a/test/unit/helpers/in_metacode_sets_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class InMetacodeSetsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/main_helper_test.rb b/test/unit/helpers/main_helper_test.rb
deleted file mode 100644
index 22da3c40..00000000
--- a/test/unit/helpers/main_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class MainHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/mapping_helper_test.rb b/test/unit/helpers/mapping_helper_test.rb
deleted file mode 100644
index 5768ae1b..00000000
--- a/test/unit/helpers/mapping_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class MappingHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/maps_helper_test.rb b/test/unit/helpers/maps_helper_test.rb
deleted file mode 100644
index 0a0efccd..00000000
--- a/test/unit/helpers/maps_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class MapsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/metacode_sets_helper_test.rb b/test/unit/helpers/metacode_sets_helper_test.rb
deleted file mode 100644
index d1983654..00000000
--- a/test/unit/helpers/metacode_sets_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class MetacodeSetsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/metacodes_helper_test.rb b/test/unit/helpers/metacodes_helper_test.rb
deleted file mode 100644
index 2837d55f..00000000
--- a/test/unit/helpers/metacodes_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class MetacodesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/sessions_helper_test.rb b/test/unit/helpers/sessions_helper_test.rb
deleted file mode 100644
index 7d44e096..00000000
--- a/test/unit/helpers/sessions_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class SessionsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/synapses_helper_test.rb b/test/unit/helpers/synapses_helper_test.rb
deleted file mode 100644
index c7a530a0..00000000
--- a/test/unit/helpers/synapses_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class SynapsesHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/topics_helper_test.rb b/test/unit/helpers/topics_helper_test.rb
deleted file mode 100644
index 12cc0b4f..00000000
--- a/test/unit/helpers/topics_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class TopicsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/users_helper_test.rb b/test/unit/helpers/users_helper_test.rb
deleted file mode 100644
index 96af37a8..00000000
--- a/test/unit/helpers/users_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class UsersHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/in_metacode_set_test.rb b/test/unit/in_metacode_set_test.rb
deleted file mode 100644
index 1873f3d2..00000000
--- a/test/unit/in_metacode_set_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class InMetacodeSetTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/unit/map_test.rb b/test/unit/map_test.rb
deleted file mode 100644
index 033cf0ff..00000000
--- a/test/unit/map_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class MapTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/unit/mapping_test.rb b/test/unit/mapping_test.rb
deleted file mode 100644
index 20115809..00000000
--- a/test/unit/mapping_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class MappingTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/unit/metacode_set_test.rb b/test/unit/metacode_set_test.rb
deleted file mode 100644
index f92bc573..00000000
--- a/test/unit/metacode_set_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class MetacodeSetTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/unit/metacode_test.rb b/test/unit/metacode_test.rb
deleted file mode 100644
index 7bfd318d..00000000
--- a/test/unit/metacode_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class MetacodeTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/unit/session_test.rb b/test/unit/session_test.rb
deleted file mode 100644
index 2d1bc1b0..00000000
--- a/test/unit/session_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class SessionTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/unit/synapse_test.rb b/test/unit/synapse_test.rb
deleted file mode 100644
index 50a6fe66..00000000
--- a/test/unit/synapse_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class SynapseTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/unit/topic_test.rb b/test/unit/topic_test.rb
deleted file mode 100644
index 90522ee5..00000000
--- a/test/unit/topic_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class TopicTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
deleted file mode 100644
index 82f61e01..00000000
--- a/test/unit/user_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class UserTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end