Client test commit done.

Few changes on the code.