fixing tests for Client Class