Expand timeout tests