diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py
index 75eb69f851..47429d2db2 100755
--- a/packager/app/test/packager_test.py
+++ b/packager/app/test/packager_test.py
@@ -718,9 +718,7 @@ class PackagerFunctionalTest(PackagerAppTest):
     self.assertPackageSuccess(
         self._GetStreams(['audio', 'video']),
         self._GetFlags(encryption=True))
-    self._DiffGold(self.output[0], 'bear-640x360-a-cenc-golden.mp4')
-    self._DiffGold(self.output[1], 'bear-640x360-v-cenc-golden.mp4')
-    self._DiffGold(self.mpd_output, 'bear-640x360-av-cenc-golden.mpd')
+    self._CheckTestResults('encryption')
     self._VerifyDecryption(self.output[0], 'bear-640x360-a-demuxed-golden.mp4')
     self._VerifyDecryption(self.output[1], 'bear-640x360-v-golden.mp4')
 
@@ -734,9 +732,7 @@ class PackagerFunctionalTest(PackagerAppTest):
             self.encryption_iv)
     ]
     self.assertPackageSuccess(self._GetStreams(['audio', 'video']), flags)
-    self._DiffGold(self.output[0], 'bear-640x360-a-cenc-golden.mp4')
-    self._DiffGold(self.output[1], 'bear-640x360-v-cenc-golden.mp4')
-    self._DiffGold(self.mpd_output, 'bear-640x360-av-cenc-golden.mpd')
+    self._CheckTestResults('encryption-using-fixed-key')
     self._VerifyDecryption(self.output[0], 'bear-640x360-a-demuxed-golden.mp4')
     self._VerifyDecryption(self.output[1], 'bear-640x360-v-golden.mp4')
 
@@ -753,6 +749,7 @@ class PackagerFunctionalTest(PackagerAppTest):
                    self.clear_lead), '--iv={0}'.format(self.encryption_iv)
     ]
     self.assertPackageSuccess(self._GetStreams(['audio', 'video']), flags)
+    self._CheckTestResults('encryption-multi-keys')
 
     self.encryption_key_id = audio_key_id
     self.encryption_key = audio_key
@@ -781,6 +778,7 @@ class PackagerFunctionalTest(PackagerAppTest):
     ]
 
     self.assertPackageSuccess(streams, flags)
+    self._CheckTestResults('encryption-multi-keys-with-stream-label')
 
     self.encryption_key_id = audio_key_id
     self.encryption_key = audio_key
@@ -797,10 +795,7 @@ class PackagerFunctionalTest(PackagerAppTest):
     flags = self._GetFlags(encryption=True)
 
     self.assertPackageSuccess(streams, flags)
-
-    self._DiffGold(self.output[0], 'bear-640x360-a-golden.mp4')
-    self._DiffGold(self.output[1], 'bear-640x360-v-cenc-golden.mp4')
-    self._DiffGold(self.mpd_output, 'bear-640x360-a-clear-v-cenc-golden.mpd')
+    self._CheckTestResults('encryption-of-only-video-stream')
     self._VerifyDecryption(self.output[1], 'bear-640x360-v-golden.mp4')
 
   def testPackageEncryptionAndTrickPlay(self):
@@ -811,10 +806,7 @@ class PackagerFunctionalTest(PackagerAppTest):
     ]
 
     self.assertPackageSuccess(streams, self._GetFlags(encryption=True))
-    self._DiffGold(self.output[0], 'bear-640x360-a-cenc-golden.mp4')
-    self._DiffGold(self.output[1], 'bear-640x360-v-cenc-golden.mp4')
-    self._DiffGold(self.output[2], 'bear-640x360-v-trick-1-cenc-golden.mp4')
-    self._DiffGold(self.mpd_output, 'bear-640x360-av-trick-1-cenc-golden.mpd')
+    self._CheckTestResults('encryption-and-trick-play')
     self._VerifyDecryption(self.output[0], 'bear-640x360-a-demuxed-golden.mp4')
     self._VerifyDecryption(self.output[1], 'bear-640x360-v-golden.mp4')
     self._VerifyDecryption(self.output[2], 'bear-640x360-v-trick-1-golden.mp4')
@@ -830,27 +822,21 @@ class PackagerFunctionalTest(PackagerAppTest):
     ]
 
     self.assertPackageSuccess(streams, self._GetFlags(encryption=True))
-    self._DiffGold(self.output[0], 'bear-640x360-a-cenc-golden.mp4')
-    self._DiffGold(self.output[1], 'bear-640x360-v-cenc-golden.mp4')
-    self._DiffGold(self.output[2], 'bear-640x360-v-trick-1-cenc-golden.mp4')
-    self._DiffGold(self.output[3], 'bear-640x360-v-trick-2-cenc-golden.mp4')
-    self._DiffGold(self.mpd_output,
-                   'bear-640x360-av-trick-1-trick-2-cenc-golden.mpd')
+    self._CheckTestResults('encryption-and-two-trick-plays')
     self._VerifyDecryption(self.output[0], 'bear-640x360-a-demuxed-golden.mp4')
     self._VerifyDecryption(self.output[1], 'bear-640x360-v-golden.mp4')
     self._VerifyDecryption(self.output[2], 'bear-640x360-v-trick-1-golden.mp4')
     self._VerifyDecryption(self.output[3], 'bear-640x360-v-trick-2-golden.mp4')
 
   def testPackageEncryptionAndNoClearLead(self):
+    streams = [
+        self._GetStream('audio'),
+        self._GetStream('video')
+    ]
+
     self.clear_lead = 0
-    self.assertPackageSuccess(
-        self._GetStreams(['audio', 'video']), self._GetFlags(encryption=True))
-    self._DiffGold(self.output[0],
-                   'bear-640x360-a-cenc-no-clear-lead-golden.mp4')
-    self._DiffGold(self.output[1],
-                   'bear-640x360-v-cenc-no-clear-lead-golden.mp4')
-    self._DiffGold(self.mpd_output,
-                   'bear-640x360-av-cenc-no-clear-lead-golden.mpd')
+    self.assertPackageSuccess(streams, self._GetFlags(encryption=True))
+    self._CheckTestResults('encryption-and-no-clear-lead')
     self._VerifyDecryption(self.output[0], 'bear-640x360-a-demuxed-golden.mp4')
     self._VerifyDecryption(self.output[1], 'bear-640x360-v-golden.mp4')
 
@@ -858,9 +844,7 @@ class PackagerFunctionalTest(PackagerAppTest):
     self.assertPackageSuccess(
         self._GetStreams(['audio', 'video']),
         self._GetFlags(encryption=True, include_pssh_in_stream=False))
-    self._DiffGold(self.output[0], 'bear-640x360-a-cenc-no-pssh-golden.mp4')
-    self._DiffGold(self.output[1], 'bear-640x360-v-cenc-no-pssh-golden.mp4')
-    self._DiffGold(self.mpd_output, 'bear-640x360-av-cenc-no-pssh-golden.mpd')
+    self._CheckTestResults('encryption-and-no-pssh-in-stream')
     self._VerifyDecryption(self.output[0], 'bear-640x360-a-demuxed-golden.mp4')
     self._VerifyDecryption(self.output[1], 'bear-640x360-v-golden.mp4')
 
@@ -869,9 +853,7 @@ class PackagerFunctionalTest(PackagerAppTest):
         self._GetStreams(['audio', 'video']),
         self._GetFlags(encryption=True,
                        protection_scheme='cbc1'))
-    self._DiffGold(self.output[0], 'bear-640x360-a-cbc1-golden.mp4')
-    self._DiffGold(self.output[1], 'bear-640x360-v-cbc1-golden.mp4')
-    self._DiffGold(self.mpd_output, 'bear-640x360-av-cbc1-golden.mpd')
+    self._CheckTestResults('encryption-cbc-1')
     self._VerifyDecryption(self.output[0], 'bear-640x360-a-demuxed-golden.mp4')
     self._VerifyDecryption(self.output[1], 'bear-640x360-v-golden.mp4')
 
@@ -880,9 +862,7 @@ class PackagerFunctionalTest(PackagerAppTest):
         self._GetStreams(['audio', 'video']),
         self._GetFlags(encryption=True,
                        protection_scheme='cens'))
-    self._DiffGold(self.output[0], 'bear-640x360-a-cens-golden.mp4')
-    self._DiffGold(self.output[1], 'bear-640x360-v-cens-golden.mp4')
-    self._DiffGold(self.mpd_output, 'bear-640x360-av-cens-golden.mpd')
+    self._CheckTestResults('encryption-cens')
     self._VerifyDecryption(self.output[0], 'bear-640x360-a-demuxed-golden.mp4')
     self._VerifyDecryption(self.output[1], 'bear-640x360-v-golden.mp4')
 
@@ -901,30 +881,33 @@ class PackagerFunctionalTest(PackagerAppTest):
     self.assertPackageSuccess(
         self._GetStreams(['audio', 'video']),
         self._GetFlags(encryption=True, ad_cues='1.5'))
-    self._DiffGold(self.output[0], 'bear-640x360-a-cenc-golden.mp4')
-    self._DiffGold(self.output[1], 'bear-640x360-v-cenc-golden.mp4')
-    self._DiffGold(self.mpd_output, 'bear-640x360-av-cenc-ad_cues-golden.mpd')
+    self._CheckTestResults('encryption-and-ad-cues')
     self._VerifyDecryption(self.output[0], 'bear-640x360-a-demuxed-golden.mp4')
     self._VerifyDecryption(self.output[1], 'bear-640x360-v-golden.mp4')
 
   def testPackageWebmSubsampleEncryption(self):
-    self.assertPackageSuccess(
-        self._GetStreams(['video'],
-                         output_format='webm',
-                         test_files=['bear-320x180-vp9-altref.webm']),
-        self._GetFlags(encryption=True))
-    self._DiffGold(self.output[0], 'bear-320x180-vp9-altref-enc-golden.webm')
+    streams = [
+        self._GetStream('video',
+                        output_format='webm',
+                        test_file='bear-320x180-vp9-altref.webm')
+    ]
+    self.assertPackageSuccess(streams, self._GetFlags(encryption=True))
+    self._CheckTestResults('webm-subsample-encryption')
     self._VerifyDecryption(self.output[0],
                            'bear-320x180-vp9-altref-dec-golden.webm')
 
   def testPackageWebmVp9FullSampleEncryption(self):
-    self.assertPackageSuccess(
-        self._GetStreams(['video'],
-                         output_format='webm',
-                         test_files=['bear-320x180-vp9-altref.webm']),
-        self._GetFlags(encryption=True, vp9_subsample_encryption=False))
-    self._DiffGold(self.output[0],
-                   'bear-320x180-vp9-fullsample-enc-golden.webm')
+    streams = [
+        self._GetStream('video',
+                        output_format='webm',
+                        test_file='bear-320x180-vp9-altref.webm')
+    ]
+    flags = self._GetFlags(
+        encryption=True,
+        vp9_subsample_encryption=False)
+
+    self.assertPackageSuccess(streams, flags)
+    self._CheckTestResults('webm-vp9-full-sample-encryption')
     self._VerifyDecryption(self.output[0],
                            'bear-320x180-vp9-altref-dec-golden.webm')
 
@@ -981,43 +964,52 @@ class PackagerFunctionalTest(PackagerAppTest):
         'avc-ts-with-encryption-exercise-emulation-prevention')
 
   def testPackageWebmWithEncryption(self):
-    self.assertPackageSuccess(
-        self._GetStreams(['video'],
-                         output_format='webm',
-                         test_files=['bear-640x360.webm']),
-        self._GetFlags(encryption=True))
-    self._DiffGold(self.output[0], 'bear-640x360-vp8-cenc-golden.webm')
-    self._DiffGold(self.mpd_output, 'bear-640x360-vp8-cenc-webm-golden.mpd')
+    streams = [
+        self._GetStream('video',
+                        output_format='webm',
+                        test_file='bear-640x360.webm')
+    ]
+    flags = self._GetFlags(encryption=True)
+
+    self.assertPackageSuccess(streams, flags)
+    self._CheckTestResults('webm-with-encryption')
     self._VerifyDecryption(self.output[0], 'bear-640x360-vp8-golden.webm')
 
   def testPackageHevcWithEncryption(self):
-    self.assertPackageSuccess(
-        self._GetStreams(['video'],
-                         test_files=['bear-640x360-hevc.mp4']),
-        self._GetFlags(encryption=True))
-    self._DiffGold(self.output[0], 'bear-640x360-hevc-cenc-golden.mp4')
-    self._DiffGold(self.mpd_output, 'bear-640x360-hevc-cenc-golden.mpd')
+    streams = [
+        self._GetStream('video', test_file='bear-640x360-hevc.mp4')
+    ]
+    flags = self._GetFlags(encryption=True)
+
+    self.assertPackageSuccess(streams, flags)
+    self._CheckTestResults('hevc-with-encryption')
     self._VerifyDecryption(self.output[0], 'bear-640x360-hevc-golden.mp4')
 
   def testPackageVp8Mp4WithEncryption(self):
-    self.assertPackageSuccess(
-        self._GetStreams(['video'],
-                         output_format='mp4',
-                         test_files=['bear-640x360.webm']),
-        self._GetFlags(encryption=True))
-    self._DiffGold(self.output[0], 'bear-640x360-vp8-cenc-golden.mp4')
-    self._DiffGold(self.mpd_output, 'bear-640x360-vp8-cenc-golden.mpd')
+    streams = [
+        self._GetStream('video',
+                        output_format='mp4',
+                        test_file='bear-640x360.webm')
+    ]
+    flags = self._GetFlags(encryption=True)
+
+    self.assertPackageSuccess(streams, flags)
+    self._CheckTestResults('vp8-mp4-with-encryption')
     self._VerifyDecryption(self.output[0], 'bear-640x360-vp8-golden.mp4')
 
   def testPackageOpusVp9Mp4WithEncryption(self):
-    self.assertPackageSuccess(
-        self._GetStreams(['audio', 'video'],
-                         output_format='mp4',
-                         test_files=['bear-320x240-vp9-opus.webm']),
-        self._GetFlags(encryption=True))
-    self._DiffGold(self.output[0], 'bear-320x240-opus-cenc-golden.mp4')
-    self._DiffGold(self.output[1], 'bear-320x240-vp9-cenc-golden.mp4')
-    self._DiffGold(self.mpd_output, 'bear-320x240-opus-vp9-cenc-golden.mpd')
+    streams = [
+        self._GetStream('audio',
+                        output_format='mp4',
+                        test_file='bear-320x240-vp9-opus.webm'),
+        self._GetStream('video',
+                        output_format='mp4',
+                        test_file='bear-320x240-vp9-opus.webm'),
+    ]
+    flags = self._GetFlags(encryption=True)
+
+    self.assertPackageSuccess(streams, flags)
+    self._CheckTestResults('opus-vp9-mp4-with-encryption')
     self._VerifyDecryption(self.output[0], 'bear-320x240-opus-golden.mp4')
     self._VerifyDecryption(self.output[1], 'bear-320x240-vp9-golden.mp4')
 
diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4
new file mode 100644
index 0000000000..2b40464893
Binary files /dev/null and b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 differ
diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4
new file mode 100644
index 0000000000..43bfd90f1f
Binary files /dev/null and b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.mp4 differ
diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-ad_cues-golden.mpd b/packager/app/test/testdata/encryption-and-ad-cues/output.mpd
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-av-cenc-ad_cues-golden.mpd
rename to packager/app/test/testdata/encryption-and-ad-cues/output.mpd
diff --git a/packager/app/test/testdata/bear-640x360-a-cenc-no-clear-lead-golden.mp4 b/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-a-cenc-no-clear-lead-golden.mp4
rename to packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/bear-640x360-v-cenc-no-clear-lead-golden.mp4 b/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-video.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-v-cenc-no-clear-lead-golden.mp4
rename to packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-video.mp4
diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-no-clear-lead-golden.mpd b/packager/app/test/testdata/encryption-and-no-clear-lead/output.mpd
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-av-cenc-no-clear-lead-golden.mpd
rename to packager/app/test/testdata/encryption-and-no-clear-lead/output.mpd
diff --git a/packager/app/test/testdata/bear-640x360-a-cenc-no-pssh-golden.mp4 b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-a-cenc-no-pssh-golden.mp4
rename to packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/bear-640x360-v-cenc-no-pssh-golden.mp4 b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-video.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-v-cenc-no-pssh-golden.mp4
rename to packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-video.mp4
diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-no-pssh-golden.mpd b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-av-cenc-no-pssh-golden.mpd
rename to packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd
diff --git a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4
new file mode 100644
index 0000000000..2b40464893
Binary files /dev/null and b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 differ
diff --git a/packager/app/test/testdata/bear-640x360-v-trick-1-cenc-golden.mp4 b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video-trick_play_factor_1.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-v-trick-1-cenc-golden.mp4
rename to packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video-trick_play_factor_1.mp4
diff --git a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video.mp4
new file mode 100644
index 0000000000..43bfd90f1f
Binary files /dev/null and b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-video.mp4 differ
diff --git a/packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.mpd b/packager/app/test/testdata/encryption-and-trick-play/output.mpd
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.mpd
rename to packager/app/test/testdata/encryption-and-trick-play/output.mpd
diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4
new file mode 100644
index 0000000000..2b40464893
Binary files /dev/null and b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 differ
diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_1.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_1.mp4
new file mode 100644
index 0000000000..c6251150ff
Binary files /dev/null and b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_1.mp4 differ
diff --git a/packager/app/test/testdata/bear-640x360-v-trick-2-cenc-golden.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_2.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-v-trick-2-cenc-golden.mp4
rename to packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video-trick_play_factor_2.mp4
diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video.mp4
new file mode 100644
index 0000000000..43bfd90f1f
Binary files /dev/null and b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-video.mp4 differ
diff --git a/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.mpd b/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.mpd
rename to packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd
diff --git a/packager/app/test/testdata/bear-640x360-a-cbc1-golden.mp4 b/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-a-cbc1-golden.mp4
rename to packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/bear-640x360-v-cbc1-golden.mp4 b/packager/app/test/testdata/encryption-cbc-1/bear-640x360-video.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-v-cbc1-golden.mp4
rename to packager/app/test/testdata/encryption-cbc-1/bear-640x360-video.mp4
diff --git a/packager/app/test/testdata/bear-640x360-av-cbc1-golden.mpd b/packager/app/test/testdata/encryption-cbc-1/output.mpd
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-av-cbc1-golden.mpd
rename to packager/app/test/testdata/encryption-cbc-1/output.mpd
diff --git a/packager/app/test/testdata/bear-640x360-a-cens-golden.mp4 b/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-a-cens-golden.mp4
rename to packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/bear-640x360-v-cens-golden.mp4 b/packager/app/test/testdata/encryption-cens/bear-640x360-video.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-v-cens-golden.mp4
rename to packager/app/test/testdata/encryption-cens/bear-640x360-video.mp4
diff --git a/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd b/packager/app/test/testdata/encryption-cens/output.mpd
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-av-cens-golden.mpd
rename to packager/app/test/testdata/encryption-cens/output.mpd
diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4
new file mode 100644
index 0000000000..6e9aec3606
Binary files /dev/null and b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 differ
diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-video.mp4
new file mode 100644
index 0000000000..f875a54176
Binary files /dev/null and b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-video.mp4 differ
diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd
new file mode 100644
index 0000000000..ca1cbfc4f2
--- /dev/null
+++ b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>-->
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.73607S">
+  <Period id="0">
+    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
+      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="10111213-1415-1617-1819-202122232425"/>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAARHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAIQERITFBUWFxgZICEiIyQlICEiIyQlJicoKTAxMjM0NQAAAAA=</cenc:pssh>
+      </ContentProtection>
+      <Representation id="0" bandwidth="885637" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+        <BaseURL>bear-640x360-video.mp4</BaseURL>
+        <SegmentBase indexRange="1107-1174" timescale="30000">
+          <Initialization range="0-1106"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+    <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
+      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="20212223-2425-2627-2829-303132333435"/>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAARHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAIQERITFBUWFxgZICEiIyQlICEiIyQlJicoKTAxMjM0NQAAAAA=</cenc:pssh>
+      </ContentProtection>
+      <Representation id="1" bandwidth="129232" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
+        <BaseURL>bear-640x360-audio.mp4</BaseURL>
+        <SegmentBase indexRange="983-1050" timescale="44100">
+          <Initialization range="0-982"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>
diff --git a/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4
new file mode 100644
index 0000000000..7ee40116d0
Binary files /dev/null and b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 differ
diff --git a/packager/app/test/testdata/encryption-multi-keys/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-video.mp4
new file mode 100644
index 0000000000..db9f0c3c9f
Binary files /dev/null and b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-video.mp4 differ
diff --git a/packager/app/test/testdata/encryption-multi-keys/output.mpd b/packager/app/test/testdata/encryption-multi-keys/output.mpd
new file mode 100644
index 0000000000..d0ebd03f27
--- /dev/null
+++ b/packager/app/test/testdata/encryption-multi-keys/output.mpd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>-->
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.73607S">
+  <Period id="0">
+    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
+      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="20212223-2425-2627-2829-303132333435"/>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAARHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAIQERITFBUWFxgZICEiIyQlICEiIyQlJicoKTAxMjM0NQAAAAA=</cenc:pssh>
+      </ContentProtection>
+      <Representation id="0" bandwidth="885637" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+        <BaseURL>bear-640x360-video.mp4</BaseURL>
+        <SegmentBase indexRange="1107-1174" timescale="30000">
+          <Initialization range="0-1106"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+    <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
+      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="10111213-1415-1617-1819-202122232425"/>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAARHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAIQERITFBUWFxgZICEiIyQlICEiIyQlJicoKTAxMjM0NQAAAAA=</cenc:pssh>
+      </ContentProtection>
+      <Representation id="1" bandwidth="129232" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
+        <BaseURL>bear-640x360-audio.mp4</BaseURL>
+        <SegmentBase indexRange="983-1050" timescale="44100">
+          <Initialization range="0-982"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>
diff --git a/packager/app/test/testdata/bear-640x360-a-golden.mp4 b/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-a-golden.mp4
rename to packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4
diff --git a/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-video.mp4
new file mode 100644
index 0000000000..43bfd90f1f
Binary files /dev/null and b/packager/app/test/testdata/encryption-of-only-video-stream/bear-640x360-video.mp4 differ
diff --git a/packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.mpd b/packager/app/test/testdata/encryption-of-only-video-stream/output.mpd
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.mpd
rename to packager/app/test/testdata/encryption-of-only-video-stream/output.mpd
diff --git a/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4
new file mode 100644
index 0000000000..2b40464893
Binary files /dev/null and b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 differ
diff --git a/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-video.mp4
new file mode 100644
index 0000000000..43bfd90f1f
Binary files /dev/null and b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-video.mp4 differ
diff --git a/packager/app/test/testdata/encryption-using-fixed-key/output.mpd b/packager/app/test/testdata/encryption-using-fixed-key/output.mpd
new file mode 100644
index 0000000000..510eb1fa6d
--- /dev/null
+++ b/packager/app/test/testdata/encryption-using-fixed-key/output.mpd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>-->
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.73607S">
+  <Period id="0">
+    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
+      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
+      </ContentProtection>
+      <Representation id="0" bandwidth="885590" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+        <BaseURL>bear-640x360-video.mp4</BaseURL>
+        <SegmentBase indexRange="1091-1158" timescale="30000">
+          <Initialization range="0-1090"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+    <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
+      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
+      </ContentProtection>
+      <Representation id="1" bandwidth="129185" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
+        <BaseURL>bear-640x360-audio.mp4</BaseURL>
+        <SegmentBase indexRange="967-1034" timescale="44100">
+          <Initialization range="0-966"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>
diff --git a/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption/bear-640x360-audio.mp4
new file mode 100644
index 0000000000..2b40464893
Binary files /dev/null and b/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 differ
diff --git a/packager/app/test/testdata/encryption/bear-640x360-video.mp4 b/packager/app/test/testdata/encryption/bear-640x360-video.mp4
new file mode 100644
index 0000000000..43bfd90f1f
Binary files /dev/null and b/packager/app/test/testdata/encryption/bear-640x360-video.mp4 differ
diff --git a/packager/app/test/testdata/encryption/output.mpd b/packager/app/test/testdata/encryption/output.mpd
new file mode 100644
index 0000000000..510eb1fa6d
--- /dev/null
+++ b/packager/app/test/testdata/encryption/output.mpd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>-->
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.73607S">
+  <Period id="0">
+    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
+      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
+      </ContentProtection>
+      <Representation id="0" bandwidth="885590" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+        <BaseURL>bear-640x360-video.mp4</BaseURL>
+        <SegmentBase indexRange="1091-1158" timescale="30000">
+          <Initialization range="0-1090"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+    <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
+      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
+      </ContentProtection>
+      <Representation id="1" bandwidth="129185" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
+        <BaseURL>bear-640x360-audio.mp4</BaseURL>
+        <SegmentBase indexRange="967-1034" timescale="44100">
+          <Initialization range="0-966"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>
diff --git a/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mp4 b/packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mp4
rename to packager/app/test/testdata/hevc-with-encryption/bear-640x360-hevc-video.mp4
diff --git a/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd b/packager/app/test/testdata/hevc-with-encryption/output.mpd
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd
rename to packager/app/test/testdata/hevc-with-encryption/output.mpd
diff --git a/packager/app/test/testdata/bear-320x240-opus-cenc-golden.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-audio.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-320x240-opus-cenc-golden.mp4
rename to packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-audio.mp4
diff --git a/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mp4 b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mp4
rename to packager/app/test/testdata/opus-vp9-mp4-with-encryption/bear-320x240-vp9-opus-video.mp4
diff --git a/packager/app/test/testdata/bear-320x240-opus-vp9-cenc-golden.mpd b/packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd
similarity index 100%
rename from packager/app/test/testdata/bear-320x240-opus-vp9-cenc-golden.mpd
rename to packager/app/test/testdata/opus-vp9-mp4-with-encryption/output.mpd
diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mp4 b/packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mp4
rename to packager/app/test/testdata/vp8-mp4-with-encryption/bear-640x360-video.mp4
diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd b/packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd
rename to packager/app/test/testdata/vp8-mp4-with-encryption/output.mpd
diff --git a/packager/app/test/testdata/bear-320x180-vp9-altref-enc-golden.webm b/packager/app/test/testdata/webm-subsample-encryption/bear-320x180-vp9-altref-video.webm
similarity index 100%
rename from packager/app/test/testdata/bear-320x180-vp9-altref-enc-golden.webm
rename to packager/app/test/testdata/webm-subsample-encryption/bear-320x180-vp9-altref-video.webm
diff --git a/packager/app/test/testdata/webm-subsample-encryption/output.mpd b/packager/app/test/testdata/webm-subsample-encryption/output.mpd
new file mode 100644
index 0000000000..b51490fea9
--- /dev/null
+++ b/packager/app/test/testdata/webm-subsample-encryption/output.mpd
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>-->
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.769S">
+  <Period id="0">
+    <AdaptationSet id="0" contentType="video" width="320" height="180" frameRate="1000000/33000" subsegmentAlignment="true" par="16:9">
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b" cenc:default_KID="31323334-3536-3738-3930-313233343536">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
+      </ContentProtection>
+      <Representation id="0" bandwidth="185084" codecs="vp9" mimeType="video/webm" sar="1:1">
+        <BaseURL>bear-320x180-vp9-altref-video.webm</BaseURL>
+        <SegmentBase indexRange="353-371" timescale="1000000">
+          <Initialization range="0-352"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>
diff --git a/packager/app/test/testdata/bear-320x180-vp9-fullsample-enc-golden.webm b/packager/app/test/testdata/webm-vp9-full-sample-encryption/bear-320x180-vp9-altref-video.webm
similarity index 100%
rename from packager/app/test/testdata/bear-320x180-vp9-fullsample-enc-golden.webm
rename to packager/app/test/testdata/webm-vp9-full-sample-encryption/bear-320x180-vp9-altref-video.webm
diff --git a/packager/app/test/testdata/webm-vp9-full-sample-encryption/output.mpd b/packager/app/test/testdata/webm-vp9-full-sample-encryption/output.mpd
new file mode 100644
index 0000000000..b51490fea9
--- /dev/null
+++ b/packager/app/test/testdata/webm-vp9-full-sample-encryption/output.mpd
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>-->
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.769S">
+  <Period id="0">
+    <AdaptationSet id="0" contentType="video" width="320" height="180" frameRate="1000000/33000" subsegmentAlignment="true" par="16:9">
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b" cenc:default_KID="31323334-3536-3738-3930-313233343536">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
+      </ContentProtection>
+      <Representation id="0" bandwidth="185084" codecs="vp9" mimeType="video/webm" sar="1:1">
+        <BaseURL>bear-320x180-vp9-altref-video.webm</BaseURL>
+        <SegmentBase indexRange="353-371" timescale="1000000">
+          <Initialization range="0-352"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>
diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.webm b/packager/app/test/testdata/webm-with-encryption/bear-640x360-video.webm
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-vp8-cenc-golden.webm
rename to packager/app/test/testdata/webm-with-encryption/bear-640x360-video.webm
diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd b/packager/app/test/testdata/webm-with-encryption/output.mpd
similarity index 100%
rename from packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd
rename to packager/app/test/testdata/webm-with-encryption/output.mpd