Fix regressed test cases