Merge "Add cross process mutex test and upgrade tests"