Core: Clean up selector tests