Added Client and New Test Cases