Added parametrization to client tests.