Merge "Add more server migration tests"