Updated tests to exercise overridable options.