diff --git a/.travis.yml b/.travis.yml
index 3d8884632..e0e22e1d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 language: ruby
-sudo: required
 cache: bundler
 bundler_args: '--without production development'
 rvm:
diff --git a/app/admin/user.rb b/app/admin/user.rb
index 09d337b42..203743025 100644
--- a/app/admin/user.rb
+++ b/app/admin/user.rb
@@ -43,7 +43,7 @@
     end
     f.inputs "Members" do
       f.has_many :members do |m|
-        m.input :organization
+        m.input :organization, collection: Organization.order(id: :asc).pluck(:name, :id)
         m.input :manager
       end
     end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5c4512e0d..6c198475c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -6,11 +6,14 @@ module ApplicationHelper
   # from gravatar
   def avatar_url(user, size = 32)
     gravatar_id = Digest::MD5::hexdigest(user.email).downcase
-    gravatar_options = Hash[set: "set1",
-                            gravatar: "hashed",
-                            size: "#{size}x#{size}"]
-    "https://www.gravatar.com/avatar/#{gravatar_id}.png?" +
-      "#{Rack::Utils.build_query(gravatar_options)}&d=identicon"
+    gravatar_options = {
+      set: "set1",
+      gravatar: "hashed",
+      size: "#{size}x#{size}",
+      d: "identicon"
+    }
+
+    "https://www.gravatar.com/avatar/#{gravatar_id}.png?#{gravatar_options.to_param}"
   end
 
   def mdash
@@ -38,7 +41,7 @@ def show_error_messages!(resource)
     messages = resource.errors.
                full_messages.map { |msg| content_tag(:li, msg) }.join
     html = <<-HTML
-    <div class="alert alert-error alert-block">
+    <div class="alert alert-danger">
       <button type="button" class="close" data-dismiss="alert">x</button>
       <ul>
         #{messages}
@@ -80,4 +83,15 @@ def get_body_css_class(controller)
 
     "#{classes[controller]}"
   end
+
+  def alert_class(alert)
+    case alert
+    when 'error', 'alert'
+      'alert-danger'
+    when 'notice'
+      'alert-success'
+    else
+      'alert-info'
+    end
+  end
 end
diff --git a/app/helpers/categories_helper.rb b/app/helpers/categories_helper.rb
deleted file mode 100644
index e06f31554..000000000
--- a/app/helpers/categories_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module CategoriesHelper
-end
diff --git a/app/helpers/devise_helper.rb b/app/helpers/devise_helper.rb
deleted file mode 100644
index 6db8fc929..000000000
--- a/app/helpers/devise_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module DeviseHelper
-end
diff --git a/app/helpers/global_helper.rb b/app/helpers/global_helper.rb
deleted file mode 100644
index be6bce4b2..000000000
--- a/app/helpers/global_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module GlobalHelper
-end
diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb
deleted file mode 100644
index 18a2aea43..000000000
--- a/app/helpers/messages_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module MessagesHelper
-  def alert_class(alert)
-    if alert == 'error' || alert == 'alert'
-      'alert-danger'
-    elsif alert == 'success'
-      'alert-success'
-    elsif alert == 'notice'
-      'alert-info'
-    else
-      'alert-info'
-    end
-  end
-end
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
deleted file mode 100644
index 24cc9a80e..000000000
--- a/app/helpers/organizations_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module OrganizationsHelper
-end
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
deleted file mode 100644
index 309f8b2eb..000000000
--- a/app/helpers/sessions_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module SessionsHelper
-end
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
deleted file mode 100644
index 23450bc5c..000000000
--- a/app/helpers/tags_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module TagsHelper
-end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index e7526201c..edd02894b 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -1,6 +1,4 @@
 module UsersHelper
-  private
-
   def edit_user_path(user)
     can_edit_user?(user) ? super : ""
   end
diff --git a/app/views/layouts/_messages.html.erb b/app/views/layouts/_messages.html.erb
index b5e081551..0222a2c35 100644
--- a/app/views/layouts/_messages.html.erb
+++ b/app/views/layouts/_messages.html.erb
@@ -3,10 +3,10 @@
 
   <div class="alert <%= alert_class(key) %>">
     <button type="button" class="close" data-dismiss="alert">x</button>
-      <ul>
-        <li>
-          <%= value %>
-        </li>
-      </ul>
+    <ul>
+      <li>
+        <%= value %>
+      </li>
+    </ul>
   </div>
 <% end %>
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 4b8786f02..d86db2045 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -66,7 +66,7 @@
   config.error_notification_tag = :div
 
   # CSS class to add for error notification helper.
-  config.error_notification_class = 'alert alert-error'
+  config.error_notification_class = 'alert alert-danger'
 
   # ID to add for error notification helper.
   # config.error_notification_id = nil
diff --git a/spec/helpers/.gitkeep b/spec/helpers/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
new file mode 100644
index 000000000..dee9814e5
--- /dev/null
+++ b/spec/helpers/application_helper_spec.rb
@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+RSpec.describe ApplicationHelper do
+  it 'avatar_url returns url to gravatar' do
+    user = Fabricate(:user)
+    gravatar_id = Digest::MD5::hexdigest(user.email).downcase
+    expect(helper.avatar_url(user, 50)).to eq("https://www.gravatar.com/avatar/#{gravatar_id}.png?d=identicon&gravatar=hashed&set=set1&size=50x50")
+  end
+
+  describe 'seconds_to_hm' do
+    it 'with 0 returns em dash' do
+      expect(helper.seconds_to_hm(0)).to eq("&mdash;")
+    end
+
+    it 'with non-zero returns specific format' do
+      expect(helper.seconds_to_hm(10)).to eq("0:00")
+      expect(helper.seconds_to_hm(60)).to eq("0:01")
+      expect(helper.seconds_to_hm(-60)).to eq("-0:01")
+      expect(helper.seconds_to_hm(3600)).to eq("1:00")
+    end
+  end
+
+  it 'alert_class returns specific error classes' do
+    expect(helper.alert_class('error')).to eq('alert-danger')
+    expect(helper.alert_class('alert')).to eq('alert-danger')
+    expect(helper.alert_class('notice')).to eq('alert-success')
+    expect(helper.alert_class('foo')).to eq('alert-info')
+  end
+end
\ No newline at end of file
diff --git a/spec/helpers/glyph_helper_spec.rb b/spec/helpers/glyph_helper_spec.rb
new file mode 100644
index 000000000..9c3578395
--- /dev/null
+++ b/spec/helpers/glyph_helper_spec.rb
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+RSpec.describe GlyphHelper do
+  describe 'glyph helper' do
+    it 'renders an span with glyphicon classes' do
+      expect(helper.glyph('foo')).to match(/<span class=\"glyphicon glyphicon-foo\"><\/span>/)
+    end
+
+    it 'special mappings' do
+      sample = GlyphHelper::GLYPHS.to_a.sample[0]
+      expect(helper.glyph(sample)).to match(GlyphHelper::GLYPHS[sample])
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8bb3db7cd..b33a21212 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,6 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-ENV["ADMINS"] = "superadmin@example.com"
+ENV["ADMINS"] = "admin@timeoverflow.org"
 
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
@@ -11,6 +11,7 @@
 require 'selenium/webdriver'
 require 'faker'
 require 'shoulda/matchers'
+
 I18n.reload!
 
 Capybara.register_driver :chrome do |app|
@@ -36,7 +37,7 @@
 # in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
-# Make sure schem persists when running tests.
+# Make sure schema persists when running tests.
 # We ran into an error that forced us to run rake db:migrate RAILS_ENV=test
 # before running tests. This kind of fixes it, although we should have a closer
 # look at this and find a better solution
@@ -75,7 +76,6 @@
     feature_specs = items_by_type[:feature] || []
     rest_of_specs = items_by_type[:rest] || []
 
-
     random = Random.new(config.seed)
 
     [