Fix issues exposed by different scheduling on OmniOS.

Notice the "-wait" necessary before reconfiguring server s1, this
mistake is probably present in other testcases too.
Add a delay for EXP to act