Add a test for client side implementation