Merge "Junit tests for ServiceException"