Use new timeout stuff in this old test