Refactored mock selectors