CRM-14972 fix for test breakage - the fix part
CRM-14972 update tests
Merge pull request #3645 from eileenmcnaughton/CRM-14972

CRM-14972 fix test-exposed bug in separate membership payment