CRM-13891 - test fixes, replace hard-coded IDs with name lookups and acc...

...ommodate option group with more than 10 options.

----------------------------------------
* CRM-13891:
  http://issues.civicrm.org/jira/browse/CRM-13891