Fixing tests affected by the change.