Refactored selector tests