Update feature and helper specs for capybara 2