Merge "Modify share server migration tests"