Merge "Refactored UserVisibilityMediator unit tests:"