CRM-13891 - test fixes, replace hard-coded IDs with name lookups and accommodate option group with more than 10 options.

----------------------------------------
* CRM-13891:
  http://issues.civicrm.org/jira/browse/CRM-13891
Merge pull request #2839 from davecivicrm/CRM-13891testFixes

CRM-13891 - test fixes, replace hard-coded IDs with name lookups and acc...
Merge remote-tracking branch 'upstream/master' into master-doctrine-2014-04-07-15-23-02