CRM-15168 open up test to include a few more entities