CRM-12984 looks like last commit affected these tests - change to test setup function
Merge pull request #1109 from eileenmcnaughton/4.3

CRM-12984 looks like last commit affected these tests - change to test s...