fixes for failing CRM tests

https://test.civicrm.org/job/CiviCRM-master-git/LABEL=debian6,SUITE=CRM_AllTests/436/testReport/