unit tests for client
more unit tests?