Update KeyMatcher and KeyMatcherTest.