Add additional tests for the client