Minor test fix + Some Rubocop "offenses" fixes.