improving timeout tests