Fix broken unit test due to merge conflict