Merge pull request #11334 from jitendrapurohit/CRM-21436-unittest