fix surround tests