add tests for client side