Fix a broken test case after the merge