Switch spec_helper to rails_helper, in accord with upgrade guidelines