CRM-14319 test set up tweaks
Merge pull request #3102 from eileenmcnaughton/tests

CRM-14319 test set up tweaks