Get idaho test to pass, expand timeout. Fix dedup