Small changes for better rubocop assimilation, plus an additional test.