fixes #2272 - English edits in preparation of Capybara testing
Fixes #2272 - added Capybara integration tests, but without javascripts tests