Caught more test cases