CRM-14319 test set up tweaks