Grab support for TEST_MATCH from upstream, update wiki.