Added a few test cases for client