[CDE-139]: Unit test for client side