Fix MatchHandler tests.