Fix broken test cases
5 files changed