modified test file names and test cases