Make integration spec more consistent