Added tests for new services

Change-Id: I38e1d0cd033e319daf99ba6315a645ce28e6d9e8