Fix tests broken in 60953ba