Wrap logic for selecting options in acceptance tests

@wedaly