Wrap logic for selecting options in acceptance tests
Merge pull request #1141 from edx/zoldak/fix-problem-test

Wrap logic for selecting options in acceptance tests