Add match tests