Merge "Fix failed tests"