Fix more broken test cases.