                             didHaveDvr = (userInfo?["enabled"] as? Bool) ?? false
                         }
                         
-                        core.activePlayback!.trigger(Event.bufferUpdate.rawValue)
+                        core.activeContainer!.on(InternalEvent.didChangePlayback.rawValue) { _ in
+                            core.activePlayback!.trigger(Event.bufferUpdate.rawValue)
+                        }
                         
                         expect(didHaveDvr).toEventually(beFalse())
                     }

        _playbackType = playbackType
    }
}

class CoreStub: Core {
    
    override var activeContainer: Container? {
        get {
            return _container
        }
        
        set {
            _container = activeContainer
        }
    }
    
    private var _container: Container? = ContainerStub()
}

class ContainerStub: Container {
    override var playback: Playback? {
        get {
            return _playback
        }
        set {
            _playback = newValue
        }
    }
    
    private var _playback: Playback?
}

@testable import Clappr

class DVRPluginTests: QuickSpec {
    
    var playback: AVFoundationPlaybackStub!
    var container: Container!
    
    override func spec() {
        super.spec()

