Refactor serverspec tests, adding more