Merge "Refactor SH ServicehandlerImplTest"