Replace uses of have_tag with have_selector, and don't include have_tag