Refactored failing test for OptionGroup.

Change-Id: Ia7cc646649dd3e98822ace82e1eefac3f2ba2a5e