Fix tests broken in f780902e