added tests and methods to client class