more serverspec 2 fixes and cleanup