Increased the amount of time that the tests sleep while they wait for states to change. This should make them more tolerant of server load by allowing more time for things to settle down.
Test now tries to reset the servers when successful. Still seems to rarely fail.