Fix failed test cases