Fix more testcases