Fix more inconsistent tests