Fix more test issues.