Improved DuplicateTestNameFix to fix #391.
Merge pull request #398 from facebook/nekto/improve_dup_fix

Improved DuplicateTestNameFix to fix #391.