Fix more test cases