fix remaing presuite tests