Fix affected test cases
2 files changed