diff --git a/common/lib/capa/capa_problem.py b/common/lib/capa/capa_problem.py
index 16ecb9186a..80ec8806f3 100644
--- a/common/lib/capa/capa_problem.py
+++ b/common/lib/capa/capa_problem.py
@@ -200,12 +200,12 @@ class LoncapaProblem(object):
         self.student_answers = answers
         oldcmap = self.correct_map				# old CorrectMap
         newcmap = CorrectMap()					# start new with empty CorrectMap
-        log.debug('Responders: %s' % self.responders)
+        # log.debug('Responders: %s' % self.responders)
         for responder in self.responders.values():
             results = responder.evaluate_answers(answers,oldcmap)      # call the responsetype instance to do the actual grading
             newcmap.update(results)
         self.correct_map = newcmap
-        log.debug('%s: in grade_answers, answers=%s, cmap=%s' % (self,answers,newcmap))
+        # log.debug('%s: in grade_answers, answers=%s, cmap=%s' % (self,answers,newcmap))
         return newcmap
 
     def get_question_answers(self):
diff --git a/common/lib/xmodule/tests.py b/common/lib/xmodule/tests.py
index 69e69aa1d9..f8187269e9 100644
--- a/common/lib/xmodule/tests.py
+++ b/common/lib/xmodule/tests.py
@@ -1,9 +1,9 @@
 #
-# unittests for courseware
+# unittests for xmodule (and capa)
 #
 # Note: run this using a like like this:
 #
-# django-admin.py test --settings=envs.test_ike --pythonpath=. courseware
+# django-admin.py test --settings=lms.envs.test_ike --pythonpath=. common/lib/xmodule
 
 import unittest
 import os
@@ -96,31 +96,31 @@ class MultiChoiceTest(unittest.TestCase):
         multichoice_file = os.path.dirname(__file__)+"/test_files/multichoice.xml"
         test_lcp = lcp.LoncapaProblem(open(multichoice_file), '1', system=i4xs)
         correct_answers = {'1_2_1':'choice_foil3'}
-        self.assertEquals(test_lcp.grade_answers(correct_answers)['1_2_1'], 'correct')
+        self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct')
         false_answers = {'1_2_1':'choice_foil2'}
-        self.assertEquals(test_lcp.grade_answers(false_answers)['1_2_1'], 'incorrect')
+        self.assertEquals(test_lcp.grade_answers(false_answers).get_correctness('1_2_1'), 'incorrect')
 
     def test_MC_bare_grades(self):
         multichoice_file = os.path.dirname(__file__)+"/test_files/multi_bare.xml"
         test_lcp = lcp.LoncapaProblem(open(multichoice_file), '1', system=i4xs)
         correct_answers = {'1_2_1':'choice_2'}
-        self.assertEquals(test_lcp.grade_answers(correct_answers)['1_2_1'], 'correct')
+        self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct')
         false_answers = {'1_2_1':'choice_1'}
-        self.assertEquals(test_lcp.grade_answers(false_answers)['1_2_1'], 'incorrect')
+        self.assertEquals(test_lcp.grade_answers(false_answers).get_correctness('1_2_1'), 'incorrect')
         
     def test_TF_grade(self):
         truefalse_file =  os.path.dirname(__file__)+"/test_files/truefalse.xml"
         test_lcp = lcp.LoncapaProblem(open(truefalse_file), '1', system=i4xs)
         correct_answers = {'1_2_1':['choice_foil2', 'choice_foil1']}
-        self.assertEquals(test_lcp.grade_answers(correct_answers)['1_2_1'], 'correct')
+        self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct')
         false_answers = {'1_2_1':['choice_foil1']}
-        self.assertEquals(test_lcp.grade_answers(false_answers)['1_2_1'], 'incorrect')
+        self.assertEquals(test_lcp.grade_answers(false_answers).get_correctness('1_2_1'), 'incorrect')
         false_answers = {'1_2_1':['choice_foil1', 'choice_foil3']}
-        self.assertEquals(test_lcp.grade_answers(false_answers)['1_2_1'], 'incorrect')
+        self.assertEquals(test_lcp.grade_answers(false_answers).get_correctness('1_2_1'), 'incorrect')
         false_answers = {'1_2_1':['choice_foil3']}
-        self.assertEquals(test_lcp.grade_answers(false_answers)['1_2_1'], 'incorrect')
+        self.assertEquals(test_lcp.grade_answers(false_answers).get_correctness('1_2_1'), 'incorrect')
         false_answers = {'1_2_1':['choice_foil1', 'choice_foil2', 'choice_foil3']}
-        self.assertEquals(test_lcp.grade_answers(false_answers)['1_2_1'], 'incorrect')
+        self.assertEquals(test_lcp.grade_answers(false_answers).get_correctness('1_2_1'), 'incorrect')
         
 class ImageResponseTest(unittest.TestCase):
     def test_ir_grade(self):
@@ -131,8 +131,8 @@ class ImageResponseTest(unittest.TestCase):
         test_answers = {'1_2_1':'[500,20]',
                         '1_2_2':'[250,300]',
                         }
-        self.assertEquals(test_lcp.grade_answers(test_answers)['1_2_1'], 'correct')
-        self.assertEquals(test_lcp.grade_answers(test_answers)['1_2_2'], 'incorrect')
+        self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_1'), 'correct')
+        self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_2'), 'incorrect')
         
 class SymbolicResponseTest(unittest.TestCase):
     def test_sr_grade(self):
@@ -220,8 +220,8 @@ class SymbolicResponseTest(unittest.TestCase):
   </mstyle>
 </math>''',
                         }
-        self.assertEquals(test_lcp.grade_answers(correct_answers)['1_2_1'], 'correct')
-        self.assertEquals(test_lcp.grade_answers(wrong_answers)['1_2_1'], 'incorrect')
+        self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct')
+        self.assertEquals(test_lcp.grade_answers(wrong_answers).get_correctness('1_2_1'), 'incorrect')
         
 class OptionResponseTest(unittest.TestCase):
     '''
@@ -237,8 +237,8 @@ class OptionResponseTest(unittest.TestCase):
         test_answers = {'1_2_1':'True',
                         '1_2_2':'True',
                         }
-        self.assertEquals(test_lcp.grade_answers(test_answers)['1_2_1'], 'correct')
-        self.assertEquals(test_lcp.grade_answers(test_answers)['1_2_2'], 'incorrect')
+        self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_1'), 'correct')
+        self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_2'), 'incorrect')
 
 #-----------------------------------------------------------------------------
 # Grading tests