Add capybara for integration testing (more upgrade fixes)