Add more tests for the client