Update OptionPatternMatcher and add test for 100% code coverage