fixes #2272 Added Capybara intergration tests
more edits to failing tests