Fix some RuboCop offenses
Update to ChefSpec 4.1