Fits more test cases