diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
new file mode 100644
index 00000000..ac32e90a
--- /dev/null
+++ b/.github/workflows/pr.yaml
@@ -0,0 +1,62 @@
+name: Test Pull Request
+
+on: [pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.8']
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Cache .cache/pip
+      uses: actions/cache@v3
+      id: cache-pip
+      with:
+        path: ~/.cache/pip
+        key: pip_cache_py_${{ matrix.python-version }}
+    - name: Install package
+      run: |
+        touch requirements.txt
+        pip install -r requirements.txt black==23.3 flake8==6.0
+    - name: Flake8
+      run: flake8 --ignore=C901,W503,E501
+    # at the moment I would prefer not to enable this
+    # - name: Black
+    #   uses: psf/black@23.3.0
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.8']
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Cache .cache/pip
+      uses: actions/cache@v3
+      id: cache-pip
+      with:
+        path: ~/.cache/pip
+        key: pip_cache_py_${{ matrix.python-version }}
+    - name: setup
+      run: |
+        pip install -r requirements.txt .
+        pip install -r requirements-dev.txt
+    #TODO reenable: works only on branch?
+    # - name: diff_pydocstyle_report
+    #   run: make diff_pydocstyle_report
+    - name: Test
+      run: make test
+    - name: Planemo lint tools
+      run: planemo l tests/test-data/
+    # planemo test content of tests/test-data (this is OK, because the previous
+    # tests ensure equality of the xmls that are generated and those in the package)
+    - name: planemo test tools
+      run: export PATH=$(pwd)/tests/test-data:$PATH && planemo t tests/test-data/
\ No newline at end of file
diff --git a/ctdconverter/galaxy/converter.py b/ctdconverter/galaxy/converter.py
index d0744000..e30023f4 100755
--- a/ctdconverter/galaxy/converter.py
+++ b/ctdconverter/galaxy/converter.py
@@ -1160,24 +1160,23 @@ def create_param_attribute_list(param_node, param, model, supported_file_formats
     # parameters need to be treated in cheetah. variable names are currently fixed back
     # to dashes in fill_ctd.py. currently there seems to be only a single tool
     # requiring this https://github.com/OpenMS/OpenMS/pull/4529
-    param_node.attrib["name"] = get_galaxy_parameter_name(param)
-    param_node.attrib["argument"] = "-%s" % utils.extract_param_name(param)
+    argument = "-%s" % utils.extract_param_name(param)
+    name = get_galaxy_parameter_name(param)
+    if argument.lstrip("-").replace("-", "_") != name:
+        param_node.attrib["name"] = get_galaxy_parameter_name(param)
+    param_node.attrib["argument"] = argument
+
     param_type = TYPE_TO_GALAXY_TYPE[param.type]
     if param_type is None:
         raise ModelError("Unrecognized parameter type %(type)s for parameter %(name)s"
                          % {"type": param.type, "name": param.name})
+
     # ITEMLIST is rendered as text field (even if its integers or floats), an
-    # exception is files which are treated a bit below
+    # exception is files which are treated just below
     if param.is_list:
         param_type = "text"
-
     if is_selection_parameter(param):
         param_type = "select"
-        if len(param.restrictions.choices) < 5:
-            param_node.attrib["display"] = "checkboxes"
-        if param.is_list:
-            param_node.attrib["multiple"] = "true"
-
     if is_boolean_parameter(param):
         param_type = "boolean"
 
@@ -1204,10 +1203,20 @@ def create_param_attribute_list(param_node, param, model, supported_file_formats
     # (in Galaxy the default would be prefilled in the form and at least
     # one option needs to be selected).
     if not (param.default is None or type(param.default) is _Null) and param_node.attrib["type"] in ["integer", "float", "text", "boolean", "select"]:
-        logger.error("%s %s %s %s %s" % (param.name, param.default is None, type(param.default) is _Null, param_type, param.type))
-        param_node.attrib["optional"] = "false"
+        # logger.error("%s %s %s %s %s" % (param.name, param.default is None, type(param.default) is _Null, param_type, param.type))
+        optional = False
     else:
-        param_node.attrib["optional"] = str(not param.required).lower()
+        optional = not param.required
+    param_node.attrib["optional"] = str(optional).lower()
+
+    if is_selection_parameter(param):
+        if param.is_list:
+            param_node.attrib["multiple"] = "true"
+        if len(param.restrictions.choices) < 5:
+            if param.is_list and optional:
+                param_node.attrib["display"] = "checkboxes"
+            elif not param.is_list and not optional:
+                param_node.attrib["display"] = "radio"
 
     # check for parameters with restricted values (which will correspond to a "select" in galaxy)
     if param.restrictions is not None or param_type == "boolean":
@@ -1482,7 +1491,7 @@ def create_boolean_parameter(param_node, param):
 
 def all_outputs(model, parameter_hardcoder):
     """
-    return lists of reqired and optional output parameters
+    return lists of required and optional output parameters
     """
     out = []
     optout = []
@@ -1673,6 +1682,15 @@ def create_tests(parent, inputs=None, outputs=None, test_macros_prefix=None, nam
         test_node = add_child_node(tests_node, "test")
         strip_elements(inputs, "validator", "sanitizer")
         for node in inputs.iter():
+            # params do not have a name if redundant with argument
+            # -> readd and restore attrib order
+            if node.tag == "param" and not node.attrib.get("name") and node.attrib.get("argument"):
+                attrib = copy.deepcopy(node.attrib)
+                node.attrib["name"] = node.attrib["argument"].lstrip("-").replace("-", "_")
+                for a in attrib:
+                    del node.attrib[a]
+                    node.attrib[a] = attrib[a]
+
             if node.tag == "expand" and node.attrib["macro"] == ADVANCED_OPTIONS_NAME + "macro":
                 node.tag = "conditional"
                 node.attrib["name"] = ADVANCED_OPTIONS_NAME + "cond"
@@ -1742,9 +1760,10 @@ def create_tests(parent, inputs=None, outputs=None, test_macros_prefix=None, nam
                 node.attrib["value"] = "outfile.txt"
             if node.tag == "collection":
                 node.tag = "output_collection"
+                node.attrib["count"] = "0"  # add a mock count element
             if node.attrib.get("name", None) == "stdout":
                 node.attrib["lines_diff"] = "2"
-            for a in set(node.attrib) - {"name", "value", "ftype", "lines_diff"}:
+            for a in set(node.attrib) - {"name", "value", "ftype", "lines_diff", "count"}:
                 del node.attrib[a]
         strip_elements(outputs, "delete_node", "discover_datasets", "filter", "change_format")
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 00000000..c8bbc23f
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,3 @@
+diff_cover
+planemo
+pydocstyle
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..9efeead0
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+git+https://github.com/WorkflowConversion/CTDopts
+lxml
+ruamel.yaml
\ No newline at end of file
diff --git a/tests/test-data/bool.xml b/tests/test-data/bool.xml
index 89f1ed08..ea96da1b 100644
--- a/tests/test-data/bool.xml
+++ b/tests/test-data/bool.xml
@@ -32,12 +32,12 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
     <configfile name="hardcoded_json"><![CDATA[{}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="flag" argument="-flag" type="boolean" truevalue="true" falsevalue="false" checked="false" label="flag" help=""/>
-    <param name="flag_adv" argument="-flag_adv" type="boolean" truevalue="true" falsevalue="false" checked="false" label="flag" help=""/>
-    <param name="true" argument="-true" type="boolean" truevalue="true" falsevalue="false" checked="true" label="bool" help=""/>
-    <param name="false" argument="-false" type="boolean" truevalue="true" falsevalue="false" checked="false" label="bool" help=""/>
-    <param name="flag_true" argument="-flag_true" type="boolean" truevalue="true" falsevalue="false" checked="true" label="bool" help=""/>
-    <param name="flag_false" argument="-flag_false" type="boolean" truevalue="true" falsevalue="false" checked="false" label="bool" help=""/>
+    <param argument="-flag" type="boolean" truevalue="true" falsevalue="false" checked="false" label="flag" help=""/>
+    <param argument="-flag_adv" type="boolean" truevalue="true" falsevalue="false" checked="false" label="flag" help=""/>
+    <param argument="-true" type="boolean" truevalue="true" falsevalue="false" checked="true" label="bool" help=""/>
+    <param argument="-false" type="boolean" truevalue="true" falsevalue="false" checked="false" label="bool" help=""/>
+    <param argument="-flag_true" type="boolean" truevalue="true" falsevalue="false" checked="true" label="bool" help=""/>
+    <param argument="-flag_false" type="boolean" truevalue="true" falsevalue="false" checked="false" label="bool" help=""/>
     <section name="test_section" title="Test Section" help="" expanded="false">
       <param name="sect_true" argument="-test_section:sect_true" type="boolean" truevalue="true" falsevalue="false" checked="true" label="bool" help=""/>
       <param name="sect_false" argument="-test_section:sect_false" type="boolean" truevalue="true" falsevalue="false" checked="false" label="bool" help=""/>
@@ -49,10 +49,10 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       <param name="sect_flag_false_adv" argument="-test_section:sect_flag_false_adv" type="boolean" truevalue="true" falsevalue="false" checked="false" label="bool" help=""/>
     </section>
     <expand macro="adv_opts_macro">
-      <param name="true_adv" argument="-true_adv" type="boolean" truevalue="true" falsevalue="false" checked="true" label="bool" help=""/>
-      <param name="false_adv" argument="-false_adv" type="boolean" truevalue="true" falsevalue="false" checked="false" label="bool" help=""/>
-      <param name="flag_true_adv" argument="-flag_true_adv" type="boolean" truevalue="true" falsevalue="false" checked="true" label="bool" help=""/>
-      <param name="flag_false_adv" argument="-flag_false_adv" type="boolean" truevalue="true" falsevalue="false" checked="false" label="bool" help=""/>
+      <param argument="-true_adv" type="boolean" truevalue="true" falsevalue="false" checked="true" label="bool" help=""/>
+      <param argument="-false_adv" type="boolean" truevalue="true" falsevalue="false" checked="false" label="bool" help=""/>
+      <param argument="-flag_true_adv" type="boolean" truevalue="true" falsevalue="false" checked="true" label="bool" help=""/>
+      <param argument="-flag_false_adv" type="boolean" truevalue="true" falsevalue="false" checked="false" label="bool" help=""/>
     </expand>
     <param name="OPTIONAL_OUTPUTS" type="select" optional="true" multiple="true" label="Optional outputs">
       <option value="ctd_out_FLAG">Output used ctd (ini) configuration file</option>
diff --git a/tests/test-data/float.xml b/tests/test-data/float.xml
index abfa3a2b..da0975d8 100644
--- a/tests/test-data/float.xml
+++ b/tests/test-data/float.xml
@@ -32,14 +32,14 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
     <configfile name="hardcoded_json"><![CDATA[{}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="default_mandatory_unrestricted" argument="-default_mandatory_unrestricted" type="float" optional="false" value="0.0" label="float" help=""/>
-    <param name="default_optional_unrestricted" argument="-default_optional_unrestricted" type="float" optional="false" value="0.0" label="float" help=""/>
-    <param name="default_mandatory_unrestricted_min" argument="-default_mandatory_unrestricted_min" type="float" optional="false" min="0.0" value="0.0" label="float" help=""/>
-    <param name="default_optional_unrestricted_min" argument="-default_optional_unrestricted_min" type="float" optional="false" min="0.0" value="0.0" label="float" help=""/>
-    <param name="default_mandatory_unrestricted_max" argument="-default_mandatory_unrestricted_max" type="float" optional="false" max="100.0" value="0.0" label="float" help=""/>
-    <param name="default_optional_unrestricted_max" argument="-default_optional_unrestricted_max" type="float" optional="false" max="100.0" value="0.0" label="float" help=""/>
-    <param name="default_mandatory_unrestricted_minmax" argument="-default_mandatory_unrestricted_minmax" type="float" optional="false" min="0.0" max="100.0" value="0.0" label="float" help=""/>
-    <param name="default_optional_unrestricted_minmax" argument="-default_optional_unrestricted_minmax" type="float" optional="false" min="0.0" max="100.0" value="0.0" label="float" help=""/>
+    <param argument="-default_mandatory_unrestricted" type="float" optional="false" value="0.0" label="float" help=""/>
+    <param argument="-default_optional_unrestricted" type="float" optional="false" value="0.0" label="float" help=""/>
+    <param argument="-default_mandatory_unrestricted_min" type="float" optional="false" min="0.0" value="0.0" label="float" help=""/>
+    <param argument="-default_optional_unrestricted_min" type="float" optional="false" min="0.0" value="0.0" label="float" help=""/>
+    <param argument="-default_mandatory_unrestricted_max" type="float" optional="false" max="100.0" value="0.0" label="float" help=""/>
+    <param argument="-default_optional_unrestricted_max" type="float" optional="false" max="100.0" value="0.0" label="float" help=""/>
+    <param argument="-default_mandatory_unrestricted_minmax" type="float" optional="false" min="0.0" max="100.0" value="0.0" label="float" help=""/>
+    <param argument="-default_optional_unrestricted_minmax" type="float" optional="false" min="0.0" max="100.0" value="0.0" label="float" help=""/>
     <section name="test_section" title="Test Section" help="" expanded="false">
       <param name="sect_default_mandatory_unrestricted" argument="-test_section:sect_default_mandatory_unrestricted" type="float" optional="false" value="0.0" label="float" help=""/>
       <param name="sect_default_optional_unrestricted" argument="-test_section:sect_default_optional_unrestricted" type="float" optional="false" value="0.0" label="float" help=""/>
@@ -59,14 +59,14 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       <param name="sect_default_optional_unrestricted_adv_minmax" argument="-test_section:sect_default_optional_unrestricted_adv_minmax" type="float" optional="false" min="0.0" max="100.0" value="0.0" label="float" help=""/>
     </section>
     <expand macro="adv_opts_macro">
-      <param name="default_mandatory_unrestricted_adv" argument="-default_mandatory_unrestricted_adv" type="float" optional="false" value="0.0" label="float" help=""/>
-      <param name="default_optional_unrestricted_adv" argument="-default_optional_unrestricted_adv" type="float" optional="false" value="0.0" label="float" help=""/>
-      <param name="default_mandatory_unrestricted_adv_min" argument="-default_mandatory_unrestricted_adv_min" type="float" optional="false" min="0.0" value="0.0" label="float" help=""/>
-      <param name="default_optional_unrestricted_adv_min" argument="-default_optional_unrestricted_adv_min" type="float" optional="false" min="0.0" value="0.0" label="float" help=""/>
-      <param name="default_mandatory_unrestricted_adv_max" argument="-default_mandatory_unrestricted_adv_max" type="float" optional="false" max="100.0" value="0.0" label="float" help=""/>
-      <param name="default_optional_unrestricted_adv_max" argument="-default_optional_unrestricted_adv_max" type="float" optional="false" max="100.0" value="0.0" label="float" help=""/>
-      <param name="default_mandatory_unrestricted_adv_minmax" argument="-default_mandatory_unrestricted_adv_minmax" type="float" optional="false" min="0.0" max="100.0" value="0.0" label="float" help=""/>
-      <param name="default_optional_unrestricted_adv_minmax" argument="-default_optional_unrestricted_adv_minmax" type="float" optional="false" min="0.0" max="100.0" value="0.0" label="float" help=""/>
+      <param argument="-default_mandatory_unrestricted_adv" type="float" optional="false" value="0.0" label="float" help=""/>
+      <param argument="-default_optional_unrestricted_adv" type="float" optional="false" value="0.0" label="float" help=""/>
+      <param argument="-default_mandatory_unrestricted_adv_min" type="float" optional="false" min="0.0" value="0.0" label="float" help=""/>
+      <param argument="-default_optional_unrestricted_adv_min" type="float" optional="false" min="0.0" value="0.0" label="float" help=""/>
+      <param argument="-default_mandatory_unrestricted_adv_max" type="float" optional="false" max="100.0" value="0.0" label="float" help=""/>
+      <param argument="-default_optional_unrestricted_adv_max" type="float" optional="false" max="100.0" value="0.0" label="float" help=""/>
+      <param argument="-default_mandatory_unrestricted_adv_minmax" type="float" optional="false" min="0.0" max="100.0" value="0.0" label="float" help=""/>
+      <param argument="-default_optional_unrestricted_adv_minmax" type="float" optional="false" min="0.0" max="100.0" value="0.0" label="float" help=""/>
     </expand>
     <param name="OPTIONAL_OUTPUTS" type="select" optional="true" multiple="true" label="Optional outputs">
       <option value="ctd_out_FLAG">Output used ctd (ini) configuration file</option>
diff --git a/tests/test-data/ifile.xml b/tests/test-data/ifile.xml
index ec93a199..5f091a19 100644
--- a/tests/test-data/ifile.xml
+++ b/tests/test-data/ifile.xml
@@ -756,30 +756,30 @@ ${' '.join(["'test_section.sect_list_mandatory_multformat/%s/%s.%s'"%(i, re.sub(
     <configfile name="hardcoded_json"><![CDATA[{}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="mandatory_noformat" argument="-mandatory_noformat" type="data" format="txt" optional="false" label="input file" help=" select txt data sets(s)"/>
-    <param name="optional_noformat" argument="-optional_noformat" type="data" format="txt" optional="true" label="input file" help=" select txt data sets(s)"/>
-    <param name="mandatory_oneformat" argument="-mandatory_oneformat" type="data" format="tsv" optional="false" label="input file" help=" select tsv data sets(s)"/>
-    <param name="optional_oneformat" argument="-optional_oneformat" type="data" format="tsv" optional="true" label="input file" help=" select tsv data sets(s)"/>
-    <param name="mandatory_multformat" argument="-mandatory_multformat" type="data" format="tabular,tsv" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
-    <param name="optional_multformat" argument="-optional_multformat" type="data" format="tabular,tsv" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
-    <param name="default_mandatory_noformat" argument="-default_mandatory_noformat" type="data" format="txt" optional="true" label="input file" help=" select txt data sets(s)"/>
-    <param name="default_optional_noformat" argument="-default_optional_noformat" type="data" format="txt" optional="true" value="test.ext" label="input file" help=" select txt data sets(s)"/>
-    <param name="default_mandatory_oneformat" argument="-default_mandatory_oneformat" type="data" format="tsv" optional="true" label="input file" help=" select tsv data sets(s)"/>
-    <param name="default_optional_oneformat" argument="-default_optional_oneformat" type="data" format="tsv" optional="true" value="test.ext" label="input file" help=" select tsv data sets(s)"/>
-    <param name="default_mandatory_multformat" argument="-default_mandatory_multformat" type="data" format="tabular,tsv" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
-    <param name="default_optional_multformat" argument="-default_optional_multformat" type="data" format="tabular,tsv" optional="true" value="test.ext" label="input file" help=" select tabular,tsv data sets(s)"/>
-    <param name="list_mandatory_noformat" argument="-list_mandatory_noformat" type="data" format="txt" multiple="true" optional="false" label="input file" help=" select txt data sets(s)"/>
-    <param name="list_optional_noformat" argument="-list_optional_noformat" type="data" format="txt" multiple="true" optional="true" label="input file" help=" select txt data sets(s)"/>
-    <param name="list_mandatory_oneformat" argument="-list_mandatory_oneformat" type="data" format="tsv" multiple="true" optional="false" label="input file" help=" select tsv data sets(s)"/>
-    <param name="list_optional_oneformat" argument="-list_optional_oneformat" type="data" format="tsv" multiple="true" optional="true" label="input file" help=" select tsv data sets(s)"/>
-    <param name="list_mandatory_multformat" argument="-list_mandatory_multformat" type="data" format="tabular,tsv" multiple="true" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
-    <param name="list_optional_multformat" argument="-list_optional_multformat" type="data" format="tabular,tsv" multiple="true" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
-    <param name="list_default_mandatory_noformat" argument="-list_default_mandatory_noformat" type="data" format="txt" multiple="true" optional="true" label="input file" help=" select txt data sets(s)"/>
-    <param name="list_default_optional_noformat" argument="-list_default_optional_noformat" type="data" format="txt" multiple="true" optional="true" value="test.ext" label="input file" help=" select txt data sets(s)"/>
-    <param name="list_default_mandatory_oneformat" argument="-list_default_mandatory_oneformat" type="data" format="tsv" multiple="true" optional="true" label="input file" help=" select tsv data sets(s)"/>
-    <param name="list_default_optional_oneformat" argument="-list_default_optional_oneformat" type="data" format="tsv" multiple="true" optional="true" value="test.ext" label="input file" help=" select tsv data sets(s)"/>
-    <param name="list_default_mandatory_multformat" argument="-list_default_mandatory_multformat" type="data" format="tabular,tsv" multiple="true" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
-    <param name="list_default_optional_multformat" argument="-list_default_optional_multformat" type="data" format="tabular,tsv" multiple="true" optional="true" value="test.ext" label="input file" help=" select tabular,tsv data sets(s)"/>
+    <param argument="-mandatory_noformat" type="data" format="txt" optional="false" label="input file" help=" select txt data sets(s)"/>
+    <param argument="-optional_noformat" type="data" format="txt" optional="true" label="input file" help=" select txt data sets(s)"/>
+    <param argument="-mandatory_oneformat" type="data" format="tsv" optional="false" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-optional_oneformat" type="data" format="tsv" optional="true" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-mandatory_multformat" type="data" format="tabular,tsv" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
+    <param argument="-optional_multformat" type="data" format="tabular,tsv" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
+    <param argument="-default_mandatory_noformat" type="data" format="txt" optional="true" label="input file" help=" select txt data sets(s)"/>
+    <param argument="-default_optional_noformat" type="data" format="txt" optional="true" value="test.ext" label="input file" help=" select txt data sets(s)"/>
+    <param argument="-default_mandatory_oneformat" type="data" format="tsv" optional="true" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-default_optional_oneformat" type="data" format="tsv" optional="true" value="test.ext" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-default_mandatory_multformat" type="data" format="tabular,tsv" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
+    <param argument="-default_optional_multformat" type="data" format="tabular,tsv" optional="true" value="test.ext" label="input file" help=" select tabular,tsv data sets(s)"/>
+    <param argument="-list_mandatory_noformat" type="data" format="txt" multiple="true" optional="false" label="input file" help=" select txt data sets(s)"/>
+    <param argument="-list_optional_noformat" type="data" format="txt" multiple="true" optional="true" label="input file" help=" select txt data sets(s)"/>
+    <param argument="-list_mandatory_oneformat" type="data" format="tsv" multiple="true" optional="false" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-list_optional_oneformat" type="data" format="tsv" multiple="true" optional="true" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-list_mandatory_multformat" type="data" format="tabular,tsv" multiple="true" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
+    <param argument="-list_optional_multformat" type="data" format="tabular,tsv" multiple="true" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
+    <param argument="-list_default_mandatory_noformat" type="data" format="txt" multiple="true" optional="true" label="input file" help=" select txt data sets(s)"/>
+    <param argument="-list_default_optional_noformat" type="data" format="txt" multiple="true" optional="true" value="test.ext" label="input file" help=" select txt data sets(s)"/>
+    <param argument="-list_default_mandatory_oneformat" type="data" format="tsv" multiple="true" optional="true" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-list_default_optional_oneformat" type="data" format="tsv" multiple="true" optional="true" value="test.ext" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-list_default_mandatory_multformat" type="data" format="tabular,tsv" multiple="true" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
+    <param argument="-list_default_optional_multformat" type="data" format="tabular,tsv" multiple="true" optional="true" value="test.ext" label="input file" help=" select tabular,tsv data sets(s)"/>
     <section name="test_section" title="Test Section" help="" expanded="false">
       <param name="sect_mandatory_noformat" argument="-test_section:sect_mandatory_noformat" type="data" format="txt" optional="false" label="input file" help=" select txt data sets(s)"/>
       <param name="sect_optional_noformat" argument="-test_section:sect_optional_noformat" type="data" format="txt" optional="true" label="input file" help=" select txt data sets(s)"/>
@@ -831,30 +831,30 @@ ${' '.join(["'test_section.sect_list_mandatory_multformat/%s/%s.%s'"%(i, re.sub(
       <param name="sect_list_default_optional_multformat_adv" argument="-test_section:sect_list_default_optional_multformat_adv" type="data" format="tabular,tsv" multiple="true" optional="true" value="test.ext" label="input file" help=" select tabular,tsv data sets(s)"/>
     </section>
     <expand macro="adv_opts_macro">
-      <param name="mandatory_noformat_adv" argument="-mandatory_noformat_adv" type="data" format="txt" optional="false" label="input file" help=" select txt data sets(s)"/>
-      <param name="optional_noformat_adv" argument="-optional_noformat_adv" type="data" format="txt" optional="true" label="input file" help=" select txt data sets(s)"/>
-      <param name="mandatory_oneformat_adv" argument="-mandatory_oneformat_adv" type="data" format="tsv" optional="false" label="input file" help=" select tsv data sets(s)"/>
-      <param name="optional_oneformat_adv" argument="-optional_oneformat_adv" type="data" format="tsv" optional="true" label="input file" help=" select tsv data sets(s)"/>
-      <param name="mandatory_multformat_adv" argument="-mandatory_multformat_adv" type="data" format="tabular,tsv" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
-      <param name="optional_multformat_adv" argument="-optional_multformat_adv" type="data" format="tabular,tsv" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
-      <param name="default_mandatory_noformat_adv" argument="-default_mandatory_noformat_adv" type="data" format="txt" optional="true" label="input file" help=" select txt data sets(s)"/>
-      <param name="default_optional_noformat_adv" argument="-default_optional_noformat_adv" type="data" format="txt" optional="true" value="test.ext" label="input file" help=" select txt data sets(s)"/>
-      <param name="default_mandatory_oneformat_adv" argument="-default_mandatory_oneformat_adv" type="data" format="tsv" optional="true" label="input file" help=" select tsv data sets(s)"/>
-      <param name="default_optional_oneformat_adv" argument="-default_optional_oneformat_adv" type="data" format="tsv" optional="true" value="test.ext" label="input file" help=" select tsv data sets(s)"/>
-      <param name="default_mandatory_multformat_adv" argument="-default_mandatory_multformat_adv" type="data" format="tabular,tsv" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
-      <param name="default_optional_multformat_adv" argument="-default_optional_multformat_adv" type="data" format="tabular,tsv" optional="true" value="test.ext" label="input file" help=" select tabular,tsv data sets(s)"/>
-      <param name="list_mandatory_noformat_adv" argument="-list_mandatory_noformat_adv" type="data" format="txt" multiple="true" optional="false" label="input file" help=" select txt data sets(s)"/>
-      <param name="list_optional_noformat_adv" argument="-list_optional_noformat_adv" type="data" format="txt" multiple="true" optional="true" label="input file" help=" select txt data sets(s)"/>
-      <param name="list_mandatory_oneformat_adv" argument="-list_mandatory_oneformat_adv" type="data" format="tsv" multiple="true" optional="false" label="input file" help=" select tsv data sets(s)"/>
-      <param name="list_optional_oneformat_adv" argument="-list_optional_oneformat_adv" type="data" format="tsv" multiple="true" optional="true" label="input file" help=" select tsv data sets(s)"/>
-      <param name="list_mandatory_multformat_adv" argument="-list_mandatory_multformat_adv" type="data" format="tabular,tsv" multiple="true" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
-      <param name="list_optional_multformat_adv" argument="-list_optional_multformat_adv" type="data" format="tabular,tsv" multiple="true" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
-      <param name="list_default_mandatory_noformat_adv" argument="-list_default_mandatory_noformat_adv" type="data" format="txt" multiple="true" optional="true" label="input file" help=" select txt data sets(s)"/>
-      <param name="list_default_optional_noformat_adv" argument="-list_default_optional_noformat_adv" type="data" format="txt" multiple="true" optional="true" value="test.ext" label="input file" help=" select txt data sets(s)"/>
-      <param name="list_default_mandatory_oneformat_adv" argument="-list_default_mandatory_oneformat_adv" type="data" format="tsv" multiple="true" optional="true" label="input file" help=" select tsv data sets(s)"/>
-      <param name="list_default_optional_oneformat_adv" argument="-list_default_optional_oneformat_adv" type="data" format="tsv" multiple="true" optional="true" value="test.ext" label="input file" help=" select tsv data sets(s)"/>
-      <param name="list_default_mandatory_multformat_adv" argument="-list_default_mandatory_multformat_adv" type="data" format="tabular,tsv" multiple="true" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
-      <param name="list_default_optional_multformat_adv" argument="-list_default_optional_multformat_adv" type="data" format="tabular,tsv" multiple="true" optional="true" value="test.ext" label="input file" help=" select tabular,tsv data sets(s)"/>
+      <param argument="-mandatory_noformat_adv" type="data" format="txt" optional="false" label="input file" help=" select txt data sets(s)"/>
+      <param argument="-optional_noformat_adv" type="data" format="txt" optional="true" label="input file" help=" select txt data sets(s)"/>
+      <param argument="-mandatory_oneformat_adv" type="data" format="tsv" optional="false" label="input file" help=" select tsv data sets(s)"/>
+      <param argument="-optional_oneformat_adv" type="data" format="tsv" optional="true" label="input file" help=" select tsv data sets(s)"/>
+      <param argument="-mandatory_multformat_adv" type="data" format="tabular,tsv" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
+      <param argument="-optional_multformat_adv" type="data" format="tabular,tsv" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
+      <param argument="-default_mandatory_noformat_adv" type="data" format="txt" optional="true" label="input file" help=" select txt data sets(s)"/>
+      <param argument="-default_optional_noformat_adv" type="data" format="txt" optional="true" value="test.ext" label="input file" help=" select txt data sets(s)"/>
+      <param argument="-default_mandatory_oneformat_adv" type="data" format="tsv" optional="true" label="input file" help=" select tsv data sets(s)"/>
+      <param argument="-default_optional_oneformat_adv" type="data" format="tsv" optional="true" value="test.ext" label="input file" help=" select tsv data sets(s)"/>
+      <param argument="-default_mandatory_multformat_adv" type="data" format="tabular,tsv" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
+      <param argument="-default_optional_multformat_adv" type="data" format="tabular,tsv" optional="true" value="test.ext" label="input file" help=" select tabular,tsv data sets(s)"/>
+      <param argument="-list_mandatory_noformat_adv" type="data" format="txt" multiple="true" optional="false" label="input file" help=" select txt data sets(s)"/>
+      <param argument="-list_optional_noformat_adv" type="data" format="txt" multiple="true" optional="true" label="input file" help=" select txt data sets(s)"/>
+      <param argument="-list_mandatory_oneformat_adv" type="data" format="tsv" multiple="true" optional="false" label="input file" help=" select tsv data sets(s)"/>
+      <param argument="-list_optional_oneformat_adv" type="data" format="tsv" multiple="true" optional="true" label="input file" help=" select tsv data sets(s)"/>
+      <param argument="-list_mandatory_multformat_adv" type="data" format="tabular,tsv" multiple="true" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
+      <param argument="-list_optional_multformat_adv" type="data" format="tabular,tsv" multiple="true" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
+      <param argument="-list_default_mandatory_noformat_adv" type="data" format="txt" multiple="true" optional="true" label="input file" help=" select txt data sets(s)"/>
+      <param argument="-list_default_optional_noformat_adv" type="data" format="txt" multiple="true" optional="true" value="test.ext" label="input file" help=" select txt data sets(s)"/>
+      <param argument="-list_default_mandatory_oneformat_adv" type="data" format="tsv" multiple="true" optional="true" label="input file" help=" select tsv data sets(s)"/>
+      <param argument="-list_default_optional_oneformat_adv" type="data" format="tsv" multiple="true" optional="true" value="test.ext" label="input file" help=" select tsv data sets(s)"/>
+      <param argument="-list_default_mandatory_multformat_adv" type="data" format="tabular,tsv" multiple="true" optional="true" label="input file" help=" select tabular,tsv data sets(s)"/>
+      <param argument="-list_default_optional_multformat_adv" type="data" format="tabular,tsv" multiple="true" optional="true" value="test.ext" label="input file" help=" select tabular,tsv data sets(s)"/>
     </expand>
     <param name="OPTIONAL_OUTPUTS" type="select" optional="true" multiple="true" label="Optional outputs">
       <option value="ctd_out_FLAG">Output used ctd (ini) configuration file</option>
diff --git a/tests/test-data/integer.xml b/tests/test-data/integer.xml
index 655678b9..45e6aa45 100644
--- a/tests/test-data/integer.xml
+++ b/tests/test-data/integer.xml
@@ -32,14 +32,14 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
     <configfile name="hardcoded_json"><![CDATA[{}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="default_mandatory_unrestricted" argument="-default_mandatory_unrestricted" type="integer" optional="false" value="0" label="int" help=""/>
-    <param name="default_optional_unrestricted" argument="-default_optional_unrestricted" type="integer" optional="false" value="0" label="int" help=""/>
-    <param name="default_mandatory_unrestricted_min" argument="-default_mandatory_unrestricted_min" type="integer" optional="false" min="0" value="0" label="int" help=""/>
-    <param name="default_optional_unrestricted_min" argument="-default_optional_unrestricted_min" type="integer" optional="false" min="0" value="0" label="int" help=""/>
-    <param name="default_mandatory_unrestricted_max" argument="-default_mandatory_unrestricted_max" type="integer" optional="false" max="100" value="0" label="int" help=""/>
-    <param name="default_optional_unrestricted_max" argument="-default_optional_unrestricted_max" type="integer" optional="false" max="100" value="0" label="int" help=""/>
-    <param name="default_mandatory_unrestricted_minmax" argument="-default_mandatory_unrestricted_minmax" type="integer" optional="false" min="0" max="100" value="0" label="int" help=""/>
-    <param name="default_optional_unrestricted_minmax" argument="-default_optional_unrestricted_minmax" type="integer" optional="false" min="0" max="100" value="0" label="int" help=""/>
+    <param argument="-default_mandatory_unrestricted" type="integer" optional="false" value="0" label="int" help=""/>
+    <param argument="-default_optional_unrestricted" type="integer" optional="false" value="0" label="int" help=""/>
+    <param argument="-default_mandatory_unrestricted_min" type="integer" optional="false" min="0" value="0" label="int" help=""/>
+    <param argument="-default_optional_unrestricted_min" type="integer" optional="false" min="0" value="0" label="int" help=""/>
+    <param argument="-default_mandatory_unrestricted_max" type="integer" optional="false" max="100" value="0" label="int" help=""/>
+    <param argument="-default_optional_unrestricted_max" type="integer" optional="false" max="100" value="0" label="int" help=""/>
+    <param argument="-default_mandatory_unrestricted_minmax" type="integer" optional="false" min="0" max="100" value="0" label="int" help=""/>
+    <param argument="-default_optional_unrestricted_minmax" type="integer" optional="false" min="0" max="100" value="0" label="int" help=""/>
     <section name="test_section" title="Test Section" help="" expanded="false">
       <param name="sect_default_mandatory_unrestricted" argument="-test_section:sect_default_mandatory_unrestricted" type="integer" optional="false" value="0" label="int" help=""/>
       <param name="sect_default_optional_unrestricted" argument="-test_section:sect_default_optional_unrestricted" type="integer" optional="false" value="0" label="int" help=""/>
@@ -59,14 +59,14 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       <param name="sect_default_optional_unrestricted_adv_minmax" argument="-test_section:sect_default_optional_unrestricted_adv_minmax" type="integer" optional="false" min="0" max="100" value="0" label="int" help=""/>
     </section>
     <expand macro="adv_opts_macro">
-      <param name="default_mandatory_unrestricted_adv" argument="-default_mandatory_unrestricted_adv" type="integer" optional="false" value="0" label="int" help=""/>
-      <param name="default_optional_unrestricted_adv" argument="-default_optional_unrestricted_adv" type="integer" optional="false" value="0" label="int" help=""/>
-      <param name="default_mandatory_unrestricted_adv_min" argument="-default_mandatory_unrestricted_adv_min" type="integer" optional="false" min="0" value="0" label="int" help=""/>
-      <param name="default_optional_unrestricted_adv_min" argument="-default_optional_unrestricted_adv_min" type="integer" optional="false" min="0" value="0" label="int" help=""/>
-      <param name="default_mandatory_unrestricted_adv_max" argument="-default_mandatory_unrestricted_adv_max" type="integer" optional="false" max="100" value="0" label="int" help=""/>
-      <param name="default_optional_unrestricted_adv_max" argument="-default_optional_unrestricted_adv_max" type="integer" optional="false" max="100" value="0" label="int" help=""/>
-      <param name="default_mandatory_unrestricted_adv_minmax" argument="-default_mandatory_unrestricted_adv_minmax" type="integer" optional="false" min="0" max="100" value="0" label="int" help=""/>
-      <param name="default_optional_unrestricted_adv_minmax" argument="-default_optional_unrestricted_adv_minmax" type="integer" optional="false" min="0" max="100" value="0" label="int" help=""/>
+      <param argument="-default_mandatory_unrestricted_adv" type="integer" optional="false" value="0" label="int" help=""/>
+      <param argument="-default_optional_unrestricted_adv" type="integer" optional="false" value="0" label="int" help=""/>
+      <param argument="-default_mandatory_unrestricted_adv_min" type="integer" optional="false" min="0" value="0" label="int" help=""/>
+      <param argument="-default_optional_unrestricted_adv_min" type="integer" optional="false" min="0" value="0" label="int" help=""/>
+      <param argument="-default_mandatory_unrestricted_adv_max" type="integer" optional="false" max="100" value="0" label="int" help=""/>
+      <param argument="-default_optional_unrestricted_adv_max" type="integer" optional="false" max="100" value="0" label="int" help=""/>
+      <param argument="-default_mandatory_unrestricted_adv_minmax" type="integer" optional="false" min="0" max="100" value="0" label="int" help=""/>
+      <param argument="-default_optional_unrestricted_adv_minmax" type="integer" optional="false" min="0" max="100" value="0" label="int" help=""/>
     </expand>
     <param name="OPTIONAL_OUTPUTS" type="select" optional="true" multiple="true" label="Optional outputs">
       <option value="ctd_out_FLAG">Output used ctd (ini) configuration file</option>
diff --git a/tests/test-data/label-help.xml b/tests/test-data/label-help.xml
index dae6c607..3eb8e4b2 100644
--- a/tests/test-data/label-help.xml
+++ b/tests/test-data/label-help.xml
@@ -32,28 +32,28 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
     <configfile name="hardcoded_json"><![CDATA[{}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="do" argument="-do" type="text" optional="false" value="" label="label label label label label label label label" help="help">
+    <param argument="-do" type="text" optional="false" value="" label="label label label label label label label label" help="help">
       <expand macro="list_string_san" name="do"/>
     </param>
-    <param name="qm" argument="-qm" type="text" optional="false" value="" label="label label label label label label label label" help="help">
+    <param argument="-qm" type="text" optional="false" value="" label="label label label label label label label label" help="help">
       <expand macro="list_string_san" name="qm"/>
     </param>
-    <param name="ex" argument="-ex" type="text" optional="false" value="" label="label label label label label label label label" help="help">
+    <param argument="-ex" type="text" optional="false" value="" label="label label label label label label label label" help="help">
       <expand macro="list_string_san" name="ex"/>
     </param>
-    <param name="sc" argument="-sc" type="text" optional="false" value="" label="label label label label label label label label &amp; label" help="help">
+    <param argument="-sc" type="text" optional="false" value="" label="label label label label label label label label &amp; label" help="help">
       <expand macro="list_string_san" name="sc"/>
     </param>
-    <param name="coeg" argument="-coeg" type="text" optional="false" value="" label="label label label label label label label label" help="e.g. help">
+    <param argument="-coeg" type="text" optional="false" value="" label="label label label label label label label label" help="e.g. help">
       <expand macro="list_string_san" name="coeg"/>
     </param>
-    <param name="pteg" argument="-pteg" type="text" optional="false" value="" label="label label label label label label label label" help="(e.g. help)">
+    <param argument="-pteg" type="text" optional="false" value="" label="label label label label label label label label" help="(e.g. help)">
       <expand macro="list_string_san" name="pteg"/>
     </param>
-    <param name="coie" argument="-coie" type="text" optional="false" value="" label="label label label label label label label label" help="i.e. help">
+    <param argument="-coie" type="text" optional="false" value="" label="label label label label label label label label" help="i.e. help">
       <expand macro="list_string_san" name="coie"/>
     </param>
-    <param name="ptie" argument="-ptie" type="text" optional="false" value="" label="label label label label label label label label" help="(i.e. help)">
+    <param argument="-ptie" type="text" optional="false" value="" label="label label label label label label label label" help="(i.e. help)">
       <expand macro="list_string_san" name="ptie"/>
     </param>
     <expand macro="adv_opts_macro"/>
diff --git a/tests/test-data/ofile-corresponding-input.xml b/tests/test-data/ofile-corresponding-input.xml
index bb213ef6..885012ac 100644
--- a/tests/test-data/ofile-corresponding-input.xml
+++ b/tests/test-data/ofile-corresponding-input.xml
@@ -214,9 +214,9 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
     <configfile name="hardcoded_json"><![CDATA[{}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="input_noformat" argument="-input_noformat" type="data" format="txt" optional="false" label="input file" help=" select txt data sets(s)"/>
-    <param name="input_oneformat" argument="-input_oneformat" type="data" format="tsv" optional="false" label="input file" help=" select tsv data sets(s)"/>
-    <param name="input_multformat" argument="-input_multformat" type="data" format="tabular,tsv" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
+    <param argument="-input_noformat" type="data" format="txt" optional="false" label="input file" help=" select txt data sets(s)"/>
+    <param argument="-input_oneformat" type="data" format="tsv" optional="false" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-input_multformat" type="data" format="tabular,tsv" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
     <expand macro="adv_opts_macro"/>
     <param name="OPTIONAL_OUTPUTS" type="select" optional="true" multiple="true" label="Optional outputs">
       <option value="optional_noformat_FLAG">optional_noformat (output file)</option>
diff --git a/tests/test-data/ofile-mult-typeparam.xml b/tests/test-data/ofile-mult-typeparam.xml
index 8f033925..e44b0f2b 100644
--- a/tests/test-data/ofile-mult-typeparam.xml
+++ b/tests/test-data/ofile-mult-typeparam.xml
@@ -51,14 +51,14 @@ ${' '.join(["&& mv -n 'test_section_sect_mandatory_mandatoryinput/%(bn)s/%(id)s.
     <configfile name="hardcoded_json"><![CDATA[{}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="mandatory_mandatoryinput_type" argument="-mandatory_mandatoryinput_type" display="checkboxes" type="select" optional="false" label="string" help="">
+    <param argument="-mandatory_mandatoryinput_type" type="select" optional="false" display="radio" label="string" help="">
       <option value="ewt">tsv (ewt)</option>
       <option value="ext">tsv (ext)</option>
       <expand macro="list_string_san" name="mandatory_mandatoryinput_type"/>
     </param>
-    <param name="inp_mandatory_mandatoryinput" argument="-inp_mandatory_mandatoryinput" type="data" format="tsv" multiple="true" optional="false" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-inp_mandatory_mandatoryinput" type="data" format="tsv" multiple="true" optional="false" label="input file" help=" select tsv data sets(s)"/>
     <section name="test_section" title="Test Section" help="" expanded="false">
-      <param name="sect_mandatory_mandatoryinput_type" argument="-test_section:sect_mandatory_mandatoryinput_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_mandatory_mandatoryinput_type" argument="-test_section:sect_mandatory_mandatoryinput_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="eut">txt (eut)</option>
         <option value="ewt">tsv (ewt)</option>
         <option value="ext">tsv (ext)</option>
@@ -93,8 +93,8 @@ ${' '.join(["&& mv -n 'test_section_sect_mandatory_mandatoryinput/%(bn)s/%(id)s.
       <conditional name="adv_opts_cond">
         <param name="adv_opts_selector" value="advanced"/>
       </conditional>
-      <output_collection name="mandatory_mandatoryinput"/>
-      <output_collection name="test_section_sect_mandatory_mandatoryinput"/>
+      <output_collection name="mandatory_mandatoryinput" count="0"/>
+      <output_collection name="test_section_sect_mandatory_mandatoryinput" count="0"/>
     </test>
   </tests>
   <help><![CDATA[Multiple Output File parameter tests.
diff --git a/tests/test-data/ofile-mult.xml b/tests/test-data/ofile-mult.xml
index ae4ae589..fd6970db 100644
--- a/tests/test-data/ofile-mult.xml
+++ b/tests/test-data/ofile-mult.xml
@@ -60,8 +60,8 @@ ${' '.join(["&& mv -n 'mandatory_mandatoryinput/%(bn)s/%(id)s.%(gext)s' 'mandato
     <configfile name="hardcoded_json"><![CDATA[{}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="inp_mandatory_mandatoryinput" argument="-inp_mandatory_mandatoryinput" type="data" format="tsv" multiple="true" optional="false" label="input file" help=" select tsv data sets(s)"/>
-    <param name="inp_optional_mandatoryinput" argument="-inp_optional_mandatoryinput" type="data" format="tsv" multiple="true" optional="false" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-inp_mandatory_mandatoryinput" type="data" format="tsv" multiple="true" optional="false" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-inp_optional_mandatoryinput" type="data" format="tsv" multiple="true" optional="false" label="input file" help=" select tsv data sets(s)"/>
     <expand macro="adv_opts_macro"/>
     <param name="OPTIONAL_OUTPUTS" type="select" optional="true" multiple="true" label="Optional outputs">
       <option value="optional_mandatoryinput_FLAG">optional_mandatoryinput (output file)</option>
@@ -87,7 +87,7 @@ ${' '.join(["&& mv -n 'mandatory_mandatoryinput/%(bn)s/%(id)s.%(gext)s' 'mandato
       <conditional name="adv_opts_cond">
         <param name="adv_opts_selector" value="advanced"/>
       </conditional>
-      <output_collection name="mandatory_mandatoryinput"/>
+      <output_collection name="mandatory_mandatoryinput" count="0"/>
     </test>
   </tests>
   <help><![CDATA[Multiple Output File parameter tests.
diff --git a/tests/test-data/ofile-typeparam.xml b/tests/test-data/ofile-typeparam.xml
index 51f9ae5f..f4195980 100644
--- a/tests/test-data/ofile-typeparam.xml
+++ b/tests/test-data/ofile-typeparam.xml
@@ -170,77 +170,77 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
     <configfile name="hardcoded_json"><![CDATA[{}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="mandatory_noformat_type" argument="-mandatory_noformat_type" display="checkboxes" type="select" optional="false" label="string" help="">
+    <param argument="-mandatory_noformat_type" type="select" optional="false" display="radio" label="string" help="">
       <option value="ext">tsv (ext)</option>
       <option value="eyt">tabular (eyt)</option>
       <option value="ezt">tabular (ezt)</option>
       <expand macro="list_string_san" name="mandatory_noformat_type"/>
     </param>
-    <param name="optional_noformat_type" argument="-optional_noformat_type" display="checkboxes" type="select" optional="false" label="string" help="">
+    <param argument="-optional_noformat_type" type="select" optional="false" display="radio" label="string" help="">
       <option value="ext">tsv (ext)</option>
       <option value="eyt">tabular (eyt)</option>
       <option value="ezt">tabular (ezt)</option>
       <expand macro="list_string_san" name="optional_noformat_type"/>
     </param>
-    <param name="mandatory_multformat_type" argument="-mandatory_multformat_type" display="checkboxes" type="select" optional="false" label="string" help="">
+    <param argument="-mandatory_multformat_type" type="select" optional="false" display="radio" label="string" help="">
       <option value="ext">tsv (ext)</option>
       <option value="eyt">tabular (eyt)</option>
       <option value="ezt">tabular (ezt)</option>
       <expand macro="list_string_san" name="mandatory_multformat_type"/>
     </param>
-    <param name="optional_multformat_type" argument="-optional_multformat_type" display="checkboxes" type="select" optional="false" label="string" help="">
+    <param argument="-optional_multformat_type" type="select" optional="false" display="radio" label="string" help="">
       <option value="ext">tsv (ext)</option>
       <option value="eyt">tabular (eyt)</option>
       <option value="ezt">tabular (ezt)</option>
       <expand macro="list_string_san" name="optional_multformat_type"/>
     </param>
-    <param name="decoy_input_noformat" argument="-decoy_input_noformat" type="data" format="txt" optional="false" label="input file" help=" select txt data sets(s)"/>
-    <param name="decoy_input_oneformat" argument="-decoy_input_oneformat" type="data" format="tsv" optional="false" label="input file" help=" select tsv data sets(s)"/>
-    <param name="decoy_input_multformat" argument="-decoy_input_multformat" type="data" format="tabular,tsv" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
+    <param argument="-decoy_input_noformat" type="data" format="txt" optional="false" label="input file" help=" select txt data sets(s)"/>
+    <param argument="-decoy_input_oneformat" type="data" format="tsv" optional="false" label="input file" help=" select tsv data sets(s)"/>
+    <param argument="-decoy_input_multformat" type="data" format="tabular,tsv" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
     <section name="test_section" title="Test Section" help="" expanded="false">
-      <param name="sect_mandatory_noformat_type" argument="-test_section:sect_mandatory_noformat_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_mandatory_noformat_type" argument="-test_section:sect_mandatory_noformat_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="ext">tsv (ext)</option>
         <option value="eyt">tabular (eyt)</option>
         <option value="ezt">tabular (ezt)</option>
         <expand macro="list_string_san" name="sect_mandatory_noformat_type"/>
       </param>
-      <param name="sect_optional_noformat_type" argument="-test_section:sect_optional_noformat_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_optional_noformat_type" argument="-test_section:sect_optional_noformat_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="ext">tsv (ext)</option>
         <option value="eyt">tabular (eyt)</option>
         <option value="ezt">tabular (ezt)</option>
         <expand macro="list_string_san" name="sect_optional_noformat_type"/>
       </param>
-      <param name="sect_mandatory_multformat_type" argument="-test_section:sect_mandatory_multformat_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_mandatory_multformat_type" argument="-test_section:sect_mandatory_multformat_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="ext">tsv (ext)</option>
         <option value="eyt">tabular (eyt)</option>
         <option value="ezt">tabular (ezt)</option>
         <expand macro="list_string_san" name="sect_mandatory_multformat_type"/>
       </param>
-      <param name="sect_optional_multformat_type" argument="-test_section:sect_optional_multformat_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_optional_multformat_type" argument="-test_section:sect_optional_multformat_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="ext">tsv (ext)</option>
         <option value="eyt">tabular (eyt)</option>
         <option value="ezt">tabular (ezt)</option>
         <expand macro="list_string_san" name="sect_optional_multformat_type"/>
       </param>
-      <param name="sect_mandatory_noformat_adv_type" argument="-test_section:sect_mandatory_noformat_adv_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_mandatory_noformat_adv_type" argument="-test_section:sect_mandatory_noformat_adv_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="ext">tsv (ext)</option>
         <option value="eyt">tabular (eyt)</option>
         <option value="ezt">tabular (ezt)</option>
         <expand macro="list_string_san" name="sect_mandatory_noformat_adv_type"/>
       </param>
-      <param name="sect_optional_noformat_adv_type" argument="-test_section:sect_optional_noformat_adv_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_optional_noformat_adv_type" argument="-test_section:sect_optional_noformat_adv_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="ext">tsv (ext)</option>
         <option value="eyt">tabular (eyt)</option>
         <option value="ezt">tabular (ezt)</option>
         <expand macro="list_string_san" name="sect_optional_noformat_adv_type"/>
       </param>
-      <param name="sect_mandatory_multformat_adv_type" argument="-test_section:sect_mandatory_multformat_adv_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_mandatory_multformat_adv_type" argument="-test_section:sect_mandatory_multformat_adv_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="ext">tsv (ext)</option>
         <option value="eyt">tabular (eyt)</option>
         <option value="ezt">tabular (ezt)</option>
         <expand macro="list_string_san" name="sect_mandatory_multformat_adv_type"/>
       </param>
-      <param name="sect_optional_multformat_adv_type" argument="-test_section:sect_optional_multformat_adv_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_optional_multformat_adv_type" argument="-test_section:sect_optional_multformat_adv_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="ext">tsv (ext)</option>
         <option value="eyt">tabular (eyt)</option>
         <option value="ezt">tabular (ezt)</option>
@@ -251,25 +251,25 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       <param name="sect_decoy_input_multformat" argument="-test_section:sect_decoy_input_multformat" type="data" format="tabular,tsv" optional="false" label="input file" help=" select tabular,tsv data sets(s)"/>
     </section>
     <expand macro="adv_opts_macro">
-      <param name="mandatory_noformat_adv_type" argument="-mandatory_noformat_adv_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param argument="-mandatory_noformat_adv_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="ext">tsv (ext)</option>
         <option value="eyt">tabular (eyt)</option>
         <option value="ezt">tabular (ezt)</option>
         <expand macro="list_string_san" name="mandatory_noformat_adv_type"/>
       </param>
-      <param name="optional_noformat_adv_type" argument="-optional_noformat_adv_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param argument="-optional_noformat_adv_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="ext">tsv (ext)</option>
         <option value="eyt">tabular (eyt)</option>
         <option value="ezt">tabular (ezt)</option>
         <expand macro="list_string_san" name="optional_noformat_adv_type"/>
       </param>
-      <param name="mandatory_multformat_adv_type" argument="-mandatory_multformat_adv_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param argument="-mandatory_multformat_adv_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="ext">tsv (ext)</option>
         <option value="eyt">tabular (eyt)</option>
         <option value="ezt">tabular (ezt)</option>
         <expand macro="list_string_san" name="mandatory_multformat_adv_type"/>
       </param>
-      <param name="optional_multformat_adv_type" argument="-optional_multformat_adv_type" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param argument="-optional_multformat_adv_type" type="select" optional="false" display="radio" label="string" help="">
         <option value="ext">tsv (ext)</option>
         <option value="eyt">tabular (eyt)</option>
         <option value="ezt">tabular (ezt)</option>
diff --git a/tests/test-data/repeat_test.xml b/tests/test-data/repeat_test.xml
index 4970fe56..ae9ac37d 100644
--- a/tests/test-data/repeat_test.xml
+++ b/tests/test-data/repeat_test.xml
@@ -32,89 +32,89 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
     <configfile name="hardcoded_json"><![CDATA[{}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="string_wodefault_optional" argument="-string_wodefault_optional" type="text" optional="true" value="" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-string_wodefault_optional" type="text" optional="true" value="" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_string_val" name="string_wodefault_optional"/>
       <expand macro="list_string_san" name="string_wodefault_optional"/>
     </param>
-    <param name="string_wodefault_mandatory" argument="-string_wodefault_mandatory" type="text" optional="false" value="" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-string_wodefault_mandatory" type="text" optional="false" value="" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_string_val" name="string_wodefault_mandatory"/>
       <expand macro="list_string_san" name="string_wodefault_mandatory"/>
     </param>
-    <param name="string_default_optional" argument="-string_default_optional" type="text" optional="false" value="&quot;A A&quot; -B" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-string_default_optional" type="text" optional="false" value="&quot;A A&quot; -B" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_string_val" name="string_default_optional"/>
       <expand macro="list_string_san" name="string_default_optional"/>
     </param>
-    <param name="string_default_mandatory" argument="-string_default_mandatory" type="text" optional="false" value="&quot;A A&quot; -B" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-string_default_mandatory" type="text" optional="false" value="&quot;A A&quot; -B" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_string_val" name="string_default_mandatory"/>
       <expand macro="list_string_san" name="string_default_mandatory"/>
     </param>
-    <param name="int_wodefault_optional" argument="-int_wodefault_optional" type="text" optional="true" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-int_wodefault_optional" type="text" optional="true" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_integer_valsan" name="int_wodefault_optional"/>
     </param>
-    <param name="int_wodefault_mandatory" argument="-int_wodefault_mandatory" type="text" optional="false" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-int_wodefault_mandatory" type="text" optional="false" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_integer_valsan" name="int_wodefault_mandatory"/>
     </param>
-    <param name="int_default_optional" argument="-int_default_optional" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-int_default_optional" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_integer_valsan" name="int_default_optional"/>
     </param>
-    <param name="int_default_mandatory" argument="-int_default_mandatory" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-int_default_mandatory" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_integer_valsan" name="int_default_mandatory"/>
     </param>
-    <param name="int_resticted_wodefault_optional" argument="-int_resticted_wodefault_optional" type="text" optional="true" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-int_resticted_wodefault_optional" type="text" optional="true" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_integer_valsan" name="int_resticted_wodefault_optional">
         <validator type="expression" message="a space separated list of integer values in the range -100:100 is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  -100 <= int(_) <= 100])
 ]]></validator>
       </expand>
     </param>
-    <param name="int_resticted_wodefault_mandatory" argument="-int_resticted_wodefault_mandatory" type="text" optional="false" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-int_resticted_wodefault_mandatory" type="text" optional="false" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_integer_valsan" name="int_resticted_wodefault_mandatory">
         <validator type="expression" message="a space separated list of integer values in the range -100: is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  -100 <= int(_)])
 ]]></validator>
       </expand>
     </param>
-    <param name="int_resticted_default_optional" argument="-int_resticted_default_optional" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-int_resticted_default_optional" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_integer_valsan" name="int_resticted_default_optional">
         <validator type="expression" message="a space separated list of integer values in the range :None is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  int(_) <= 100])
 ]]></validator>
       </expand>
     </param>
-    <param name="int_resticted_default_mandatory" argument="-int_resticted_default_mandatory" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-int_resticted_default_mandatory" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_integer_valsan" name="int_resticted_default_mandatory">
         <validator type="expression" message="a space separated list of integer values in the range -100:100 is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  -100 <= int(_) <= 100])
 ]]></validator>
       </expand>
     </param>
-    <param name="double_wodefault_optional" argument="-double_wodefault_optional" type="text" optional="true" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-double_wodefault_optional" type="text" optional="true" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_float_valsan" name="double_wodefault_optional"/>
     </param>
-    <param name="double_wodefault_mandatory" argument="-double_wodefault_mandatory" type="text" optional="false" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-double_wodefault_mandatory" type="text" optional="false" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_float_valsan" name="double_wodefault_mandatory"/>
     </param>
-    <param name="double_default_optional" argument="-double_default_optional" type="text" optional="false" value="-1.0 2.0" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-double_default_optional" type="text" optional="false" value="-1.0 2.0" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_float_valsan" name="double_default_optional"/>
     </param>
-    <param name="double_default_mandatory" argument="-double_default_mandatory" type="text" optional="false" value="-1.0 2.0" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-double_default_mandatory" type="text" optional="false" value="-1.0 2.0" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_float_valsan" name="double_default_mandatory"/>
     </param>
-    <param name="double_resticted_wodefault_optional" argument="-double_resticted_wodefault_optional" type="text" optional="true" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-double_resticted_wodefault_optional" type="text" optional="true" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_float_valsan" name="double_resticted_wodefault_optional">
         <validator type="expression" message="a space separated list of float values in the range -1.0:1.0 is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  -1.0 <= float(_) <= 1.0])
 ]]></validator>
       </expand>
     </param>
-    <param name="double_resticted_wodefault_mandatory" argument="-double_resticted_wodefault_mandatory" type="text" optional="false" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-double_resticted_wodefault_mandatory" type="text" optional="false" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_float_valsan" name="double_resticted_wodefault_mandatory">
         <validator type="expression" message="a space separated list of float values in the range -1.0: is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  -1.0 <= float(_)])
 ]]></validator>
       </expand>
     </param>
-    <param name="double_resticted_default_optional" argument="-double_resticted_default_optional" type="text" optional="false" value="-0.3 0.5" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-double_resticted_default_optional" type="text" optional="false" value="-0.3 0.5" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_float_valsan" name="double_resticted_default_optional">
         <validator type="expression" message="a space separated list of float values in the range :None is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  float(_) <= 1.0])
 ]]></validator>
       </expand>
     </param>
-    <param name="double_resticted_default_mandatory" argument="-double_resticted_default_mandatory" type="text" optional="false" value="-0.3 0.5" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+    <param argument="-double_resticted_default_mandatory" type="text" optional="false" value="-0.3 0.5" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
       <expand macro="list_float_valsan" name="double_resticted_default_mandatory">
         <validator type="expression" message="a space separated list of float values in the range -1.0:1.0 is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  -1.0 <= float(_) <= 1.0])
 ]]></validator>
@@ -299,89 +299,89 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       </param>
     </section>
     <expand macro="adv_opts_macro">
-      <param name="string_wodefault_optional_adv" argument="-string_wodefault_optional_adv" type="text" optional="true" value="" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-string_wodefault_optional_adv" type="text" optional="true" value="" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_string_val" name="string_wodefault_optional_adv"/>
         <expand macro="list_string_san" name="string_wodefault_optional_adv"/>
       </param>
-      <param name="string_wodefault_mandatory_adv" argument="-string_wodefault_mandatory_adv" type="text" optional="false" value="" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-string_wodefault_mandatory_adv" type="text" optional="false" value="" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_string_val" name="string_wodefault_mandatory_adv"/>
         <expand macro="list_string_san" name="string_wodefault_mandatory_adv"/>
       </param>
-      <param name="string_default_optional_adv" argument="-string_default_optional_adv" type="text" optional="false" value="&quot;A A&quot; -B" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-string_default_optional_adv" type="text" optional="false" value="&quot;A A&quot; -B" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_string_val" name="string_default_optional_adv"/>
         <expand macro="list_string_san" name="string_default_optional_adv"/>
       </param>
-      <param name="string_default_mandatory_adv" argument="-string_default_mandatory_adv" type="text" optional="false" value="&quot;A A&quot; -B" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-string_default_mandatory_adv" type="text" optional="false" value="&quot;A A&quot; -B" label="string list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_string_val" name="string_default_mandatory_adv"/>
         <expand macro="list_string_san" name="string_default_mandatory_adv"/>
       </param>
-      <param name="int_wodefault_optional_adv" argument="-int_wodefault_optional_adv" type="text" optional="true" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-int_wodefault_optional_adv" type="text" optional="true" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_integer_valsan" name="int_wodefault_optional_adv"/>
       </param>
-      <param name="int_wodefault_mandatory_adv" argument="-int_wodefault_mandatory_adv" type="text" optional="false" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-int_wodefault_mandatory_adv" type="text" optional="false" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_integer_valsan" name="int_wodefault_mandatory_adv"/>
       </param>
-      <param name="int_default_optional_adv" argument="-int_default_optional_adv" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-int_default_optional_adv" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_integer_valsan" name="int_default_optional_adv"/>
       </param>
-      <param name="int_default_mandatory_adv" argument="-int_default_mandatory_adv" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-int_default_mandatory_adv" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_integer_valsan" name="int_default_mandatory_adv"/>
       </param>
-      <param name="int_resticted_wodefault_optional_adv" argument="-int_resticted_wodefault_optional_adv" type="text" optional="true" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-int_resticted_wodefault_optional_adv" type="text" optional="true" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_integer_valsan" name="int_resticted_wodefault_optional_adv">
           <validator type="expression" message="a space separated list of integer values in the range -100:100 is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  -100 <= int(_) <= 100])
 ]]></validator>
         </expand>
       </param>
-      <param name="int_resticted_wodefault_mandatory_adv" argument="-int_resticted_wodefault_mandatory_adv" type="text" optional="false" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-int_resticted_wodefault_mandatory_adv" type="text" optional="false" value="" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_integer_valsan" name="int_resticted_wodefault_mandatory_adv">
           <validator type="expression" message="a space separated list of integer values in the range -100: is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  -100 <= int(_)])
 ]]></validator>
         </expand>
       </param>
-      <param name="int_resticted_default_optional_adv" argument="-int_resticted_default_optional_adv" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-int_resticted_default_optional_adv" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_integer_valsan" name="int_resticted_default_optional_adv">
           <validator type="expression" message="a space separated list of integer values in the range :None is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  int(_) <= 100])
 ]]></validator>
         </expand>
       </param>
-      <param name="int_resticted_default_mandatory_adv" argument="-int_resticted_default_mandatory_adv" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-int_resticted_default_mandatory_adv" type="text" optional="false" value="-1 2" label="int list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_integer_valsan" name="int_resticted_default_mandatory_adv">
           <validator type="expression" message="a space separated list of integer values in the range -100:100 is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  -100 <= int(_) <= 100])
 ]]></validator>
         </expand>
       </param>
-      <param name="double_wodefault_optional_adv" argument="-double_wodefault_optional_adv" type="text" optional="true" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-double_wodefault_optional_adv" type="text" optional="true" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_float_valsan" name="double_wodefault_optional_adv"/>
       </param>
-      <param name="double_wodefault_mandatory_adv" argument="-double_wodefault_mandatory_adv" type="text" optional="false" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-double_wodefault_mandatory_adv" type="text" optional="false" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_float_valsan" name="double_wodefault_mandatory_adv"/>
       </param>
-      <param name="double_default_optional_adv" argument="-double_default_optional_adv" type="text" optional="false" value="-1.0 2.0" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-double_default_optional_adv" type="text" optional="false" value="-1.0 2.0" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_float_valsan" name="double_default_optional_adv"/>
       </param>
-      <param name="double_default_mandatory_adv" argument="-double_default_mandatory_adv" type="text" optional="false" value="-1.0 2.0" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-double_default_mandatory_adv" type="text" optional="false" value="-1.0 2.0" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_float_valsan" name="double_default_mandatory_adv"/>
       </param>
-      <param name="double_resticted_wodefault_optional_adv" argument="-double_resticted_wodefault_optional_adv" type="text" optional="true" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-double_resticted_wodefault_optional_adv" type="text" optional="true" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_float_valsan" name="double_resticted_wodefault_optional_adv">
           <validator type="expression" message="a space separated list of float values in the range -1.0:1.0 is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  -1.0 <= float(_) <= 1.0])
 ]]></validator>
         </expand>
       </param>
-      <param name="double_resticted_wodefault_mandatory_adv" argument="-double_resticted_wodefault_mandatory_adv" type="text" optional="false" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-double_resticted_wodefault_mandatory_adv" type="text" optional="false" value="" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_float_valsan" name="double_resticted_wodefault_mandatory_adv">
           <validator type="expression" message="a space separated list of float values in the range -1.0: is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  -1.0 <= float(_)])
 ]]></validator>
         </expand>
       </param>
-      <param name="double_resticted_default_optional_adv" argument="-double_resticted_default_optional_adv" type="text" optional="false" value="-0.3 0.5" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-double_resticted_default_optional_adv" type="text" optional="false" value="-0.3 0.5" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_float_valsan" name="double_resticted_default_optional_adv">
           <validator type="expression" message="a space separated list of float values in the range :None is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  float(_) <= 1.0])
 ]]></validator>
         </expand>
       </param>
-      <param name="double_resticted_default_mandatory_adv" argument="-double_resticted_default_mandatory_adv" type="text" optional="false" value="-0.3 0.5" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
+      <param argument="-double_resticted_default_mandatory_adv" type="text" optional="false" value="-0.3 0.5" label="double list" help=" (space separated list, in order to allow for spaces in list items surround them by single quotes)">
         <expand macro="list_float_valsan" name="double_resticted_default_mandatory_adv">
           <validator type="expression" message="a space separated list of float values in the range -1.0:1.0 is required"><![CDATA[len(value.split(' ')) == len([_ for _ in value.split(' ') if  -1.0 <= float(_) <= 1.0])
 ]]></validator>
diff --git a/tests/test-data/select_test.xml b/tests/test-data/select_test.xml
index 02429e2c..6f6baa74 100644
--- a/tests/test-data/select_test.xml
+++ b/tests/test-data/select_test.xml
@@ -32,35 +32,35 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
     <configfile name="hardcoded_json"><![CDATA[{}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="wodefault_mandatory" argument="-wodefault_mandatory" display="checkboxes" type="select" optional="false" label="string" help="">
+    <param argument="-wodefault_mandatory" type="select" optional="false" display="radio" label="string" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C">C</option>
       <option value="D">D</option>
       <expand macro="list_string_san" name="wodefault_mandatory"/>
     </param>
-    <param name="default_mandatory" argument="-default_mandatory" display="checkboxes" type="select" optional="false" label="string" help="">
+    <param argument="-default_mandatory" type="select" optional="false" display="radio" label="string" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C" selected="true">C</option>
       <option value="D">D</option>
       <expand macro="list_string_san" name="default_mandatory"/>
     </param>
-    <param name="wodefault_optional" argument="-wodefault_optional" display="checkboxes" type="select" optional="true" label="string" help="">
+    <param argument="-wodefault_optional" type="select" optional="true" label="string" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C">C</option>
       <option value="D">D</option>
       <expand macro="list_string_san" name="wodefault_optional"/>
     </param>
-    <param name="default_optional" argument="-default_optional" display="checkboxes" type="select" optional="false" label="string" help="">
+    <param argument="-default_optional" type="select" optional="false" display="radio" label="string" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C" selected="true">C</option>
       <option value="D">D</option>
       <expand macro="list_string_san" name="default_optional"/>
     </param>
-    <param name="wodefault_mandatory_many" argument="-wodefault_mandatory_many" type="select" optional="false" label="string" help="">
+    <param argument="-wodefault_mandatory_many" type="select" optional="false" label="string" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C">C</option>
@@ -68,7 +68,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       <option value="E">E</option>
       <expand macro="list_string_san" name="wodefault_mandatory_many"/>
     </param>
-    <param name="default_mandatory_many" argument="-default_mandatory_many" type="select" optional="false" label="string" help="">
+    <param argument="-default_mandatory_many" type="select" optional="false" label="string" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C" selected="true">C</option>
@@ -76,7 +76,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       <option value="E">E</option>
       <expand macro="list_string_san" name="default_mandatory_many"/>
     </param>
-    <param name="wodefault_optional_many" argument="-wodefault_optional_many" type="select" optional="true" label="string" help="">
+    <param argument="-wodefault_optional_many" type="select" optional="true" label="string" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C">C</option>
@@ -84,7 +84,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       <option value="E">E</option>
       <expand macro="list_string_san" name="wodefault_optional_many"/>
     </param>
-    <param name="default_optional_many" argument="-default_optional_many" type="select" optional="false" label="string" help="">
+    <param argument="-default_optional_many" type="select" optional="false" label="string" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C" selected="true">C</option>
@@ -92,35 +92,35 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       <option value="E">E</option>
       <expand macro="list_string_san" name="default_optional_many"/>
     </param>
-    <param name="list_wodefault_optional" argument="-list_wodefault_optional" display="checkboxes" multiple="true" type="select" optional="true" label="string list" help="">
+    <param argument="-list_wodefault_optional" type="select" optional="true" multiple="true" display="checkboxes" label="string list" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C">C</option>
       <option value="D">D</option>
       <expand macro="list_string_san" name="list_wodefault_optional"/>
     </param>
-    <param name="list_wodefault_mandatory" argument="-list_wodefault_mandatory" display="checkboxes" multiple="true" type="select" optional="false" label="string list" help="">
+    <param argument="-list_wodefault_mandatory" type="select" optional="false" multiple="true" label="string list" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C">C</option>
       <option value="D">D</option>
       <expand macro="list_string_san" name="list_wodefault_mandatory"/>
     </param>
-    <param name="list_default_optional" argument="-list_default_optional" display="checkboxes" multiple="true" type="select" optional="false" label="string list" help="">
+    <param argument="-list_default_optional" type="select" optional="false" multiple="true" label="string list" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C" selected="true">C</option>
       <option value="D" selected="true">D</option>
       <expand macro="list_string_san" name="list_default_optional"/>
     </param>
-    <param name="list_default_mandatory" argument="-list_default_mandatory" display="checkboxes" multiple="true" type="select" optional="false" label="string list" help="">
+    <param argument="-list_default_mandatory" type="select" optional="false" multiple="true" label="string list" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C" selected="true">C</option>
       <option value="D" selected="true">D</option>
       <expand macro="list_string_san" name="list_default_mandatory"/>
     </param>
-    <param name="list_wodefault_optional_many" argument="-list_wodefault_optional_many" multiple="true" type="select" optional="true" label="string list" help="">
+    <param argument="-list_wodefault_optional_many" type="select" optional="true" multiple="true" label="string list" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C">C</option>
@@ -128,7 +128,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       <option value="E">E</option>
       <expand macro="list_string_san" name="list_wodefault_optional_many"/>
     </param>
-    <param name="list_wodefault_mandatory_many" argument="-list_wodefault_mandatory_many" multiple="true" type="select" optional="false" label="string list" help="">
+    <param argument="-list_wodefault_mandatory_many" type="select" optional="false" multiple="true" label="string list" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C">C</option>
@@ -136,7 +136,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       <option value="E">E</option>
       <expand macro="list_string_san" name="list_wodefault_mandatory_many"/>
     </param>
-    <param name="list_default_optional_many" argument="-list_default_optional_many" multiple="true" type="select" optional="false" label="string list" help="">
+    <param argument="-list_default_optional_many" type="select" optional="false" multiple="true" label="string list" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C" selected="true">C</option>
@@ -144,7 +144,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       <option value="E">E</option>
       <expand macro="list_string_san" name="list_default_optional_many"/>
     </param>
-    <param name="list_default_mandatory_many" argument="-list_default_mandatory_many" multiple="true" type="select" optional="false" label="string list" help="">
+    <param argument="-list_default_mandatory_many" type="select" optional="false" multiple="true" label="string list" help="">
       <option value="A">A</option>
       <option value="B">B</option>
       <option value="C" selected="true">C</option>
@@ -153,28 +153,28 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       <expand macro="list_string_san" name="list_default_mandatory_many"/>
     </param>
     <section name="test_section" title="Test Section" help="" expanded="false">
-      <param name="sect_wodefault_mandatory" argument="-test_section:sect_wodefault_mandatory" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_wodefault_mandatory" argument="-test_section:sect_wodefault_mandatory" type="select" optional="false" display="radio" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="sect_wodefault_mandatory"/>
       </param>
-      <param name="sect_default_mandatory" argument="-test_section:sect_default_mandatory" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_default_mandatory" argument="-test_section:sect_default_mandatory" type="select" optional="false" display="radio" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="sect_default_mandatory"/>
       </param>
-      <param name="sect_wodefault_optional" argument="-test_section:sect_wodefault_optional" display="checkboxes" type="select" optional="true" label="string" help="">
+      <param name="sect_wodefault_optional" argument="-test_section:sect_wodefault_optional" type="select" optional="true" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="sect_wodefault_optional"/>
       </param>
-      <param name="sect_default_optional" argument="-test_section:sect_default_optional" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_default_optional" argument="-test_section:sect_default_optional" type="select" optional="false" display="radio" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
@@ -213,35 +213,35 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="sect_default_optional_many"/>
       </param>
-      <param name="sect_list_wodefault_optional" argument="-test_section:sect_list_wodefault_optional" display="checkboxes" multiple="true" type="select" optional="true" label="string list" help="">
+      <param name="sect_list_wodefault_optional" argument="-test_section:sect_list_wodefault_optional" type="select" optional="true" multiple="true" display="checkboxes" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="sect_list_wodefault_optional"/>
       </param>
-      <param name="sect_list_wodefault_mandatory" argument="-test_section:sect_list_wodefault_mandatory" display="checkboxes" multiple="true" type="select" optional="false" label="string list" help="">
+      <param name="sect_list_wodefault_mandatory" argument="-test_section:sect_list_wodefault_mandatory" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="sect_list_wodefault_mandatory"/>
       </param>
-      <param name="sect_list_default_optional" argument="-test_section:sect_list_default_optional" display="checkboxes" multiple="true" type="select" optional="false" label="string list" help="">
+      <param name="sect_list_default_optional" argument="-test_section:sect_list_default_optional" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
         <option value="D" selected="true">D</option>
         <expand macro="list_string_san" name="sect_list_default_optional"/>
       </param>
-      <param name="sect_list_default_mandatory" argument="-test_section:sect_list_default_mandatory" display="checkboxes" multiple="true" type="select" optional="false" label="string list" help="">
+      <param name="sect_list_default_mandatory" argument="-test_section:sect_list_default_mandatory" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
         <option value="D" selected="true">D</option>
         <expand macro="list_string_san" name="sect_list_default_mandatory"/>
       </param>
-      <param name="sect_list_wodefault_optional_many" argument="-test_section:sect_list_wodefault_optional_many" multiple="true" type="select" optional="true" label="string list" help="">
+      <param name="sect_list_wodefault_optional_many" argument="-test_section:sect_list_wodefault_optional_many" type="select" optional="true" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
@@ -249,7 +249,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="sect_list_wodefault_optional_many"/>
       </param>
-      <param name="sect_list_wodefault_mandatory_many" argument="-test_section:sect_list_wodefault_mandatory_many" multiple="true" type="select" optional="false" label="string list" help="">
+      <param name="sect_list_wodefault_mandatory_many" argument="-test_section:sect_list_wodefault_mandatory_many" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
@@ -257,7 +257,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="sect_list_wodefault_mandatory_many"/>
       </param>
-      <param name="sect_list_default_optional_many" argument="-test_section:sect_list_default_optional_many" multiple="true" type="select" optional="false" label="string list" help="">
+      <param name="sect_list_default_optional_many" argument="-test_section:sect_list_default_optional_many" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
@@ -265,7 +265,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="sect_list_default_optional_many"/>
       </param>
-      <param name="sect_list_default_mandatory_many" argument="-test_section:sect_list_default_mandatory_many" multiple="true" type="select" optional="false" label="string list" help="">
+      <param name="sect_list_default_mandatory_many" argument="-test_section:sect_list_default_mandatory_many" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
@@ -273,28 +273,28 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="sect_list_default_mandatory_many"/>
       </param>
-      <param name="sect_wodefault_mandatory_adv" argument="-test_section:sect_wodefault_mandatory_adv" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_wodefault_mandatory_adv" argument="-test_section:sect_wodefault_mandatory_adv" type="select" optional="false" display="radio" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="sect_wodefault_mandatory_adv"/>
       </param>
-      <param name="sect_default_mandatory_adv" argument="-test_section:sect_default_mandatory_adv" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_default_mandatory_adv" argument="-test_section:sect_default_mandatory_adv" type="select" optional="false" display="radio" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="sect_default_mandatory_adv"/>
       </param>
-      <param name="sect_wodefault_optional_adv" argument="-test_section:sect_wodefault_optional_adv" display="checkboxes" type="select" optional="true" label="string" help="">
+      <param name="sect_wodefault_optional_adv" argument="-test_section:sect_wodefault_optional_adv" type="select" optional="true" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="sect_wodefault_optional_adv"/>
       </param>
-      <param name="sect_default_optional_adv" argument="-test_section:sect_default_optional_adv" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param name="sect_default_optional_adv" argument="-test_section:sect_default_optional_adv" type="select" optional="false" display="radio" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
@@ -333,35 +333,35 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="sect_default_optional_many_adv"/>
       </param>
-      <param name="sect_list_wodefault_optional_adv" argument="-test_section:sect_list_wodefault_optional_adv" display="checkboxes" multiple="true" type="select" optional="true" label="string list" help="">
+      <param name="sect_list_wodefault_optional_adv" argument="-test_section:sect_list_wodefault_optional_adv" type="select" optional="true" multiple="true" display="checkboxes" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="sect_list_wodefault_optional_adv"/>
       </param>
-      <param name="sect_list_wodefault_mandatory_adv" argument="-test_section:sect_list_wodefault_mandatory_adv" display="checkboxes" multiple="true" type="select" optional="false" label="string list" help="">
+      <param name="sect_list_wodefault_mandatory_adv" argument="-test_section:sect_list_wodefault_mandatory_adv" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="sect_list_wodefault_mandatory_adv"/>
       </param>
-      <param name="sect_list_default_optional_adv" argument="-test_section:sect_list_default_optional_adv" display="checkboxes" multiple="true" type="select" optional="false" label="string list" help="">
+      <param name="sect_list_default_optional_adv" argument="-test_section:sect_list_default_optional_adv" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
         <option value="D" selected="true">D</option>
         <expand macro="list_string_san" name="sect_list_default_optional_adv"/>
       </param>
-      <param name="sect_list_default_mandatory_adv" argument="-test_section:sect_list_default_mandatory_adv" display="checkboxes" multiple="true" type="select" optional="false" label="string list" help="">
+      <param name="sect_list_default_mandatory_adv" argument="-test_section:sect_list_default_mandatory_adv" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
         <option value="D" selected="true">D</option>
         <expand macro="list_string_san" name="sect_list_default_mandatory_adv"/>
       </param>
-      <param name="sect_list_wodefault_optional_many_adv" argument="-test_section:sect_list_wodefault_optional_many_adv" multiple="true" type="select" optional="true" label="string list" help="">
+      <param name="sect_list_wodefault_optional_many_adv" argument="-test_section:sect_list_wodefault_optional_many_adv" type="select" optional="true" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
@@ -369,7 +369,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="sect_list_wodefault_optional_many_adv"/>
       </param>
-      <param name="sect_list_wodefault_mandatory_many_adv" argument="-test_section:sect_list_wodefault_mandatory_many_adv" multiple="true" type="select" optional="false" label="string list" help="">
+      <param name="sect_list_wodefault_mandatory_many_adv" argument="-test_section:sect_list_wodefault_mandatory_many_adv" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
@@ -377,7 +377,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="sect_list_wodefault_mandatory_many_adv"/>
       </param>
-      <param name="sect_list_default_optional_many_adv" argument="-test_section:sect_list_default_optional_many_adv" multiple="true" type="select" optional="false" label="string list" help="">
+      <param name="sect_list_default_optional_many_adv" argument="-test_section:sect_list_default_optional_many_adv" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
@@ -385,7 +385,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="sect_list_default_optional_many_adv"/>
       </param>
-      <param name="sect_list_default_mandatory_many_adv" argument="-test_section:sect_list_default_mandatory_many_adv" multiple="true" type="select" optional="false" label="string list" help="">
+      <param name="sect_list_default_mandatory_many_adv" argument="-test_section:sect_list_default_mandatory_many_adv" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
@@ -395,35 +395,35 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       </param>
     </section>
     <expand macro="adv_opts_macro">
-      <param name="wodefault_mandatory_adv" argument="-wodefault_mandatory_adv" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param argument="-wodefault_mandatory_adv" type="select" optional="false" display="radio" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="wodefault_mandatory_adv"/>
       </param>
-      <param name="default_mandatory_adv" argument="-default_mandatory_adv" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param argument="-default_mandatory_adv" type="select" optional="false" display="radio" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="default_mandatory_adv"/>
       </param>
-      <param name="wodefault_optional_adv" argument="-wodefault_optional_adv" display="checkboxes" type="select" optional="true" label="string" help="">
+      <param argument="-wodefault_optional_adv" type="select" optional="true" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="wodefault_optional_adv"/>
       </param>
-      <param name="default_optional_adv" argument="-default_optional_adv" display="checkboxes" type="select" optional="false" label="string" help="">
+      <param argument="-default_optional_adv" type="select" optional="false" display="radio" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="default_optional_adv"/>
       </param>
-      <param name="wodefault_mandatory_many_adv" argument="-wodefault_mandatory_many_adv" type="select" optional="false" label="string" help="">
+      <param argument="-wodefault_mandatory_many_adv" type="select" optional="false" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
@@ -431,7 +431,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="wodefault_mandatory_many_adv"/>
       </param>
-      <param name="default_mandatory_many_adv" argument="-default_mandatory_many_adv" type="select" optional="false" label="string" help="">
+      <param argument="-default_mandatory_many_adv" type="select" optional="false" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
@@ -439,7 +439,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="default_mandatory_many_adv"/>
       </param>
-      <param name="wodefault_optional_many_adv" argument="-wodefault_optional_many_adv" type="select" optional="true" label="string" help="">
+      <param argument="-wodefault_optional_many_adv" type="select" optional="true" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
@@ -447,7 +447,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="wodefault_optional_many_adv"/>
       </param>
-      <param name="default_optional_many_adv" argument="-default_optional_many_adv" type="select" optional="false" label="string" help="">
+      <param argument="-default_optional_many_adv" type="select" optional="false" label="string" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
@@ -455,35 +455,35 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="default_optional_many_adv"/>
       </param>
-      <param name="list_wodefault_optional_adv" argument="-list_wodefault_optional_adv" display="checkboxes" multiple="true" type="select" optional="true" label="string list" help="">
+      <param argument="-list_wodefault_optional_adv" type="select" optional="true" multiple="true" display="checkboxes" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="list_wodefault_optional_adv"/>
       </param>
-      <param name="list_wodefault_mandatory_adv" argument="-list_wodefault_mandatory_adv" display="checkboxes" multiple="true" type="select" optional="false" label="string list" help="">
+      <param argument="-list_wodefault_mandatory_adv" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
         <option value="D">D</option>
         <expand macro="list_string_san" name="list_wodefault_mandatory_adv"/>
       </param>
-      <param name="list_default_optional_adv" argument="-list_default_optional_adv" display="checkboxes" multiple="true" type="select" optional="false" label="string list" help="">
+      <param argument="-list_default_optional_adv" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
         <option value="D" selected="true">D</option>
         <expand macro="list_string_san" name="list_default_optional_adv"/>
       </param>
-      <param name="list_default_mandatory_adv" argument="-list_default_mandatory_adv" display="checkboxes" multiple="true" type="select" optional="false" label="string list" help="">
+      <param argument="-list_default_mandatory_adv" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
         <option value="D" selected="true">D</option>
         <expand macro="list_string_san" name="list_default_mandatory_adv"/>
       </param>
-      <param name="list_wodefault_optional_many_adv" argument="-list_wodefault_optional_many_adv" multiple="true" type="select" optional="true" label="string list" help="">
+      <param argument="-list_wodefault_optional_many_adv" type="select" optional="true" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
@@ -491,7 +491,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="list_wodefault_optional_many_adv"/>
       </param>
-      <param name="list_wodefault_mandatory_many_adv" argument="-list_wodefault_mandatory_many_adv" multiple="true" type="select" optional="false" label="string list" help="">
+      <param argument="-list_wodefault_mandatory_many_adv" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C">C</option>
@@ -499,7 +499,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="list_wodefault_mandatory_many_adv"/>
       </param>
-      <param name="list_default_optional_many_adv" argument="-list_default_optional_many_adv" multiple="true" type="select" optional="false" label="string list" help="">
+      <param argument="-list_default_optional_many_adv" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
@@ -507,7 +507,7 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
         <option value="E">E</option>
         <expand macro="list_string_san" name="list_default_optional_many_adv"/>
       </param>
-      <param name="list_default_mandatory_many_adv" argument="-list_default_mandatory_many_adv" multiple="true" type="select" optional="false" label="string list" help="">
+      <param argument="-list_default_mandatory_many_adv" type="select" optional="false" multiple="true" label="string list" help="">
         <option value="A">A</option>
         <option value="B">B</option>
         <option value="C" selected="true">C</option>
diff --git a/tests/test-data/string.xml b/tests/test-data/string.xml
index eb1d1838..25b2883a 100644
--- a/tests/test-data/string.xml
+++ b/tests/test-data/string.xml
@@ -32,16 +32,16 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
     <configfile name="hardcoded_json"><![CDATA[{}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="wodefault_mandatory_unrestricted" argument="-wodefault_mandatory_unrestricted" type="text" optional="false" value="" label="string" help="">
+    <param argument="-wodefault_mandatory_unrestricted" type="text" optional="false" value="" label="string" help="">
       <expand macro="list_string_san" name="wodefault_mandatory_unrestricted"/>
     </param>
-    <param name="default_mandatory_unrestricted" argument="-default_mandatory_unrestricted" type="text" optional="false" value="default" label="string" help="">
+    <param argument="-default_mandatory_unrestricted" type="text" optional="false" value="default" label="string" help="">
       <expand macro="list_string_san" name="default_mandatory_unrestricted"/>
     </param>
-    <param name="wodefault_optional_unrestricted" argument="-wodefault_optional_unrestricted" type="text" optional="true" value="" label="string" help="">
+    <param argument="-wodefault_optional_unrestricted" type="text" optional="true" value="" label="string" help="">
       <expand macro="list_string_san" name="wodefault_optional_unrestricted"/>
     </param>
-    <param name="default_optional_unrestricted" argument="-default_optional_unrestricted" type="text" optional="false" value="default" label="string" help="">
+    <param argument="-default_optional_unrestricted" type="text" optional="false" value="default" label="string" help="">
       <expand macro="list_string_san" name="default_optional_unrestricted"/>
     </param>
     <section name="test_section" title="Test Section" help="" expanded="false">
@@ -71,16 +71,16 @@ python3 '$__tool_directory__/fill_ctd.py' '@EXECUTABLE@.ctd' '$args_json' '$hard
       </param>
     </section>
     <expand macro="adv_opts_macro">
-      <param name="wodefault_mandatory_unrestricted_adv" argument="-wodefault_mandatory_unrestricted_adv" type="text" optional="false" value="" label="string" help="">
+      <param argument="-wodefault_mandatory_unrestricted_adv" type="text" optional="false" value="" label="string" help="">
         <expand macro="list_string_san" name="wodefault_mandatory_unrestricted_adv"/>
       </param>
-      <param name="default_mandatory_unrestricted_adv" argument="-default_mandatory_unrestricted_adv" type="text" optional="false" value="default" label="string" help="">
+      <param argument="-default_mandatory_unrestricted_adv" type="text" optional="false" value="default" label="string" help="">
         <expand macro="list_string_san" name="default_mandatory_unrestricted_adv"/>
       </param>
-      <param name="wodefault_optional_unrestricted_adv" argument="-wodefault_optional_unrestricted_adv" type="text" optional="true" value="" label="string" help="">
+      <param argument="-wodefault_optional_unrestricted_adv" type="text" optional="true" value="" label="string" help="">
         <expand macro="list_string_san" name="wodefault_optional_unrestricted_adv"/>
       </param>
-      <param name="default_optional_unrestricted_adv" argument="-default_optional_unrestricted_adv" type="text" optional="false" value="default" label="string" help="">
+      <param argument="-default_optional_unrestricted_adv" type="text" optional="false" value="default" label="string" help="">
         <expand macro="list_string_san" name="default_optional_unrestricted_adv"/>
       </param>
     </expand>