Merge "Refactor public share test cases"