Merge "Add junit tests for CallbackHandlerService"