Fixed #20864 – Made the test client use common method for performing req...

...uests.