Added tests for new services

Change-Id: I08afb1b358292782bab069a93de18049ae3470fa