Adds some more conditions, trying to fight races in TestPullUpdates