Added extra wait to prevent intermittent test timeout