Move to serverspec v2