Test timeout fix