Merge "Fix test cases broken"