Updates for chefspec 4.1, guard cleanup