Merge "Fix failed test cases"