Remove client unittest dependency on NamedTuple