diff --git a/test/functional/tools/collection_mixed_param.xml b/test/functional/tools/collection_mixed_param.xml
index 98d435be3a3..73b3eb8800f 100644
--- a/test/functional/tools/collection_mixed_param.xml
+++ b/test/functional/tools/collection_mixed_param.xml
@@ -3,8 +3,19 @@
     cat #for $f in $f1# ${f} #end for# $f2 >> $out1;
   </command>
   <inputs>
-    <param name="f1" type="data_collection" collection_type="paired" />
-    <param name="f2" type="data" format="txt" />
+    <param name="f1" type="data_collection" collection_type="paired" label="collection param" />
+    <param name="f2" type="data" format="txt" label="data param" />
+    <conditional name="advanced">
+      <param name="full" type="select" label="Parameter Settings">
+        <option value="no">Use defaults</option>
+        <option value="yes">Full parameter list</option>
+      </param>
+      <when value="yes">
+        <param name="advanced_threshold" type="integer" value="8" />
+      </when>
+      <when value="no">
+      </when>
+    </conditional>
   </inputs>
   <outputs>
     <data format="txt" name="out1" />
diff --git a/test/functional/tools/collection_paired_test.xml b/test/functional/tools/collection_paired_test.xml
index 72a78371db8..329a84111b0 100644
--- a/test/functional/tools/collection_paired_test.xml
+++ b/test/functional/tools/collection_paired_test.xml
@@ -3,7 +3,7 @@
     cat $f1.forward $f1['reverse'] >> $out1;
   </command>
   <inputs>
-    <param name="f1" type="data_collection" collection_type="paired" />
+    <param name="f1" type="data_collection" collection_type="paired" label="Input pair" />
   </inputs>
   <outputs>
     <data format="txt" name="out1" />
diff --git a/test/functional/tools/multi_data_param.xml b/test/functional/tools/multi_data_param.xml
index 9ffe8bbabe3..057e584a1f6 100644
--- a/test/functional/tools/multi_data_param.xml
+++ b/test/functional/tools/multi_data_param.xml
@@ -4,8 +4,19 @@
     cat #for $f in $f2# ${f} #end for# >> $out2
   </command>
   <inputs>
-    <param name="f1" type="data" format="txt" multiple="true" />
-    <param name="f2" type="data" format="txt" multiple="true" />
+    <param name="f1" type="data" format="txt" multiple="true" label="Data 1" />
+    <param name="f2" type="data" format="txt" multiple="true" label="Data 2" />
+    <conditional name="advanced">
+      <param name="full" type="select" label="Parameter Settings">
+        <option value="no">Use defaults</option>
+        <option value="yes">Full parameter list</option>
+      </param>
+      <when value="yes">
+        <param name="advanced_threshold" type="integer" value="8" />
+      </when>
+      <when value="no">
+      </when>
+    </conditional>
   </inputs>
   <outputs>
     <data format="txt" name="out1" />
diff --git a/test/qunit/tests/workflow_editor_tests.js b/test/qunit/tests/workflow_editor_tests.js
index f30b8f71829..cfcdab8322a 100644
--- a/test/qunit/tests/workflow_editor_tests.js
+++ b/test/qunit/tests/workflow_editor_tests.js
@@ -803,11 +803,12 @@ define([
             return node;
         },
         addOutput: function( terminal, connected ) {
+            var self = this;
             var connectedOutput = this.newOutputTerminal();
-            var inputTerminal = this.newInputTerminal();
             var node = terminal.node;
             if( connected ) {
                 with_workflow_global( function() {
+                    var inputTerminal = self.newInputTerminal();
                     new Connector( inputTerminal, connectedOutput );
                 } );
             }
@@ -818,10 +819,11 @@ define([
             return this.addOutput( terminal, true );
         },
         addConnectedInput: function( terminal ) {
+            var self = this;
             var connectedInput = this.newInputTerminal();
-            var outputTerminal = this.newOutputTerminal();
             var node = terminal.node;
             with_workflow_global( function() {
+                var outputTerminal = self.newOutputTerminal();
                 new Connector( connectedInput, outputTerminal );
             } );
             this._addTerminalTo( connectedInput, node.input_terminals );