Tidy up.
Sorted out more timing issues in integration specs.