--- a/extract-partitions.xml	Mon Jun 17 11:46:55 2024 +0000
+++ b/extract-partitions.xml	Thu Oct 03 13:46:53 2024 +0000
@@ -1,10 +1,10 @@
 <tool id="khmer_extract_partitions" name="khmer: Extract partitions" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="@PROFILE@">
     <description>Separate sequences that are annotated with partitions into grouped files</description>
-    <expand macro="bio_tools"/>
     <macros>
         <token name="@BINARY@">extract-partitions.py</token>
         <import>macros.xml</import>
     </macros>
+    <expand macro="bio_tools"/>
     <expand macro="requirements" />
     <expand macro="stdio" />
     <expand macro="version" />
@@ -31,15 +31,20 @@
             label="Output unassigned sequences" help="(--output-unassigned/-U)" />
     </inputs>
     <outputs>
-        <data name="distribution" format="txt" from_work_dir="output.dist" label="${tool.name} on ${on_string}: Partition size distribution" />
-        <collection name="groups-of-partitions" type="list" format="fasta">
+        <data name="distribution" format="txt" from_work_dir="output/output.dist" label="${tool.name} on ${on_string}: Partition size distribution" />
+        <collection name="groups_of_partitions" type="list" format="fasta">
             <discover_datasets pattern="__name__" directory="output" format="fasta"/>
         </collection>
     </outputs>
     <tests>
         <test>
             <param name="inputs" value="random-20-a.fa.part"/>
-            <output_collection name="groups-of-partitions">
+            <output name="distribution">
+                <assert_contents>
+                    <has_text text="99 1 1 99"/>
+                </assert_contents>
+            </output>
+            <output_collection name="groups_of_partitions">
                 <element name="output.group0000.fa" file="random-20-a.part.extract.fa" />
             </output_collection>
         </test>