With more test cases