diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb
index 942444a..4575333 100644
--- a/features/step_definitions/user_steps.rb
+++ b/features/step_definitions/user_steps.rb
@@ -20,6 +20,7 @@ def create_user
   create_visitor
   delete_user
   @user = FactoryGirl.create(:user, email: @visitor[:email])
+  @user.add_role("")
 end
 
 def delete_user
@@ -47,7 +48,7 @@ def sign_in
 
 ### GIVEN ###
 Given /^I am not logged in$/ do
-  visit '/users/sign_out'
+  visit destroy_user_session_path
 end
 
 Given /^I am logged in$/ do
@@ -128,10 +129,6 @@ def sign_in
   click_button "Update"
 end
 
-When /^I look at the list of users$/ do
-  visit '/'
-end
-
 ### THEN ###
 Then /^I should be signed in$/ do
   page.should have_content "Logout"
@@ -140,7 +137,6 @@ def sign_in
 end
 
 Then /^I should be signed out$/ do
-  page.should have_content "Sign up"
   page.should have_content "Login"
   page.should_not have_content "Logout"
 end
@@ -158,19 +154,19 @@ def sign_in
 end
 
 Then /^I should see an invalid email message$/ do
-  page.should have_content "Email is invalid"
+  page.should have_content "is invalid"
 end
 
 Then /^I should see a missing password message$/ do
-  page.should have_content "Password can't be blank"
+  page.should have_content "can't be blank"
 end
 
 Then /^I should see a missing password confirmation message$/ do
-  page.should have_content "Password doesn't match confirmation"
+  page.should have_content "doesn't match confirmation"
 end
 
 Then /^I should see a mismatched password message$/ do
-  page.should have_content "Password doesn't match confirmation"
+  page.should have_content "doesn't match confirmation"
 end
 
 Then /^I should see a signed out message$/ do
diff --git a/features/users/user_show.feature b/features/users/user_show.feature
deleted file mode 100644
index cc02fe7..0000000
--- a/features/users/user_show.feature
+++ /dev/null
@@ -1,9 +0,0 @@
-Feature: Show Users
-  As a visitor to the website
-  I want to see registered users listed on the homepage
-  so I can know if the site has users
-
-    Scenario: Viewing users
-      Given I exist as a user
-      When I look at the list of users
-      Then I should see my name