Improve reliability of capybara tests. Travis gets a number of sporadic failures.
More test improvements. Hopefully travis will pass sometime soon