--- a/est-abundance.xml	Tue Aug 31 07:47:09 2021 +0000
+++ b/est-abundance.xml	Wed Jul 06 14:47:21 2022 +0000
@@ -1,8 +1,5 @@
-<tool id="est_abundance" name="Estimate Abundance at Taxonomic Level" version="@TOOL_VERSION@+galaxy0">
+<tool id="est_abundance" name="Estimate Abundance at Taxonomic Level" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@">
     <description>Bayesian Reestimation of Abundance with KrakEN</description>
-    <xrefs>
-        <xref type="bio.tools">bracken</xref>
-    </xrefs>
     <macros>
         <import>macros.xml</import>
     </macros>
@@ -13,6 +10,9 @@
     <edam_operations>
         <edam_operation>operation_2238</edam_operation>
     </edam_operations>
+    <xrefs>
+        <xref type="bio.tools">bracken</xref>
+    </xrefs>
     <expand macro="requirements" />    
     <command detect_errors="exit_code"><![CDATA[
     est_abundance.py 
@@ -21,6 +21,8 @@
     -l $level 
     -t $threshold 
     -o '$report'
+    ## --out-report needs to be set always, since it is written next to the input file
+    --out-report bracken.report
     ]]>
     </command>    
     <inputs>
@@ -42,22 +44,28 @@
         <param name="threshold" type="integer" value="10" label="Number of mismatches allowed when matching tag"
                help="Threshold for the minimum number of reads kraken must assign to a classification for that 
                      classification to be considered in the final abundance estimation." />
+        <param argument="--out-report" type="boolean" checked="false" label="Produce Kraken-Style Bracken report"/>
     </inputs>
     <outputs>
         <data name="report" format="tabular" label="${tool.name} on ${on_string}: Report" />
+        <data name="kraken_report" format="tabular" from_work_dir="bracken.report" label="${tool.name} on ${on_string}: Kraken style report">
+            <filter>out_report</filter>
+        </data>
     </outputs>
     <tests>
-        <test>
+        <test expect_num_outputs="1">
             <param name="input" value="NC_003198.1_simulated_kraken_report.txt" ftype="tabular"/>
             <param name="level" value="S" />
             <param name="bracken_database" value="test_entry"/>
             <output name="report" file="NC_003198.1_simulated_bracken_report.txt" ftype="tabular"/>
         </test>
-        <test>
+        <test expect_num_outputs="2">
             <param name="input" value="NC_011750.1_simulated_kraken_report.txt" ftype="tabular"/>
             <param name="level" value="S" />
             <param name="bracken_database" value="test_entry"/>
+            <param name="out_report" value="true"/>
             <output name="report" file="NC_011750.1_simulated_bracken_report.txt" ftype="tabular"/>
+            <output name="kraken_report" file="NC_011750.1_simulated_kraken_style_bracken_report.txt" ftype="tabular"/>
         </test>
     </tests>
     <help>