Fix more test fail.