More test cases covered