diff --git a/Test/CourseContentPageViewControllerTests.swift b/Test/CourseContentPageViewControllerTests.swift
index e0b397789..17433b7c7 100644
--- a/Test/CourseContentPageViewControllerTests.swift
+++ b/Test/CourseContentPageViewControllerTests.swift
@@ -87,7 +87,7 @@ class CourseContentPageViewControllerTests: SnapshotTestCase {
             return nil
         }
     }
-  /*
+    
     func testNextButton() {
         let childIDs = outline.blocks[outline.root]!.children
         XCTAssertTrue(childIDs.count > 2, "Need at least three children for this test")
@@ -109,7 +109,7 @@ class CourseContentPageViewControllerTests: SnapshotTestCase {
                     XCTAssertEqual($0.value!, childID)
                 }
             }
-            self.waitForExpectations()
+            self.OEXWaitForExpectations()
             XCTAssertTrue(controller.t_prevButtonEnabled)
             XCTAssertEqual(controller.t_nextButtonEnabled, childID != childIDs.last!)
         }
@@ -137,7 +137,7 @@ class CourseContentPageViewControllerTests: SnapshotTestCase {
                     testExpectation.fulfill()
                 }
             }
-            self.waitForExpectations()
+            self.OEXWaitForExpectations()
         }
     }
     
@@ -178,7 +178,7 @@ class CourseContentPageViewControllerTests: SnapshotTestCase {
                         testExpectation.fulfill()
                     }
                 }
-                self.waitForExpectations()
+                self.OEXWaitForExpectations()
             }
         
             let pageEvents = environment.eventTracker.events.compactMap { (e: MockAnalyticsRecord) -> MockAnalyticsEventRecord? in
@@ -197,7 +197,7 @@ class CourseContentPageViewControllerTests: SnapshotTestCase {
                 XCTAssertEqual(event.event.name, OEXAnalyticsEventComponentViewed)
             }
     }
-*/
+    
     func testSnapshotContent() {
         let parent : CourseBlockID = CourseOutlineTestDataFactory.knownParentIDWithMultipleChildren
         let childIDs = outline.blocks[parent]!.children