* moved client to class variable
* fixing tests