more rubocop/spec changes.