                     let spy = PlayerTestObserver(player: videoPlayer)
                     var delegateCalled = false
                     
-                    waitUntil(timeout: 10.0) { done -> Void in
+                    ///CST
+                    self.waitExpectation(timeout: 10.0 * tm) { done -> Void in
                         
                         spy.onPlaybackFinished = {
                             delegateCalled = true

                    let spy = PlayerTestObserver(player: videoPlayer)
                    var delegateCalled = false
                    
                    waitUntil(timeout: 10.0) { done -> Void in
                        
                        spy.onPlayerReady = {
                            videoPlayer.play()

                    let spy = PlayerTestObserver(player: videoPlayer)
                    var delegateCalled = false

                    ///CST
                    self.waitExpectation(timeout: 10.0 * tm) { done -> Void in
                        
                        var onceToken = 0x1
                        spy.onPlayerStateChanged = { _ in
