Upgrade Rails, fix test