chefspec and rubocop fixes