                       command-delay-ms 10000
                       scf-store/update-facts!
                       (fn [fact-data]
-                        (.put hand-off-queue "got the lock")
-                        (.poll hand-off-queue 5 TimeUnit/SECONDS)
+                        (.countDown latch)
                         (storage-replace-facts! fact-data))]
           (let [first-message? (atom false)
                 second-message? (atom false)
                 fut (future
                       (handle-message (store-command' q command))
                       (reset! first-message? true))
-
-                _ (.poll hand-off-queue 5 TimeUnit/SECONDS)
 
                 new-facts (update-in facts [:values]
                                      (fn [values]


            (handle-message (store-command' q new-facts-cmd))
            (reset! second-message? true)
            (let [failed-cmdref (take-with-timeout!! command-chan default-timeout-ms)]
              (is (= 1 (count (:attempts failed-cmdref))))
              (is (re-matches

            (handle-message (store-command' q new-catalog-cmd))
            (reset! second-message? true)
            (is (empty? (fs/list-dir (:path dlo))))

            @fut

            (let [failed-cmdref (take-with-timeout!! command-chan default-timeout-ms)]
              (is (= 1 (count (:attempts failed-cmdref))))
