Merge pull request #14310 from eileenmcnaughton/dedupe_custom_tests