Adding service management UT