CRM-14178 fix error static vs nonstatic error introded in PR process
Merge pull request #3417 from eileenmcnaughton/test_fixes

CRM-14178 fix error static vs nonstatic error introded in PR process