rubocop offenses cleanup.  misc pkgs added to test.