Fix overlapping test case names that seem to have been hiding some failing tests.