Added more specific test cases