Make return smoketest friendlier