Imporving Documentation & Tests for the service layer.

Change-Id: Ibbb8c293caf6463e140c55d25b367a4672c526b5