Added more test files and test cases