Correction for shorting + added testinfo.