diff --git a/cms/djangoapps/contentstore/features/advanced-settings.py b/cms/djangoapps/contentstore/features/advanced-settings.py
index 473fc20a68..2360baea5a 100644
--- a/cms/djangoapps/contentstore/features/advanced-settings.py
+++ b/cms/djangoapps/contentstore/features/advanced-settings.py
@@ -31,8 +31,10 @@ def press_the_notification_button(step, name):
 
     # Save was clicked if either the save notification bar is gone, or we have a error notification
     # overlaying it (expected in the case of typing Object into display_name).
-    save_clicked = lambda: world.is_css_not_present('.is-shown.wrapper-notification-warning') or\
-                           world.is_css_present('.is-shown.wrapper-notification-error')
+    def save_clicked():
+        confirmation_dismissed = world.is_css_not_present('.is-shown.wrapper-notification-warning')
+        error_showing = world.is_css_present('.is-shown.wrapper-notification-error')
+        return confirmation_dismissed or error_showing
 
     assert_true(world.css_click(css, success_condition=save_clicked), 'Save button not clicked after 5 attempts.')
 
diff --git a/cms/djangoapps/contentstore/tests/test_checklists.py b/cms/djangoapps/contentstore/tests/test_checklists.py
index 0e5cd9b884..52e9ba14fe 100644
--- a/cms/djangoapps/contentstore/tests/test_checklists.py
+++ b/cms/djangoapps/contentstore/tests/test_checklists.py
@@ -19,7 +19,6 @@ class ChecklistTestCase(CourseTestCase):
         modulestore = get_modulestore(self.course.location)
         return modulestore.get_item(self.course.location).checklists
 
-
     def compare_checklists(self, persisted, request):
         """
         Handles url expansion as possible difference and descends into guts
@@ -99,7 +98,6 @@ class ChecklistTestCase(CourseTestCase):
                                                            'name': self.course.location.name,
                                                            'checklist_index': 2})
 
-
         def get_first_item(checklist):
             return checklist['items'][0]
 
diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py
index 6b8622f992..5c2a15ac87 100644
--- a/cms/djangoapps/contentstore/tests/test_course_settings.py
+++ b/cms/djangoapps/contentstore/tests/test_course_settings.py
@@ -131,9 +131,14 @@ class CourseDetailsTestCase(CourseTestCase):
 
     @override_settings(MKTG_URLS={'ROOT': 'dummy-root'})
     def test_marketing_site_fetch(self):
-        settings_details_url = reverse('settings_details',
-            kwargs={'org': self.course_location.org, 'name': self.course_location.name,
-                    'course': self.course_location.course})
+        settings_details_url = reverse(
+            'settings_details',
+            kwargs={
+                'org': self.course_location.org,
+                'name': self.course_location.name,
+                'course': self.course_location.course
+            }
+        )
 
         with mock.patch.dict('django.conf.settings.MITX_FEATURES', {'ENABLE_MKTG_SITE': True}):
             response = self.client.get(settings_details_url)
@@ -150,9 +155,14 @@ class CourseDetailsTestCase(CourseTestCase):
             self.assertNotContains(response, "Requirements")
 
     def test_regular_site_fetch(self):
-        settings_details_url = reverse('settings_details',
-            kwargs={'org': self.course_location.org, 'name': self.course_location.name,
-                    'course': self.course_location.course})
+        settings_details_url = reverse(
+            'settings_details',
+            kwargs={
+                'org': self.course_location.org,
+                'name': self.course_location.name,
+                'course': self.course_location.course
+            }
+        )
 
         with mock.patch.dict('django.conf.settings.MITX_FEATURES', {'ENABLE_MKTG_SITE': False}):
             response = self.client.get(settings_details_url)