test fix (CRM-12697)

BAO test fixes