Add missing tests, debug MatchHandler.