serverspec 2 fixes to e2e tests

also some cleanup in the os-detection