Add more test cases to pass test coverage