Added test cases
Also changed a file name