Merge "Added unit tests for CldsEventDelegate"