Fixing broken test because of bad merging