Fix tests for new serverspec