added more unit test for client side