Merge "Improve test coverage for share migration"