Simplifying version selection rule processing and rounding out integration tests

+review REVIEW-5137