Fix to broken tests caused by 0acdb80