Make first batch of Selector tests pass.