Merge "Fix failing test cases"