UUID churn in tests.

22 files changed, 24 insertions, 24 deletions

diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml
index cddbbb4d..65e64265 100644
--- a/test/ref/DCP/dcp_test1/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1022</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><ChunkList><Chunk><Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1374</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>161326</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1022</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><ChunkList><Chunk><Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1374</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>161326</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
diff --git a/test/ref/DCP/dcp_test1/audio.mxf b/test/ref/DCP/dcp_test1/audio.mxf
index f6844eeb..d249b939 100644
--- a/test/ref/DCP/dcp_test1/audio.mxf
+++ b/test/ref/DCP/dcp_test1/audio.mxf
diff --git a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index de478c96..9076dd4f 100644
--- a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
+++ b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL"><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:8e293965-f8ad-48c6-971d-261b01f65cdb</Id><AssetList><MainPicture><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>EQtZQCRMlzp+/R5/NBN0mNT8f00=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>K8Yisaim2ieTxRCD2T2pm04nvCY=</Hash></MainSound></AssetList></Reel></ReelList></CompositionPlaylist>
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL"><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id><AssetList><MainPicture><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>fppx9bI5WaFQjRcwmeobYY29GNY=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>fnl4pJDAQk/xQ54W4R+l6S7PB7E=</Hash></MainSound></AssetList></Reel></ReelList></CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml b/test/ref/DCP/dcp_test1/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml
index e016d5d9..3d65798a 100644
--- a/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml
+++ b/test/ref/DCP/dcp_test1/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText><Hash>V2QDW8nppqeF1DO8FpF+N3FiBYU=</Hash><Size>1374</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText><Hash>EQtZQCRMlzp+/R5/NBN0mNT8f00=</Hash><Size>26080</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><AnnotationText>9482e87d-292d-4e0e-a98d-c61822b60fe9</AnnotationText><Hash>K8Yisaim2ieTxRCD2T2pm04nvCY=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText><Hash>1/64LdRLarzX5wgiEK/BjuXuSik=</Hash><Size>1374</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText><Hash>fppx9bI5WaFQjRcwmeobYY29GNY=</Hash><Size>26080</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id><AnnotationText>8b92bcee-62fc-4a33-a51a-816e9611ce85</AnnotationText><Hash>fnl4pJDAQk/xQ54W4R+l6S7PB7E=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/DCP/dcp_test1/video.mxf b/test/ref/DCP/dcp_test1/video.mxf
index 6683f261..63d3bff3 100644
--- a/test/ref/DCP/dcp_test1/video.mxf
+++ b/test/ref/DCP/dcp_test1/video.mxf
diff --git a/test/ref/DCP/dcp_test2/ASSETMAP.xml b/test/ref/DCP/dcp_test2/ASSETMAP.xml
index db468534..532f60ed 100644
--- a/test/ref/DCP/dcp_test2/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test2/ASSETMAP.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:646747f3-51ee-47ec-a0a2-5f8c415818e8</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:6d857146-24c9-4626-bc7a-3971b15f1ba4</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_6d857146-24c9-4626-bc7a-3971b15f1ba4.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1022</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id><ChunkList><Chunk><Path>cpl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1498</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>35032</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:8ee8f7da-8da2-4adb-ae0e-31e8f4b91900</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>161326</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:fc17a5e4-1127-4eb7-847f-a982d1ad0b34</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:2afb4e45-f01c-4abc-a354-2ffc0c240a5e</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1022</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c</Id><ChunkList><Chunk><Path>cpl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1498</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f9</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>35032</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:58d42406-691b-47e3-be74-e7a7b49c9514</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>161326</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
diff --git a/test/ref/DCP/dcp_test2/audio.mxf b/test/ref/DCP/dcp_test2/audio.mxf
index 32f3c05d..255b6a11 100644
--- a/test/ref/DCP/dcp_test2/audio.mxf
+++ b/test/ref/DCP/dcp_test2/audio.mxf
diff --git a/test/ref/DCP/dcp_test2/cpl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml b/test/ref/DCP/dcp_test2/cpl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml
index d7ff3479..cc2434dd 100644
--- a/test/ref/DCP/dcp_test2/cpl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml
+++ b/test/ref/DCP/dcp_test2/cpl_cd49971e-bf4c-4594-8474-54ebef09a40c.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL"><Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:5bdc7da4-eaf1-43e6-854f-7a1175edf94a</Id><AssetList><MainSound><Id>urn:uuid:8ee8f7da-8da2-4adb-ae0e-31e8f4b91900</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>FfVYhCr2G4t9a385ZqZdwhhBwzM=</Hash></MainSound><msp-cpl:MainStereoscopicPicture xmlns:msp-cpl="http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL"><Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>XFEj7mS4aUASmAW7FvVOY78635c=</Hash><FrameRate>48 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></msp-cpl:MainStereoscopicPicture></AssetList></Reel></ReelList></CompositionPlaylist>
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL"><Id>urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:41eebce6-86f2-4939-b27a-81e4dd3606e9</Id><AssetList><MainSound><Id>urn:uuid:58d42406-691b-47e3-be74-e7a7b49c9514</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>hNT4mrE0QqE9NgUzqf+Eh3CYGWE=</Hash></MainSound><msp-cpl:MainStereoscopicPicture xmlns:msp-cpl="http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL"><Id>urn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f9</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>M6O1IKSNbWdBQI6zm6AUFOUsrsg=</Hash><FrameRate>48 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></msp-cpl:MainStereoscopicPicture></AssetList></Reel></ReelList></CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test2/pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml b/test/ref/DCP/dcp_test2/pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml
new file mode 100644
index 00000000..52affab1
--- /dev/null
+++ b/test/ref/DCP/dcp_test2/pkl_2afb4e45-f01c-4abc-a354-2ffc0c240a5e.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:2afb4e45-f01c-4abc-a354-2ffc0c240a5e</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c</Id><AnnotationText>cd49971e-bf4c-4594-8474-54ebef09a40c</AnnotationText><Hash>9UToAEAcnkP2slky4m9+zpKr1Bw=</Hash><Size>1498</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:07e9f5a0-83ab-4791-8c6b-7df5d11f76f9</Id><AnnotationText>07e9f5a0-83ab-4791-8c6b-7df5d11f76f9</AnnotationText><Hash>M6O1IKSNbWdBQI6zm6AUFOUsrsg=</Hash><Size>35032</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:58d42406-691b-47e3-be74-e7a7b49c9514</Id><AnnotationText>58d42406-691b-47e3-be74-e7a7b49c9514</AnnotationText><Hash>hNT4mrE0QqE9NgUzqf+Eh3CYGWE=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/DCP/dcp_test2/pkl_6d857146-24c9-4626-bc7a-3971b15f1ba4.xml b/test/ref/DCP/dcp_test2/pkl_6d857146-24c9-4626-bc7a-3971b15f1ba4.xml
deleted file mode 100644
index a3ec9bae..00000000
--- a/test/ref/DCP/dcp_test2/pkl_6d857146-24c9-4626-bc7a-3971b15f1ba4.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:6d857146-24c9-4626-bc7a-3971b15f1ba4</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id><AnnotationText>74e205d0-d145-42d2-8c49-7b55d058ca55</AnnotationText><Hash>RewKGbAI7jndaXVkAQgm+g76o1E=</Hash><Size>1498</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id><AnnotationText>63c3aece-c581-4603-b612-75e43f0c0430</AnnotationText><Hash>XFEj7mS4aUASmAW7FvVOY78635c=</Hash><Size>35032</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:8ee8f7da-8da2-4adb-ae0e-31e8f4b91900</Id><AnnotationText>8ee8f7da-8da2-4adb-ae0e-31e8f4b91900</AnnotationText><Hash>FfVYhCr2G4t9a385ZqZdwhhBwzM=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/DCP/dcp_test2/video.mxf b/test/ref/DCP/dcp_test2/video.mxf
index d5846832..42cae0b2 100644
--- a/test/ref/DCP/dcp_test2/video.mxf
+++ b/test/ref/DCP/dcp_test2/video.mxf
diff --git a/test/ref/DCP/dcp_test5/ASSETMAP.xml b/test/ref/DCP/dcp_test5/ASSETMAP.xml
index 9bda0c4d..a06c3eb8 100644
--- a/test/ref/DCP/dcp_test5/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test5/ASSETMAP.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:7c247206-50b3-487d-96ed-29b19512a4bb</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:a0488650-63ea-4b53-92a3-00a2c4e516fe</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_a0488650-63ea-4b53-92a3-00a2c4e516fe.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1022</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:330161f5-434e-424a-a701-3d3f26700c52</Id><ChunkList><Chunk><Path>cpl_330161f5-434e-424a-a701-3d3f26700c52.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1817</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:402c5a88-2512-4465-9c0b-cfa687dbc5d0</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:78f4f085-0901-4a0f-96f9-e21987072a51</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>161326</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:7574c611-f8de-4d20-98c4-2eb7dc87080a</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:34acc068-e059-4fb9-90ca-461c57d17dae</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_34acc068-e059-4fb9-90ca-461c57d17dae.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1022</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:11c45f5d-d465-4c41-b008-5284cf38a037</Id><ChunkList><Chunk><Path>cpl_11c45f5d-d465-4c41-b008-5284cf38a037.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1817</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:7f8b3329-371b-4342-b849-a2ee840e8f45</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:5ee06e49-440d-4aba-b83d-c783391e87bc</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>161326</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
diff --git a/test/ref/DCP/dcp_test5/audio.mxf b/test/ref/DCP/dcp_test5/audio.mxf
index 84358553..2e0a0c80 100644
--- a/test/ref/DCP/dcp_test5/audio.mxf
+++ b/test/ref/DCP/dcp_test5/audio.mxf
diff --git a/test/ref/DCP/dcp_test5/cpl_330161f5-434e-424a-a701-3d3f26700c52.xml b/test/ref/DCP/dcp_test5/cpl_11c45f5d-d465-4c41-b008-5284cf38a037.xml
index 45587f5a..1219522f 100644
--- a/test/ref/DCP/dcp_test5/cpl_330161f5-434e-424a-a701-3d3f26700c52.xml
+++ b/test/ref/DCP/dcp_test5/cpl_11c45f5d-d465-4c41-b008-5284cf38a037.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL"><Id>urn:uuid:330161f5-434e-424a-a701-3d3f26700c52</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:4be406ed-9b7d-4746-bf35-e73598ef1e64</Id><AssetList><MainPicture><Id>urn:uuid:402c5a88-2512-4465-9c0b-cfa687dbc5d0</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>eiqr9sUevuwoy7pprmgU6r0zBD8=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:78f4f085-0901-4a0f-96f9-e21987072a51</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>iTTXhr9BviLgys5ldPFRzPXP2GM=</Hash></MainSound><axd:AuxData xmlns:axd="http://www.dolby.com/schemas/2012/AD"><Id>urn:uuid:73f2a92b-f963-47cc-a3d7-c7ca2fd10a64</Id><AnnotationText>20160218_NameOfFilm_FTR_OV_EN_A_dcs_r01.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>1489</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>1489</Duration><Hash>jo8pQSebhScPN4EVvvpIUWRrDeM=</Hash><axd:DataType>urn:smpte:ul:060e2b34.04010105.0e090604.00000000</axd:DataType></axd:AuxData></AssetList></Reel></ReelList></CompositionPlaylist>
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL"><Id>urn:uuid:11c45f5d-d465-4c41-b008-5284cf38a037</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:a898dd75-ec7c-4161-8606-c8a618bc2e88</Id><AssetList><MainPicture><Id>urn:uuid:7f8b3329-371b-4342-b849-a2ee840e8f45</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>EhBPen6Vp+D3a2wcjeXA64+x4fs=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:5ee06e49-440d-4aba-b83d-c783391e87bc</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>T7S0u9QjNuhMsig5GMKweK9BBzM=</Hash></MainSound><axd:AuxData xmlns:axd="http://www.dolby.com/schemas/2012/AD"><Id>urn:uuid:c200d3dd-82db-4d51-99af-c55ace94d535</Id><AnnotationText>20160218_NameOfFilm_FTR_OV_EN_A_dcs_r01.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>1489</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>1489</Duration><Hash>jo8pQSebhScPN4EVvvpIUWRrDeM=</Hash><axd:DataType>urn:smpte:ul:060e2b34.04010105.0e090604.00000000</axd:DataType></axd:AuxData></AssetList></Reel></ReelList></CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test5/pkl_34acc068-e059-4fb9-90ca-461c57d17dae.xml b/test/ref/DCP/dcp_test5/pkl_34acc068-e059-4fb9-90ca-461c57d17dae.xml
new file mode 100644
index 00000000..36db1a3d
--- /dev/null
+++ b/test/ref/DCP/dcp_test5/pkl_34acc068-e059-4fb9-90ca-461c57d17dae.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:34acc068-e059-4fb9-90ca-461c57d17dae</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:11c45f5d-d465-4c41-b008-5284cf38a037</Id><AnnotationText>11c45f5d-d465-4c41-b008-5284cf38a037</AnnotationText><Hash>6d2DG9wN0raCQX6c+w1PQEGR8p0=</Hash><Size>1817</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:7f8b3329-371b-4342-b849-a2ee840e8f45</Id><AnnotationText>7f8b3329-371b-4342-b849-a2ee840e8f45</AnnotationText><Hash>EhBPen6Vp+D3a2wcjeXA64+x4fs=</Hash><Size>26080</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:5ee06e49-440d-4aba-b83d-c783391e87bc</Id><AnnotationText>5ee06e49-440d-4aba-b83d-c783391e87bc</AnnotationText><Hash>T7S0u9QjNuhMsig5GMKweK9BBzM=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/DCP/dcp_test5/pkl_a0488650-63ea-4b53-92a3-00a2c4e516fe.xml b/test/ref/DCP/dcp_test5/pkl_a0488650-63ea-4b53-92a3-00a2c4e516fe.xml
deleted file mode 100644
index b9411549..00000000
--- a/test/ref/DCP/dcp_test5/pkl_a0488650-63ea-4b53-92a3-00a2c4e516fe.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:a0488650-63ea-4b53-92a3-00a2c4e516fe</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:330161f5-434e-424a-a701-3d3f26700c52</Id><AnnotationText>330161f5-434e-424a-a701-3d3f26700c52</AnnotationText><Hash>1k7O7TxEnXk811VbcQz/cVYF0lI=</Hash><Size>1817</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:402c5a88-2512-4465-9c0b-cfa687dbc5d0</Id><AnnotationText>402c5a88-2512-4465-9c0b-cfa687dbc5d0</AnnotationText><Hash>eiqr9sUevuwoy7pprmgU6r0zBD8=</Hash><Size>26080</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:78f4f085-0901-4a0f-96f9-e21987072a51</Id><AnnotationText>78f4f085-0901-4a0f-96f9-e21987072a51</AnnotationText><Hash>iTTXhr9BviLgys5ldPFRzPXP2GM=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/DCP/dcp_test5/video.mxf b/test/ref/DCP/dcp_test5/video.mxf
index 678cc996..ee2a6b96 100644
--- a/test/ref/DCP/dcp_test5/video.mxf
+++ b/test/ref/DCP/dcp_test5/video.mxf
diff --git a/test/ref/DCP/encryption_test/ASSETMAP.xml b/test/ref/DCP/encryption_test/ASSETMAP.xml
index 9877c9f1..0e2605fd 100644
--- a/test/ref/DCP/encryption_test/ASSETMAP.xml
+++ b/test/ref/DCP/encryption_test/ASSETMAP.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:90de5ece-9755-4264-8431-20a99062c4e5</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:c47e00ab-c686-406a-a89d-1da5b2e6884f</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_c47e00ab-c686-406a-a89d-1da5b2e6884f.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8146</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:c200d3dd-82db-4d51-99af-c55ace94d535</Id><ChunkList><Chunk><Path>cpl_c200d3dd-82db-4d51-99af-c55ace94d535.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8618</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:34acc068-e059-4fb9-90ca-461c57d17dae</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>29896</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:ea72f7f2-0d06-43f2-97a7-4800f9093f15</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>165454</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:9a5cc86d-e865-4317-ba80-a429f959cdd0</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:de125b93-db76-41d3-bccd-73deb5b2bb49</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8146</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:975df3ad-1ace-4c08-aa20-c729ffa5a6b1</Id><ChunkList><Chunk><Path>cpl_975df3ad-1ace-4c08-aa20-c729ffa5a6b1.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8618</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:e3146267-6089-4647-87d8-071cda0f9063</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>29896</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d4</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>165454</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf
index 82b59ae1..53340ac8 100644
--- a/test/ref/DCP/encryption_test/audio.mxf
+++ b/test/ref/DCP/encryption_test/audio.mxf
diff --git a/test/ref/DCP/encryption_test/cpl_c200d3dd-82db-4d51-99af-c55ace94d535.xml b/test/ref/DCP/encryption_test/cpl_975df3ad-1ace-4c08-aa20-c729ffa5a6b1.xml
index 857caf58..8cc62807 100644
--- a/test/ref/DCP/encryption_test/cpl_c200d3dd-82db-4d51-99af-c55ace94d535.xml
+++ b/test/ref/DCP/encryption_test/cpl_975df3ad-1ace-4c08-aa20-c729ffa5a6b1.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:c200d3dd-82db-4d51-99af-c55ace94d535</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:cf27deeb-6aa2-469c-8d74-fb53cb31b2ed</Id><AssetList><MainPicture><Id>urn:uuid:34acc068-e059-4fb9-90ca-461c57d17dae</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:7574c611-f8de-4d20-98c4-2eb7dc87080a</KeyId><Hash>dKNUZPoe9KensrjDwEw4I+BYh4A=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:ea72f7f2-0d06-43f2-97a7-4800f9093f15</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:05010b26-c7ba-460d-88b8-cdf62f3ef0f5</KeyId><Hash>KLRGLmtyTuf9l8LDzFzSuKvAI4s=</Hash></MainSound></AssetList></Reel></ReelList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>l31ZrMPp8STJ8IiZbc2yPoYa3yU=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>j5zXcnambbGOzNvD8UrWmsQYQAQT9h2fC8W+GpAu5Sz6ixibsS7flgAzMOLCqtKa
-q8vnOR7SpiXyzMip6KF8o/iXnG4VT/giaI86FXL8kA9npblU3ngK2T4uSBrZqx9P
-j7r6vLFAKNSh4gLmj2BJJ27OqGOk7RVi1GJoexVppOO4DAHVQP8seNgbXwsKxc8R
-qBO4ofQW0IcWK2BitAUMAwCG44IyCkMgRBzsJkIPN/zLMIOKD9yrY6aK2JnGhNTl
-RcwxpIpYrV6/SB1h1CVFpT5n7FELQIv0BnedZNx3QRYT1w3Ci/NYccUtAV1kC1SL
-9qV924vYZO3lfmbqNcR9+g==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:975df3ad-1ace-4c08-aa20-c729ffa5a6b1</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:aeca384d-e91d-451d-93de-12d5eddb6cb5</Id><AssetList><MainPicture><Id>urn:uuid:e3146267-6089-4647-87d8-071cda0f9063</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:a9c8fc99-1853-4fb3-885c-634160d09cb0</KeyId><Hash>aUTqa7a8OuzPa3bLYwh9kFVi1T8=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d4</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:899a0acb-6864-412d-a976-2b7d949c5d08</KeyId><Hash>9zMCdZLeqvkJOE8Ixobv0GExLw0=</Hash></MainSound></AssetList></Reel></ReelList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>CmacYfUXbWtNYIqHqT5baM0nKPs=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>i503holT0TV4gXrNoYyYY3B1thkQUo6GL02HNPrdwALIXA08tkSg/y/sF0yuEVVk
+at/V+cQJZU+jO4C5oX+0mcodH0xktAZ7tcBMKaGM2Opc1rh0W3K21ijt2MAVSHP4
+AqVgRGJef3fVKy8kkv27p1N3yoFW1gUnHgLOvrT22KoZY5f7MxZ1oIf6dnkgPkaX
+WquVCn0eBVjH8nSDZXjJ5VylpfF05AONZgwC3VWhvKJK7RJbuzRw2eKm/1TfjAJw
+kwB/r/MeIu9notMLexN64oKJijQGwn5Cx9e8s/L+4NzOQDcIPFPC5mc6f8uealbo
+28Et9o4fahIRdHYNVvTaMA==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
 NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
 NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
diff --git a/test/ref/DCP/encryption_test/pkl_c47e00ab-c686-406a-a89d-1da5b2e6884f.xml b/test/ref/DCP/encryption_test/pkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml
index f282b7cd..dbdf3956 100644
--- a/test/ref/DCP/encryption_test/pkl_c47e00ab-c686-406a-a89d-1da5b2e6884f.xml
+++ b/test/ref/DCP/encryption_test/pkl_de125b93-db76-41d3-bccd-73deb5b2bb49.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:c47e00ab-c686-406a-a89d-1da5b2e6884f</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:c200d3dd-82db-4d51-99af-c55ace94d535</Id><AnnotationText>c200d3dd-82db-4d51-99af-c55ace94d535</AnnotationText><Hash>XSYd635HjAWQyaL/df9LBUYoAu4=</Hash><Size>8618</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:34acc068-e059-4fb9-90ca-461c57d17dae</Id><AnnotationText>34acc068-e059-4fb9-90ca-461c57d17dae</AnnotationText><Hash>dKNUZPoe9KensrjDwEw4I+BYh4A=</Hash><Size>29896</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:ea72f7f2-0d06-43f2-97a7-4800f9093f15</Id><AnnotationText>ea72f7f2-0d06-43f2-97a7-4800f9093f15</AnnotationText><Hash>KLRGLmtyTuf9l8LDzFzSuKvAI4s=</Hash><Size>165454</Size><Type>application/mxf</Type></Asset></AssetList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>08BJadDaDRXrlQ1M9MDXyJhW+8c=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>ol5Wt15UHWibOwRI7qBDiLQOMpFOdVGeKTWAYR/ffEzkZoDKThhME14RDuu9LXxO
-97597tK3mJOFju+eP4FBcEDWGaXJBXWKxMh01C/GgsoXrmPj+MOmMmOvks9Qz+v0
-BBM4XBCmk/6BN16eC+BU3LEyyyEBPsaBF03uK2Wv2fIc1uKPPXBuG4MAt3RwkR/I
-/sWIOwGvIDXVsN9nASMN4WZcjg18STQ9RMXvl0cAgkRztsohQwEI6g/AswHFW1Kh
-NZ5u0PkxS/D16CkZFO1RW00lI3kINAKePnbVAatf6kNrgESwwhKvpkSDwLFmmB9w
-v2uaZggmyjsGxNjckqiSFw==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:de125b93-db76-41d3-bccd-73deb5b2bb49</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:975df3ad-1ace-4c08-aa20-c729ffa5a6b1</Id><AnnotationText>975df3ad-1ace-4c08-aa20-c729ffa5a6b1</AnnotationText><Hash>2aBaofl0cfNVZJw3RcHsHJWn+8M=</Hash><Size>8618</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:e3146267-6089-4647-87d8-071cda0f9063</Id><AnnotationText>e3146267-6089-4647-87d8-071cda0f9063</AnnotationText><Hash>aUTqa7a8OuzPa3bLYwh9kFVi1T8=</Hash><Size>29896</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d4</Id><AnnotationText>b177f5a2-0d5b-4e7a-b5e3-34c04cfda6d4</AnnotationText><Hash>9zMCdZLeqvkJOE8Ixobv0GExLw0=</Hash><Size>165454</Size><Type>application/mxf</Type></Asset></AssetList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>kumrmO6JvJaMLsV56xysIftL3LE=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>oGS4FeLGzzx5+3VI9Ivm7tB420Z8rWcnz0nAeWdxUpu5lNBAWx2P9AEQv+Y5LsP4
+cI70cMYMbBf2rkQTVqS5q7rC8CBsQnjjqaFUjjrn+qdahhCbXAki7O1kFmW0FT2i
+GRYQAAMOhCmP8uQ5WN3U+YJillbIhuong6T3r228lmwrg0aUM6uKfKY+03xIEtHN
+85Nw2Ts/JVdk2VkXLp3hl4hFLRs8wb9O4+FANdXxBSOW2QsVUc+KQPBGNJCSixcn
+16usvA9Pu11Eoo/bPAevZMITBVkDW9xzMbpDJvm2Jbm6hvKAqjmr9Aa4SOOZQNxs
+weQmxA7TpzOkYzkly1fw0Q==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
 NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
 NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
diff --git a/test/ref/DCP/encryption_test/video.mxf b/test/ref/DCP/encryption_test/video.mxf
index 4d21fdbd..b1e1ce86 100644
--- a/test/ref/DCP/encryption_test/video.mxf
+++ b/test/ref/DCP/encryption_test/video.mxf