Refactoring to use serverspec