Re-generated test cases, all tests pass