Clean up manual timeouts in feature tests