Remove client unittest dependency on NamedTuple

Back port this fix as it is breaking on 2.5 as well