Updating/fixing tests to work with Serverspec 2.x.