Ensure both flags are tested

- Wrote a data provider so that the option name both with and without
  underscores may be tested.