3853 Correct merge conflicts in test