Fix test fail issue