Rename duplicate 'combined * and ?' test cases to include singular/plural suffix for clarity and to support targeted test runs.
Rename duplicate 'combined * and ?' test cases to include singular/plural suffix for clarity and to support targeted test runs.