Added tests for Client