Updated: increased timeout to prevent false-positive in tests