More option tests
Refactor options.