Merge pull request #6382 from eileenmcnaughton/CRM-16923-tests