diff --git a/common/lib/xmodule/xmodule/tests/test_course_module.py b/common/lib/xmodule/xmodule/tests/test_course_module.py
index 8de53c3bb2..97c6be2ed6 100644
--- a/common/lib/xmodule/xmodule/tests/test_course_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_course_module.py
@@ -101,7 +101,7 @@ class IsNewCourseTestCase(unittest.TestCase):
         assert(descriptor.is_newish is True)
 
         descriptor = self.get_dummy_course(start='2013-02-02T12:00', is_new=False)
-        assert(descriptor.is_new is False)
+        assert(descriptor.is_newish is False)
 
         descriptor = self.get_dummy_course(start='2013-02-02T12:00', is_new=True)
         assert(descriptor.is_newish is True)
diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py
index c4547241e0..c0ecd7e854 100644
--- a/common/lib/xmodule/xmodule/tests/test_import.py
+++ b/common/lib/xmodule/xmodule/tests/test_import.py
@@ -370,13 +370,13 @@ class ImportTestCase(BaseCourseTestCase):
         self.assertFalse(course.is_cohorted)
 
         # empty config -> False
-        course.metadata['cohort_config'] = {}
+        course.cohort_config = {}
         self.assertFalse(course.is_cohorted)
 
         # false config -> False
-        course.metadata['cohort_config'] = {'cohorted': False}
+        course.cohort_config = {'cohorted': False}
         self.assertFalse(course.is_cohorted)
 
         # and finally...
-        course.metadata['cohort_config'] = {'cohorted': True}
+        course.cohort_config = {'cohorted': True}
         self.assertTrue(course.is_cohorted)
diff --git a/common/lib/xmodule/xmodule/tests/test_self_assessment.py b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
index 617b2b142a..00101d7f40 100644
--- a/common/lib/xmodule/xmodule/tests/test_self_assessment.py
+++ b/common/lib/xmodule/xmodule/tests/test_self_assessment.py
@@ -28,8 +28,6 @@ class SelfAssessmentTest(unittest.TestCase):
     location = Location(["i4x", "edX", "sa_test", "selfassessment",
                          "SampleQuestion"])
 
-    metadata = {'attempts': '10'}
-
     descriptor = Mock()
 
     def setUp(self):
@@ -46,13 +44,14 @@ class SelfAssessmentTest(unittest.TestCase):
                 'max_score': 1,
                 'display_name': "Name",
                 'accept_file_upload': False,
-                'close_date': None
+                'close_date': None,
+                'attempts': '10'
+
                 }
 
         self.module = SelfAssessmentModule(test_system, self.location,
-                                      self.definition, self.descriptor,
-                                      static_data, 
-                                      state, metadata=self.metadata)
+                                      self.descriptor,
+                                      static_data)
 
     def test_get_html(self):
         html = self.module.get_html(test_system)