update benz
import cond-expand tests from @KeenS's patch