Refctore tests for services: Savanna, Murano

Change-Id: I6ec5c303bea9b06a77fcf4d4b5d591ae996ec404