Increase timeout to 31s