Fix broken canonical_test_matching