Merge pull request #89460 from ahoppen/c-index-test-adjusments