diff --git a/test/functional/tools/column_multi_param.xml b/test/functional/tools/column_multi_param.xml
index e01713d27df..cc368c50c17 100644
--- a/test/functional/tools/column_multi_param.xml
+++ b/test/functional/tools/column_multi_param.xml
@@ -9,7 +9,7 @@
     <param name="col" type="data_column" data_ref="input1" label="Column to Use" />
   </inputs>
   <outputs>
-    <data name="output1" type="tabular" from_work_dir="col_output" />
+    <data name="output1" format="tabular" from_work_dir="col_output" />
   </outputs>
   <tests>
     <test>
diff --git a/test/functional/tools/column_param.xml b/test/functional/tools/column_param.xml
index 656dad2374a..c0eea67e198 100644
--- a/test/functional/tools/column_param.xml
+++ b/test/functional/tools/column_param.xml
@@ -7,7 +7,7 @@
     <param name="col" type="data_column" data_ref="input1" label="Column to Use" />
   </inputs>
   <outputs>
-    <data name="output1" type="tabular" from_work_dir="col_output" />
+    <data name="output1" format="tabular" from_work_dir="col_output" />
   </outputs>
   <tests>
     <test>
diff --git a/test/functional/tools/identifier_collection.xml b/test/functional/tools/identifier_collection.xml
index 222302ebfce..e5f0a3e4dcc 100644
--- a/test/functional/tools/identifier_collection.xml
+++ b/test/functional/tools/identifier_collection.xml
@@ -8,7 +8,7 @@
     <param type="data_collection" collection_type="list" name="input1" label="Input 1" />
   </inputs>
   <outputs>
-    <data name="output1" type="tabular" from_work_dir="output1" />
+    <data name="output1" format="tabular" from_work_dir="output1" />
   </outputs>
   <tests>
   </tests>
diff --git a/test/functional/tools/identifier_multiple.xml b/test/functional/tools/identifier_multiple.xml
index ac7416942f8..4fdac746896 100644
--- a/test/functional/tools/identifier_multiple.xml
+++ b/test/functional/tools/identifier_multiple.xml
@@ -8,7 +8,7 @@
     <param type="data" name="input1" label="Input 1" multiple="true" />
   </inputs>
   <outputs>
-    <data name="output1" type="tabular" from_work_dir="output1" />
+    <data name="output1" format="tabular" from_work_dir="output1" />
   </outputs>
   <tests>
   </tests>
diff --git a/test/functional/tools/identifier_single.xml b/test/functional/tools/identifier_single.xml
index 2b870f86c98..992873bed7c 100644
--- a/test/functional/tools/identifier_single.xml
+++ b/test/functional/tools/identifier_single.xml
@@ -6,7 +6,7 @@
     <param type="data" name="input1" label="Input 1" />
   </inputs>
   <outputs>
-    <data name="output1" type="tabular" from_work_dir="output1" />
+    <data name="output1" format="tabular" from_work_dir="output1" />
   </outputs>
   <tests>
   </tests>
diff --git a/test/functional/tools/inputs_as_json.xml b/test/functional/tools/inputs_as_json.xml
index d4c735fbf03..7cf8dafb28b 100644
--- a/test/functional/tools/inputs_as_json.xml
+++ b/test/functional/tools/inputs_as_json.xml
@@ -75,7 +75,7 @@ with open("output", "w") as f:
                 <param name="more_text" type="text" value="sdefault" />
             </when> 
         </conditional>
-        <section name="section_example">
+        <section name="section_example" title="Section Example">
             <param name="section_text" type="text" value="section_default" />
         </section>
     </inputs>
diff --git a/test/functional/tools/multi_output.xml b/test/functional/tools/multi_output.xml
index 7d0a6ae2e84..8348b71281e 100644
--- a/test/functional/tools/multi_output.xml
+++ b/test/functional/tools/multi_output.xml
@@ -1,4 +1,4 @@
-<tool id="multi_output" name="Multi_Output" description="multi_output" force_history_refresh="True" version="0.1.0">
+<tool id="multi_output" name="Multi_Output" version="0.1.0">
   <command>
     echo "Hello" > $report;
     echo "World Contents" > '${__new_file_path__}/primary_${report.id}_world_visible_?'
diff --git a/test/functional/tools/multi_output_assign_primary.xml b/test/functional/tools/multi_output_assign_primary.xml
index 2c4557156eb..cb98e0955c9 100644
--- a/test/functional/tools/multi_output_assign_primary.xml
+++ b/test/functional/tools/multi_output_assign_primary.xml
@@ -1,4 +1,4 @@
-<tool id="multi_output_assign_primary" name="multi_output_assign_primary" description="multi_output_assign_primary" version="0.1.0">
+<tool id="multi_output_assign_primary" name="multi_output_assign_primary" version="0.1.0">
   <command>
     echo "1" > sample1.report.tsv;
     echo "2" > sample2.report.tsv;
diff --git a/test/functional/tools/multi_output_configured.xml b/test/functional/tools/multi_output_configured.xml
index cd5965a049d..dc3baeb50fb 100644
--- a/test/functional/tools/multi_output_configured.xml
+++ b/test/functional/tools/multi_output_configured.xml
@@ -1,4 +1,4 @@
-<tool id="multi_output_configured" name="Multi_Output_Configured" description="multi_output_configured" version="0.1.0">
+<tool id="multi_output_configured" name="Multi_Output_Configured" version="0.1.0">
   <command>
     echo "Hello" > $report;
     mkdir subdir1;
diff --git a/test/functional/tools/tool_directory.xml b/test/functional/tools/tool_directory.xml
index 23990e98864..53532f531bb 100644
--- a/test/functional/tools/tool_directory.xml
+++ b/test/functional/tools/tool_directory.xml
@@ -6,7 +6,7 @@
     <param type="integer" name="ignored" label="Ignored" value="0" />
   </inputs>
   <outputs>
-    <data name="output1" type="xml" from_work_dir="output1" />
+    <data name="output1" format="xml" from_work_dir="output1" />
   </outputs>
   <tests>
     <test>
diff --git a/test/functional/tools/validation_repeat.xml b/test/functional/tools/validation_repeat.xml
index e8bfacff411..ad9ee1b5904 100644
--- a/test/functional/tools/validation_repeat.xml
+++ b/test/functional/tools/validation_repeat.xml
@@ -8,10 +8,10 @@
     #end for
   </command>
   <inputs>
-    <repeat name="r1" label="Repeat 1">
+    <repeat name="r1" title="Repeat 1">
       <param name="text" type="text" label="text input" />
     </repeat>
-    <repeat name="r2" label="Repeat 2">
+    <repeat name="r2" title="Repeat 2">
       <param name="text" type="text" label="text input">
         <validator type="empty_field" />
         <sanitizer>
diff --git a/tools/data_source/upload.xml b/tools/data_source/upload.xml
index e28b95dbb56..6d08c75bad7 100644
--- a/tools/data_source/upload.xml
+++ b/tools/data_source/upload.xml
@@ -53,7 +53,7 @@
       <param name="NAME" type="hidden" help="Name for dataset in upload"></param>
     </upload_dataset>
     <param name="dbkey" type="genomebuild" label="Genome" />
-    <conditional name="files_metadata" title="Specify metadata" value_from="self:app.datatypes_registry.get_upload_metadata_params" value_ref="file_type" value_ref_in_group="False" />
+    <conditional name="files_metadata" value_from="self:app.datatypes_registry.get_upload_metadata_params" value_ref="file_type" value_ref_in_group="False" />
     <!-- <param name="other_dbkey" type="text" label="Or user-defined Genome" /> -->
   </inputs>
   <help>