add an extra verification step to expectStreamEvents. Several failures found.
fix verifySwitching2: the unsub var wasn't correctly updated
fix verifySwitching2 again
skip verifySwitching2 for certain "unstable" streams