diff --git a/common/test/data/simple/course.xml b/common/test/data/simple/course.xml
index c9bb5ec..529528c 100644
--- a/common/test/data/simple/course.xml
+++ b/common/test/data/simple/course.xml
@@ -1,13 +1,13 @@
 <course name="A Simple Course" org="edX" course="simple" graceperiod="1 day 5 hours 59 minutes 59 seconds" slug="2012_Fall">
   <chapter name="Overview">
-    <video name="Welcome" youtube_id_0_75="&quot;izygArpw-Qo&quot;" youtube_id_1_0="&quot;p2Q6BrNhdh8&quot;" youtube_id_1_25="&quot;1EeWXzPdhSA&quot;" youtube_id_1_5="&quot;rABDYkeK0x8&quot;"/>
+    <video name="Welcome" youtube_id_0_75="izygArpw-Qo" youtube_id_1_0="p2Q6BrNhdh8" youtube_id_1_25="1EeWXzPdhSA" youtube_id_1_5="rABDYkeK0x8"/>
     <videosequence format="Lecture Sequence" name="A simple sequence">
       <html name="toylab" filename="toylab"/>
-      <video name="S0V1: Video Resources" youtube_id_0_75="&quot;EuzkdzfR0i8&quot;" youtube_id_1_0="&quot;1bK-WdDi6Qw&quot;" youtube_id_1_25="&quot;0v1VzoDVUTM&quot;" youtube_id_1_5="&quot;Bxk_-ZJb240&quot;"/>
+      <video name="S0V1: Video Resources" youtube_id_0_75="EuzkdzfR0i8" youtube_id_1_0="1bK-WdDi6Qw" youtube_id_1_25="0v1VzoDVUTM" youtube_id_1_5="Bxk_-ZJb240"/>
     </videosequence>
     <section name="Lecture 2">
     <sequential>
-        <video youtube_id_1_0="&quot;TBvX7HzxexQ&quot;"/>
+        <video youtube_id_1_0="TBvX7HzxexQ"/>
         <problem name="L1 Problem 1" points="1" type="lecture" showanswer="attempted" filename="L1_Problem_1" rerandomize="never"/>
       </sequential>
     </section>
@@ -18,7 +18,7 @@
         <problem type="lecture" showanswer="attempted" rerandomize="true" display_name="A simple coding problem" name="Simple coding problem" filename="ps01-simple" url_name="ps01-simple"/>
       </sequential>
     </section>
-    <video name="Lost Video" youtube_id_1_0="&quot;TBvX7HzxexQ&quot;"/>
+    <video name="Lost Video" youtube_id_1_0="TBvX7HzxexQ"/>
     <sequential format="Lecture Sequence" url_name='test_sequence'>
         <vertical url_name='test_vertical'>
             <html url_name='test_html'>
diff --git a/common/test/data/test_exam_registration/course/2012_Fall.xml b/common/test/data/test_exam_registration/course/2012_Fall.xml
index 1e3dbf0..9cd963a 100644
--- a/common/test/data/test_exam_registration/course/2012_Fall.xml
+++ b/common/test/data/test_exam_registration/course/2012_Fall.xml
@@ -2,9 +2,9 @@
   <chapter url_name="Overview">
     <videosequence url_name="Toy_Videos">
       <html url_name="toylab"/>
-      <video url_name="Video_Resources" youtube_id_1_0="&quot;1bK-WdDi6Qw&quot;"/>
+      <video url_name="Video_Resources" youtube_id_1_0="1bK-WdDi6Qw"/>
     </videosequence>
-    <video url_name="Welcome" youtube_id_1_0="&quot;p2Q6BrNhdh8&quot;"/>
+    <video url_name="Welcome" youtube_id_1_0="p2Q6BrNhdh8"/>
   </chapter>
   <chapter url_name="Ch2">
      <html url_name="test_html">
diff --git a/common/test/data/test_start_date/course/2012_Fall.xml b/common/test/data/test_start_date/course/2012_Fall.xml
index 1e3dbf0..9cd963a 100644
--- a/common/test/data/test_start_date/course/2012_Fall.xml
+++ b/common/test/data/test_start_date/course/2012_Fall.xml
@@ -2,9 +2,9 @@
   <chapter url_name="Overview">
     <videosequence url_name="Toy_Videos">
       <html url_name="toylab"/>
-      <video url_name="Video_Resources" youtube_id_1_0="&quot;1bK-WdDi6Qw&quot;"/>
+      <video url_name="Video_Resources" youtube_id_1_0="1bK-WdDi6Qw"/>
     </videosequence>
-    <video url_name="Welcome" youtube_id_1_0="&quot;p2Q6BrNhdh8&quot;"/>
+    <video url_name="Welcome" youtube_id_1_0="p2Q6BrNhdh8"/>
   </chapter>
   <chapter url_name="Ch2">
      <html url_name="test_html">
diff --git a/common/test/data/toy/chapter/secret/magic.xml b/common/test/data/toy/chapter/secret/magic.xml
index 0b2c7f6..62756b8 100644
--- a/common/test/data/toy/chapter/secret/magic.xml
+++ b/common/test/data/toy/chapter/secret/magic.xml
@@ -1,3 +1,3 @@
 <chapter>
-    <video url_name="toyvideo" youtube_id_1_0="&quot;OEoXaMPEzfM&quot;"/>
+    <video url_name="toyvideo" youtube_id_1_0="OEoXaMPEzfM"/>
 </chapter>
diff --git a/common/test/data/toy/course/2012_Fall.xml b/common/test/data/toy/course/2012_Fall.xml
index ded9713..c350004 100644
--- a/common/test/data/toy/course/2012_Fall.xml
+++ b/common/test/data/toy/course/2012_Fall.xml
@@ -3,11 +3,11 @@
   <chapter url_name="Overview">
     <videosequence url_name="Toy_Videos">
       <html url_name="secret:toylab"/>
-      <video url_name="Video_Resources" youtube_id_1_0="&quot;1bK-WdDi6Qw&quot;"/>
+      <video url_name="Video_Resources" youtube_id_1_0="1bK-WdDi6Qw"/>
     </videosequence>
-    <video url_name="Welcome" youtube_id_1_0="&quot;p2Q6BrNhdh8&quot;"/>
-    <video url_name="video_123456789012" youtube_id_1_0="&quot;p2Q6BrNhdh8&quot;"/>
-    <video url_name="video_4f66f493ac8f" youtube_id_1_0="&quot;p2Q6BrNhdh8&quot;"/>
+    <video url_name="Welcome" youtube_id_1_0="p2Q6BrNhdh8"/>
+    <video url_name="video_123456789012" youtube_id_1_0="p2Q6BrNhdh8"/>
+    <video url_name="video_4f66f493ac8f" youtube_id_1_0="p2Q6BrNhdh8"/>
   </chapter>
   <chapter url_name="secret:magic"/>
   <chapter url_name="poll_test"/>
diff --git a/common/test/data/two_toys/video/Video_Resources.xml b/common/test/data/two_toys/video/Video_Resources.xml
index a78f6df..e9ce8f2 100644
--- a/common/test/data/two_toys/video/Video_Resources.xml
+++ b/common/test/data/two_toys/video/Video_Resources.xml
@@ -1 +1 @@
-<video youtube_id_1_0="&quot;1bK-WdDi6Qw&quot;" display_name="Video Resources"/>
+<video youtube_id_1_0="1bK-WdDi6Qw" display_name="Video Resources"/>