- consolidate the option tests into one test module
- replace the complex multi-assert tests with simpler ones
- add more tests to confirm our option precedence