More test cases to improve statement coverage