More work for #1814 to improve capybara test readability/maintainability

Still plenty more to do, but would like to have this merged into master.