remove constrained_matching flag from canonical_test