Added more test cases for client