Updating documentation and added some unit tests for component selection rules changes.

+review REVIEW-5137