Removed dupe and re-numbered test cases.