Using indexes for union preselection, updated tests