Fixing broken test after merge conflicts