Add better timeout test