CRM-15168 fix intermittantly failing test that was highlighted by previous commits