A little cleaning of the timeout test