wait_until_ready should wait for green

This is because rerunning the tests will crash ES after a while - also
use the default timeout of 30.
Reorder the tests

Suspect the time boosting is not being applied