Refs #7456 - Fix rubocop warnings and add more tests