diff --git a/Rx.xcodeproj/project.pbxproj b/Rx.xcodeproj/project.pbxproj
index c26e499b..e5cc2053 100644
--- a/Rx.xcodeproj/project.pbxproj
+++ b/Rx.xcodeproj/project.pbxproj
@@ -497,10 +497,10 @@
 		C8E3A7151C25CEF100643FE6 /* HotObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A70E1C25CEF100643FE6 /* HotObservable.swift */; };
 		C8E3A7161C25CEF100643FE6 /* HotObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A70E1C25CEF100643FE6 /* HotObservable.swift */; };
 		C8E3A7171C25CEF100643FE6 /* HotObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A70E1C25CEF100643FE6 /* HotObservable.swift */; };
-		C8E3A7181C25CEF100643FE6 /* MockObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A70F1C25CEF100643FE6 /* MockObserver.swift */; };
-		C8E3A7191C25CEF100643FE6 /* MockObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A70F1C25CEF100643FE6 /* MockObserver.swift */; };
-		C8E3A71A1C25CEF100643FE6 /* MockObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A70F1C25CEF100643FE6 /* MockObserver.swift */; };
-		C8E3A71B1C25CEF100643FE6 /* MockObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A70F1C25CEF100643FE6 /* MockObserver.swift */; };
+		C8E3A7181C25CEF100643FE6 /* TestableObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A70F1C25CEF100643FE6 /* TestableObserver.swift */; };
+		C8E3A7191C25CEF100643FE6 /* TestableObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A70F1C25CEF100643FE6 /* TestableObserver.swift */; };
+		C8E3A71A1C25CEF100643FE6 /* TestableObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A70F1C25CEF100643FE6 /* TestableObserver.swift */; };
+		C8E3A71B1C25CEF100643FE6 /* TestableObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A70F1C25CEF100643FE6 /* TestableObserver.swift */; };
 		C8E3A71E1C25CF1000643FE6 /* Recorded.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A71C1C25CF1000643FE6 /* Recorded.swift */; };
 		C8E3A71F1C25CF1000643FE6 /* Recorded.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A71C1C25CF1000643FE6 /* Recorded.swift */; };
 		C8E3A7201C25CF1000643FE6 /* Recorded.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A71C1C25CF1000643FE6 /* Recorded.swift */; };
@@ -525,6 +525,10 @@
 		C8E3A7371C26088C00643FE6 /* Any+Equatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A7351C26088C00643FE6 /* Any+Equatable.swift */; };
 		C8E3A7381C26088C00643FE6 /* Any+Equatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A7351C26088C00643FE6 /* Any+Equatable.swift */; };
 		C8E3A7391C26088C00643FE6 /* Any+Equatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E3A7351C26088C00643FE6 /* Any+Equatable.swift */; };
+		C8E7B3691C30C6B800B34368 /* TestableObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E7B3681C30C6B800B34368 /* TestableObservable.swift */; };
+		C8E7B36A1C30C6B800B34368 /* TestableObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E7B3681C30C6B800B34368 /* TestableObservable.swift */; };
+		C8E7B36B1C30C6B800B34368 /* TestableObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E7B3681C30C6B800B34368 /* TestableObservable.swift */; };
+		C8E7B36C1C30C6B800B34368 /* TestableObservable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E7B3681C30C6B800B34368 /* TestableObservable.swift */; };
 		C8F0BF921BBBFB8B001B112F /* Observable+Creation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C981B8A72BE0088E94D /* Observable+Creation.swift */; };
 		C8F0BF931BBBFB8B001B112F /* ConnectableObservableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C4D1B8A72BE0088E94D /* ConnectableObservableType.swift */; };
 		C8F0BF941BBBFB8B001B112F /* Just.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C3DA021B9390C4004D233E /* Just.swift */; };
@@ -1229,13 +1233,14 @@
 		C8E3A7031C25CE7B00643FE6 /* TestScheduler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestScheduler.swift; sourceTree = "<group>"; };
 		C8E3A70D1C25CEF100643FE6 /* ColdObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColdObservable.swift; sourceTree = "<group>"; };
 		C8E3A70E1C25CEF100643FE6 /* HotObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HotObservable.swift; sourceTree = "<group>"; };
-		C8E3A70F1C25CEF100643FE6 /* MockObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockObserver.swift; sourceTree = "<group>"; };
+		C8E3A70F1C25CEF100643FE6 /* TestableObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestableObserver.swift; sourceTree = "<group>"; };
 		C8E3A71C1C25CF1000643FE6 /* Recorded.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Recorded.swift; sourceTree = "<group>"; };
 		C8E3A71D1C25CF1000643FE6 /* Subscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = "<group>"; };
 		C8E3A7261C25CF8C00643FE6 /* RxTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxTests.swift; sourceTree = "<group>"; };
 		C8E3A72B1C25D14700643FE6 /* XCTest+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "XCTest+Rx.swift"; sourceTree = "<group>"; };
 		C8E3A7301C2606A900643FE6 /* Event+Equatable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Event+Equatable.swift"; sourceTree = "<group>"; };
 		C8E3A7351C26088C00643FE6 /* Any+Equatable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Any+Equatable.swift"; sourceTree = "<group>"; };
+		C8E7B3681C30C6B800B34368 /* TestableObservable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestableObservable.swift; sourceTree = "<group>"; };
 		C8F0C0021BBBFB8B001B112F /* RxSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C8F0C04B1BBBFBB9001B112F /* RxCocoa.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C8F0C0581BBBFBCE001B112F /* RxBlocking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxBlocking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1858,13 +1863,14 @@
 				C8E3A71D1C25CF1000643FE6 /* Subscription.swift */,
 				C8E3A70D1C25CEF100643FE6 /* ColdObservable.swift */,
 				C8E3A70E1C25CEF100643FE6 /* HotObservable.swift */,
-				C8E3A70F1C25CEF100643FE6 /* MockObserver.swift */,
+				C8E3A70F1C25CEF100643FE6 /* TestableObserver.swift */,
 				C8E3A7021C25CE7B00643FE6 /* Schedulers */,
 				C8E3A6FD1C25CE2200643FE6 /* Info.plist */,
 				C8E3A7261C25CF8C00643FE6 /* RxTests.swift */,
 				C8E3A72B1C25D14700643FE6 /* XCTest+Rx.swift */,
 				C8E3A7301C2606A900643FE6 /* Event+Equatable.swift */,
 				C8E3A7351C26088C00643FE6 /* Any+Equatable.swift */,
+				C8E7B3681C30C6B800B34368 /* TestableObservable.swift */,
 			);
 			path = RxTests;
 			sourceTree = "<group>";
@@ -2789,9 +2795,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C8E7B3691C30C6B800B34368 /* TestableObservable.swift in Sources */,
 				C8E3A7051C25CE7B00643FE6 /* TestScheduler.swift in Sources */,
 				C8E3A7311C2606A900643FE6 /* Event+Equatable.swift in Sources */,
-				C8E3A7181C25CEF100643FE6 /* MockObserver.swift in Sources */,
+				C8E3A7181C25CEF100643FE6 /* TestableObserver.swift in Sources */,
 				C807F3621C2ACED300017910 /* TestSchedulerVirtualTimeConverter.swift in Sources */,
 				C8E3A72C1C25D14700643FE6 /* XCTest+Rx.swift in Sources */,
 				C8E3A71E1C25CF1000643FE6 /* Recorded.swift in Sources */,
@@ -2807,9 +2814,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C8E7B36A1C30C6B800B34368 /* TestableObservable.swift in Sources */,
 				C8E3A7061C25CE7B00643FE6 /* TestScheduler.swift in Sources */,
 				C8E3A7321C2606A900643FE6 /* Event+Equatable.swift in Sources */,
-				C8E3A7191C25CEF100643FE6 /* MockObserver.swift in Sources */,
+				C8E3A7191C25CEF100643FE6 /* TestableObserver.swift in Sources */,
 				C807F3631C2ACED300017910 /* TestSchedulerVirtualTimeConverter.swift in Sources */,
 				C8E3A72D1C25D14700643FE6 /* XCTest+Rx.swift in Sources */,
 				C8E3A71F1C25CF1000643FE6 /* Recorded.swift in Sources */,
@@ -2825,9 +2833,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C8E7B36B1C30C6B800B34368 /* TestableObservable.swift in Sources */,
 				C8E3A7071C25CE7B00643FE6 /* TestScheduler.swift in Sources */,
 				C8E3A7331C2606A900643FE6 /* Event+Equatable.swift in Sources */,
-				C8E3A71A1C25CEF100643FE6 /* MockObserver.swift in Sources */,
+				C8E3A71A1C25CEF100643FE6 /* TestableObserver.swift in Sources */,
 				C807F3641C2ACED300017910 /* TestSchedulerVirtualTimeConverter.swift in Sources */,
 				C8E3A72E1C25D14700643FE6 /* XCTest+Rx.swift in Sources */,
 				C8E3A7201C25CF1000643FE6 /* Recorded.swift in Sources */,
@@ -2843,9 +2852,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C8E7B36C1C30C6B800B34368 /* TestableObservable.swift in Sources */,
 				C8E3A7081C25CE7B00643FE6 /* TestScheduler.swift in Sources */,
 				C8E3A7341C2606A900643FE6 /* Event+Equatable.swift in Sources */,
-				C8E3A71B1C25CEF100643FE6 /* MockObserver.swift in Sources */,
+				C8E3A71B1C25CEF100643FE6 /* TestableObserver.swift in Sources */,
 				C807F3651C2ACED300017910 /* TestSchedulerVirtualTimeConverter.swift in Sources */,
 				C8E3A72F1C25D14700643FE6 /* XCTest+Rx.swift in Sources */,
 				C8E3A7211C25CF1000643FE6 /* Recorded.swift in Sources */,
diff --git a/RxTests/ColdObservable.swift b/RxTests/ColdObservable.swift
index 784208a8..fdd01f28 100644
--- a/RxTests/ColdObservable.swift
+++ b/RxTests/ColdObservable.swift
@@ -15,47 +15,23 @@ Recorded events are replayed after subscription once per subscriber.
 
 Event times represent relative offset to subscription time.
 */
-public class ColdObservable<Element: Equatable>
-    : ObservableType
-    , ObservableConvertibleType {
-    public typealias E = Element
+class ColdObservable<Element>
+    : TestableObservable<Element> {
 
-    public typealias RecordedEvent = Recorded<Event<Element>>
-
-    /**
-     Parent test scheduler.
-    */
-    let _testScheduler: TestScheduler
-
-    /**
-     Subscriptions recorded during cold observable lifetime.
-    */
-    public private(set) var subscriptions: [Subscription]
-
-    /**
-     List of events to replay for each of the subscriber.
-
-     Event times represent relative offset to subscription time.
-    */
-    public private(set) var recordedEvents: [RecordedEvent]
-
-    init(testScheduler: TestScheduler, recordedEvents: [RecordedEvent]) {
-        _testScheduler = testScheduler
-        
-        self.recordedEvents = recordedEvents
-        self.subscriptions = []
+    override init(testScheduler: TestScheduler, recordedEvents: [Recorded<Event<Element>>]) {
+        super.init(testScheduler: testScheduler, recordedEvents: recordedEvents)
     }
 
     /**
     Subscribes `observer` to receive events for this sequence.
     */
-    public func subscribe<O : ObserverType where O.E == E>(observer: O) -> Disposable {
-        subscriptions.append(Subscription(self._testScheduler.clock))
+    override func subscribe<O : ObserverType where O.E == Element>(observer: O) -> Disposable {
+        subscriptions.append(Subscription(testScheduler.clock))
         
         let i = self.subscriptions.count - 1
 
         for recordedEvent in recordedEvents {
-            _testScheduler.scheduleRelativeVirtual((), dueTime: recordedEvent.time, action: { (_) in
+            testScheduler.scheduleRelativeVirtual((), dueTime: recordedEvent.time, action: { (_) in
                 observer.on(recordedEvent.value)
                 return NopDisposable.instance
             })
@@ -63,7 +39,7 @@ public class ColdObservable<Element: Equatable>
         
         return AnonymousDisposable {
             let existing = self.subscriptions[i]
-            self.subscriptions[i] = Subscription(existing.subscribe, self._testScheduler.clock)
+            self.subscriptions[i] = Subscription(existing.subscribe, self.testScheduler.clock)
         }
     }
 }
\ No newline at end of file
diff --git a/RxTests/HotObservable.swift b/RxTests/HotObservable.swift
index 76bc8a15..33058e2f 100644
--- a/RxTests/HotObservable.swift
+++ b/RxTests/HotObservable.swift
@@ -16,42 +16,19 @@ import RxSwift
 
  Event times represent absolute `TestScheduler` time.
  */
-public class HotObservable<Element : Equatable>
-    : ObservableType
-    , ObservableConvertibleType {
-    public typealias E = Element
-    public typealias Events = Recorded<Event<Element>>
-
+class HotObservable<Element>
+    : TestableObservable<Element> {
     typealias Observer = AnyObserver<Element>
 
-    /**
-     Parent test scheduler.
-     */
-    private let _testScheduler: TestScheduler
-
     /**
      Current subscribed observers.
     */
     private var _observers: Bag<AnyObserver<Element>>
 
-    /**
-     Subscriptions recorded during hot observable lifetime.
-    */
-    public private(set) var subscriptions: [Subscription]
-
-    /**
-     List of events to replay for all subscribers.
-     
-     Event times represent absolute `TestScheduler` time.
-    */
-    public private(set) var recordedEvents: [Events]
-
-    init(testScheduler: TestScheduler, recordedEvents: [Events]) {
-        _testScheduler = testScheduler
+    override init(testScheduler: TestScheduler, recordedEvents: [Recorded<Event<Element>>]) {
         _observers = Bag()
         
-        self.recordedEvents = recordedEvents
-        self.subscriptions = []
+        super.init(testScheduler: testScheduler, recordedEvents: recordedEvents)
 
         for recordedEvent in recordedEvents {
             testScheduler.scheduleAt(recordedEvent.time) { t in
@@ -63,9 +40,9 @@ public class HotObservable<Element : Equatable>
     /**
      Subscribes `observer` to receive events for this sequence.
      */
-    public func subscribe<O : ObserverType where O.E == E>(observer: O) -> Disposable {
+    override func subscribe<O : ObserverType where O.E == Element>(observer: O) -> Disposable {
         let key = _observers.insert(AnyObserver(observer))
-        subscriptions.append(Subscription(self._testScheduler.clock))
+        subscriptions.append(Subscription(self.testScheduler.clock))
         
         let i = self.subscriptions.count - 1
         
@@ -74,7 +51,7 @@ public class HotObservable<Element : Equatable>
             assert(removed != nil)
             
             let existing = self.subscriptions[i]
-            self.subscriptions[i] = Subscription(existing.subscribe, self._testScheduler.clock)
+            self.subscriptions[i] = Subscription(existing.subscribe, self.testScheduler.clock)
         }
     }
 }
diff --git a/RxTests/Schedulers/TestScheduler.swift b/RxTests/Schedulers/TestScheduler.swift
index 93361bab..383dee16 100644
--- a/RxTests/Schedulers/TestScheduler.swift
+++ b/RxTests/Schedulers/TestScheduler.swift
@@ -46,7 +46,7 @@ public class TestScheduler : VirtualTimeScheduler<TestSchedulerVirtualTimeConver
     - parameter events: Events to surface through the created sequence at their specified absolute virtual times.
     - returns: Hot observable sequence that can be used to assert the timing of subscriptions and events.
     */
-    public func createHotObservable<Element>(events: [Recorded<Event<Element>>]) -> HotObservable<Element> {
+    public func createHotObservable<Element>(events: [Recorded<Event<Element>>]) -> TestableObservable<Element> {
         return HotObservable(testScheduler: self as AnyObject as! TestScheduler, recordedEvents: events)
     }
 
@@ -56,7 +56,7 @@ public class TestScheduler : VirtualTimeScheduler<TestSchedulerVirtualTimeConver
      - parameter events: Events to surface through the created sequence at their specified virtual time offsets from the sequence subscription time.
      - returns: Cold observable sequence that can be used to assert the timing of subscriptions and events.
     */
-    public func createColdObservable<Element>(events: [Recorded<Event<Element>>]) -> ColdObservable<Element> {
+    public func createColdObservable<Element>(events: [Recorded<Event<Element>>]) -> TestableObservable<Element> {
         return ColdObservable(testScheduler: self as AnyObject as! TestScheduler, recordedEvents: events)
     }
 
@@ -66,8 +66,8 @@ public class TestScheduler : VirtualTimeScheduler<TestSchedulerVirtualTimeConver
      - parameter type: Optional type hint of the observed sequence elements.
      - returns: Observer that can be used to assert the timing of events.
     */
-    public func createObserver<E>(type: E.Type) -> MockObserver<E> {
-        return MockObserver(scheduler: self as AnyObject as! TestScheduler)
+    public func createObserver<E>(type: E.Type) -> TestableObserver<E> {
+        return TestableObserver(scheduler: self as AnyObject as! TestScheduler)
     }
 
     /**
@@ -98,10 +98,10 @@ public class TestScheduler : VirtualTimeScheduler<TestSchedulerVirtualTimeConver
     - parameter disposed: Virtual time at which to dispose the subscription.
     - returns: Observer with timestamped recordings of events that were received during the virtual time window when the subscription to the source sequence was active.
     */
-    public func start<Element>(created: Time, subscribed: Time, disposed: Time, create: () -> Observable<Element>) -> MockObserver<Element> {
+    public func start<Element>(created: Time, subscribed: Time, disposed: Time, create: () -> Observable<Element>) -> TestableObserver<Element> {
         var source : Observable<Element>? = nil
         var subscription : Disposable? = nil
-        let observer: MockObserver<Element> = createObserver(Element)
+        let observer = createObserver(Element)
         
         self.scheduleAbsoluteVirtual((), time: created) {
             source = create()
@@ -134,7 +134,7 @@ public class TestScheduler : VirtualTimeScheduler<TestSchedulerVirtualTimeConver
      - parameter disposed: Virtual time at which to dispose the subscription.
      - returns: Observer with timestamped recordings of events that were received during the virtual time window when the subscription to the source sequence was active.
      */
-    public func start<Element>(disposed: Time, create: () -> Observable<Element>) -> MockObserver<Element> {
+    public func start<Element>(disposed: Time, create: () -> Observable<Element>) -> TestableObserver<Element> {
         return start(Defaults.created, subscribed: Defaults.subscribed, disposed: disposed, create: create)
     }
 
@@ -149,7 +149,7 @@ public class TestScheduler : VirtualTimeScheduler<TestSchedulerVirtualTimeConver
      - parameter create: Factory method to create an observable sequence.
      - returns: Observer with timestamped recordings of events that were received during the virtual time window when the subscription to the source sequence was active.
      */
-    public func start<Element>(create: () -> Observable<Element>) -> MockObserver<Element> {
+    public func start<Element>(create: () -> Observable<Element>) -> TestableObserver<Element> {
         return start(Defaults.created, subscribed: Defaults.subscribed, disposed: Defaults.disposed, create: create)
     }
 }
\ No newline at end of file
diff --git a/RxTests/TestableObservable.swift b/RxTests/TestableObservable.swift
new file mode 100644
index 00000000..de9c9d94
--- /dev/null
+++ b/RxTests/TestableObservable.swift
@@ -0,0 +1,44 @@
+//
+//  TestableObservable.swift
+//  Rx
+//
+//  Created by Krunoslav Zaher on 12/28/15.
+//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
+//
+
+import Foundation
+import RxSwift
+
+/**
+ Observable sequence that records subscription lifetimes and timestamped events sent to observers.
+*/
+public class TestableObservable<Element>
+    : ObservableType {
+    public typealias E = Element
+    /**
+     Subscriptions recorded during observable lifetime.
+    */
+    public internal(set) var subscriptions: [Subscription]
+
+    /**
+     List of events to replay for all subscribers.
+     
+     Event times represent absolute `TestScheduler` time.
+    */
+    public internal(set) var recordedEvents: [Recorded<Event<Element>>]
+    
+    /**
+     Parent test scheduler.
+     */
+    internal let testScheduler: TestScheduler
+
+    init(testScheduler: TestScheduler, recordedEvents: [Recorded<Event<Element>>]) {
+        self.testScheduler = testScheduler
+        self.recordedEvents = recordedEvents
+        self.subscriptions = []
+    }
+
+    public func subscribe<O : ObserverType where O.E == Element>(observer: O) -> Disposable {
+        fatalError("Abstract method")
+    }
+}
\ No newline at end of file
diff --git a/RxTests/MockObserver.swift b/RxTests/TestableObserver.swift
similarity index 91%
rename from RxTests/MockObserver.swift
rename to RxTests/TestableObserver.swift
index 5ba3288b..4ae95901 100644
--- a/RxTests/MockObserver.swift
+++ b/RxTests/TestableObserver.swift
@@ -1,5 +1,5 @@
 //
-//  MockObserver.swift
+//  TestableObserver.swift
 //  Rx
 //
 //  Created by Krunoslav Zaher on 2/15/15.
@@ -12,7 +12,7 @@ import RxSwift
 /**
  Observer that records events together with virtual time when they were received.
 */
-public class MockObserver<ElementType>
+public class TestableObserver<ElementType>
     : ObserverType {
     public typealias Element = ElementType
     
diff --git a/Tests/RxSwiftTests/TestImplementations/Observable+Extensions.swift b/Tests/RxSwiftTests/TestImplementations/Observable+Extensions.swift
index f63e26dd..64f83fbd 100644
--- a/Tests/RxSwiftTests/TestImplementations/Observable+Extensions.swift
+++ b/Tests/RxSwiftTests/TestImplementations/Observable+Extensions.swift
@@ -14,19 +14,11 @@ public func == <T>(lhs: Observable<T>, rhs: Observable<T>) -> Bool {
     return lhs === rhs
 }
 
-extension HotObservable : Equatable {
+extension TestableObservable : Equatable {
 
 }
 
-extension ColdObservable : Equatable {
-    
-}
-
-public func == <T>(lhs: HotObservable<T>, rhs: HotObservable<T>) -> Bool {
-    return lhs === rhs
-}
-
-public func == <T>(lhs: ColdObservable<T>, rhs: ColdObservable<T>) -> Bool {
+public func == <T>(lhs: TestableObservable<T>, rhs: TestableObservable<T>) -> Bool {
     return lhs === rhs
 }
 
diff --git a/Tests/RxSwiftTests/Tests/Observable+AggregateTest.swift b/Tests/RxSwiftTests/Tests/Observable+AggregateTest.swift
index 1e63668b..b15c30cf 100644
--- a/Tests/RxSwiftTests/Tests/Observable+AggregateTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+AggregateTest.swift
@@ -355,7 +355,7 @@ extension ObservableAggregateTest {
     func test_ToArrayWithSingleItem_Return() {
         let scheduler = TestScheduler(initialClock: 0)
         
-        let xs: ColdObservable<Int> = scheduler.createColdObservable([
+        let xs: TestableObservable<Int> = scheduler.createColdObservable([
             next(10, 1),
             completed(20)
             ])
@@ -380,7 +380,7 @@ extension ObservableAggregateTest {
     func test_ToArrayWithMultipleItems_Return() {
         let scheduler = TestScheduler(initialClock: 0)
         
-        let xs: ColdObservable<Int> = scheduler.createColdObservable([
+        let xs: TestableObservable<Int> = scheduler.createColdObservable([
             next(10, 1),
             next(20, 2),
             next(30, 3),
@@ -408,7 +408,7 @@ extension ObservableAggregateTest {
     func test_ToArrayWithNoItems_Empty() {
         let scheduler = TestScheduler(initialClock: 0)
         
-        let xs: ColdObservable<Int> = scheduler.createColdObservable([
+        let xs: TestableObservable<Int> = scheduler.createColdObservable([
             completed(50)
             ])
         
@@ -454,7 +454,7 @@ extension ObservableAggregateTest {
     func test_ToArrayWithImmediateError_Throw() {
         let scheduler = TestScheduler(initialClock: 0)
         
-        let xs: ColdObservable<Int> = scheduler.createColdObservable([
+        let xs: TestableObservable<Int> = scheduler.createColdObservable([
             error(10, testError)
             ])
         
@@ -477,7 +477,7 @@ extension ObservableAggregateTest {
     func test_ToArrayWithMultipleItems_Throw() {
         let scheduler = TestScheduler(initialClock: 0)
         
-        let xs: ColdObservable<Int> = scheduler.createColdObservable([
+        let xs: TestableObservable<Int> = scheduler.createColdObservable([
             next(10, 1),
             next(20, 2),
             next(30, 3),
diff --git a/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift b/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift
index cad8534e..d252d656 100644
--- a/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+ConcurrencyTest.swift
@@ -599,7 +599,7 @@ extension ObservableConcurrencyTest {
     func testSubscribeOn_SchedulerCompleted() {
         let scheduler = TestScheduler(initialClock: 0)
 
-        let xs: HotObservable<Int> = scheduler.createHotObservable([
+        let xs: TestableObservable<Int> = scheduler.createHotObservable([
             completed(300)
             ])
 
@@ -619,7 +619,7 @@ extension ObservableConcurrencyTest {
     func testSubscribeOn_SchedulerError() {
         let scheduler = TestScheduler(initialClock: 0)
 
-        let xs: HotObservable<Int> = scheduler.createHotObservable([
+        let xs: TestableObservable<Int> = scheduler.createHotObservable([
             error(300, testError)
             ])
 
diff --git a/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift b/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift
index 62bc7c96..0fea9316 100644
--- a/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+CreationTest.swift
@@ -327,7 +327,7 @@ extension ObservableCreationTests {
         var disposeInvoked = 0
         var createInvoked = 0
        
-        var xs:ColdObservable<Int>!
+        var xs:TestableObservable<Int>!
         var disposable:MockDisposable!
         var _d:MockDisposable!
         
@@ -373,7 +373,7 @@ extension ObservableCreationTests {
         var disposeInvoked = 0
         var createInvoked = 0
        
-        var xs:ColdObservable<Int>!
+        var xs:TestableObservable<Int>!
         var disposable:MockDisposable!
         var _d:MockDisposable!
         
@@ -419,7 +419,7 @@ extension ObservableCreationTests {
         var disposeInvoked = 0
         var createInvoked = 0
        
-        var xs:ColdObservable<Int>!
+        var xs:TestableObservable<Int>!
         var disposable:MockDisposable!
         var _d:MockDisposable!
         
diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.swift b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.swift
index 04f5e484..aef82e51 100644
--- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.swift
@@ -66,11 +66,11 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             completed(210)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             completed(220)
         ])
         
@@ -96,13 +96,13 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(210, 1),
             completed(400)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(220, 2),
             completed(400)
@@ -131,14 +131,14 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5),
             completed(220)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -224,15 +224,15 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             completed(210)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             completed(220)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             completed(230)
         ])
         
@@ -259,19 +259,19 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(210, 1),
             completed(400)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(220, 2),
             completed(400)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(230, 3),
             completed(400)
@@ -301,14 +301,14 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5),
             completed(220)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -316,7 +316,7 @@ extension ObservableMultipleTest {
             completed(230)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -410,19 +410,19 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             completed(210)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             completed(220)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             completed(230)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             completed(240)
         ])
         
@@ -450,25 +450,25 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(210, 1),
             completed(400)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(220, 2),
             completed(400)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(230, 3),
             completed(400)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(240, 4),
             completed(400)
@@ -499,14 +499,14 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5),
             completed(220)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -514,7 +514,7 @@ extension ObservableMultipleTest {
             completed(230)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -523,7 +523,7 @@ extension ObservableMultipleTest {
             completed(240)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -625,23 +625,23 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             completed(210)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             completed(220)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             completed(230)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             completed(240)
         ])
         
-        let e4: HotObservable<Int> = scheduler.createHotObservable([
+        let e4: TestableObservable<Int> = scheduler.createHotObservable([
             completed(250)
         ])
         
@@ -670,31 +670,31 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(210, 1),
             completed(400)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(220, 2),
             completed(400)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(230, 3),
             completed(400)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(240, 4),
             completed(400)
         ])
         
-        let e4: HotObservable<Int> = scheduler.createHotObservable([
+        let e4: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(250, 5),
             completed(400)
@@ -726,14 +726,14 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5),
             completed(220)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -741,7 +741,7 @@ extension ObservableMultipleTest {
             completed(230)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -750,7 +750,7 @@ extension ObservableMultipleTest {
             completed(240)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -760,7 +760,7 @@ extension ObservableMultipleTest {
             completed(250)
         ])
         
-        let e4: HotObservable<Int> = scheduler.createHotObservable([
+        let e4: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -870,27 +870,27 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             completed(210)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             completed(220)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             completed(230)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             completed(240)
         ])
         
-        let e4: HotObservable<Int> = scheduler.createHotObservable([
+        let e4: TestableObservable<Int> = scheduler.createHotObservable([
             completed(250)
         ])
         
-        let e5: HotObservable<Int> = scheduler.createHotObservable([
+        let e5: TestableObservable<Int> = scheduler.createHotObservable([
             completed(260)
         ])
         
@@ -920,37 +920,37 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(210, 1),
             completed(400)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(220, 2),
             completed(400)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(230, 3),
             completed(400)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(240, 4),
             completed(400)
         ])
         
-        let e4: HotObservable<Int> = scheduler.createHotObservable([
+        let e4: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(250, 5),
             completed(400)
         ])
         
-        let e5: HotObservable<Int> = scheduler.createHotObservable([
+        let e5: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(260, 6),
             completed(400)
@@ -983,14 +983,14 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5),
             completed(220)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -998,7 +998,7 @@ extension ObservableMultipleTest {
             completed(230)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1007,7 +1007,7 @@ extension ObservableMultipleTest {
             completed(240)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1017,7 +1017,7 @@ extension ObservableMultipleTest {
             completed(250)
         ])
         
-        let e4: HotObservable<Int> = scheduler.createHotObservable([
+        let e4: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1028,7 +1028,7 @@ extension ObservableMultipleTest {
             completed(260)
         ])
         
-        let e5: HotObservable<Int> = scheduler.createHotObservable([
+        let e5: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1146,31 +1146,31 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             completed(210)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             completed(220)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             completed(230)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             completed(240)
         ])
         
-        let e4: HotObservable<Int> = scheduler.createHotObservable([
+        let e4: TestableObservable<Int> = scheduler.createHotObservable([
             completed(250)
         ])
         
-        let e5: HotObservable<Int> = scheduler.createHotObservable([
+        let e5: TestableObservable<Int> = scheduler.createHotObservable([
             completed(260)
         ])
         
-        let e6: HotObservable<Int> = scheduler.createHotObservable([
+        let e6: TestableObservable<Int> = scheduler.createHotObservable([
             completed(270)
         ])
         
@@ -1201,43 +1201,43 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(210, 1),
             completed(400)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(220, 2),
             completed(400)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(230, 3),
             completed(400)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(240, 4),
             completed(400)
         ])
         
-        let e4: HotObservable<Int> = scheduler.createHotObservable([
+        let e4: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(250, 5),
             completed(400)
         ])
         
-        let e5: HotObservable<Int> = scheduler.createHotObservable([
+        let e5: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(260, 6),
             completed(400)
         ])
         
-        let e6: HotObservable<Int> = scheduler.createHotObservable([
+        let e6: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(270, 7),
             completed(400)
@@ -1271,14 +1271,14 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5),
             completed(220)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1286,7 +1286,7 @@ extension ObservableMultipleTest {
             completed(230)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1295,7 +1295,7 @@ extension ObservableMultipleTest {
             completed(240)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1305,7 +1305,7 @@ extension ObservableMultipleTest {
             completed(250)
         ])
         
-        let e4: HotObservable<Int> = scheduler.createHotObservable([
+        let e4: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1316,7 +1316,7 @@ extension ObservableMultipleTest {
             completed(260)
         ])
         
-        let e5: HotObservable<Int> = scheduler.createHotObservable([
+        let e5: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1328,7 +1328,7 @@ extension ObservableMultipleTest {
             completed(270)
         ])
         
-        let e6: HotObservable<Int> = scheduler.createHotObservable([
+        let e6: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1454,35 +1454,35 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             completed(210)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             completed(220)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             completed(230)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             completed(240)
         ])
         
-        let e4: HotObservable<Int> = scheduler.createHotObservable([
+        let e4: TestableObservable<Int> = scheduler.createHotObservable([
             completed(250)
         ])
         
-        let e5: HotObservable<Int> = scheduler.createHotObservable([
+        let e5: TestableObservable<Int> = scheduler.createHotObservable([
             completed(260)
         ])
         
-        let e6: HotObservable<Int> = scheduler.createHotObservable([
+        let e6: TestableObservable<Int> = scheduler.createHotObservable([
             completed(270)
         ])
         
-        let e7: HotObservable<Int> = scheduler.createHotObservable([
+        let e7: TestableObservable<Int> = scheduler.createHotObservable([
             completed(280)
         ])
         
@@ -1514,49 +1514,49 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(210, 1),
             completed(400)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(220, 2),
             completed(400)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(230, 3),
             completed(400)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(240, 4),
             completed(400)
         ])
         
-        let e4: HotObservable<Int> = scheduler.createHotObservable([
+        let e4: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(250, 5),
             completed(400)
         ])
         
-        let e5: HotObservable<Int> = scheduler.createHotObservable([
+        let e5: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(260, 6),
             completed(400)
         ])
         
-        let e6: HotObservable<Int> = scheduler.createHotObservable([
+        let e6: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(270, 7),
             completed(400)
         ])
         
-        let e7: HotObservable<Int> = scheduler.createHotObservable([
+        let e7: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(280, 8),
             completed(400)
@@ -1591,14 +1591,14 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         
-        let e0: HotObservable<Int> = scheduler.createHotObservable([
+        let e0: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5),
             completed(220)
         ])
         
-        let e1: HotObservable<Int> = scheduler.createHotObservable([
+        let e1: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1606,7 +1606,7 @@ extension ObservableMultipleTest {
             completed(230)
         ])
         
-        let e2: HotObservable<Int> = scheduler.createHotObservable([
+        let e2: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1615,7 +1615,7 @@ extension ObservableMultipleTest {
             completed(240)
         ])
         
-        let e3: HotObservable<Int> = scheduler.createHotObservable([
+        let e3: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1625,7 +1625,7 @@ extension ObservableMultipleTest {
             completed(250)
         ])
         
-        let e4: HotObservable<Int> = scheduler.createHotObservable([
+        let e4: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1636,7 +1636,7 @@ extension ObservableMultipleTest {
             completed(260)
         ])
         
-        let e5: HotObservable<Int> = scheduler.createHotObservable([
+        let e5: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1648,7 +1648,7 @@ extension ObservableMultipleTest {
             completed(270)
         ])
         
-        let e6: HotObservable<Int> = scheduler.createHotObservable([
+        let e6: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
@@ -1661,7 +1661,7 @@ extension ObservableMultipleTest {
             completed(280)
         ])
         
-        let e7: HotObservable<Int> = scheduler.createHotObservable([
+        let e7: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
  
             next(210, 5), 
diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.tt b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.tt
index ef7d61d3..042f2251 100644
--- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.tt
+++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest+Zip.tt
@@ -58,7 +58,7 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         <% for j in 0..<i { %>
-        let e<%= j %>: HotObservable<Int> = scheduler.createHotObservable([
+        let e<%= j %>: TestableObservable<Int> = scheduler.createHotObservable([
             completed(<%= 200 + (j + 1) * 10 %>)
         ])
         <% } %>
@@ -83,7 +83,7 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         <% for j in 0..<i { %>
-        let e<%= j %>: HotObservable<Int> = scheduler.createHotObservable([
+        let e<%= j %>: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
             next(<%= 200 + (j + 1) * 10 %>, <%= j + 1 %>),
             completed(400)
@@ -111,7 +111,7 @@ extension ObservableMultipleTest {
         let scheduler = TestScheduler(initialClock: 0)
 
         <% for j in 0..<i { %>
-        let e<%= j %>: HotObservable<Int> = scheduler.createHotObservable([
+        let e<%= j %>: TestableObservable<Int> = scheduler.createHotObservable([
             next(150, 1),
 <% for k in 0...j { %> 
             next(<%= 200 + (k + 1) * 10 %>, <%= 5 + k %>),<% } %>
diff --git a/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift b/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift
index bd46773d..753c64bf 100644
--- a/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+MultipleTest.swift
@@ -882,7 +882,7 @@ extension ObservableMultipleTest {
         let xs = scheduler.createHotObservable(xSequence)
 
         let res = scheduler.start {
-            xs.flatMapLatest { x throws -> ColdObservable<Int> in
+            xs.flatMapLatest { x throws -> TestableObservable<Int> in
                 if x < 1 {
                     return observables[x]
                 }
@@ -1721,7 +1721,7 @@ extension ObservableMultipleTest {
             completed(150)
         ])
         
-        let xs: HotObservable<ColdObservable<Int>> = scheduler.createHotObservable([
+        let xs: TestableObservable<TestableObservable<Int>> = scheduler.createHotObservable([
             next(300, ys1),
             next(400, ys2),
             next(500, ys3),
@@ -1791,7 +1791,7 @@ extension ObservableMultipleTest {
             completed(50)
             ])
         
-        let xs: HotObservable<ColdObservable<Int>> = scheduler.createHotObservable([
+        let xs: TestableObservable<TestableObservable<Int>> = scheduler.createHotObservable([
             next(300, ys1),
             next(400, ys2),
             next(500, ys3),
@@ -1864,7 +1864,7 @@ extension ObservableMultipleTest {
             completed(150)
             ])
         
-        let xs: HotObservable<ColdObservable<Int>> = scheduler.createHotObservable([
+        let xs: TestableObservable<TestableObservable<Int>> = scheduler.createHotObservable([
             next(300, ys1),
             next(400, ys2),
             next(500, ys3),
@@ -1926,7 +1926,7 @@ extension ObservableMultipleTest {
             completed(50)
             ])
         
-        let xs: HotObservable<ColdObservable<Int>> = scheduler.createHotObservable([
+        let xs: TestableObservable<TestableObservable<Int>> = scheduler.createHotObservable([
             next(300, ys1),
             next(400, ys2),
             error(500, testError1),
@@ -1992,7 +1992,7 @@ extension ObservableMultipleTest {
             completed(300)
             ])
         
-        let xs: HotObservable<ColdObservable<Int>> = scheduler.createHotObservable([
+        let xs: TestableObservable<TestableObservable<Int>> = scheduler.createHotObservable([
             next(210, ys1),
             next(260, ys2),
             next(270, ys3),
@@ -2070,7 +2070,7 @@ extension ObservableMultipleTest {
             completed(300)
             ])
         
-        let xs: HotObservable<ColdObservable<Int>> = scheduler.createHotObservable([
+        let xs: TestableObservable<TestableObservable<Int>> = scheduler.createHotObservable([
             next(210, ys1),
             next(260, ys2),
             next(270, ys3),
@@ -2148,7 +2148,7 @@ extension ObservableMultipleTest {
             completed(300)
             ])
         
-        let xs: HotObservable<ColdObservable<Int>> = scheduler.createHotObservable([
+        let xs: TestableObservable<TestableObservable<Int>> = scheduler.createHotObservable([
             next(210, ys1),
             next(260, ys2),
             next(270, ys3),
@@ -2226,7 +2226,7 @@ extension ObservableMultipleTest {
             completed(300)
             ])
         
-        let xs: HotObservable<ColdObservable<Int>> = scheduler.createHotObservable([
+        let xs: TestableObservable<TestableObservable<Int>> = scheduler.createHotObservable([
             next(210, ys1),
             next(260, ys2),
             next(270, ys3),
@@ -2304,7 +2304,7 @@ extension ObservableMultipleTest {
             completed(300)
             ])
         
-        let xs: HotObservable<ColdObservable<Int>> = scheduler.createHotObservable([
+        let xs: TestableObservable<TestableObservable<Int>> = scheduler.createHotObservable([
             next(210, ys1),
             next(260, ys2),
             next(270, ys3),
@@ -2377,7 +2377,7 @@ extension ObservableMultipleTest {
             completed(300)
             ])
         
-        let xs: HotObservable<ColdObservable<Int>> = scheduler.createHotObservable([
+        let xs: TestableObservable<TestableObservable<Int>> = scheduler.createHotObservable([
             next(210, ys1),
             next(260, ys2),
             next(270, ys3),
@@ -2450,7 +2450,7 @@ extension ObservableMultipleTest {
             completed(300)
             ])
         
-        let xs: HotObservable<ColdObservable<Int>> = scheduler.createHotObservable([
+        let xs: TestableObservable<TestableObservable<Int>> = scheduler.createHotObservable([
             next(210, ys1),
             next(260, ys2),
             next(270, ys3),
@@ -3282,7 +3282,7 @@ extension ObservableMultipleTest {
             ])
         
         let res = scheduler.start {
-            ([e0, e1] as [HotObservable<Int>]).combineLatest { $0.reduce(0, combine:+) }
+            ([e0, e1] as [TestableObservable<Int>]).combineLatest { $0.reduce(0, combine:+) }
         }
         
         XCTAssertEqual(res.events, [
diff --git a/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift b/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift
index ea423f3e..b5df6545 100644
--- a/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift
@@ -1803,7 +1803,7 @@ extension ObservableStandardSequenceOperatorsTest {
 
         var invoked = 0
         let res = scheduler.start {
-            return xs.flatMapFirst { (x: ColdObservable<Int>) -> ColdObservable<Int> in
+            return xs.flatMapFirst { (x: TestableObservable<Int>) -> TestableObservable<Int> in
                 invoked += 1
                 if invoked == 2 {
                     throw testError
@@ -2432,7 +2432,7 @@ extension ObservableStandardSequenceOperatorsTest {
         
         var invoked = 0
         let res = scheduler.start {
-            return xs.flatMap { (x: ColdObservable<Int>) -> ColdObservable<Int> in
+            return xs.flatMap { (x: TestableObservable<Int>) -> TestableObservable<Int> in
                 invoked += 1
                 if invoked == 3 {
                     throw testError
@@ -3101,7 +3101,7 @@ extension ObservableStandardSequenceOperatorsTest {
         
         var invoked = 0
         let res = scheduler.start {
-            return xs.flatMapWithIndex { (x: ColdObservable<Int>, _: Int) -> ColdObservable<Int> in
+            return xs.flatMapWithIndex { (x: TestableObservable<Int>, _: Int) -> TestableObservable<Int> in
                 invoked += 1
                 if invoked == 3 {
                     throw testError
diff --git a/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift b/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift
index ba990c4a..a2ab447b 100644
--- a/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift
+++ b/Tests/RxSwiftTests/Tests/Observable+TimeTest.swift
@@ -1145,7 +1145,7 @@ extension ObservableTimeTest {
     func testSkip_Error() {
         let scheduler = TestScheduler(initialClock: 0)
 
-        let xs: HotObservable<Int> = scheduler.createHotObservable([
+        let xs: TestableObservable<Int> = scheduler.createHotObservable([
             error(210, testError)
             ])
 
@@ -1165,7 +1165,7 @@ extension ObservableTimeTest {
     func testSkip_Never() {
         let scheduler = TestScheduler(initialClock: 0)
 
-        let xs: HotObservable<Int> = scheduler.createHotObservable([
+        let xs: TestableObservable<Int> = scheduler.createHotObservable([
             ])
 
         let res = scheduler.start {
@@ -1777,7 +1777,7 @@ extension ObservableTimeTest {
             completed(500)
             ])
         
-        let ys: ColdObservable<Int> = scheduler.createColdObservable([
+        let ys: TestableObservable<Int> = scheduler.createColdObservable([
             ])
         
         let res = scheduler.start {
@@ -1801,7 +1801,7 @@ extension ObservableTimeTest {
     func testTimeout_TimeoutOccurs_Completed() {
         let scheduler = TestScheduler(initialClock: 0)
         
-        let xs: HotObservable<Int> = scheduler.createHotObservable([
+        let xs: TestableObservable<Int> = scheduler.createHotObservable([
             completed(500)
             ])
         
@@ -1829,7 +1829,7 @@ extension ObservableTimeTest {
     func testTimeout_TimeoutOccurs_Error() {
         let scheduler = TestScheduler(initialClock: 0)
 
-        let xs: HotObservable<Int> = scheduler.createHotObservable([
+        let xs: TestableObservable<Int> = scheduler.createHotObservable([
             error(500, testError)
             ])
 
@@ -1857,11 +1857,11 @@ extension ObservableTimeTest {
     func testTimeout_TimeoutOccurs_NextIsError() {
         let scheduler = TestScheduler(initialClock: 0)
         
-        let xs: HotObservable<Int> = scheduler.createHotObservable([
+        let xs: TestableObservable<Int> = scheduler.createHotObservable([
             next(500, 42)
             ])
         
-        let ys: ColdObservable<Int> = scheduler.createColdObservable([
+        let ys: TestableObservable<Int> = scheduler.createColdObservable([
             error(100, testError)
             ])
         
@@ -1885,11 +1885,11 @@ extension ObservableTimeTest {
     func testTimeout_TimeoutNotOccurs_Completed() {
         let scheduler = TestScheduler(initialClock: 0)
         
-        let xs: HotObservable<Int> = scheduler.createHotObservable([
+        let xs: TestableObservable<Int> = scheduler.createHotObservable([
             completed(250)
             ])
         
-        let ys: ColdObservable<Int> = scheduler.createColdObservable([
+        let ys: TestableObservable<Int> = scheduler.createColdObservable([
             next(100, -1)
             ])
         
@@ -1911,11 +1911,11 @@ extension ObservableTimeTest {
     func testTimeout_TimeoutNotOccurs_Error() {
         let scheduler = TestScheduler(initialClock: 0)
         
-        let xs: HotObservable<Int> = scheduler.createHotObservable([
+        let xs: TestableObservable<Int> = scheduler.createHotObservable([
             error(250, testError)
             ])
         
-        let ys: ColdObservable<Int> = scheduler.createColdObservable([
+        let ys: TestableObservable<Int> = scheduler.createColdObservable([
             next(100, -1)
             ])