Merge pull request #6712 from jitendrapurohit/CRM-17146-tests