Merge pull request #1252 from eileenmcnaughton/CRM-13072-testfixes