diff --git a/common/lib/capa/capa/util.py b/common/lib/capa/capa/util.py
index 1dc113cd20..211ada4d62 100644
--- a/common/lib/capa/capa/util.py
+++ b/common/lib/capa/capa/util.py
@@ -39,5 +39,10 @@ def convert_files_to_filenames(answers):
     '''
     new_answers = dict()
     for answer_id in answers.keys():
-        new_answers[answer_id] = unicode(answers[answer_id])
+        # TODO This should be done more cleanly; however, this fixes bugs
+        # that were introduced with this function.
+        if isinstance(answers[answer_id], list):
+            new_answers[answer_id] = answers[answer_id]
+        else:
+            new_answers[answer_id] = unicode(answers[answer_id])
     return new_answers
diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py
index 7f6fcfe00c..7b1641956c 100644
--- a/common/lib/xmodule/xmodule/tests/__init__.py
+++ b/common/lib/xmodule/xmodule/tests/__init__.py
@@ -31,7 +31,7 @@ i4xs = ModuleSystem(
     user=Mock(),
     filestore=fs.osfs.OSFS(os.path.dirname(os.path.realpath(__file__))),
     debug=True,
-    xqueue_callback_url='/',
+    xqueue=None, # TODO FIXME
     is_staff=False
 )