Improve option context test coverage