 ;;                         k (s/from-coll (map (comp keyword str) (range 1 (inc n))))]
 ;;                  (m/return [n k]))
 ;;           sample (s/take 6 snks)]
-;;       (t/is (s/event-stream? snks))
+;;       (t/is (s/observable? snks))
 ;;       (drain! sample #(t/is (= % [[1 :1]
 ;;                                   [2 :1]
 ;;                                   [2 :2]

;;       (drain! b #(t/is (= % [1]))
;;                 #(t/is (= % :oh-no)))
;;       (s/push! b 1)
;;       (s/error! b :oh-no)
;;       (s/end! b)
;;       (s/on-end b done))))

;; (t/deftest bus-plug
;;   (t/async done

;;  (t/async done
;;    (let [s (s/from-coll [0 1 2])
;;          s2 (m/fmap inc s)]
;;      (t/is (s/observable? s))
;;      (t/is (s/observable? s2))
;;      (drain! s2 #(do (t/is (= % [1 2 3]))
;;                       (done))))))

