Rails update.
More test updates
Another round of test improvements, getting the Capybara tests back out of pending