Upgrade: capybara (2.0.2 ~> 2.1.0) (part 3, test tweaks)