Improve timeout tests