expanded and cleaned up capybara tests