Merge "Add tests for share server migration"