Client and Unit testing added