Updated matching test