Fix tests (typo, ENV vars, retryable logic)