Increase timeout to 2 min, use an ensure.