Reduce runtime of long-running S2S unit tests (and fix OF-2942 as a byproduct)

Reduce runtime of long-running S2S unit tests (and fix OF-2942 as a byproduct) #3500