Progress (incomplete) on selector tests