Fix tests so they wait for start event