Fix overlapping test case names.
Merge pull request #3464 from jrmithdobbs/fix_overlapping_testcase_name

Fix overlapping test case names.