--- a/iqtree.xml	Wed Oct 17 11:43:10 2018 -0400
+++ b/iqtree.xml	Wed Jan 29 16:34:20 2020 -0500
@@ -1,4 +1,4 @@
-<tool id="iqtree" name="IQ-TREE" version="@TOOL_VERSION@.1" >
+<tool id="iqtree" name="IQ-TREE" version="@TOOL_VERSION@.3" >
     <description>Phylogenomic / evolutionary tree construction from multiple sequences</description>
     <macros>
         <import>iqtree_macros.xml</import>
@@ -303,9 +303,8 @@
                     <param name="opt_custommodel" type="boolean" checked="false" label="Use Custom Model" help="See http://www.iqtree.org/doc/Substitution-Models"/>
                     <when value="true">
                         <param argument="-m" type="text" label="Model">
-                            <sanitizer>
-                                <valid initial="string.ascii_uppercase,+" />
-                            </sanitizer>
+                            <expand macro="sanitize_query"
+                                    validinitial="string.ascii_uppercase,string.digits,string.punctuation" />
                         </param>
                     </when>
                     <when value="false">
@@ -632,6 +631,21 @@
                 </assert_contents>
             </output>
         </test>
+        <test>
+            <param name='s' value='example.phy' />
+            <param name='opt_custommodel' value='true' />
+            <param name='m' value='GTR+G{0.9}' />
+            <output name='iqtree'>
+                <assert_contents>
+                    <has_text_matching expression=".*Human.*Whale.*" />
+                </assert_contents>
+            </output>
+            <output name='treefile'>
+                <assert_contents>
+                    <has_text_matching expression="\(LngfishAu:(\d|\..)+,\(LngfishSA:(\d.)+,.*" />
+                </assert_contents>
+            </output>
+        </test>
     </tests>
     <help><![CDATA[
 IQ-TREE