Groom existing test case files

[khvn26]

1. We need to make sure that every test case file represents a distinct specific test case, and remove duplicate test cases.
2. We need to come up with better file names for existing test cases.