Merge pull request #13694 from vdemeester/opts-test-coverage

Tests, refactor and coverage on package opts