Better waiting in test to support new CI server / ncrunch.