Improving tests for component selection rule targeting

+review REVIEW-5180