Added client class.
Updated unit tests.

Signed-off-by: Froilan <froilan.co@orangeandbronze.com>