Added more test cases to test file