added client attribute to facilitate testing