Renamed options, for more clarity in tests.
Refactored option test sets.
More test refactoring.