                      (m/emit-barrier)
                      (switch-peer :p4)
                      (m/receive-messages)
-                     (m/receive-messages))]
-        (is (m/all-barriers-seen? m-p4))
+                     (m/receive-messages))
 
-        ;(is (m/all-barriers-seen? (m/receive-messages (switch-peer (last mss) :p4))))
-        )
+            _ (is (m/all-barriers-seen? m-p4))
 
-      (let [m-p1-acks (-> (last mss)
+            m-p1-acks (-> (last mss)
                           (switch-peer :p1)
                           (m/receive-acks)
                           (m/receive-acks)
                           (m/receive-acks)
-                          
+
                           )
             m-p2-acks (-> m-p1-acks 
                           (switch-peer :p2)

              (m/emit-barrier)
              (m/send-messages [:m3 :m4] [t1-queue-p2])
              ;; don't emit next barrier so that :m5 and :m6 will be blocked
              
              )
        ms (reductions (fn [m p]
                         (-> m

            m-p2-next-acks (-> m-p2-acks
                               (m/flush-acks)
                               (m/receive-acks)
                               (m/receive-acks))]
        (is (m/all-acks-seen? m-p1-acks))
        (is (m/all-acks-seen? m-p2-acks))
        (is (m/all-acks-seen? m-p2-next-acks))))))
