This test needs to wait for s2 also, otherwise the "expect" there may
never be reached.

Split out the param settings, so we can see the previous values.