Change timeout on poll_for_merge_lock() to avoid unwanted QuickCheck+PULSE timeouts
PULSE test cleanup, attempt better coverage of important cases & shrinking