VALID_CPL_ANNOTATION_TEXT: note -> annotation_text.

1 files changed, 106 insertions, 106 deletions

diff --git a/test/verify_test.cc b/test/verify_test.cc
index 73b8860f..d9bc3e41 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -537,7 +537,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_picture_sound_hash)
 				).set_cpl_id(dcp_test1_cpl_id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id("5407b210-4441-4e97-8b16-8bdc7c12da54"),
 			VN(
 				VC::INCORRECT_PICTURE_HASH, canonical(video_path)
@@ -581,7 +581,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_picture_sound_hashes)
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id("5407b210-4441-4e97-8b16-8bdc7c12da54"),
 			VN(
 				VC::MISMATCHED_CPL_HASHES, canonical(dir / dcp_test1_cpl())
@@ -624,7 +624,7 @@ BOOST_AUTO_TEST_CASE (verify_failed_read_content_kind)
 				canonical(cpl->file().get())
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id("5407b210-4441-4e97-8b16-8bdc7c12da54"),
 			VN(
 				VC::MISMATCHED_CPL_HASHES, canonical(dir / dcp_test1_cpl())
@@ -683,7 +683,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_picture_frame_rate)
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id("5407b210-4441-4e97-8b16-8bdc7c12da54"),
 			VN(
 				VC::MISMATCHED_CPL_HASHES, canonical(cpl_path)
@@ -719,7 +719,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_asset)
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			{ VC::MISSING_ASSET, canonical(dir) / "video.mxf" }
 		});
 }
@@ -749,7 +749,7 @@ BOOST_AUTO_TEST_CASE (verify_empty_asset_path)
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			{ VC::EMPTY_ASSET_PATH }
 		};
 
@@ -782,7 +782,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_standard)
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			{ VC::MISMATCHED_STANDARD },
 			VN(VC::INVALID_XML, canonical(cpl_path), 42).set_cpl_id(cpl->id()).set_error("invalid character encountered"),
 			VN(VC::INVALID_XML, canonical(cpl_path), 53).set_cpl_id(cpl->id()).set_error("no declaration found for element 'Id'"),
@@ -829,7 +829,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_id)
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::MATCHING_CPL_HASHES, cpl),
 			VN(VC::INVALID_XML, canonical(cpl_path), 3).set_cpl_id(cpl->id()).set_error(
 				"value 'urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358a' does not match regular expression "
@@ -869,7 +869,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_issue_date)
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			VN(
 				VC::MISMATCHED_CPL_HASHES, canonical(cpl_path)
 				).set_cpl_id(cpl->id()).set_reference_hash("skI+5b/9LA/y6h0mcyxysJYanxI=").set_calculated_hash("sz3BeIugJ567q3HMnA62JeRw4TE="),
@@ -909,7 +909,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_pkl_id)
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::MATCHING_CPL_HASHES, cpl),
 			VN(VC::INVALID_XML, canonical(pkl_path), 3).set_error(
 				"value 'urn:uuid:x199d58b-5ef8-4d49-b270-07e590ccb280' does not match regular "
@@ -950,7 +950,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_asset_map_id)
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::MATCHING_CPL_HASHES, cpl),
 			VN(VC::INVALID_XML, canonical(asset_map_path), 3).set_error(
 				"value 'urn:uuid:x17b3de4-6dda-408d-b19b-6711354b0bc3' does not match regular "
@@ -1114,7 +1114,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_picture_frame_size_in_bytes)
 		note(VC::NONE_ENCRYPTED, cpl),
 		note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 		note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-		note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+		VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 		note(VC::CORRECT_PICTURE_HASH, canonical(dir / "pic.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 	};
 
@@ -1172,7 +1172,7 @@ BOOST_AUTO_TEST_CASE (verify_nearly_invalid_picture_frame_size_in_bytes)
 		note(VC::NONE_ENCRYPTED, cpl),
 		note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 		note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-		note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+		VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 	};
 
 	for (auto i = 0; i < 24; ++i) {
@@ -1224,7 +1224,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_picture_frame_size_in_bytes)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "pic.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(VC::MISSING_CPL_METADATA, cpl->file().get()).set_cpl_id(cpl->id())
 		});
@@ -1401,7 +1401,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_smpte_subtitles)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			VN(VC::MISSING_CPL_METADATA, cpl->file().get()).set_cpl_id(cpl->id()),
 			VN(VC::INVALID_SUBTITLE_ISSUE_DATE, string{"2021-04-14T13:19:14.000+02:00"}).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(asset->id()),
 			VN(VC::INCORRECT_SUBTITLE_NAMESPACE_COUNT, asset->id()).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(asset->id()),
@@ -1433,7 +1433,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_smpte_subtitles)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			VN(VC::INVALID_XML, path(), 2).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(asset->id()).set_error("no declaration found for element 'Foo'"),
 			VN(VC::INVALID_XML, path(), 2).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(asset->id()).set_error(
 				"element 'Foo' is not allowed for content model "
@@ -1468,7 +1468,7 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			VN(VC::EMPTY_TEXT).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(asset->id()),
 			VN(VC::INVALID_SUBTITLE_FIRST_TEXT_TIME).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(asset->id()),
 			VN(VC::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf")).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(asset->id()),
@@ -1569,7 +1569,7 @@ BOOST_AUTO_TEST_CASE (verify_external_asset)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			VN(VC::EXTERNAL_ASSET).set_asset_id(picture->asset()->id()),
 			VN(VC::MISSING_CPL_METADATA, cpl->file().get()).set_cpl_id(cpl->id())
 		});
@@ -1656,7 +1656,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "pic.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(VC::INVALID_XML, canonical(cpl->file().get()), 50).set_cpl_id(cpl->id()).set_error("no declaration found for element 'meta:MainSoundXConfiguration'"),
 			VN(VC::INVALID_XML, canonical(cpl->file().get()), 51).set_cpl_id(cpl->id()).set_error("no declaration found for element 'meta:MainSoundXSampleRate'"),
@@ -1732,7 +1732,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language1)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			VN(VC::INVALID_LANGUAGE).set_cpl_id(cpl->id()).set_reel_index(0).set_language("badlang"),
 			VN(VC::INVALID_LANGUAGE).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(asset->id()).set_language("wrong-andbad"),
 			VN(VC::MISSING_CPL_METADATA, cpl->file().get()).set_cpl_id(cpl->id())
@@ -1765,7 +1765,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language2)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			VN(VC::INVALID_LANGUAGE).set_cpl_id(cpl->id()).set_reel_index(0).set_language("badlang"),
 			VN(VC::INVALID_LANGUAGE).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(asset->id()).set_language("wrong-andbad"),
 			VN(VC::MISSING_CPL_METADATA, cpl->file().get()).set_cpl_id(cpl->id())
@@ -1823,7 +1823,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3)
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "videofoo.mxf"), cpl).set_reel_index(0).set_asset_id(picture->id()),
 			VN(VC::INVALID_LANGUAGE).set_cpl_id(cpl->id()).set_language("this-is-wrong"),
 			VN(VC::INVALID_LANGUAGE).set_cpl_id(cpl->id()).set_language("andso-is-this"),
@@ -1906,7 +1906,7 @@ check_picture_size_ok (int width, int height, int frame_rate, bool three_d)
 		note(VC::NONE_ENCRYPTED, cpl),
 		note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 		note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-		note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+		VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 		note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 		note(VC::MATCHING_CPL_HASHES, cpl),
 		VN(
@@ -1938,7 +1938,7 @@ check_picture_size_bad_frame_size (int width, int height, int frame_rate, bool t
 		note(VC::NONE_ENCRYPTED, cpl),
 		note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 		note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-		note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+		VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 		note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 		note(VC::MATCHING_CPL_HASHES, cpl),
 		VN(
@@ -1973,7 +1973,7 @@ check_picture_size_bad_2k_frame_rate (int width, int height, int frame_rate, boo
 		note(VC::NONE_ENCRYPTED, cpl),
 		note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 		note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-		note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+		VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 		note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 		note(VC::MATCHING_CPL_HASHES, cpl),
 		VN(
@@ -2008,7 +2008,7 @@ check_picture_size_bad_4k_frame_rate (int width, int height, int frame_rate, boo
 		note(VC::NONE_ENCRYPTED, cpl),
 		note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 		note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-		note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+		VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 		note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 		note(VC::MATCHING_CPL_HASHES, cpl),
 		VN(
@@ -2134,7 +2134,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_xml_size_in_bytes)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			VN(VC::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(asset->id()),
 			VN(
 				VC::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES, canonical(dir / "subs.mxf")
@@ -2185,7 +2185,7 @@ verify_timed_text_asset_too_large (string name)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			VN(
 				VC::INVALID_TIMED_TEXT_SIZE_IN_BYTES, canonical(dir / "subs.mxf")
 				).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(asset->id()).set_size_in_bytes(121698284),
@@ -2265,7 +2265,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(VC::MISSING_SUBTITLE_LANGUAGE, canonical(dir / "subs.mxf")).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(subs_id),
@@ -2330,7 +2330,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(path / "video0.mxf"), cpl).set_reel_index(0).set_asset_id(picture_ids[0]),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(path / "video1.mxf"), cpl).set_reel_index(1).set_asset_id(picture_ids[1]),
 			VN(VC::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf")).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(subs_ids[0]),
@@ -2394,7 +2394,7 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::CORRECT_PICTURE_HASH, canonical(path / "video0.mxf"), cpl).set_reel_index(0).set_asset_id(picture_ids[0]),
 			note(VC::CORRECT_PICTURE_HASH, canonical(path / "video1.mxf"), cpl).set_reel_index(1).set_asset_id(picture_ids[1]),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(path / "video0.mxf"), cpl).set_reel_index(0).set_asset_id(picture_ids[0]),
@@ -2463,7 +2463,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(VC::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf")).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(subs->id()),
 			VN(VC::INVALID_SUBTITLE_FIRST_TEXT_TIME).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(subs->id()),
@@ -2521,7 +2521,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -2634,7 +2634,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_first_text_time)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -2659,7 +2659,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -2718,7 +2718,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -2749,7 +2749,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_spacing)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -2779,7 +2779,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_spacing)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -2804,7 +2804,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_subtitle_duration)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -2830,7 +2830,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_subtitle_duration_bv21)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -2854,7 +2854,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_duration)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -2885,7 +2885,7 @@ BOOST_AUTO_TEST_CASE (verify_subtitle_overlapping_reel_boundary)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -2919,7 +2919,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count1)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -2950,7 +2950,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count1)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -2981,7 +2981,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count2)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3013,7 +3013,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count2)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3041,7 +3041,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length1)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3070,7 +3070,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length2)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3102,7 +3102,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count1)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3133,7 +3133,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count2)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3164,7 +3164,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_count3)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3196,7 +3196,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count4)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3224,7 +3224,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_length)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3252,7 +3252,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_length)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3283,7 +3283,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign1)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3313,7 +3313,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_valign2)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3344,7 +3344,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering1)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3374,7 +3374,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering2)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3396,7 +3396,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering3)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3420,7 +3420,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_closed_caption_ordering4)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3459,7 +3459,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "videofoo.mxf"), cpl).set_reel_index(0).set_asset_id(picture->id()),
@@ -3590,7 +3590,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_asset_duration)
 		{},
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(mp->id()),
@@ -3677,7 +3677,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_main_subtitle_from_some_reels)
 			{},
 			{
 				note(VC::NONE_ENCRYPTED, cpl),
-				note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+				VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 				note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 				note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 				note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3704,7 +3704,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_main_subtitle_from_some_reels)
 			{},
 			{
 				note(VC::NONE_ENCRYPTED, cpl),
-				note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+				VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 				note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 				note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 				note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3729,7 +3729,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_main_subtitle_from_some_reels)
 			{},
 			{
 				note(VC::NONE_ENCRYPTED, cpl),
-				note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+				VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 				note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 				note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 				note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
@@ -3822,7 +3822,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_asset_counts)
 				note(VC::MATCHING_CPL_HASHES, cpl),
 				note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video1.mxf"), cpl).set_reel_index(0).set_asset_id(picture_ids[0]),
 				note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video2.mxf"), cpl).set_reel_index(1).set_asset_id(picture_ids[1]),
-				note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+				VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 				note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 				note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 				VN(VC::MISMATCHED_CLOSED_CAPTION_ASSET_COUNTS).set_cpl_id(cpl->id()),
@@ -3846,7 +3846,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_asset_counts)
 				note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video2.mxf"), cpl).set_reel_index(1).set_asset_id(picture_ids[1]),
 				note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 				note(VC::MATCHING_CPL_HASHES, cpl),
-				note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+				VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 				note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 				note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video1.mxf"), cpl).set_reel_index(0).set_asset_id(picture_ids[0]),
 				note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video2.mxf"), cpl).set_reel_index(1).set_asset_id(picture_ids[1]),
@@ -3871,7 +3871,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_closed_caption_asset_counts)
 				note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video2.mxf"), cpl).set_reel_index(1).set_asset_id(picture_ids[1]),
 				note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 				note(VC::MATCHING_CPL_HASHES, cpl),
-				note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+				VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 				note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 				note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video1.mxf"), cpl).set_reel_index(0).set_asset_id(picture_ids[0]),
 				note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video2.mxf"), cpl).set_reel_index(1).set_asset_id(picture_ids[1]),
@@ -3925,7 +3925,7 @@ verify_text_entry_point_check(dcp::TextType type, path dir, dcp::VerificationNot
 		{},
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
@@ -4017,7 +4017,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_hash)
 				string{"1998x1080"},
 				cpl->file().get()
 				).set_cpl_id(cpl->id()),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
@@ -4070,7 +4070,7 @@ verify_markers_test (
 		);
 	test_notes.push_back(note(VC::VALID_CONTENT_KIND, string{"feature"}, cpl));
 	test_notes.push_back(note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl));
-	test_notes.push_back(note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl));
+	test_notes.push_back(VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"));
 	test_notes.push_back(note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id));
 
 	check_verify_result({dir}, {}, test_notes);
@@ -4191,7 +4191,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_metadata_version_number)
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(VC::MISSING_CPL_METADATA_VERSION_NUMBER, cpl->file().get()).set_cpl_id(cpl->id())
 		});
@@ -4225,7 +4225,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata1)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(
@@ -4268,7 +4268,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata2)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(
@@ -4312,7 +4312,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata3)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(
@@ -4357,7 +4357,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata1)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(
@@ -4401,7 +4401,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata2)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(
@@ -4448,7 +4448,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata6)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(
@@ -4496,7 +4496,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata7)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(
@@ -4543,7 +4543,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata8)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(VC::VALID_MAIN_PICTURE_ACTIVE_AREA, string{"1998x1080"}, cpl->file().get()).set_cpl_id(cpl->id()),
@@ -4588,7 +4588,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata9)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(
@@ -4641,7 +4641,7 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_cpl_with_encrypted_content)
 		{
 			note(VC::ALL_ENCRYPTED, cpl),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_CONTENT_KIND, string{"feature"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
@@ -4688,7 +4688,7 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_pkl_with_encrypted_content)
 		{
 			note(VC::ALL_ENCRYPTED, cpl),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_CONTENT_KIND, string{"feature"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
@@ -4740,7 +4740,7 @@ BOOST_AUTO_TEST_CASE (verify_unsigned_pkl_with_unencrypted_content)
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 		});
 }
@@ -4818,7 +4818,7 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 				cpl->file().get()
 				).set_cpl_id(cpl->id()),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
@@ -4928,7 +4928,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_resource_id)
 		{},
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
@@ -5003,7 +5003,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_timed_text_id)
 		{},
 		{
 			note(VC::NONE_ENCRYPTED, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
@@ -5084,7 +5084,7 @@ BOOST_AUTO_TEST_CASE (verify_unexpected_things_in_main_markers)
 				string{"1998x1080"},
 				canonical(cpl->file().get())
 				).set_cpl_id(cpl->id()),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			VN(
@@ -5127,7 +5127,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_content_kind)
 				canonical(cpl->file().get())
 				).set_cpl_id(cpl->id()),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
@@ -5168,7 +5168,7 @@ BOOST_AUTO_TEST_CASE(verify_valid_content_kind)
 			note(VC::NONE_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(
@@ -5216,7 +5216,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_1)
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(
@@ -5265,7 +5265,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_picture_active_area_2)
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(
@@ -5316,7 +5316,7 @@ BOOST_AUTO_TEST_CASE(verify_duplicate_pkl_asset_ids)
 				canonical(cpl->file().get())
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::NONE_ENCRYPTED, cpl),
 			{ VC::DUPLICATE_ASSET_ID_IN_PKL, pkl.id(), canonical(find_pkl(dir)) },
@@ -5357,7 +5357,7 @@ BOOST_AUTO_TEST_CASE(verify_duplicate_assetmap_asset_ids)
 				canonical(cpl->file().get())
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::NONE_ENCRYPTED, cpl),
 			VN(
@@ -5454,7 +5454,7 @@ BOOST_AUTO_TEST_CASE(verify_mismatched_sound_channel_counts)
 				cpl->file().get()
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::CORRECT_PICTURE_HASH, canonical(path / "video1.mxf"), cpl).set_reel_index(0).set_asset_id(picture_ids[0]),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(path / "video1.mxf"), cpl).set_reel_index(0).set_asset_id(picture_ids[0]),
 			note(VC::CORRECT_PICTURE_HASH, canonical(path / "video2.mxf"), cpl).set_reel_index(1).set_asset_id(picture_ids[1]),
@@ -5520,7 +5520,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_main_sound_configuration)
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::CORRECT_PICTURE_HASH, canonical(path / "video1.mxf"), cpl).set_reel_index(0).set_asset_id(mp->id()),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(path / "video1.mxf"), cpl).set_reel_index(0).set_asset_id(mp->id()),
 			VN(
@@ -5602,7 +5602,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_tile_part_size)
 		note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 		note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 		note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-		note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+		VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 		note(VC::MATCHING_CPL_HASHES, cpl),
 		VN(VC::MISSING_FFOC).set_cpl_id(cpl->id()),
 		VN(VC::MISSING_LFOC).set_cpl_id(cpl->id())
@@ -5654,7 +5654,7 @@ BOOST_AUTO_TEST_CASE(verify_too_many_subtitle_namespaces)
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"feature"}, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"Dcp_FTR-1_F_XX-XX_MOS_2K_20230407_SMPTE_OV"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("Dcp_FTR-1_F_XX-XX_MOS_2K_20230407_SMPTE_OV"),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "j2c_42b34dcd-caa5-4c7b-aa0f-66a590947ba1.mxf"), cpl).set_reel_index(0).set_asset_id("42b34dcd-caa5-4c7b-aa0f-66a590947ba1"),
 			note(
 				VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES,
@@ -5764,7 +5764,7 @@ BOOST_AUTO_TEST_CASE(verify_missing_load_font)
 				cpl->file().get()
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
@@ -5807,7 +5807,7 @@ BOOST_AUTO_TEST_CASE(verify_spots_wrong_asset)
 				cpl->file().get()
 				).set_cpl_id(cpl->id()),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
 			VN(VC::MISMATCHED_ASSET_MAP_ID).set_asset_id(asset_1).set_other_asset_id(asset_2)
 		});
@@ -5842,7 +5842,7 @@ BOOST_AUTO_TEST_CASE(verify_cpl_content_version_label_text_empty)
 			note(VC::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL, cpl),
 			note(VC::MATCHING_CPL_HASHES, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"A Test DCP"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("A Test DCP"),
 			note(VC::CORRECT_PICTURE_HASH, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "video.mxf"), cpl).set_reel_index(0).set_asset_id(picture_id),
 			VN(VC::EMPTY_CONTENT_VERSION_LABEL_TEXT, cpl->file().get()).set_cpl_id(cpl->id())
@@ -5875,7 +5875,7 @@ BOOST_AUTO_TEST_CASE(verify_encrypted_smpte_dcp)
 			note(VC::MATCHING_CPL_HASHES, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			note(VC::ALL_ENCRYPTED, cpl),
 			VN(VC::MISSING_CPL_METADATA, canonical(cpl_file)).set_cpl_id(cpl->id())
 		});
@@ -5906,7 +5906,7 @@ BOOST_AUTO_TEST_CASE(verify_encrypted_smpte_dcp_without_kdm)
 			note(VC::ALL_ENCRYPTED, cpl),
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpl),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpl),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("hello"),
 			VN(VC::MISSED_CHECK_OF_ENCRYPTED).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(subtitle_id),
 			VN(VC::MISSED_CHECK_OF_ENCRYPTED).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(subtitle_id),
 			VN(VC::MISSED_CHECK_OF_ENCRYPTED).set_cpl_id(cpl->id()).set_reel_index(0).set_asset_id(subtitle_id),
@@ -5929,7 +5929,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_sound_bit_depth)
 		note(VC::MATCHING_CPL_HASHES, cpl),
 		note(VC::VALID_CONTENT_KIND, string{"Advertisement"}, cpl),
 		note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpl->content_version()->label_text, cpl),
-		note(VC::VALID_CPL_ANNOTATION_TEXT, string{"204794_Kitex_Scoobee_Day_Bags_30_Sec_Malayalam_220524_RADQR"}, cpl),
+		VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpl->id()).set_annotation_text("204794_Kitex_Scoobee_Day_Bags_30_Sec_Malayalam_220524_RADQR"),
 		note(VC::NONE_ENCRYPTED, cpl),
 		note(VC::CORRECT_PICTURE_HASH, canonical(dir / "Video.mxf"), cpl).set_reel_index(0).set_asset_id("fd4796c2-9c84-454c-91f4-13ad127cea8a"),
 		note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(dir / "Video.mxf"), cpl).set_reel_index(0).set_asset_id("fd4796c2-9c84-454c-91f4-13ad127cea8a"),
@@ -6085,8 +6085,8 @@ BOOST_AUTO_TEST_CASE(verify_dcp_with_two_cpls)
 			note(VC::VALID_CONTENT_KIND, string{"trailer"}, cpls[1]),
 			note(VC::NONE_ENCRYPTED, cpls[0]),
 			note(VC::NONE_ENCRYPTED, cpls[1]),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpls[0]),
-			note(VC::VALID_CPL_ANNOTATION_TEXT, string{"hello"}, cpls[1]),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpls[0]->id()).set_annotation_text("hello"),
+			VN(VC::VALID_CPL_ANNOTATION_TEXT).set_cpl_id(cpls[1]->id()).set_annotation_text("hello"),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpls[0]->content_version()->label_text, cpls[0]),
 			note(VC::VALID_CONTENT_VERSION_LABEL_TEXT, cpls[1]->content_version()->label_text, cpls[1]),
 			note(VC::VALID_PICTURE_FRAME_SIZES_IN_BYTES, canonical(combined / "videofoo.mxf"), cpls[0]).set_reel_index(0).set_asset_id(picture_ids[0]),