Fixing broken test due merge.