Fixing service and package serverspec tests.