Merge "Fix test failures"