test fix - set globals in main setup function rather than ad hoc
Merge pull request #3503 from eileenmcnaughton/CRM-14866

test fix - set globals in main setup function rather than ad hoc