Added some tests for the Client