Upgrade to Capybara 2