Merge "UT for ServicehandlerImpl"