Migrated more common option set code.
Expanded option/optset tests.