 lessThan = (limit) -> 
   (x) -> x < limit
 
-expectEvents_ = (src, expectedEvents) ->
-  verifySingleSubscriber src(), expectedEvents
-  #verifySwitching src(), expectedEvents
+expectPropertyEvents = (src, expectedEvents) ->
+  runs -> verifySingleSubscriber src(), expectedEvents
+
+expectStreamEvents = (src, expectedEvents) ->
+  runs -> verifySingleSubscriber src(), expectedEvents
+  runs -> verifySwitching src(), expectedEvents
 
 verifySingleSubscriber = (src, expectedEvents) ->
   events = []


describe "pushStream", ->
  it "delivers pushed events", ->
    expectEvents_(
      ->
        s = Bacon.pushStream()
        s.push "pullMe"


describe "Property", ->
  it "delivers current value and changes to subscribers", ->
    expectPropertyEvents(
      ->
        s = Bacon.pushStream()
        p = s.toProperty("a")
