Update InfoTest from dmacks current Stable changes