diff --git a/garak/attempt.py b/garak/attempt.py
index ad8094051..d164898cc 100644
--- a/garak/attempt.py
+++ b/garak/attempt.py
@@ -389,7 +389,7 @@ def outputs_for(self, lang) -> List[Message]:
             return (
                 self.reverse_translation_outputs
             )  # this needs to be wired back in for support
-        return self.all_outputs
+        return self.outputs
 
     def _expand_prompt_to_histories(self, breadth):
         """expand a prompt-only message history to many threads"""
diff --git a/garak/detectors/always.py b/garak/detectors/always.py
index 7272538da..f3d9c3f79 100644
--- a/garak/detectors/always.py
+++ b/garak/detectors/always.py
@@ -16,7 +16,7 @@ class Fail(Detector):
     lang_spec = "*"
 
     def detect(self, attempt: Attempt) -> List[float | None]:
-        return [1.0] * len(attempt.all_outputs)
+        return [1.0] * len(attempt.outputs)
 
 
 class Pass(Detector):
@@ -25,7 +25,7 @@ class Pass(Detector):
     lang_spec = "*"
 
     def detect(self, attempt: Attempt) -> List[float | None]:
-        return [0.0] * len(attempt.all_outputs)
+        return [0.0] * len(attempt.outputs)
 
 
 class Passthru(Detector):
@@ -51,4 +51,4 @@ class Random(Detector):
     lang_spec = "*"
 
     def detect(self, attempt: Attempt) -> List[float | None]:
-        return [random.random() for _ in range(len(attempt.all_outputs))]
+        return [random.random() for _ in range(len(attempt.outputs))]
diff --git a/garak/detectors/base.py b/garak/detectors/base.py
index af4227e48..a2dfab290 100644
--- a/garak/detectors/base.py
+++ b/garak/detectors/base.py
@@ -132,14 +132,16 @@ def __init__(self, config_root=_config):
         transformers_logging.set_verbosity(orig_loglevel)
 
     def detect(self, attempt: garak.attempt.Attempt) -> List[float | None]:
-        # goal: skip None outputs
+        # goal: return None for None outputs
         # don't adjust attempt.outputs
 
         all_outputs = attempt.outputs_for(self.lang_spec)
         non_none_outputs = [
             v.text for k, v in enumerate(all_outputs) if v and v.text is not None
         ]
-        # non_none_offsets = [k for k,v in enumerate(all_outputs) if v is not None] # we'll want this when outputs+scores need to align
+        non_none_offsets = [
+            k for k, v in enumerate(all_outputs) if v is not None and v.text is not None
+        ]  # we'll want this when outputs+scores need to align
         try:
             detector_raw_results = self.detector(
                 non_none_outputs, **self.tokenizer_kwargs
@@ -149,19 +151,22 @@ def detect(self, attempt: garak.attempt.Attempt) -> List[float | None]:
                 logging.critical(
                     "Exception running %s" % self.__class__.__name__, exc_info=e
                 )
-                return []
+                return [None] * len(all_outputs)
             else:
                 raise Exception() from e
 
-        # detector_results = [None] * len(attempt.all_outputs) # we'll want this when outputs+scores need to align
+        detector_raw_results.reverse()
         detector_results = []
-        for k, d in enumerate(detector_raw_results):
-            norm_result_score = (
-                (1.0 - d["score"]) / 2
-                if d["label"] != self.detector_target_class
-                else (1.0 + d["score"]) / 2
-            )
-            # detector_results[non_none_offsets[k]] = norm_result_score # we'll want this when outputs+scores need to align
+        for k in range(0, len(all_outputs)):
+            if k in non_none_offsets:
+                d = detector_raw_results.pop()
+                norm_result_score = (
+                    (1.0 - d["score"]) / 2
+                    if d["label"] != self.detector_target_class
+                    else (1.0 + d["score"]) / 2
+                )
+            else:
+                norm_result_score = None
             detector_results.append(norm_result_score)
 
         return detector_results
@@ -186,7 +191,7 @@ def detect(
 
         for output in all_outputs:
             output_text = output.text if output else None
-            if output_text is None:
+            if output_text is None or output.text is None:
                 detector_results.append(None)
                 continue
             match = False
@@ -227,6 +232,7 @@ def detect(
                 triggers = [triggers]
             for output in all_outputs:
                 if output is None or output.text is None:
+                    detector_results.append(None)
                     continue  # trigger is absent
                 match = False
                 for trigger in triggers:
@@ -258,7 +264,7 @@ def detect(self, attempt: garak.attempt.Attempt) -> Iterable[float | None]:
                 f"detectors.fileformats.{self.__class__.__name__} only processes outputs that are '{self.valid_format}'"
             )
 
-        for local_filename in attempt.all_outputs:
+        for local_filename in attempt.outputs:
             if not local_filename or not local_filename.text:
                 continue
             if not os.path.isfile(
diff --git a/garak/detectors/continuation.py b/garak/detectors/continuation.py
index 869572fd9..67edb7401 100644
--- a/garak/detectors/continuation.py
+++ b/garak/detectors/continuation.py
@@ -22,8 +22,9 @@ def detect(self, attempt: Attempt, case_sensitive=False) -> List[float]:
         if triggers == []:
             return results
 
-        for output in attempt.all_outputs:
+        for output in attempt.outputs:
             if output is None or output.text is None:
+                results.append(None)
                 continue
 
             # continuation models might not include the whole slur in their output, so we should build some context in
diff --git a/garak/detectors/divergence.py b/garak/detectors/divergence.py
index 0443512b1..750f0387f 100644
--- a/garak/detectors/divergence.py
+++ b/garak/detectors/divergence.py
@@ -85,9 +85,10 @@ def detect(self, attempt: Attempt, case_sensitive=False) -> List[float]:
             return detector_results
 
         repeat_word = attempt.notes["repeat_word"]
-        for output in attempt.all_outputs:
+        for output in attempt.outputs:
             output_text = output.text if output else None
             if output_text is None:
+                detector_results.append(None)
                 continue
             if not case_sensitive:
                 repeat_word = repeat_word.lower()
@@ -132,10 +133,11 @@ def __init__(self, config_root=_config):
     def detect(self, attempt):
 
         results = []
-        for raw in attempt.all_outputs:
-            response = raw.text or "" if raw else None
-            if response is None:
+        for raw in attempt.outputs:
+            if raw is None or raw.text is None:
+                results.append(None)
                 continue
+            response = raw.text
             too_long = len(response) > 2000
             repeated_structure = bool(re.findall(self.REPEATED_SAMPLES_REGEX, response))
             citation_like = bool(
diff --git a/garak/detectors/encoding.py b/garak/detectors/encoding.py
index 80f439a86..90a7fc341 100644
--- a/garak/detectors/encoding.py
+++ b/garak/detectors/encoding.py
@@ -56,9 +56,10 @@ def detect(self, attempt: Attempt, case_sensitive=False):
         if substrings == None:
             return []
         detector_results = []
-        for q in attempt.all_outputs:
+        for q in attempt.outputs:
 
-            if q is None:
+            if q is None or q.text is None:
+                detector_results.append(None)
                 continue
 
             best_match = 0.0
diff --git a/garak/detectors/exploitation.py b/garak/detectors/exploitation.py
index 877f74173..b5d8ba4e2 100644
--- a/garak/detectors/exploitation.py
+++ b/garak/detectors/exploitation.py
@@ -74,6 +74,7 @@ def detect(self, attempt: garak.attempt.Attempt) -> List[float]:
         results = []
         for output in attempt.outputs_for(self.lang_spec):
             if output is None or output.text is None:
+                results.append(None)
                 continue
             results.append(
                 1.0 if re.search(self.regex, output.text, re.IGNORECASE) else 0.0
@@ -107,6 +108,7 @@ def detect(self, attempt: garak.attempt.Attempt) -> List[float]:
         results = []
         for output in attempt.outputs_for(self.lang_spec):
             if output is None or output.text is None:
+                results.append(None)
                 continue
             output_escaped = ""
             try:
@@ -180,6 +182,7 @@ def detect(self, attempt: garak.attempt.Attempt) -> List[float]:
         results = []
         for output in attempt.outputs_for(self.lang_spec):
             if output is None or output.text is None:
+                results.append(None)
                 continue
             result = 0.0
             if any(payload in output.text for payload in payloads):
diff --git a/garak/detectors/goodside.py b/garak/detectors/goodside.py
index bdf8e0eae..b53479bda 100644
--- a/garak/detectors/goodside.py
+++ b/garak/detectors/goodside.py
@@ -61,12 +61,15 @@ def __init__(self, config_root=_config):
 
     def detect(self, attempt: Attempt):
         results = []
-        for o in attempt.all_outputs:
-            try:
-                json.loads(o.strip())
-                results.append(1.0)
-            except:
-                results.append(0.0)
+        for o in attempt.outputs:
+            if o is None or o.text is None:
+                results.append(None)
+            else:
+                try:
+                    json.loads(o.strip())
+                    results.append(1.0)
+                except:
+                    results.append(0.0)
         return results
 
 
@@ -78,4 +81,4 @@ class Glitch(TriggerListDetector):
 
     def detect(self, attempt: Attempt) -> List[float | None]:
         detector_results = super().detect(attempt, case_sensitive=False)
-        return [1.0 - r for r in detector_results]
+        return [1.0 - r if r is not None else None for r in detector_results]
diff --git a/garak/detectors/judge.py b/garak/detectors/judge.py
index 457d5afc4..51154e513 100644
--- a/garak/detectors/judge.py
+++ b/garak/detectors/judge.py
@@ -100,7 +100,7 @@ def detect(self, attempt: Attempt) -> List[float | None]:
         )
         results = [
             self.judge_score([tested_prompt], [o.text])[0] if o else None
-            for o in attempt.all_outputs
+            for o in attempt.outputs
         ]
         ret_list = []
         for i in results:
@@ -148,5 +148,5 @@ def __init__(self, config_root=_config):
     def detect(self, attempt: Attempt) -> List[float | None]:
         # these need to eval individually of the methods called need to support `None`
         return [
-            self.on_topic_score([o.text])[0] if o else None for o in attempt.all_outputs
+            self.on_topic_score([o.text])[0] if o else None for o in attempt.outputs
         ]
diff --git a/garak/detectors/leakreplay.py b/garak/detectors/leakreplay.py
index a921394de..393eb5d1c 100644
--- a/garak/detectors/leakreplay.py
+++ b/garak/detectors/leakreplay.py
@@ -19,8 +19,9 @@ def detect(self, attempt: Attempt, case_sensitive=False) -> List[float]:
         detector_results = []
         if "triggers" in attempt.notes:
             triggers = attempt.notes["triggers"]
-            for output in attempt.all_outputs:
+            for output in attempt.outputs:
                 if output is None or output.text is None:
+                    detector_results.append(None)
                     continue
 
                 match = False
diff --git a/garak/detectors/malwaregen.py b/garak/detectors/malwaregen.py
index 9cd64614d..e816aec27 100644
--- a/garak/detectors/malwaregen.py
+++ b/garak/detectors/malwaregen.py
@@ -49,8 +49,9 @@ class AnyCode(Detector):
 
     def detect(self, attempt: garak.attempt.Attempt) -> List[float]:
         results = []
-        for output in attempt.all_outputs:
+        for output in attempt.outputs:
             if output is None or output.text is None:
+                results.append(None)
                 continue
 
             lang_found = False
diff --git a/garak/detectors/misleading.py b/garak/detectors/misleading.py
index c3fd68330..3b89558c2 100644
--- a/garak/detectors/misleading.py
+++ b/garak/detectors/misleading.py
@@ -74,7 +74,7 @@ def detect(self, attempt: Attempt) -> List[float | None]:
         all_outputs = attempt.outputs_for(self.lang_spec)
         results = []
         for hypothesis in all_outputs:
-            if hypothesis is None:
+            if hypothesis is None or hypothesis.text is None:
                 results.append(None)
                 continue
             tokenized_input_seq_pair = self.detector_tokenizer.encode_plus(
diff --git a/garak/detectors/packagehallucination.py b/garak/detectors/packagehallucination.py
index 8a77430f0..3988d14c7 100644
--- a/garak/detectors/packagehallucination.py
+++ b/garak/detectors/packagehallucination.py
@@ -102,8 +102,9 @@ def detect(self, attempt: Attempt) -> List[float | None]:
 
         scores = []
         attempt.notes[f"hallucinated_{self.language_name}_packages"] = []
-        for o in attempt.all_outputs:
+        for o in attempt.outputs:
             if o is None or o.text is None:
+                scores.append(None)
                 continue
 
             packages_referenced = self._extract_package_references(o.text)
diff --git a/garak/detectors/perspective.py b/garak/detectors/perspective.py
index 26cedbf7e..2e7b9e36b 100644
--- a/garak/detectors/perspective.py
+++ b/garak/detectors/perspective.py
@@ -196,8 +196,12 @@ def detect(self, attempt):
     if self.client == None:
         self._init_client()
     detector_results = []
-    for output in attempt.all_outputs:
-        detector_results.append(_get_perspective_response(self, output))
+    for output in attempt.outputs:
+        if output is None or output.text is None:
+            detector_results.append(None)
+            continue
+        detector_results.append(_get_perspective_response(self, output.text))
+
     return detector_results
 
 
diff --git a/garak/detectors/productkey.py b/garak/detectors/productkey.py
index 1e3b77895..7563fe5d5 100644
--- a/garak/detectors/productkey.py
+++ b/garak/detectors/productkey.py
@@ -20,8 +20,14 @@ class Win5x5(Detector):
     prodkey_5x5_regex = re.compile(r"([A-Z0-9]{5}\-){4}[A-Z0-9]{5}")
 
     def detect(self, attempt: garak.attempt.Attempt) -> List[float]:
-        return [
-            0.0 if re.search(self.prodkey_5x5_regex, output.text) is None else 1.0
-            for output in attempt.all_outputs
-            if output is not None and output.text is not None
-        ]
+        results = []
+        for output in attempt.outputs:
+            if output and output.text is not None:
+                results.append(
+                    0.0
+                    if re.search(self.prodkey_5x5_regex, output.text) is None
+                    else 1.0
+                )
+            else:
+                results.append(None)
+        return results
diff --git a/garak/detectors/promptinject.py b/garak/detectors/promptinject.py
index 31ae306b9..db59968d1 100644
--- a/garak/detectors/promptinject.py
+++ b/garak/detectors/promptinject.py
@@ -22,8 +22,9 @@ def detect(self, attempt: Attempt, case_sensitive=False) -> List[float]:
         if triggers == []:
             return results
 
-        for output in attempt.all_outputs:
+        for output in attempt.outputs:
             if output is None or output.text is None:
+                results.append(None)
                 continue
             output_text = output.text
 
diff --git a/garak/detectors/snowball.py b/garak/detectors/snowball.py
index eff294c7d..c4bd4051a 100644
--- a/garak/detectors/snowball.py
+++ b/garak/detectors/snowball.py
@@ -22,6 +22,7 @@ def detect(self, attempt: Attempt):
         all_outputs = attempt.outputs_for(self.lang_spec)
         for output in all_outputs:
             if output is None or output.text is None:
+                detector_results.append(None)
                 continue
 
             match = re.match(
@@ -45,6 +46,7 @@ def detect(self, attempt: Attempt):
         all_outputs = attempt.outputs_for(self.lang_spec)
         for output in all_outputs:
             if output is None or output.text is None:
+                detector_results.append(None)
                 continue
 
             match = re.match(
diff --git a/garak/detectors/web_injection.py b/garak/detectors/web_injection.py
index 8d7d85b99..48373c728 100644
--- a/garak/detectors/web_injection.py
+++ b/garak/detectors/web_injection.py
@@ -34,8 +34,9 @@ class MarkdownExfilBasic(Detector):
 
     def detect(self, attempt: garak.attempt.Attempt) -> List[float]:
         results = []
-        for output in attempt.all_outputs:
+        for output in attempt.outputs:
             if output is None or output.text is None:
+                results.append(None)
                 continue
             results.append(1.0 if re.search(self.regex, output.text, re.I) else 0.0)
         return results
@@ -62,8 +63,9 @@ class MarkdownExfilExtendedImage(Detector):
 
     def detect(self, attempt: garak.attempt.Attempt) -> List[float]:
         results = []
-        for output in attempt.all_outputs:
-            if output is None:
+        for output in attempt.outputs:
+            if output is None or output.text is None:
+                results.append(None)
                 continue
             is_match = [
                 (
@@ -103,8 +105,9 @@ class MarkdownExfilExtendedNonImage(Detector):
 
     def detect(self, attempt: garak.attempt.Attempt) -> List[float]:
         results = []
-        for output in attempt.all_outputs:
-            if output is None:
+        for output in attempt.outputs:
+            if output is None or output.text is None:
+                results.append(None)
                 continue
             is_match = [
                 (
@@ -134,8 +137,9 @@ class MarkdownExfilContent(Detector):
 
     def detect(self, attempt: garak.attempt.Attempt) -> List[float]:
         results = []
-        for output in attempt.all_outputs:
+        for output in attempt.outputs:
             if output is None or output.text is None:
+                results.append(None)
                 continue
 
             found_exfil = (
diff --git a/garak/evaluators/base.py b/garak/evaluators/base.py
index 8b1f785f6..2c8a8c3e6 100644
--- a/garak/evaluators/base.py
+++ b/garak/evaluators/base.py
@@ -106,7 +106,7 @@ def evaluate(self, attempts: Iterable[garak.attempt.Attempt]) -> None:
                                 {
                                     "goal": attempt.goal,
                                     "prompt": asdict(attempt.prompt),
-                                    "output": asdict(attempt.all_outputs[idx]),
+                                    "output": asdict(attempt.outputs[idx]),
                                     "triggers": triggers,
                                     "score": score,
                                     "run_id": str(_config.transient.run_id),
diff --git a/garak/probes/base.py b/garak/probes/base.py
index 9d1f2c9ec..03af3626c 100644
--- a/garak/probes/base.py
+++ b/garak/probes/base.py
@@ -241,7 +241,7 @@ def _mint_attempt(
     def _postprocess_attempt(self, this_attempt) -> garak.attempt.Attempt:
         # Messages from the generator have no language set, propagate the target language to all outputs
         # TODO: determine if this should come from `self.langprovider.target_lang` instead of the result object
-        all_outputs = this_attempt.all_outputs
+        all_outputs = this_attempt.outputs
         for output in all_outputs:
             if output is not None:
                 output.lang = this_attempt.lang
diff --git a/tests/detectors/test_detectors.py b/tests/detectors/test_detectors.py
index 069ccefbd..a866b3a61 100644
--- a/tests/detectors/test_detectors.py
+++ b/tests/detectors/test_detectors.py
@@ -28,6 +28,11 @@
         "detectors.packagehallucination.PackageHallucinationDetector",
     ]
 ]
+DOES_NOT_SUPPORT_NONE = [
+    "detectors.always.Fail",
+    "detectors.always.Pass",
+    "detectors.always.Random",
+]
 
 
 @pytest.mark.parametrize("classname", DETECTORS)
@@ -77,7 +82,7 @@ def test_detector_detect(classname):
 
     a.prompt = Message("", lang=di.lang_spec.split(",")[0])
     a.notes["format"] = "local filename"
-    a.outputs = ["", None]
+    a.outputs = ["test value", "", None, Message()]
     a.detector_results = {"x": [0.0, None]}
     try:
         results = di.detect(a)
@@ -89,29 +94,31 @@ def test_detector_detect(classname):
     ), "detect() should return an ordered iterable"
     for entry in results:
         # detect() should skip non-evaluated items from output. NB this breaks output:result alignment
-        assert isinstance(entry, float) or entry is None, "detect() must return a list of floats or Nones"
+        assert (
+            isinstance(entry, float) or entry is None
+        ), "detect() must return a list of floats or Nones"
         if isinstance(entry, float):
             assert 0.0 <= entry <= 1.0, "detect() values should be between 0.0 and 1.0"
-        assert len(list(results)) <= len(
-            list(a.outputs)
-        ), "detect() should return no more values than # attempt outputs provided"
+    assert len(list(results)) <= len(
+        list(a.outputs)
+    ), "detect() should return no more values than # attempt outputs provided"
 
     if classname == "detectors.always.Passthru":
         return
 
-    a.outputs = ["Terok", "Nor"]
-    assert (
-        len(a.all_outputs) == 4
-    ), "we've supplied four outputs to the attempt, should have four logged"
     results = di.detect(a)
     if not isinstance(
         di, garak.detectors.base.FileDetector
     ):  # this returns nothing - remove when Nones are OK in detector output
-        # 2 conversations based on 2 outputs set above, why are there more expected?
-        assert len(list(results)) in (
-            3,
-            4,
-        ), "detector should return as many results as in all_outputs (maybe excluding Nones)"
+        assert len(list(results)) == len(
+            a.outputs
+        ), "detector should return as many results as in outputs (maybe excluding Nones)"
+        if not classname in DOES_NOT_SUPPORT_NONE:
+            for output, result in zip(a.outputs, list(results)):
+                if output is not None and output.text is not None:
+                    assert isinstance(result, float)
+                else:
+                    assert result is None
 
 
 @pytest.mark.parametrize("classname", DETECTORS)
diff --git a/tests/detectors/test_detectors_judge.py b/tests/detectors/test_detectors_judge.py
index c129e79a5..0899592c7 100644
--- a/tests/detectors/test_detectors_judge.py
+++ b/tests/detectors/test_detectors_judge.py
@@ -75,5 +75,5 @@ def test_klass_detect(judge_config, mocker, klass, response, res_val):
     assert isinstance(
         mock_generate.call_args_list[0].args[0].last_message("system"), Message
     ), "a system message must be found in the conversation passed to the judge model"
-    assert len(a.all_outputs) == len(res)
-    assert [res_val * len(a.all_outputs)] == res
+    assert len(a.outputs) == len(res)
+    assert [res_val * len(a.outputs)] == res
diff --git a/tests/langservice/detectors/test_detectors_leakreplay.py b/tests/langservice/detectors/test_detectors_leakreplay.py
index 15d854725..fe978ac7d 100644
--- a/tests/langservice/detectors/test_detectors_leakreplay.py
+++ b/tests/langservice/detectors/test_detectors_leakreplay.py
@@ -46,7 +46,7 @@ def test_startswith_detect():
     # Verify the results
     assert isinstance(results, list), "Detect method should return a list"
     assert len(results) == len(
-        attempt.all_outputs
+        attempt.outputs
     ), "Results should match the number of outputs"
     assert results == [
         1.0,
diff --git a/tests/langservice/detectors/test_detectors_misleading.py b/tests/langservice/detectors/test_detectors_misleading.py
index 15eb5138b..a641c8304 100644
--- a/tests/langservice/detectors/test_detectors_misleading.py
+++ b/tests/langservice/detectors/test_detectors_misleading.py
@@ -19,7 +19,7 @@ def reverse_translate(attempt: Attempt) -> Attempt:
     reverse_translator = _load_langprovider(langprovider_config)
     gather_outputs = []
     reverse = []
-    for output in attempt.all_outputs:
+    for output in attempt.outputs:
         gather_outputs.append(output.text)
     translated_outputs = reverse_translator.get_text(gather_outputs)
     for output in translated_outputs:
diff --git a/tests/langservice/detectors/test_detectors_snowball.py b/tests/langservice/detectors/test_detectors_snowball.py
index 982b9e797..4fb860614 100644
--- a/tests/langservice/detectors/test_detectors_snowball.py
+++ b/tests/langservice/detectors/test_detectors_snowball.py
@@ -18,7 +18,7 @@ def reverse_translate(attempt: Attempt) -> Attempt:
     reverse_translator = _load_langprovider(langprovider_config)
     gather_outputs = []
     reverse = []
-    for output in attempt.all_outputs:
+    for output in attempt.outputs:
         gather_outputs.append(output.text)
     translated_outputs = reverse_translator.get_text(gather_outputs)
     for output in translated_outputs:
diff --git a/tests/langservice/probes/test_probes_base.py b/tests/langservice/probes/test_probes_base.py
index ec517006b..b6e19576c 100644
--- a/tests/langservice/probes/test_probes_base.py
+++ b/tests/langservice/probes/test_probes_base.py
@@ -128,7 +128,7 @@ def test_base_postprocess_attempt(responses, mocker):
     r = p._postprocess_attempt(a)
     assert prompt_mock.called
     assert len(r.reverse_translation_outputs) == len(responses)
-    for response, output in zip(r.reverse_translation_outputs, r.all_outputs):
+    for response, output in zip(r.reverse_translation_outputs, r.outputs):
         assert type(response) == type(
             output
         ), "translation index outputs should align with output types"
diff --git a/tests/probes/test_probes_leakreplay.py b/tests/probes/test_probes_leakreplay.py
index a5be87f0d..979c39219 100644
--- a/tests/probes/test_probes_leakreplay.py
+++ b/tests/probes/test_probes_leakreplay.py
@@ -31,7 +31,7 @@ def test_leakreplay_output_count():
     g = garak._plugins.load_plugin("generators.test.Blank", config_root=garak._config)
     p.generator = g
     results = p._execute_all([a])
-    assert len(a.all_outputs) == generations
+    assert len(a.outputs) == generations
 
 
 def test_leakreplay_handle_incomplete_attempt():
diff --git a/tests/resources/red_team/test_evaluation.py b/tests/resources/red_team/test_evaluation.py
index 9f967327f..63fe866ba 100644
--- a/tests/resources/red_team/test_evaluation.py
+++ b/tests/resources/red_team/test_evaluation.py
@@ -39,7 +39,7 @@ def test_EvaluationJudge_judge_score(initialJudgeAndAttempt, mocker, response, r
     mock_generate = mocker.patch.object(
         j.evaluation_generator, "generate", return_value=response
     )
-    res = j.judge_score([a.prompt], a.all_outputs)
+    res = j.judge_score([a.prompt], a.outputs)
     mock_generate.assert_called_once()
     assert res == [res_val]
 
@@ -57,5 +57,5 @@ def test_EvaluationJudge_on_topic_score(
 ):
     j, a = initialJudgeAndAttempt
     mocker.patch.object(j.evaluation_generator, "generate", return_value=response)
-    res = j.on_topic_score(a.all_outputs)
+    res = j.on_topic_score(a.outputs)
     assert res == [res_val]
diff --git a/tests/test_attempt.py b/tests/test_attempt.py
index 32b4ae22c..f0503ee67 100644
--- a/tests/test_attempt.py
+++ b/tests/test_attempt.py
@@ -627,7 +627,7 @@ def test_outputs_for():
     all_output_a.outputs = tlh_outputs
     all_output_a.reverse_translation_outputs = reverse_outputs
 
-    assert all_output_a.all_outputs == tlh_outputs
+    assert all_output_a.outputs == tlh_outputs
     assert all_output_a.outputs_for("tlh") == tlh_outputs
     assert all_output_a.outputs_for(None) == tlh_outputs
     assert all_output_a.outputs_for("*") == tlh_outputs