Make sure initial states don't send update request to target
Refactor setup for two pairs