Fix specs, get gemfile in shape for latest rails