Upgrade to Rails 4.0.1 and finish fixing tests