More test cases
Tag v1.8