               (m/next-epoch)
               (m/emit-barrier)
               (m/send-messages [:m5 :m6] [t1-queue-p2])) 
-
-
-        messages (remove nil? (mapcat (fn [_] (m/receive-messages m-p3)) (range 20)))]
+        messages (map :message (mapcat (fn [_] (m/receive-messages m-p3)) (range 20)))]
     (is (= [:m1 :m3 :m2 :m4] messages))
     (is (m/all-barriers-seen? m))
 

                         (m/receive-messages m))
                       (switch-peer m :p3)
                       (range 20))
        messages (remove nil? (mapcat :messages ms))]
    (is (= [:m1 :m3 :m2 :m4] messages))
    (is (m/all-barriers-seen? (last ms)))


                            (m/receive-messages m))
                          mnext
                          (range 20))]
      (is (= [:m5 :m6] (map :message (mapcat :messages mss))))
      (is (not (m/all-barriers-seen? (last mss))))
      (let [m-p1-acks (-> (last mss)
                          (switch-peer :p1)
