Add timeout to reduce chance of issue in nightly related to bug