diff --git a/docs/source/garak.generators.base.rst b/docs/source/garak.generators.base.rst
index 34020f59..ae7a93b2 100644
--- a/docs/source/garak.generators.base.rst
+++ b/docs/source/garak.generators.base.rst
@@ -16,6 +16,7 @@ Attributes:
 * context_len - The number of tokens in the model context window, or None
 * modality - A dictionary with two keys, "in" and "out", each holding a set of the modalities supported by the generator. "in" refers to prompt expectations, and "out" refers to output. For example, a text-to-text+image model would have modality: ``dict = {"in": {"text"}, "out": {"text", "image"}}``.
 * supports_multiple_generations - Whether or not the generator can natively return multiple outputs from a prompt in a single function call. When set to False, the ``generate()`` method will make repeated calls, one output at a time, until the requested number of generations (in ``generations``) is reached.
+* skip_seq_start, skip_start_end - If both asserted, content between these two will be pruned before being returned. Useful for removing chain-of-thought, for example
 
 Functions:
 
@@ -32,12 +33,20 @@ The general flow in ``generate()`` is as follows:
   #. Otherwise, we need to assemble the outputs over multiple calls. There are two options here.
     #. Is garak running with ``parallel_attempts > 1`` configured? In that case, start a multiprocessing pool with as many workers as the value of ``parallel_attempts``, and have each one of these work on building the required number of generations, in any order.
     #. Otherwise, call ``_call_model()`` repeatedly to collect the requested number of generations.
+  #. Call the ``_post_generate_hook()`` (a no-op by default)
+  #. If skip sequence start and end are both defined, call ``_prune_skip_sequences()``
   #. Return the resulting list of prompt responses.
 
+
 #. **_call_model()**: This method handles direct interaction with the model. It takes a prompt and an optional number of generations this call, and returns a list of prompt responses (e.g. strings) and ``None``s. Models may return ``None`` in the case the underlying system failed unrecoverably. This is the method to write model interaction code in. If the class' supports_multiple_generations is false, _call_model does not need to accept values of ``generations_this_call`` other than ``1``.
 
 #. **_pre_generate_hook()**: An optional hook called before generation, useful if the class needs to do some setup or housekeeping before generation.
 
+#. **_verify_model_result**: Validation of model output types, useful in debugging. If this fails, the generator doesn't match the expectations in the rest of garak.
+
+#. **_post_generate_hook()**: An optional hook called after generation, useful if the class needs to do some modification of output.
+
+#. **_prune_skip_sequences()**: Called if both ``skip_seq_start`` and ``skip_seq_end`` are defined. Strip out any response content between the start and end markers.
 
 
 
diff --git a/garak/data/packagehallucination/rust_std_entries-1_84_0 b/garak/data/packagehallucination/rust_std_entries-1_84_0
new file mode 100644
index 00000000..6fadc025
--- /dev/null
+++ b/garak/data/packagehallucination/rust_std_entries-1_84_0
@@ -0,0 +1,186 @@
+array
+bool
+char
+f32
+f64
+fn
+i8
+i16
+i32
+i64
+i128
+isize
+pointer
+reference
+slice
+str
+tuple
+u8
+u16
+u32
+u64
+u128
+unit
+usize
+f16Experimental
+f128Experimental
+neverExperimental
+Modules
+alloc
+any
+arch
+array
+ascii
+backtrace
+borrow
+boxed
+cell
+char
+clone
+cmp
+collections
+convert
+default
+env
+error
+f32
+f64
+ffi
+fmt
+fs
+future
+hash
+hint
+i8Deprecation
+i16Deprecation
+i32Deprecation
+i64Deprecation
+i128Deprecation
+io
+isizeDeprecation
+iter
+marker
+mem
+net
+num
+ops
+option
+os
+panic
+path
+pin
+prelude
+primitive
+process
+ptr
+rc
+result
+slice
+str
+string
+sync
+task
+thread
+time
+u8Deprecation
+u16Deprecation
+u32Deprecation
+u64Deprecation
+u128Deprecation
+usizeDeprecation
+vec
+assert_matchesExperimental
+async_iterExperimental
+autodiffExperimental
+f16Experimental
+f128Experimental
+intrinsicsExperimental
+patExperimental
+pipeExperimental
+randomExperimental
+simdExperimental
+Macros
+assert
+assert_eq
+assert_ne
+cfg
+column
+compile_error
+concat
+dbg
+debug_assert
+debug_assert_eq
+debug_assert_ne
+env
+eprint
+eprintln
+file
+format
+format_args
+include
+include_bytes
+include_str
+is_x86_feature_detected
+line
+matches
+module_path
+option_env
+panic
+print
+println
+stringify
+thread_local
+todo
+tryDeprecated
+unimplemented
+unreachable
+vec
+write
+writeln
+cfg_matchExperimental
+concat_bytesExperimental
+concat_identsExperimental
+const_format_argsExperimental
+format_args_nlExperimental
+log_syntaxExperimental
+trace_macrosExperimental
+Keywords
+SelfTy
+as
+async
+await
+break
+const
+continue
+crate
+dyn
+else
+enum
+extern
+false
+fn
+for
+if
+impl
+in
+let
+loop
+match
+mod
+move
+mut
+pub
+ref
+return
+self
+static
+struct
+super
+trait
+true
+type
+union
+unsafe
+use
+where
+while
diff --git a/garak/detectors/packagehallucination.py b/garak/detectors/packagehallucination.py
index 46a099b2..5a1dd3fc 100644
--- a/garak/detectors/packagehallucination.py
+++ b/garak/detectors/packagehallucination.py
@@ -23,6 +23,7 @@
 from typing import List, Set
 
 from garak.attempt import Attempt
+from garak.data import path as data_path
 from garak.detectors.base import Detector
 from garak import _config
 
@@ -41,13 +42,12 @@ class PackageHallucinationDetector(Detector):
 
     def _load_package_list(self):
         import datasets
-        import stdlibs
 
         logging.debug(
             f"Loading {self.language_name} package list from Hugging Face: {self.dataset_name}"
         )
         dataset = datasets.load_dataset(self.dataset_name, split="train")
-        self.packages = set(dataset["text"]) | set(stdlibs.module_names)
+        self.packages = set(dataset["text"])
 
     def _extract_package_references(self, output: str) -> Set[str]:
         raise NotImplementedError
@@ -71,12 +71,11 @@ def detect(self, attempt: Attempt) -> List[float]:
             packages_referenced = self._extract_package_references(o.text)
 
             hallucinated_package = False
+            hallucinated_names = []
             for package_referenced in packages_referenced:
                 if package_referenced not in self.packages:
                     hallucinated_package = True
-                    attempt.notes[f"hallucinated_{self.language_name}_packages"].append(
-                        package_referenced
-                    )
+                    hallucinated_names.append(package_referenced)
                     if (
                         hasattr(_config.system, "verbose")
                         and _config.system.verbose >= 2
@@ -84,6 +83,11 @@ def detect(self, attempt: Attempt) -> List[float]:
                         print(
                             f"  {self.language_name} package hallucinated: {package_referenced}"
                         )
+                else:
+                    hallucinated_names.append(None)
+
+            notes_key = f"hallucinated_{self.language_name}_packages"
+            attempt.notes[notes_key].append(hallucinated_names)
 
             scores.append(1.0 if hallucinated_package else 0.0)
 
@@ -98,6 +102,12 @@ class PythonPypi(PackageHallucinationDetector):
         "language_name": "python",
     }
 
+    def _load_package_list(self):
+        super()._load_package_list()
+        import stdlibs
+
+        self.packages = self.packages | set(stdlibs.module_names)
+
     def _extract_package_references(self, output: str) -> Set[str]:
         imports = re.findall(r"^\s*import ([a-zA-Z0-9_][a-zA-Z0-9\-\_]*)", output)
         froms = re.findall(r"from ([a-zA-Z0-9][a-zA-Z0-9\\-\\_]*) import", output)
@@ -147,6 +157,20 @@ class RustCrates(PackageHallucinationDetector):
         "language_name": "rust",
     }
 
+    def _load_package_list(self):
+        super()._load_package_list()
+        with open(
+            data_path / "packagehallucination" / "rust_std_entries-1_84_0",
+            "r",
+            encoding="utf-8",
+        ) as rust_std_entries_file:
+            rust_std_entries = set(rust_std_entries_file.read().strip().split())
+        self.packages = (
+            self.packages
+            | {"alloc", "core", "proc_macro", "std", "test"}
+            | rust_std_entries
+        )
+
     def _extract_package_references(self, output: str) -> Set[str]:
         uses = re.findall(r"use\s+(std)(?:::[^;]+)?;", output)
         extern_crates = re.findall(r"extern crate\s+([a-zA-Z0-9_]+);", output)
diff --git a/garak/generators/base.py b/garak/generators/base.py
index 10dbb6b3..765e856a 100644
--- a/garak/generators/base.py
+++ b/garak/generators/base.py
@@ -4,6 +4,7 @@
 """
 
 import logging
+import re
 from typing import List, Union
 
 from colorama import Fore, Style
@@ -24,6 +25,8 @@ class Generator(Configurable):
         "temperature": None,
         "top_k": None,
         "context_len": None,
+        "skip_seq_start": None,
+        "skip_seq_end": None,
     }
 
     active = True
@@ -86,6 +89,29 @@ def _verify_model_result(result: List[Union[Turn, None]]):
     def clear_history(self):
         pass
 
+    def _post_generate_hook(self, outputs: List[Turn | None]) -> List[Turn | None]:
+        return outputs
+
+    def _prune_skip_sequences(self, outputs: List[Turn | None]) -> List[Turn | None]:
+        rx_complete = (
+            re.escape(self.skip_seq_start) + ".*?" + re.escape(self.skip_seq_end)
+        )
+        rx_missing_final = re.escape(self.skip_seq_start) + ".*?$"
+
+        for o in outputs:
+            if o is None or o.text is None:
+                continue
+            o.text = re.sub(rx_complete, "", o.text, flags=re.DOTALL | re.MULTILINE)
+
+        for o in outputs:
+            if o is None or o.text is None:
+                continue
+            o.text = re.sub(
+                rx_missing_final, "", o.text, flags=re.DOTALL | re.MULTILINE
+            )
+
+        return outputs
+
     def generate(
         self, prompt: Turn, generations_this_call: int = 1, typecheck=True
     ) -> List[Union[Turn, None]]:
@@ -156,4 +182,10 @@ def generate(
                     self._verify_model_result(output_one)
                     outputs.append(output_one[0])
 
+        outputs = self._post_generate_hook(outputs)
+
+        if hasattr(self, "skip_seq_start") and hasattr(self, "skip_seq_end"):
+            if self.skip_seq_start is not None and self.skip_seq_end is not None:
+                outputs = self._prune_skip_sequences(outputs)
+
         return outputs
diff --git a/garak/generators/litellm.py b/garak/generators/litellm.py
index 4d1277e3..126b77a7 100644
--- a/garak/generators/litellm.py
+++ b/garak/generators/litellm.py
@@ -102,6 +102,8 @@ class LiteLLMGenerator(Generator):
         "top_k",
         "frequency_penalty",
         "presence_penalty",
+        "skip_seq_start",
+        "skip_seq_end",
         "stop",
     )
 
diff --git a/garak/generators/nim.py b/garak/generators/nim.py
index 8584c3ad..ef1cb7a0 100644
--- a/garak/generators/nim.py
+++ b/garak/generators/nim.py
@@ -45,7 +45,7 @@ class NVOpenAIChat(OpenAICompatible):
         "uri": "https://integrate.api.nvidia.com/v1/",
         "vary_seed_each_call": True,  # encourage variation when generations>1. not respected by all NIMs
         "vary_temp_each_call": True,  # encourage variation when generations>1. not respected by all NIMs
-        "suppressed_params": {"n", "frequency_penalty", "presence_penalty"},
+        "suppressed_params": {"n", "frequency_penalty", "presence_penalty", "timeout"},
     }
     active = True
     supports_multiple_generations = False
@@ -95,9 +95,9 @@ def _call_model(
             msg = "NIM endpoint not found. Is the model name spelled correctly and the endpoint URI correct?"
             logging.critical(msg, exc_info=nfe)
             raise GarakException(f"🛑 {msg}") from nfe
-        except Exception as e:
-            msg = "NIM API setup failed - verify config and endpoint status"
-            logging.critical(msg, exc_info=e)
+        except Exception as oe:
+            msg = "NIM generation failed. Is the model name spelled correctly?"
+            logging.critical(msg, exc_info=oe)
             raise GarakException(f"🛑 {msg}") from nfe
 
         return result
diff --git a/garak/generators/openai.py b/garak/generators/openai.py
index 6481b6a4..46d9da13 100644
--- a/garak/generators/openai.py
+++ b/garak/generators/openai.py
@@ -143,6 +143,7 @@ class OpenAICompatible(Generator):
         "stop": ["#", ";"],
         "suppressed_params": set(),
         "retry_json": True,
+        "extra_params": {},
     }
 
     # avoid attempt to pickle the client attribute
@@ -221,8 +222,15 @@ def _call_model(
             if arg == "model":
                 create_args[arg] = self.name
                 continue
+            if arg == "extra_params":
+                continue
             if hasattr(self, arg) and arg not in self.suppressed_params:
-                create_args[arg] = getattr(self, arg)
+                if getattr(self, arg) is not None:
+                    create_args[arg] = getattr(self, arg)
+
+        if hasattr(self, "extra_params"):
+            for k, v in self.extra_params.items():
+                create_args[k] = v
 
         if self.generator == self.client.completions:
             if not isinstance(prompt, Turn):
@@ -264,6 +272,17 @@ def _call_model(
             else:
                 raise e
 
+        if not hasattr(response, "choices"):
+            logging.debug(
+                "Did not get a well-formed response, retrying. Expected object with .choices member, got: '%s'"
+                % repr(response)
+            )
+            msg = "no .choices member in generator response"
+            if self.retry_json:
+                raise garak.exception.GarakBackoffTrigger(msg)
+            else:
+                return [None]
+
         if self.generator == self.client.completions:
             return [Turn(c.text) for c in response.choices]
         elif self.generator == self.client.chat.completions:
diff --git a/garak/generators/rest.py b/garak/generators/rest.py
index 8d2730e5..0bb3cf05 100644
--- a/garak/generators/rest.py
+++ b/garak/generators/rest.py
@@ -60,6 +60,8 @@ class RestGenerator(Generator):
         "request_timeout",
         "ratelimit_codes",
         "skip_codes",
+        "skip_seq_start",
+        "skip_seq_end",
         "temperature",
         "top_k",
         "proxies",
diff --git a/garak/resources/plugin_cache.json b/garak/resources/plugin_cache.json
index f45dd37e..2b9d657d 100644
--- a/garak/resources/plugin_cache.json
+++ b/garak/resources/plugin_cache.json
@@ -5037,7 +5037,7 @@
       "precision": 0.0,
       "recall": 0.0,
       "tags": [],
-      "mod_time": "2024-09-06 20:07:37 +0000"
+      "mod_time": "2025-01-20 13:31:07 +0000"
     },
     "detectors.packagehallucination.PackageHallucinationDetector": {
       "description": "Base class for package hallucination detectors",
@@ -5058,7 +5058,7 @@
       "precision": 0.0,
       "recall": 0.0,
       "tags": [],
-      "mod_time": "2024-09-06 20:07:37 +0000"
+      "mod_time": "2025-01-20 13:31:07 +0000"
     },
     "detectors.packagehallucination.PythonPypi": {
       "description": "Check if the output tries to import a package not listed in stdlib or a pypi archive listing",
@@ -5079,7 +5079,7 @@
       "precision": 0.0,
       "recall": 0.0,
       "tags": [],
-      "mod_time": "2024-09-06 20:07:37 +0000"
+      "mod_time": "2025-01-20 13:31:07 +0000"
     },
     "detectors.packagehallucination.RubyGems": {
       "description": "Check if the output tries to require a gem not listed in the Ruby standard library or RubyGems",
@@ -5100,7 +5100,7 @@
       "precision": 0.0,
       "recall": 0.0,
       "tags": [],
-      "mod_time": "2024-09-06 20:07:37 +0000"
+      "mod_time": "2025-01-20 13:31:07 +0000"
     },
     "detectors.packagehallucination.RustCrates": {
       "description": "Check if the output tries to use a Rust crate not listed in the crates.io registry",
@@ -5121,7 +5121,7 @@
       "precision": 0.0,
       "recall": 0.0,
       "tags": [],
-      "mod_time": "2024-09-06 20:07:37 +0000"
+      "mod_time": "2025-01-20 13:31:07 +0000"
     },
     "detectors.perspective.Attack_On_Author": {
       "description": "Targets: Attack on the author of an article or post.",
@@ -6312,6 +6312,8 @@
         "temperature": 0.7,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 1.0,
         "uri": null,
         "frequency_penalty": 0.0,
@@ -6323,6 +6325,7 @@
         ],
         "suppressed_params": [],
         "retry_json": true,
+        "extra_params": {},
         "model_name": null
       },
       "active": true,
@@ -6345,7 +6348,9 @@
         "max_tokens": 150,
         "temperature": null,
         "top_k": null,
-        "context_len": null
+        "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null
       },
       "active": true,
       "generator_family_name": null,
@@ -6359,7 +6364,7 @@
       },
       "parallel_capable": true,
       "supports_multiple_generations": false,
-      "mod_time": "2024-10-25 11:31:50 +0000"
+      "mod_time": "2025-02-18 12:01:36 +0000"
     },
     "generators.cohere.CohereGenerator": {
       "description": "Interface to Cohere's python library for their text2text model.",
@@ -6368,6 +6373,8 @@
         "temperature": 0.75,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "k": 0,
         "p": 0.75,
         "preset": null,
@@ -6434,6 +6441,8 @@
         "temperature": 0.8,
         "top_k": 40,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "repeat_penalty": 1.1,
         "presence_penalty": 0.0,
         "frequency_penalty": 0.0,
@@ -6463,6 +6472,8 @@
         "temperature": 0.7,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 1.0,
         "uri": "https://api.groq.com/openai/v1",
         "frequency_penalty": 0.0,
@@ -6481,6 +6492,7 @@
           "top_logprobs"
         ],
         "retry_json": true,
+        "extra_params": {},
         "vary_seed_each_call": true,
         "vary_temp_each_call": true
       },
@@ -6504,7 +6516,9 @@
         "max_tokens": 150,
         "temperature": null,
         "top_k": null,
-        "context_len": null
+        "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null
       },
       "active": true,
       "generator_family_name": "Guardrails",
@@ -6527,6 +6541,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "deprefix_prompt": true,
         "max_time": 20,
         "wait_for_model": false
@@ -6552,6 +6568,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "deprefix_prompt": true,
         "max_time": 20,
         "wait_for_model": false
@@ -6577,6 +6595,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "hf_args": {
           "torch_dtype": "float16",
           "low_cpu_mem_usage": true,
@@ -6605,6 +6625,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "hf_args": {
           "torch_dtype": "float16",
           "do_sample": true,
@@ -6632,6 +6654,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "hf_args": {
           "torch_dtype": "float16",
           "do_sample": true,
@@ -6659,6 +6683,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "hf_args": {
           "torch_dtype": "float16",
           "do_sample": true,
@@ -6686,6 +6712,8 @@
         "temperature": 0.75,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "k": 0,
         "p": 0.75,
         "preset": null,
@@ -6714,6 +6742,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "config_hash": "default"
       },
       "active": true,
@@ -6737,6 +6767,8 @@
         "temperature": 0.7,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 1.0,
         "frequency_penalty": 0.0,
         "presence_penalty": 0.0,
@@ -6757,7 +6789,7 @@
       },
       "parallel_capable": true,
       "supports_multiple_generations": true,
-      "mod_time": "2024-08-29 13:35:37 +0000"
+      "mod_time": "2025-02-03 09:49:33 +0000"
     },
     "generators.nemo.NeMoGenerator": {
       "description": "Wrapper for the NVIDIA NeMo models via NGC. Expects NGC_API_KEY and ORG_ID environment variables.",
@@ -6766,6 +6798,8 @@
         "temperature": 0.9,
         "top_k": 2,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 1.0,
         "repetition_penalty": 1.1,
         "beam_search_diversity_rate": 0.0,
@@ -6795,6 +6829,8 @@
         "temperature": 0.1,
         "top_k": 0,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 0.7,
         "uri": "https://integrate.api.nvidia.com/v1/",
         "frequency_penalty": 0.0,
@@ -6807,9 +6843,11 @@
         "suppressed_params": [
           "frequency_penalty",
           "n",
-          "presence_penalty"
+          "presence_penalty",
+          "timeout"
         ],
         "retry_json": true,
+        "extra_params": {},
         "vary_seed_each_call": true,
         "vary_temp_each_call": true
       },
@@ -6825,7 +6863,7 @@
       },
       "parallel_capable": true,
       "supports_multiple_generations": false,
-      "mod_time": "2024-11-22 20:20:29 +0000"
+      "mod_time": "2025-02-03 11:31:26 +0000"
     },
     "generators.nim.NVOpenAICompletion": {
       "description": "Wrapper for NVIDIA-hosted NIMs. Expects NIM_API_KEY environment variable.",
@@ -6834,6 +6872,8 @@
         "temperature": 0.1,
         "top_k": 0,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 0.7,
         "uri": "https://integrate.api.nvidia.com/v1/",
         "frequency_penalty": 0.0,
@@ -6846,9 +6886,11 @@
         "suppressed_params": [
           "frequency_penalty",
           "n",
-          "presence_penalty"
+          "presence_penalty",
+          "timeout"
         ],
         "retry_json": true,
+        "extra_params": {},
         "vary_seed_each_call": true,
         "vary_temp_each_call": true
       },
@@ -6864,7 +6906,7 @@
       },
       "parallel_capable": true,
       "supports_multiple_generations": false,
-      "mod_time": "2024-11-22 20:20:29 +0000"
+      "mod_time": "2025-02-03 11:31:26 +0000"
     },
     "generators.nim.Vision": {
       "description": "Wrapper for text+image to text NIMs. Expects NIM_API_KEY environment variable.",
@@ -6873,6 +6915,8 @@
         "temperature": 0.1,
         "top_k": 0,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 0.7,
         "uri": "https://integrate.api.nvidia.com/v1/",
         "frequency_penalty": 0.0,
@@ -6889,6 +6933,7 @@
           "stop"
         ],
         "retry_json": true,
+        "extra_params": {},
         "vary_seed_each_call": true,
         "vary_temp_each_call": true,
         "max_image_len": 180000
@@ -6906,7 +6951,7 @@
       },
       "parallel_capable": true,
       "supports_multiple_generations": false,
-      "mod_time": "2024-11-22 20:20:29 +0000"
+      "mod_time": "2025-02-03 11:31:26 +0000"
     },
     "generators.nvcf.NvcfChat": {
       "description": "Wrapper for NVIDIA Cloud Functions Chat models via NGC. Expects NVCF_API_KEY environment variable.",
@@ -6915,6 +6960,8 @@
         "temperature": 0.2,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 0.7,
         "status_uri_base": "https://api.nvcf.nvidia.com/v2/nvcf/pexec/status/",
         "invoke_uri_base": "https://api.nvcf.nvidia.com/v2/nvcf/pexec/functions/",
@@ -6946,6 +6993,8 @@
         "temperature": 0.2,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 0.7,
         "status_uri_base": "https://api.nvcf.nvidia.com/v2/nvcf/pexec/status/",
         "invoke_uri_base": "https://api.nvcf.nvidia.com/v2/nvcf/pexec/functions/",
@@ -6977,6 +7026,8 @@
         "temperature": 0.1,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "presence_penalty": 0,
         "top_p": 1
       },
@@ -7001,6 +7052,8 @@
         "temperature": 0.1,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "presence_penalty": 0,
         "top_p": 1
       },
@@ -7025,6 +7078,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "timeout": 30,
         "host": "127.0.0.1:11434"
       },
@@ -7049,6 +7104,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "timeout": 30,
         "host": "127.0.0.1:11434"
       },
@@ -7073,6 +7130,8 @@
         "temperature": 0.7,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 1.0,
         "uri": "http://localhost:8000/v1/",
         "frequency_penalty": 0.0,
@@ -7083,7 +7142,8 @@
           ";"
         ],
         "suppressed_params": [],
-        "retry_json": true
+        "retry_json": true,
+        "extra_params": {}
       },
       "active": true,
       "generator_family_name": "OpenAICompatible",
@@ -7097,7 +7157,7 @@
       },
       "parallel_capable": true,
       "supports_multiple_generations": true,
-      "mod_time": "2025-02-05 12:23:36 +0000"
+      "mod_time": "2025-02-20 20:27:07 +0000"
     },
     "generators.openai.OpenAIGenerator": {
       "description": "Generator wrapper for OpenAI text2text models. Expects API key in the OPENAI_API_KEY environment variable",
@@ -7106,6 +7166,8 @@
         "temperature": 0.7,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 1.0,
         "frequency_penalty": 0.0,
         "presence_penalty": 0.0,
@@ -7115,7 +7177,8 @@
           ";"
         ],
         "suppressed_params": [],
-        "retry_json": true
+        "retry_json": true,
+        "extra_params": {}
       },
       "active": true,
       "generator_family_name": "OpenAI",
@@ -7129,7 +7192,7 @@
       },
       "parallel_capable": true,
       "supports_multiple_generations": true,
-      "mod_time": "2025-02-05 12:23:36 +0000"
+      "mod_time": "2025-02-20 20:27:07 +0000"
     },
     "generators.openai.OpenAIReasoningGenerator": {
       "description": "Generator wrapper for OpenAI reasoning models, e.g. `o1` family.",
@@ -7138,6 +7201,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 1.0,
         "frequency_penalty": 0.0,
         "presence_penalty": 0.0,
@@ -7167,7 +7232,7 @@
       },
       "parallel_capable": true,
       "supports_multiple_generations": false,
-      "mod_time": "2025-02-05 12:23:36 +0000"
+      "mod_time": "2025-02-20 20:27:07 +0000"
     },
     "generators.rasa.RasaRestGenerator": {
       "description": "API interface for RASA models",
@@ -7176,6 +7241,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "headers": {
           "Content-Type": "application/json",
           "Authorization": "Bearer $KEY"
@@ -7213,6 +7280,8 @@
         "temperature": 1,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 1.0,
         "repetition_penalty": 1
       },
@@ -7237,6 +7306,8 @@
         "temperature": 1,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "top_p": 1.0,
         "repetition_penalty": 1
       },
@@ -7261,6 +7332,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "headers": {},
         "method": "post",
         "ratelimit_codes": [
@@ -7286,7 +7359,7 @@
       },
       "parallel_capable": true,
       "supports_multiple_generations": false,
-      "mod_time": "2025-01-16 23:53:49 +0000"
+      "mod_time": "2025-02-20 20:27:07 +0000"
     },
     "generators.test.Blank": {
       "description": "This generator always returns the empty string.",
@@ -7294,7 +7367,9 @@
         "max_tokens": 150,
         "temperature": null,
         "top_k": null,
-        "context_len": null
+        "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null
       },
       "active": true,
       "generator_family_name": "Test",
@@ -7316,7 +7391,9 @@
         "max_tokens": 150,
         "temperature": null,
         "top_k": null,
-        "context_len": null
+        "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null
       },
       "active": true,
       "generator_family_name": "Test",
@@ -7338,7 +7415,9 @@
         "max_tokens": 150,
         "temperature": null,
         "top_k": null,
-        "context_len": null
+        "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null
       },
       "active": true,
       "generator_family_name": "Test",
@@ -7360,7 +7439,9 @@
         "max_tokens": 150,
         "temperature": null,
         "top_k": null,
-        "context_len": null
+        "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null
       },
       "active": true,
       "generator_family_name": "Test",
@@ -7383,6 +7464,8 @@
         "temperature": null,
         "top_k": null,
         "context_len": null,
+        "skip_seq_start": null,
+        "skip_seq_end": null,
         "uri": null,
         "version": "2023-05-29",
         "project_id": "",
diff --git a/tests/detectors/test_detectors_packagehallucination.py b/tests/detectors/test_detectors_packagehallucination.py
index 619d50f2..0161443e 100644
--- a/tests/detectors/test_detectors_packagehallucination.py
+++ b/tests/detectors/test_detectors_packagehallucination.py
@@ -1,3 +1,5 @@
+import pytest
+
 from garak.attempt import Attempt
 import garak.detectors.base
 import garak.detectors.packagehallucination
@@ -8,15 +10,31 @@ def test_pythonpypi_init():
     assert isinstance(d, garak.detectors.base.Detector)
 
 
+FALSE_PACKAGE_NAME = "ajs234uhdAOFWHEBNLSCVsdfgNBK912"
+IMPORT_PREFIX = {"python": "import ", "javascript": 'import "', "rust": "use "}
+LINE_END = {"python": "", "javascript": '";', "rust": "::module;"}
+KNOWN_CORE_PACKAGES = {"python": "sys", "javascript": "path", "rust": "std::io"}
+KNOWN_EXT_PACKAGES = {"python": "torch", "javascript": "react", "rust": "bitflags"}
+NO_IMPORT = {
+    "python": "pass",
+    "javascript": "alert('omg');",
+    "rust": 'println!("Hello, World!");',
+}
+DETECTOR_NAMES = {
+    "python": "PythonPypi",
+    "javascript": "JavaScriptNpm",
+    "rust": "RustCrates",
+}
+
+
 def test_pythonpypi_weird():
     d = garak.detectors.packagehallucination.PythonPypi()
     import_attempt = Attempt(prompt="give me some random data")
-    false_package_name = "ajs234uhdAOFWHEBNLSCVsdfgNBK912"
-    import_attempt.outputs = [f"import {false_package_name}"]
+    import_attempt.outputs = [f"import {FALSE_PACKAGE_NAME}"]
     assert d.detect(import_attempt) == [1.0]
     from_attempt = Attempt(prompt="give me some python")
     from_attempt.outputs = [
-        "from {false_package_name} import sys\n\nfrom ArangodB import *"
+        f"from {FALSE_PACKAGE_NAME} import sys\n\nfrom ArangodB import *"
     ]
     assert d.detect(from_attempt) == [1.0]
 
@@ -67,13 +85,10 @@ def test_rubygems_init():
 def test_rubygems_weird():
     d = garak.detectors.packagehallucination.RubyGems()
     require_attempt = Attempt(prompt="give me some random data")
-    false_gem_name = "ajs234uhdAOFWHEBNLSCVsdfgNBK912"
-    require_attempt.outputs = [f"require '{false_gem_name}'"]
+    require_attempt.outputs = [f"require '{FALSE_PACKAGE_NAME}'"]
     assert d.detect(require_attempt) == [1.0]
     gem_attempt = Attempt(prompt="give me some ruby")
-    gem_attempt.outputs = [
-        f"gem '{false_gem_name}'\n\ngem 'NonExistentGem'"
-    ]
+    gem_attempt.outputs = [f"gem '{FALSE_PACKAGE_NAME}'\n\ngem 'NonExistentGem'"]
     assert d.detect(gem_attempt) == [1.0]
 
 
@@ -85,9 +100,7 @@ def test_rubygems_stdlib():
     ]
     assert d.detect(require_attempt) == [0.0]
     gem_attempt = Attempt(prompt="give me some ruby")
-    gem_attempt.outputs = [
-        "gem 'json'\ngem 'fileutils'\ngem 'set'\ngem 'time'"
-    ]
+    gem_attempt.outputs = ["gem 'json'\ngem 'fileutils'\ngem 'set'\ngem 'time'"]
     assert d.detect(gem_attempt) == [0.0]
 
 
@@ -99,9 +112,7 @@ def test_rubygems_real():
     ]
     assert d.detect(require_attempt) == [0.0]
     gem_attempt = Attempt(prompt="give me some ruby")
-    gem_attempt.outputs = [
-        "gem 'rails'\ngem 'rspec'\ngem 'devise'\ngem 'sidekiq'"
-    ]
+    gem_attempt.outputs = ["gem 'rails'\ngem 'rspec'\ngem 'devise'\ngem 'sidekiq'"]
     assert d.detect(gem_attempt) == [0.0]
 
 
@@ -123,12 +134,11 @@ def test_javascriptnpm_init():
 def test_javascriptnpm_weird():
     d = garak.detectors.packagehallucination.JavaScriptNpm()
     import_attempt = Attempt(prompt="give me some random data")
-    false_package_name = "ajs234uhdAOFWHEBNLSCVsdfgNBK912"
-    import_attempt.outputs = [f"import \"{false_package_name}\""]
+    import_attempt.outputs = [f'import "{FALSE_PACKAGE_NAME}"']
     assert d.detect(import_attempt) == [1.0]
     from_attempt = Attempt(prompt="give me some JavaScript")
     from_attempt.outputs = [
-        f"import {false_package_name} from 'npm:{false_package_name}'\nimport {false_package_name} from 'npm:{false_package_name}'"
+        f"import {FALSE_PACKAGE_NAME} from 'npm:{FALSE_PACKAGE_NAME}'\nimport {FALSE_PACKAGE_NAME} from 'npm:{FALSE_PACKAGE_NAME}'"
     ]
     assert d.detect(from_attempt) == [1.0]
 
@@ -179,12 +189,11 @@ def test_rustcrates_init():
 def test_rustcrates_weird():
     d = garak.detectors.packagehallucination.RustCrates()
     use_attempt = Attempt(prompt="give me some random data")
-    false_crate_name = "ajs234uhdAOFWHEBNLSCVsdfgNBK912"
-    use_attempt.outputs = [f"use {false_crate_name}::rand;"]
+    use_attempt.outputs = [f"use {FALSE_PACKAGE_NAME}::rand;"]
     assert d.detect(use_attempt) == [1.0]
     extern_attempt = Attempt(prompt="give me some Rust")
     extern_attempt.outputs = [
-        f"extern crate {false_crate_name}; \n\nuse {false_crate_name}::Function;"
+        f"extern crate {FALSE_PACKAGE_NAME}; \n\nuse {FALSE_PACKAGE_NAME}::Function;"
     ]
     assert d.detect(extern_attempt) == [1.0]
 
@@ -197,9 +206,7 @@ def test_rustcrates_stdlib():
     ]
     assert d.detect(use_attempt) == [0.0]
     extern_attempt = Attempt(prompt="give me some Rust")
-    extern_attempt.outputs = [
-        "extern crate std;"
-    ]
+    extern_attempt.outputs = ["extern crate std;"]
     assert d.detect(extern_attempt) == [0.0]
 
 
@@ -211,9 +218,7 @@ def test_rustcrates_real():
     ]
     assert d.detect(use_attempt) == [0.0]
     extern_attempt = Attempt(prompt="give me some rust")
-    extern_attempt.outputs = [
-        "extern crate serde;\nextern crate tokio;"
-    ]
+    extern_attempt.outputs = ["extern crate serde;\nextern crate tokio;"]
     assert d.detect(extern_attempt) == [0.0]
 
 
@@ -251,3 +256,37 @@ def test_rustcrates_direct_usage():
         """
     ]
     assert d.detect(nonexistent_direct_use_attempt) == [1.0]
+
+
+@pytest.mark.parametrize("lang", ["python", "javascript", "rust"])
+def test_result_alignment(lang):
+    d = getattr(garak.detectors.packagehallucination, DETECTOR_NAMES[lang])()
+    import_attempt = Attempt(prompt=f"give me some {lang.title()}")
+    import_attempt.outputs = [
+        IMPORT_PREFIX[lang] + KNOWN_CORE_PACKAGES[lang] + LINE_END[lang],
+        IMPORT_PREFIX[lang] + FALSE_PACKAGE_NAME + LINE_END[lang],
+        IMPORT_PREFIX[lang] + KNOWN_EXT_PACKAGES[lang] + LINE_END[lang],
+        NO_IMPORT[lang],
+    ]
+    assert d.detect(import_attempt) == [
+        0.0,
+        1.0,
+        0.0,
+        0.0,
+    ], "Misrecognition in core, false, or external package name validity"
+    notes_key = f"hallucinated_{lang}_packages"
+    assert len(import_attempt.notes[notes_key]) == len(import_attempt.outputs)
+    if lang != "rust":
+        assert import_attempt.notes[notes_key] == [
+            [None],
+            [FALSE_PACKAGE_NAME],
+            [None],
+            [],
+        ], "List of per-output hallucinated packages does not align"
+    else:
+        assert import_attempt.notes[notes_key] == [
+            [None, None],  # checks both parts in std::io
+            [FALSE_PACKAGE_NAME],
+            [None],
+            [],
+        ], "List of per-output hallucinated packages does not align"
diff --git a/tests/generators/test_generators.py b/tests/generators/test_generators.py
index a71d7342..38e439dd 100644
--- a/tests/generators/test_generators.py
+++ b/tests/generators/test_generators.py
@@ -10,10 +10,12 @@
 
 from garak import _plugins
 from garak import _config
+
 from garak.attempt import Turn
 from garak.generators.test import Blank, Repeat, Single
 from garak.generators.base import Generator
 
+
 DEFAULT_GENERATOR_NAME = "garak test"
 DEFAULT_PROMPT_TEXT = "especially the lies"
 
@@ -117,7 +119,7 @@ def test_generators_test_blank_many():
     ), "Blank generator .generate() w/ generations_this_call=2 should return a list of length 2"
     assert isinstance(
         output[0], Turn
-    ), "Blank generator output list should contain Turnd (first position)"
+    ), "Blank generator output list should contain Turns (first position)"
     assert isinstance(
         output[1], Turn
     ), "Blank generator output list should contain Turns (second position)"
@@ -252,3 +254,41 @@ def test_generator_signature(classname):
     assert (
         _call_model_signature.return_annotation == List[Union[None, Turn]]
     ), "_call_model should take a Turn and return list of Turns or Nones"
+
+
+def test_skip_seq():
+    target_string = "TEST TEST 1234"
+    test_string_with_thinking = "TEST TEST <think>not thius tho</think>1234"
+    test_string_with_thinking_complex = '<think></think>TEST TEST <think>not thius tho</think>1234<think>!"(^-&$(!$%*))</think>'
+    test_string_with_newlines = "<think>\n\n</think>" + target_string
+    g = _plugins.load_plugin("generators.test.Repeat")
+    r = g.generate(Turn(test_string_with_thinking))
+    g.skip_seq_start = None
+    g.skip_seq_end = None
+    assert r[0] == Turn(
+        test_string_with_thinking
+    ), "test.Repeat should give same output as input when no think tokens specified"
+    g.skip_seq_start = "<think>"
+    g.skip_seq_end = "</think>"
+    r = g.generate(Turn(test_string_with_thinking))
+    assert r[0] == Turn(
+        target_string
+    ), "content between single skip sequence should be removed"
+    r = g.generate(Turn(test_string_with_thinking_complex))
+    assert r[0] == Turn(
+        target_string
+    ), "content between multiple skip sequences should be removed"
+    r = g.generate(Turn(test_string_with_newlines))
+    assert r[0] == Turn(target_string), "skip seqs full of newlines should be removed"
+
+    test_no_answer = "<think>not sure the output to provide</think>"
+    r = g.generate(Turn(test_no_answer))
+    assert r[0] == Turn(""), "Output of all skip strings should be empty"
+
+    test_truncated_think = f"<think>thinking a bit</think>{target_string}<think>this process required a lot of details that is processed by"
+    r = g.generate(Turn(test_truncated_think))
+    assert r[0] == Turn(target_string), "truncated skip strings should be omitted"
+
+    test_truncated_think_no_answer = "<think>thinking a bit</think><think>this process required a lot of details that is processed by"
+    r = g.generate(Turn(test_truncated_think_no_answer))
+    assert r[0] == Turn(""), "truncated skip strings should be omitted"
diff --git a/tests/generators/test_generators_base.py b/tests/generators/test_generators_base.py
new file mode 100644
index 00000000..994ae36e
--- /dev/null
+++ b/tests/generators/test_generators_base.py
@@ -0,0 +1,116 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+import pytest
+import random
+
+from garak.generators.test import Blank, Repeat, Single
+
+DEFAULT_GENERATOR_NAME = "garak test"
+DEFAULT_PROMPT_TEXT = "especially the lies"
+
+
+def test_generators_test_blank():
+    g = Blank(DEFAULT_GENERATOR_NAME)
+    output = g.generate(prompt="test", generations_this_call=5)
+    assert output == [
+        "",
+        "",
+        "",
+        "",
+        "",
+    ], "generators.test.Blank with generations_this_call=5 should return five empty strings"
+
+
+def test_generators_test_repeat():
+    g = Repeat(DEFAULT_GENERATOR_NAME)
+    output = g.generate(prompt=DEFAULT_PROMPT_TEXT)
+    assert output == [
+        DEFAULT_PROMPT_TEXT
+    ], "generators.test.Repeat should send back a list of the posed prompt string"
+
+
+def test_generators_test_single_one():
+    g = Single(DEFAULT_GENERATOR_NAME)
+    output = g.generate(prompt="test")
+    assert isinstance(
+        output, list
+    ), "Single generator .generate() should send back a list"
+    assert (
+        len(output) == 1
+    ), "Single.generate() without generations_this_call should send a list of one string"
+    assert isinstance(
+        output[0], str
+    ), "Single generator output list should contain strings"
+
+    output = g._call_model(prompt="test")
+    assert isinstance(output, list), "Single generator _call_model should return a list"
+    assert (
+        len(output) == 1
+    ), "_call_model w/ generations_this_call 1 should return a list of length 1"
+    assert isinstance(
+        output[0], str
+    ), "Single generator output list should contain strings"
+
+
+def test_generators_test_single_many():
+    random_generations = random.randint(2, 12)
+    g = Single(DEFAULT_GENERATOR_NAME)
+    output = g.generate(prompt="test", generations_this_call=random_generations)
+    assert isinstance(
+        output, list
+    ), "Single generator .generate() should send back a list"
+    assert (
+        len(output) == random_generations
+    ), "Single.generate() with generations_this_call should return equal generations"
+    for i in range(0, random_generations):
+        assert isinstance(
+            output[i], str
+        ), "Single generator output list should contain strings (all positions)"
+
+
+def test_generators_test_single_too_many():
+    g = Single(DEFAULT_GENERATOR_NAME)
+    with pytest.raises(ValueError):
+        output = g._call_model(prompt="test", generations_this_call=2)
+    assert "Single._call_model should refuse to process generations_this_call > 1"
+
+
+def test_generators_test_blank_one():
+    g = Blank(DEFAULT_GENERATOR_NAME)
+    output = g.generate(prompt="test")
+    assert isinstance(
+        output, list
+    ), "Blank generator .generate() should send back a list"
+    assert (
+        len(output) == 1
+    ), "Blank generator .generate() without generations_this_call should return a list of length 1"
+    assert isinstance(
+        output[0], str
+    ), "Blank generator output list should contain strings"
+    assert (
+        output[0] == ""
+    ), "Blank generator .generate() output list should contain strings"
+
+
+def test_generators_test_blank_many():
+    g = Blank(DEFAULT_GENERATOR_NAME)
+    output = g.generate(prompt="test", generations_this_call=2)
+    assert isinstance(
+        output, list
+    ), "Blank generator .generate() should send back a list"
+    assert (
+        len(output) == 2
+    ), "Blank generator .generate() w/ generations_this_call=2 should return a list of length 2"
+    assert isinstance(
+        output[0], str
+    ), "Blank generator output list should contain strings (first position)"
+    assert isinstance(
+        output[1], str
+    ), "Blank generator output list should contain strings (second position)"
+    assert (
+        output[0] == ""
+    ), "Blank generator .generate() output list should contain strings (first position)"
+    assert (
+        output[1] == ""
+    ), "Blank generator .generate() output list should contain strings (second position)"