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

...etup function