Fix duplicate error and re-categorize test#296

nadavrot merged 1 commit intoswiftlang:masterswiftlang/swift:masterfrom

jtbandes:fix-testsjtbandes/swift:fix-testsCopy head branch name to clipboard