serverspec 2 fixes