Added more tests for the client