Strengthen the timeout tests