From b9876f63ca58ffec12d3db96b678f06f18e8b333 Mon Sep 17 00:00:00 2001
From: Dan <daniel.h.funk@gmail.com>
Date: Wed, 26 Jan 2022 11:50:35 -0500
Subject: [PATCH 1/3] Allow setting the sync file root using environment
 variables.

---
 config/default.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/default.py b/config/default.py
index 22ab87f1..451f348a 100644
--- a/config/default.py
+++ b/config/default.py
@@ -90,4 +90,4 @@ MAIL_USERNAME = environ.get('MAIL_USERNAME', default='')
 MAIL_PASSWORD = environ.get('MAIL_PASSWORD', default='')
 
 # Local file path
-SYNC_FILE_ROOT = './SPECS'
\ No newline at end of file
+SYNC_FILE_ROOT = environ.get('SYNC_FILE_ROOT', default='SPECS')
\ No newline at end of file

From c2c6410bbbb0b0b78bc7ad4f301e8866294e1340 Mon Sep 17 00:00:00 2001
From: Dan <daniel.h.funk@gmail.com>
Date: Thu, 17 Feb 2022 14:12:31 -0500
Subject: [PATCH 2/3] Assure we update the workflow model, so we don't keep
 reporting the error over and over again.

---
 crc/services/workflow_service.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crc/services/workflow_service.py b/crc/services/workflow_service.py
index 42246540..d4027d10 100755
--- a/crc/services/workflow_service.py
+++ b/crc/services/workflow_service.py
@@ -121,6 +121,8 @@ class WorkflowService(object):
                 processor.save()
             except Exception as e:
                 workflow_model.status = WorkflowStatus.erroring
+                db.session.add(workflow_model)
+                db.session.commit()
                 app.logger.error(f"Error running waiting task for workflow #%i (%s) for study #%i.  %s" %
                                  (workflow_model.id,
                                   workflow_model.workflow_spec_id,

From 70fc9451a439f812ddae03267ceaa70683f678ad Mon Sep 17 00:00:00 2001
From: alicia pritchett <aliciateaford@gmail.com>
Date: Mon, 21 Feb 2022 09:44:00 -0500
Subject: [PATCH 3/3] fix tests (update BPMNs)

test_stupid_slow_file_upload_form still fails
---
 .../add_delete_irb_document.bpmn              |  2 +-
 .../associated_email/associated_email.bpmn    |  2 +-
 .../boolean_default_value.bpmn                |  4 ++--
 .../data/date_validation/date_validation.bpmn |  2 +-
 .../date_value_expression.bpmn                |  2 +-
 tests/data/decision_table/decision_table.bpmn |  2 +-
 .../decision_table_dictionary_output.bpmn     |  2 +-
 .../default_value_expression.bpmn             |  4 ++--
 .../delete_task_data/delete_task_data.bpmn    | 12 +++++-----
 tests/data/docx/docx.bpmn                     | 10 ++++----
 tests/data/docx_embedded/docx_embedded.bpmn   |  6 ++---
 tests/data/email/email.bpmn                   |  4 ++--
 .../email_attachment_empty_string.bpmn        |  4 ++--
 .../email_none_attachment.bpmn                |  4 ++--
 tests/data/email_script/email_script.bpmn     | 12 +++++-----
 tests/data/enum_checkbox/enum_checkbox.bpmn   |  2 +-
 .../data/enum_empty_list/enum_empty_list.bpmn |  2 +-
 tests/data/enum_file_data/enum_file_data.bpmn | 12 +++++-----
 .../enum_options_all/enum_options_all.bpmn    | 18 +++++++-------
 .../enum_options_competing_files.bpmn         |  2 +-
 .../enum_options_from_file.bpmn               |  2 +-
 .../enum_options_from_task_data.bpmn          | 16 ++++++-------
 .../enum_options_with_search.bpmn             |  2 +-
 tests/data/enum_results/enum_results.bpmn     |  2 +-
 .../enum_value_expression.bpmn                |  4 ++--
 .../enum_value_expression_fail.bpmn           |  4 ++--
 .../exclusive_gateway/exclusive_gateway.bpmn  |  6 ++---
 .../exclusive_gateway_2.bpmn                  |  8 +++----
 .../failing_gateway_workflow.bpmn             |  4 ++--
 .../file_upload_form/file_upload_form.bpmn    |  6 ++---
 .../file_upload_form_single.bpmn              |  6 ++---
 .../form_expressions/form_expressions.bpmn    | 18 +++++++-------
 .../form_extentsions/form_extentsions.bpmn    |  2 +-
 tests/data/get_email_data/get_email_data.bpmn |  2 +-
 .../get_email_data_by_workflow.bpmn           |  2 +-
 tests/data/get_localtime/get_localtime.bpmn   |  8 +++----
 .../get_workflow_status.bpmn                  |  2 +-
 tests/data/get_zip_file/get_zip_file.bpmn     |  2 +-
 tests/data/hello_world/hello_world.bpmn       |  2 +-
 .../hidden_file_data_field.bpmn               |  8 +++----
 .../hidden_required_field.bpmn                |  4 ++--
 .../hidden_required_field_pass.bpmn           |  2 +-
 ...hidden_required_field_pass_expression.bpmn |  2 +-
 .../invalid_custom_field.bpmn                 |  2 +-
 .../invalid_expression.bpmn                   |  6 ++---
 tests/data/invalid_roles/invalid_roles.bpmn   | 10 ++++----
 tests/data/invalid_spec/invalid_spec.bpmn     |  6 ++---
 .../irb_api_personnel/irb_api_personnel.bpmn  | 10 ++++----
 tests/data/jinja_email/jinja_email.bpmn       |  8 +++----
 tests/data/ldap_lookup/ldap_lookup.bpmn       |  2 +-
 tests/data/ldap_script/ldap_script.bpmn       |  4 ++--
 ...nual_task_with_external_documentation.bpmn |  2 +-
 tests/data/message_event/message_event.bpmn   |  4 ++--
 .../missing_form_key/missing_form_key.bpmn    |  2 +-
 .../data/missing_library/missing_library.bpmn |  4 ++--
 tests/data/multi_instance/multi_instance.bpmn |  2 +-
 .../multi_instance_parallel.bpmn              |  2 +-
 tests/data/parallel_tasks/parallel_tasks.bpmn | 24 +++++++++----------
 ...sk_data_over_previous_form_submission.bpmn |  2 +-
 tests/data/random_fact/random_fact.bpmn       |  2 +-
 tests/data/random_fact/random_fact2.bpmn      |  2 +-
 .../data/read_only_field/read_only_field.bpmn |  2 +-
 tests/data/repeat_form/repeat_form.bpmn       |  2 +-
 .../data/required_fields/required_fields.bpmn |  4 ++--
 tests/data/reset_workflow/reset_workflow.bpmn |  2 +-
 tests/data/roles/roles.bpmn                   | 12 +++++-----
 .../script_with_name_error.bpmn               |  4 ++--
 .../set_study_progress_status.bpmn            |  2 +-
 tests/data/spec_from_id/spec_from_id.bpmn     |  2 +-
 .../spec_from_workflow_id.bpmn                |  2 +-
 .../study_cancellations.bpmn                  |  4 ++--
 .../study_info_script/study_info_script.bpmn  |  2 +-
 tests/data/subprocess/subprocess.bpmn         |  4 ++--
 .../test_value_expression.bpmn                |  2 +-
 .../modified/two_forms_struc_mod.bpmn         |  4 ++--
 .../modified/two_forms_text_mod.bpmn          |  4 ++--
 tests/data/two_forms/two_forms.bpmn           |  4 ++--
 tests/data/two_user_tasks/two_user_tasks.bpmn |  4 ++--
 .../update_study_info/update_study_info.bpmn  |  4 ++--
 .../workflow_form_field_name.bpmn             |  6 ++---
 .../workflow_form_field_type.bpmn             |  2 +-
 .../workflow_sync_responses/random_fact2.bpmn |  2 +-
 82 files changed, 195 insertions(+), 195 deletions(-)

diff --git a/tests/data/add_delete_irb_document/add_delete_irb_document.bpmn b/tests/data/add_delete_irb_document/add_delete_irb_document.bpmn
index 0f7f2661..216ddca4 100644
--- a/tests/data/add_delete_irb_document/add_delete_irb_document.bpmn
+++ b/tests/data/add_delete_irb_document/add_delete_irb_document.bpmn
@@ -12,7 +12,7 @@
     <bpmn:userTask id="Activity_WhichIRBDocument" name="Which IRB Document" camunda:formKey="UploadIRBDoc">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="irb_document" label="IRB Document" type="string" defaultValue="Study_Protocol_Document" />
+          <camunda:formField id="irb_document" label="'IRB Document'"  type="string" defaultValue="Study_Protocol_Document" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1j6i6nv</bpmn:incoming>
diff --git a/tests/data/associated_email/associated_email.bpmn b/tests/data/associated_email/associated_email.bpmn
index e01965af..7045b98f 100644
--- a/tests/data/associated_email/associated_email.bpmn
+++ b/tests/data/associated_email/associated_email.bpmn
@@ -9,7 +9,7 @@
     <bpmn:userTask id="Activity_GetEmailAddress" name="Get Email Address" camunda:formKey="EmailAddress">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="address" label="Please enter an email address" type="string" defaultValue="username@company.com" />
+          <camunda:formField id="address" label="'Please enter an email address'"  type="string" defaultValue="username@company.com" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0b5st2e</bpmn:incoming>
diff --git a/tests/data/boolean_default_value/boolean_default_value.bpmn b/tests/data/boolean_default_value/boolean_default_value.bpmn
index 249893e0..897107f6 100644
--- a/tests/data/boolean_default_value/boolean_default_value.bpmn
+++ b/tests/data/boolean_default_value/boolean_default_value.bpmn
@@ -7,7 +7,7 @@
     <bpmn:userTask id="Activity_SelectBoolean" name="Boolean Select" camunda:formKey="PickOne">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="pick_one" label="Pick One" type="boolean" defaultValue="yes_no" />
+          <camunda:formField id="pick_one" label="'Pick One'"  type="boolean" defaultValue="yes_no" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0zp5mss</bpmn:incoming>
@@ -37,7 +37,7 @@
       <bpmn:documentation>&lt;H1&gt;Hello&lt;/H1&gt;</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="yes_no" label="Set A default" type="boolean">
+          <camunda:formField id="yes_no" label="'Set A default'"  type="boolean">
             <camunda:validation>
               <camunda:constraint name="required" config="true" />
             </camunda:validation>
diff --git a/tests/data/date_validation/date_validation.bpmn b/tests/data/date_validation/date_validation.bpmn
index 8cf29260..308f17f5 100644
--- a/tests/data/date_validation/date_validation.bpmn
+++ b/tests/data/date_validation/date_validation.bpmn
@@ -14,7 +14,7 @@
     <bpmn:userTask id="Activity_1lg09if" name="Get Date" camunda:formKey="DateForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="a_date" label="A Date" type="date">
+          <camunda:formField id="a_date" label="'A Date'"  type="date">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
diff --git a/tests/data/date_value_expression/date_value_expression.bpmn b/tests/data/date_value_expression/date_value_expression.bpmn
index 1a334e9d..a457eb67 100644
--- a/tests/data/date_value_expression/date_value_expression.bpmn
+++ b/tests/data/date_value_expression/date_value_expression.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Date_Value_Expression" name="Date Form" camunda:formKey="My Form">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="my_date" label="my Date" type="date" defaultValue="datetime.datetime.now()">
+          <camunda:formField id="my_date" label="'my Date'"  type="date" defaultValue="datetime.datetime.now()">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
diff --git a/tests/data/decision_table/decision_table.bpmn b/tests/data/decision_table/decision_table.bpmn
index 82bcb385..93ff512a 100644
--- a/tests/data/decision_table/decision_table.bpmn
+++ b/tests/data/decision_table/decision_table.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="get_num_presents" name="Get number of presents" camunda:formKey="present_question">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="num_presents" label="How many presents will my dog Ginger leave for me today?" type="long" defaultValue="0">
+          <camunda:formField id="num_presents" label="'How many presents will my dog Ginger leave for me today?'"  type="long" defaultValue="0">
             <camunda:validation>
               <camunda:constraint name="required" config="true" />
             </camunda:validation>
diff --git a/tests/data/decision_table_dictionary_output/decision_table_dictionary_output.bpmn b/tests/data/decision_table_dictionary_output/decision_table_dictionary_output.bpmn
index 1117386f..adc54078 100644
--- a/tests/data/decision_table_dictionary_output/decision_table_dictionary_output.bpmn
+++ b/tests/data/decision_table_dictionary_output/decision_table_dictionary_output.bpmn
@@ -26,7 +26,7 @@
     <bpmn:userTask id="Task_SetName" name="Set Name" camunda:formKey="NameForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Name" type="string" defaultValue="Layla" />
+          <camunda:formField id="name" label="'Name'"  type="string" defaultValue="Layla" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0x4n744</bpmn:incoming>
diff --git a/tests/data/default_value_expression/default_value_expression.bpmn b/tests/data/default_value_expression/default_value_expression.bpmn
index 3a73f8f5..232d4fd3 100644
--- a/tests/data/default_value_expression/default_value_expression.bpmn
+++ b/tests/data/default_value_expression/default_value_expression.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Task_0zremzf" name="Set Value Expression" camunda:formKey="valueExpression">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="value_expression_expression" label="Expression Value" type="string">
+          <camunda:formField id="value_expression_expression" label="'Expression Value'"  type="string">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
@@ -22,7 +22,7 @@
     <bpmn:userTask id="Task_GetName" name="Get Name" camunda:formKey="getName">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Name" type="string" defaultValue="World">
+          <camunda:formField id="name" label="'Name'"  type="string" defaultValue="World">
             <camunda:properties>
               <camunda:property id="value_expression" value="value_expression_expression" />
             </camunda:properties>
diff --git a/tests/data/delete_task_data/delete_task_data.bpmn b/tests/data/delete_task_data/delete_task_data.bpmn
index e7ba46d9..e2fecc98 100644
--- a/tests/data/delete_task_data/delete_task_data.bpmn
+++ b/tests/data/delete_task_data/delete_task_data.bpmn
@@ -10,13 +10,13 @@
     <bpmn:userTask id="Activity_UploadSingle" name="Upload Single" camunda:formKey="SingleFile">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="Study_Protocol_Document" label="Select File" type="file" />
-          <camunda:formField id="ShortDesc" label="Short Description" type="textarea">
+          <camunda:formField id="Study_Protocol_Document" label="'Select File'"  type="file" />
+          <camunda:formField id="ShortDesc" label="'Short Description'"  type="textarea">
             <camunda:properties>
               <camunda:property id="file_data" value="Study_Protocol_Document" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="VerDate" label="Version Date" type="date">
+          <camunda:formField id="VerDate" label="'Version Date'"  type="date">
             <camunda:properties>
               <camunda:property id="file_data" value="Study_Protocol_Document" />
             </camunda:properties>
@@ -29,18 +29,18 @@
     <bpmn:userTask id="Activity_UploadRepeat" name="Upload Repeat" camunda:formKey="RepeatFile">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="Study_App_Doc" label="Select File" type="file">
+          <camunda:formField id="Study_App_Doc" label="'Select File'"  type="file">
             <camunda:properties>
               <camunda:property id="repeat" value="StudyAppDoc" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="ShortDesc" label="Short Description" type="textarea">
+          <camunda:formField id="ShortDesc" label="'Short Description'"  type="textarea">
             <camunda:properties>
               <camunda:property id="repeat" value="StudyAppDoc" />
               <camunda:property id="file_data" value="Study_App_Doc" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="VerDate" label="Version Date" type="date">
+          <camunda:formField id="VerDate" label="'Version Date'"  type="date">
             <camunda:properties>
               <camunda:property id="repeat" value="StudyAppDoc" />
               <camunda:property id="file_data" value="Study_App_Doc" />
diff --git a/tests/data/docx/docx.bpmn b/tests/data/docx/docx.bpmn
index fe11b7c5..2d26ab6e 100644
--- a/tests/data/docx/docx.bpmn
+++ b/tests/data/docx/docx.bpmn
@@ -8,11 +8,11 @@
     <bpmn:userTask id="task_gather_information" name="Gather Information" camunda:formKey="example_document_form">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="full_name" label="What is your name?" type="string" />
-          <camunda:formField id="date" label="date" type="string" />
-          <camunda:formField id="title" label="Title" type="string" />
-          <camunda:formField id="company" label="Company" type="string" />
-          <camunda:formField id="last_name" label="Last Name" type="string" />
+          <camunda:formField id="full_name" label="'What is your name?'"  type="string" />
+          <camunda:formField id="date" label="'date'"  type="string" />
+          <camunda:formField id="title" label="'Title'"  type="string" />
+          <camunda:formField id="company" label="'Company'"  type="string" />
+          <camunda:formField id="last_name" label="'Last Name'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0637d8i</bpmn:incoming>
diff --git a/tests/data/docx_embedded/docx_embedded.bpmn b/tests/data/docx_embedded/docx_embedded.bpmn
index 90bd7a60..8992534a 100644
--- a/tests/data/docx_embedded/docx_embedded.bpmn
+++ b/tests/data/docx_embedded/docx_embedded.bpmn
@@ -8,12 +8,12 @@
     <bpmn:userTask id="Activity_GetData" name="Get Data" camunda:formKey="DataForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="file_name" label="File Name" type="string" />
-          <camunda:formField id="irb_doc_code" label="IRB Doc Code" type="enum">
+          <camunda:formField id="file_name" label="'File Name'"  type="string" />
+          <camunda:formField id="irb_doc_code" label="'IRB Doc Code'"  type="enum">
             <camunda:value id="Study_App_Doc" name="Study_App_Doc" />
             <camunda:value id="Study_Protocol" name="Study_Protocol" />
           </camunda:formField>
-          <camunda:formField id="name" label="Name" type="string" defaultValue="World" />
+          <camunda:formField id="name" label="'Name'"  type="string" defaultValue="World" />
           <camunda:formField id="include_me" type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
diff --git a/tests/data/email/email.bpmn b/tests/data/email/email.bpmn
index 389ba06d..1a0de991 100644
--- a/tests/data/email/email.bpmn
+++ b/tests/data/email/email.bpmn
@@ -32,8 +32,8 @@ email_model = email(subject=subject,recipients=recipients)</bpmn:script>
     <bpmn:userTask id="Activity_1l9vih3" name="Set Recipients" camunda:formKey="MyFormKey">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="ApprvlApprvr1" label="Approver" type="string" />
-          <camunda:formField id="PIComputingID" label="Primary Investigator" type="string" />
+          <camunda:formField id="ApprvlApprvr1" label="'Approver'"  type="string" />
+          <camunda:formField id="PIComputingID" label="'Primary Investigator'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1synsig</bpmn:incoming>
diff --git a/tests/data/email_attachment_empty_string/email_attachment_empty_string.bpmn b/tests/data/email_attachment_empty_string/email_attachment_empty_string.bpmn
index e93e34a6..bcbf963d 100644
--- a/tests/data/email_attachment_empty_string/email_attachment_empty_string.bpmn
+++ b/tests/data/email_attachment_empty_string/email_attachment_empty_string.bpmn
@@ -27,8 +27,8 @@ email_id = email(subject=subject,recipients=recipients, attachments=attachments)
     <bpmn:userTask id="Activity_GetEmailData" name="Get Email Data" camunda:formKey="MyFormKey">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="subject" label="Subject" type="string" />
-          <camunda:formField id="recipients" label="Recipients" type="string" />
+          <camunda:formField id="subject" label="'Subject'"  type="string" />
+          <camunda:formField id="recipients" label="'Recipients'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1synsig</bpmn:incoming>
diff --git a/tests/data/email_none_attachment/email_none_attachment.bpmn b/tests/data/email_none_attachment/email_none_attachment.bpmn
index ebfbc897..51a0e7db 100644
--- a/tests/data/email_none_attachment/email_none_attachment.bpmn
+++ b/tests/data/email_none_attachment/email_none_attachment.bpmn
@@ -27,8 +27,8 @@ email_id = email(subject=subject,recipients=recipients, attachments=attachments)
     <bpmn:userTask id="Activity_GetEmailData" name="Get Email Data" camunda:formKey="MyFormKey">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="subject" label="Subject" type="string" />
-          <camunda:formField id="recipients" label="Recipients" type="string" />
+          <camunda:formField id="subject" label="'Subject'"  type="string" />
+          <camunda:formField id="recipients" label="'Recipients'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1synsig</bpmn:incoming>
diff --git a/tests/data/email_script/email_script.bpmn b/tests/data/email_script/email_script.bpmn
index 44892dc2..34ed4a1d 100644
--- a/tests/data/email_script/email_script.bpmn
+++ b/tests/data/email_script/email_script.bpmn
@@ -8,20 +8,20 @@
     <bpmn:userTask id="Activity_EmailForm" name="Email Form" camunda:formKey="email_form">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="subject" label="Subject" type="string" defaultValue="&#39;My Email Subject&#39;">
+          <camunda:formField id="subject" label="'Subject'"  type="string" defaultValue="&#39;My Email Subject&#39;">
             <camunda:validation>
               <camunda:constraint name="required" config="true" />
             </camunda:validation>
           </camunda:formField>
-          <camunda:formField id="recipients" label="Enter Email" type="string" defaultValue="&#39;user@example.com&#39;">
+          <camunda:formField id="recipients" label="'Enter Email'"  type="string" defaultValue="&#39;user@example.com&#39;">
             <camunda:validation>
               <camunda:constraint name="required" config="true" />
             </camunda:validation>
           </camunda:formField>
-          <camunda:formField id="cc" label="CC" type="string" />
-          <camunda:formField id="bcc" label="Bcc" type="string" />
-          <camunda:formField id="reply_to" label="Reply To" type="string" />
-          <camunda:formField id="doc_code" label="Doc Code" type="string">
+          <camunda:formField id="cc" label="'CC'"  type="string" />
+          <camunda:formField id="bcc" label="'Bcc'"  type="string" />
+          <camunda:formField id="reply_to" label="'Reply To'"  type="string" />
+          <camunda:formField id="doc_code" label="'Doc Code'"  type="string">
             <camunda:properties>
               <camunda:property id="repeat" value="doc_codes" />
             </camunda:properties>
diff --git a/tests/data/enum_checkbox/enum_checkbox.bpmn b/tests/data/enum_checkbox/enum_checkbox.bpmn
index f74586fd..b82090e0 100644
--- a/tests/data/enum_checkbox/enum_checkbox.bpmn
+++ b/tests/data/enum_checkbox/enum_checkbox.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Activity_GetData" name="Get Data" camunda:formKey="DataForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="some_field" label="Select" type="enum">
+          <camunda:formField id="some_field" label="'Select'"  type="enum">
             <camunda:properties>
               <camunda:property id="enum_type" value="checkbox" />
             </camunda:properties>
diff --git a/tests/data/enum_empty_list/enum_empty_list.bpmn b/tests/data/enum_empty_list/enum_empty_list.bpmn
index 4d7b92c1..ef7b5d29 100644
--- a/tests/data/enum_empty_list/enum_empty_list.bpmn
+++ b/tests/data/enum_empty_list/enum_empty_list.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Activity_EmptyEnum" name="Empty Enum" camunda:formKey="EmptyEnumForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="empty_select" label="Select One" type="enum">
+          <camunda:formField id="empty_select" label="'Select One'"  type="enum">
             <camunda:properties>
               <camunda:property id="spreadsheet.name" value="empty_spreadsheet.xlsx" />
               <camunda:property id="spreadsheet.value.column" value="COMPANY_ID" />
diff --git a/tests/data/enum_file_data/enum_file_data.bpmn b/tests/data/enum_file_data/enum_file_data.bpmn
index 285e0ed4..267478a6 100644
--- a/tests/data/enum_file_data/enum_file_data.bpmn
+++ b/tests/data/enum_file_data/enum_file_data.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Activity_0gtrm5e" name="Select Enum" camunda:formKey="Upload Application">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="IRB_HSR_Application_Type" label="IRB-HSR Application Type" type="enum">
+          <camunda:formField id="IRB_HSR_Application_Type" label="'IRB-HSR Application Type'"  type="enum">
             <camunda:properties>
               <camunda:property id="file_data" value="Study_App_Doc" />
               <camunda:property id="spreadsheet.name" value="IRB_HSR_Application_Type.xlsx" />
@@ -20,23 +20,23 @@
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
           </camunda:formField>
-          <camunda:formField id="Study_App_Doc" label="IRB-HSR Application" type="file" />
-          <camunda:formField id="my_test_field" label="Nickname" type="string">
+          <camunda:formField id="Study_App_Doc" label="'IRB-HSR Application'"  type="file" />
+          <camunda:formField id="my_test_field" label="'Nickname'"  type="string">
             <camunda:properties>
               <camunda:property id="file_data" value="Study_App_Doc" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="some_date" label="Date" type="date">
+          <camunda:formField id="some_date" label="'Date'"  type="date">
             <camunda:properties>
               <camunda:property id="file_data" value="Study_App_Doc" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="a_boolean" label="A Boolean" type="boolean">
+          <camunda:formField id="a_boolean" label="'A Boolean'"  type="boolean">
             <camunda:properties>
               <camunda:property id="file_data" value="Study_App_Doc" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="the_number" label="The Number" type="long">
+          <camunda:formField id="the_number" label="'The Number'"  type="long">
             <camunda:properties>
               <camunda:property id="file_data" value="Study_App_Doc" />
             </camunda:properties>
diff --git a/tests/data/enum_options_all/enum_options_all.bpmn b/tests/data/enum_options_all/enum_options_all.bpmn
index 4b6d1428..3435e98c 100644
--- a/tests/data/enum_options_all/enum_options_all.bpmn
+++ b/tests/data/enum_options_all/enum_options_all.bpmn
@@ -26,7 +26,7 @@
     <bpmn:userTask id="myFormTask" name="Render Form" camunda:formKey="my_form">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="ldap" label="LDAP Lookup" type="autocomplete">
+          <camunda:formField id="ldap" label="'LDAP Lookup'"  type="autocomplete">
             <camunda:properties>
               <camunda:property id="ldap.lookup" value="True" />
               <camunda:property id="value.column" value="uid" />
@@ -35,7 +35,7 @@
               <camunda:property id="repeat" value="repeatme" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="standard_enum" label="Standard Enum" type="enum">
+          <camunda:formField id="standard_enum" label="'Standard Enum'"  type="enum">
             <camunda:properties>
               <camunda:property id="repeat" value="repeatme" />
             </camunda:properties>
@@ -45,7 +45,7 @@
             <camunda:value id="four" name="4" />
             <camunda:value id="five" name="5" />
           </camunda:formField>
-          <camunda:formField id="spreadsheet" label="Spreadsheet" type="autocomplete">
+          <camunda:formField id="spreadsheet" label="'Spreadsheet'"  type="autocomplete">
             <camunda:properties>
               <camunda:property id="label.column" value="desc" />
               <camunda:property id="value.column" value="code" />
@@ -53,7 +53,7 @@
               <camunda:property id="repeat" value="repeatme" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="data" label="My Data" type="enum">
+          <camunda:formField id="data" label="'My Data'"  type="enum">
             <camunda:properties>
               <camunda:property id="data.name" value="dogs" />
               <camunda:property id="value.column" value="value" />
@@ -61,7 +61,7 @@
               <camunda:property id="repeat" value="repeatme" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="checkbox" label="My Checkbox" type="enum">
+          <camunda:formField id="checkbox" label="'My Checkbox'"  type="enum">
             <camunda:properties>
               <camunda:property id="enum_type" value="checkbox" />
               <camunda:property id="data.name" value="dogs" />
@@ -70,12 +70,12 @@
               <camunda:property id="repeat" value="repeatme" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="standard" label="Simple" type="string">
+          <camunda:formField id="standard" label="'Simple'"  type="string">
             <camunda:properties>
               <camunda:property id="repeat" value="repeatme" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="pets" label="Prefered Pet" type="enum">
+          <camunda:formField id="pets" label="'Prefered Pet'"  type="enum">
             <camunda:properties>
               <camunda:property id="repeat" value="repeatme" />
             </camunda:properties>
@@ -83,13 +83,13 @@
             <camunda:value id="dogs" name="Dogs" />
             <camunda:value id="other" name="other" />
           </camunda:formField>
-          <camunda:formField id="petsOther" label="Prefered Pet (Other)" type="string">
+          <camunda:formField id="petsOther" label="'Prefered Pet (Other)'"  type="string">
             <camunda:properties>
               <camunda:property id="hide_expression" value="pets != &#39;other&#39;" />
               <camunda:property id="repeat" value="repeatme" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="file" label="upload file" type="file">
+          <camunda:formField id="file" label="'upload file'"  type="file">
             <camunda:properties>
               <camunda:property id="repeat" value="repeatme" />
             </camunda:properties>
diff --git a/tests/data/enum_options_competing_files/enum_options_competing_files.bpmn b/tests/data/enum_options_competing_files/enum_options_competing_files.bpmn
index 14687339..e0b98264 100644
--- a/tests/data/enum_options_competing_files/enum_options_competing_files.bpmn
+++ b/tests/data/enum_options_competing_files/enum_options_competing_files.bpmn
@@ -30,7 +30,7 @@
     <bpmn:userTask id="animals" name="Animals" camunda:formKey="FormA">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="selectedItem" label="Select An Item" type="enum">
+          <camunda:formField id="selectedItem" label="'Select An Item'"  type="enum">
             <camunda:properties>
               <camunda:property id="spreadsheet.name" value="animals.xlsx" />
               <camunda:property id="value.column" value="Value" />
diff --git a/tests/data/enum_options_from_file/enum_options_from_file.bpmn b/tests/data/enum_options_from_file/enum_options_from_file.bpmn
index 5db7a3e8..351010f4 100644
--- a/tests/data/enum_options_from_file/enum_options_from_file.bpmn
+++ b/tests/data/enum_options_from_file/enum_options_from_file.bpmn
@@ -12,7 +12,7 @@
     <bpmn:userTask id="TaskEnumLookup" name="Enum Lookup Form" camunda:formKey="EnumForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="AllTheNames" label="Select a value" type="enum">
+          <camunda:formField id="AllTheNames" label="'Select a value'"  type="enum">
             <camunda:properties>
               <camunda:property id="spreadsheet.name" value="customer_list.xlsx" />
               <camunda:property id="value.column" value="CUSTOMER_NUMBER" />
diff --git a/tests/data/enum_options_from_task_data/enum_options_from_task_data.bpmn b/tests/data/enum_options_from_task_data/enum_options_from_task_data.bpmn
index 7f52aa7b..78629e35 100644
--- a/tests/data/enum_options_from_task_data/enum_options_from_task_data.bpmn
+++ b/tests/data/enum_options_from_task_data/enum_options_from_task_data.bpmn
@@ -12,7 +12,7 @@
     <bpmn:userTask id="Task_14svgcu" name="Enum Lookup Form" camunda:formKey="EnumForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="guest_of_honor" label="Who is the guest of honor?" type="enum">
+          <camunda:formField id="guest_of_honor" label="'Who is the guest of honor?'"  type="enum">
             <camunda:properties>
               <camunda:property id="data.name" value="invitees" />
               <camunda:property id="value.column" value="secret_id" />
@@ -28,37 +28,37 @@
     <bpmn:userTask id="Activity_0oa736e" name="Who do you want to invite to your tea party?" camunda:formKey="task_1_form">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="first_name" label="What is their first name?" type="string">
+          <camunda:formField id="first_name" label="'What is their first name?'"  type="string">
             <camunda:properties>
               <camunda:property id="repeat" value="invitees" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="last_name" label="What is their last name?" type="string">
+          <camunda:formField id="last_name" label="'What is their last name?'"  type="string">
             <camunda:properties>
               <camunda:property id="repeat" value="invitees" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="age" label="How old are they?" type="long">
+          <camunda:formField id="age" label="'How old are they?'"  type="long">
             <camunda:properties>
               <camunda:property id="repeat" value="invitees" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="likes_pie" label="Do they like pie?" type="boolean">
+          <camunda:formField id="likes_pie" label="'Do they like pie?'"  type="boolean">
             <camunda:properties>
               <camunda:property id="repeat" value="invitees" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="num_lumps" label="How many lumps of sugar in their tea?" type="long">
+          <camunda:formField id="num_lumps" label="'How many lumps of sugar in their tea?'"  type="long">
             <camunda:properties>
               <camunda:property id="repeat" value="invitees" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="secret_id" label="What is their secret identity?" type="string">
+          <camunda:formField id="secret_id" label="'What is their secret identity?'"  type="string">
             <camunda:properties>
               <camunda:property id="repeat" value="invitees" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="display_name" label="What&#39;s their nickname?" type="string">
+          <camunda:formField id="display_name" label="'What&#39;s their nickname?'"  type="string">
             <camunda:properties>
               <camunda:property id="repeat" value="invitees" />
             </camunda:properties>
diff --git a/tests/data/enum_options_with_search/enum_options_with_search.bpmn b/tests/data/enum_options_with_search/enum_options_with_search.bpmn
index 4ecab273..e3720e4a 100644
--- a/tests/data/enum_options_with_search/enum_options_with_search.bpmn
+++ b/tests/data/enum_options_with_search/enum_options_with_search.bpmn
@@ -12,7 +12,7 @@
     <bpmn:userTask id="Task_Enum_Lookup" name="Enum Lookup Form" camunda:formKey="EnumForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="sponsor" label="Select a value" type="autocomplete">
+          <camunda:formField id="sponsor" label="'Select a value'"  type="autocomplete">
             <camunda:properties>
               <camunda:property id="spreadsheet.name" value="sponsors.xlsx" />
               <camunda:property id="value.column" value="CUSTOMER_NUMBER" />
diff --git a/tests/data/enum_results/enum_results.bpmn b/tests/data/enum_results/enum_results.bpmn
index 35ae3c5c..d96311c3 100644
--- a/tests/data/enum_results/enum_results.bpmn
+++ b/tests/data/enum_results/enum_results.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Activity_EmptyEnum" name="Empty Results" camunda:formKey="EnumForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="checkbox" label="Select One" type="enum">
+          <camunda:formField id="checkbox" label="'Select One'"  type="enum">
             <camunda:properties>
               <camunda:property id="enum_type" value="checkbox" />
             </camunda:properties>
diff --git a/tests/data/enum_value_expression/enum_value_expression.bpmn b/tests/data/enum_value_expression/enum_value_expression.bpmn
index 79323574..eb6c614a 100644
--- a/tests/data/enum_value_expression/enum_value_expression.bpmn
+++ b/tests/data/enum_value_expression/enum_value_expression.bpmn
@@ -10,7 +10,7 @@
     <bpmn:userTask id="Activity_UserInput" name="User Input" camunda:formKey="UserInput">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="user_input" label="Select Yes or No" type="boolean" defaultValue="True" />
+          <camunda:formField id="user_input" label="'Select Yes or No'"  type="boolean" defaultValue="True" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_02xzhf3</bpmn:incoming>
@@ -24,7 +24,7 @@
       <bpmn:documentation>&lt;h1&gt;Hello {{ lookup_output }}&lt;/h1&gt;</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="color_select" label="Pick a color" type="enum" defaultValue="lookup_output">
+          <camunda:formField id="color_select" label="'Pick a color'"  type="enum" defaultValue="lookup_output">
             <camunda:value id="black" name="Black" />
             <camunda:value id="white" name="White" />
             <camunda:value id="grey" name="Grey" />
diff --git a/tests/data/enum_value_expression_fail/enum_value_expression_fail.bpmn b/tests/data/enum_value_expression_fail/enum_value_expression_fail.bpmn
index ddbfc613..97831a1c 100644
--- a/tests/data/enum_value_expression_fail/enum_value_expression_fail.bpmn
+++ b/tests/data/enum_value_expression_fail/enum_value_expression_fail.bpmn
@@ -10,7 +10,7 @@
     <bpmn:userTask id="Activity_UserInput" name="User Input" camunda:formKey="UserInput">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="user_input" label="Select Yes or No" type="boolean" defaultValue="True" />
+          <camunda:formField id="user_input" label="'Select Yes or No'"  type="boolean" defaultValue="True" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_02xzhf3</bpmn:incoming>
@@ -24,7 +24,7 @@
       <bpmn:documentation>&lt;h1&gt;Hello {{ lookup_output }}&lt;/h1&gt;</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="color_select" label="Pick a color" type="enum" defaultValue="white">
+          <camunda:formField id="color_select" label="'Pick a color'"  type="enum" defaultValue="white">
             <camunda:properties>
               <camunda:property id="value_expression" value="lookup_output" />
             </camunda:properties>
diff --git a/tests/data/exclusive_gateway/exclusive_gateway.bpmn b/tests/data/exclusive_gateway/exclusive_gateway.bpmn
index 3a016a0c..7925bb2c 100644
--- a/tests/data/exclusive_gateway/exclusive_gateway.bpmn
+++ b/tests/data/exclusive_gateway/exclusive_gateway.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Task_Has_Bananas" name="Enter Do You Have Bananas" camunda:formKey="bananas_form">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="has_bananas" label="Do you have bananas?" type="boolean">
+          <camunda:formField id="has_bananas" label="'Do you have bananas?'"  type="boolean">
             <camunda:validation>
               <camunda:constraint name="required" config="true" />
             </camunda:validation>
@@ -33,7 +33,7 @@
     <bpmn:userTask id="Task_Num_Bananas" name="Number of Bananas" camunda:formKey="banana_count">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="num_bananas" label="How Many Bananas do you have?" type="long" defaultValue="1" />
+          <camunda:formField id="num_bananas" label="'How Many Bananas do you have?'"  type="long" defaultValue="1" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_A_Yes_Bananas</bpmn:incoming>
@@ -42,7 +42,7 @@
     <bpmn:userTask id="Task_Why_No_Bananas" name="Why no bananas" camunda:formKey="no_bananas">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="why_no_bananas" label="Why you have no bananas?" type="string" defaultValue="&#39;I don\&#39;t know.&#39;" />
+          <camunda:formField id="why_no_bananas" label="'Why you have no bananas?'"  type="string" defaultValue="&#39;I don\&#39;t know.&#39;" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_No_Bananas</bpmn:incoming>
diff --git a/tests/data/exclusive_gateway_2/exclusive_gateway_2.bpmn b/tests/data/exclusive_gateway_2/exclusive_gateway_2.bpmn
index 7476de11..ed5556c9 100644
--- a/tests/data/exclusive_gateway_2/exclusive_gateway_2.bpmn
+++ b/tests/data/exclusive_gateway_2/exclusive_gateway_2.bpmn
@@ -28,7 +28,7 @@
     <bpmn:userTask id="Activity_07iglj7" name="Enter Task 1" camunda:formKey="form_task_1">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="which_branch" label="Which branch?" type="enum">
+          <camunda:formField id="which_branch" label="'Which branch?'"  type="enum">
             <camunda:value id="a" name="Task 2a" />
             <camunda:value id="b" name="Task 2b" />
           </camunda:formField>
@@ -40,7 +40,7 @@
     <bpmn:userTask id="Activity_19ig0xo" name="Enter Task 2a" camunda:formKey="form_task2a">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_0taj99h" label="What is your favorite color?" type="string" />
+          <camunda:formField id="FormField_0taj99h" label="'What is your favorite color?'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1fok0lz</bpmn:incoming>
@@ -49,7 +49,7 @@
     <bpmn:userTask id="Activity_1hx53cu" name="Enter Task 2b" camunda:formKey="form_task2b">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_1l30p68" label="Do you like pie?" type="boolean" />
+          <camunda:formField id="FormField_1l30p68" label="'Do you like pie?'"  type="boolean" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_21he29w</bpmn:incoming>
@@ -58,7 +58,7 @@
     <bpmn:userTask id="Activity_1b15riu" name="Enter Task 3" camunda:formKey="form_task3">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_3nh4vhj" label="Tell me a bedtime story." type="textarea" />
+          <camunda:formField id="FormField_3nh4vhj" label="'Tell me a bedtime story.'"  type="textarea" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1ph05b1</bpmn:incoming>
diff --git a/tests/data/failing_gateway_workflow/failing_gateway_workflow.bpmn b/tests/data/failing_gateway_workflow/failing_gateway_workflow.bpmn
index 833a92e8..37149f4b 100644
--- a/tests/data/failing_gateway_workflow/failing_gateway_workflow.bpmn
+++ b/tests/data/failing_gateway_workflow/failing_gateway_workflow.bpmn
@@ -40,7 +40,7 @@
     <bpmn:userTask id="Activity_Name" name="Name" camunda:formKey="NameForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Please type your name" type="string" defaultValue="Cruel World" />
+          <camunda:formField id="name" label="'Please type your name'"  type="string" defaultValue="Cruel World" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_True</bpmn:incoming>
@@ -51,7 +51,7 @@
     <bpmn:userTask id="Activity_DataSelect" name="Data Select" camunda:formKey="DataSelectForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="select_one" label="Please Select One" type="boolean">
+          <camunda:formField id="select_one" label="'Please Select One'"  type="boolean">
             <camunda:properties>
               <camunda:property id="value_expression" value="yes_no" />
             </camunda:properties>
diff --git a/tests/data/file_upload_form/file_upload_form.bpmn b/tests/data/file_upload_form/file_upload_form.bpmn
index 892537fd..1a1a76bb 100644
--- a/tests/data/file_upload_form/file_upload_form.bpmn
+++ b/tests/data/file_upload_form/file_upload_form.bpmn
@@ -16,7 +16,7 @@
 OGC will upload the Non-Funded Executed Agreement after it has been negotiated by OSP contract negotiator.</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="Date" label="Version Date" type="date">
+          <camunda:formField id="Date" label="'Version Date'"  type="date">
             <camunda:properties>
               <camunda:property id="group" value="PCRApproval" />
               <camunda:property id="file_data" value="Some_File" />
@@ -26,13 +26,13 @@ OGC will upload the Non-Funded Executed Agreement after it has been negotiated b
             <camunda:value id="AD_CoCApp" name="Ancillary Documents / Case Report Form" />
             <camunda:value id="AD_CoCAppr" name="Ancillary Documents / CoC Approval" />
           </camunda:formField>
-          <camunda:formField id="Some_File" label="Upload File" type="file">
+          <camunda:formField id="Some_File" label="'Upload File'"  type="file">
             <camunda:properties>
               <camunda:property id="group" value="PCRApproval" />
               <camunda:property id="doc_code" value="file_type" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="Language" label="Language" type="string" defaultValue="&#39;English&#39;">
+          <camunda:formField id="Language" label="'Language'"  type="string" defaultValue="&#39;English&#39;">
             <camunda:properties>
               <camunda:property id="group" value="PCRApproval" />
               <camunda:property id="file_data" value="Some_File" />
diff --git a/tests/data/file_upload_form_single/file_upload_form_single.bpmn b/tests/data/file_upload_form_single/file_upload_form_single.bpmn
index cce63241..9e724791 100644
--- a/tests/data/file_upload_form_single/file_upload_form_single.bpmn
+++ b/tests/data/file_upload_form_single/file_upload_form_single.bpmn
@@ -16,14 +16,14 @@
 OGC will upload the Non-Funded Executed Agreement after it has been negotiated by OSP contract negotiator.</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="AD_CoCApp" label="Upload File" type="file" />
-          <camunda:formField id="Language" label="Language" type="string" defaultValue="Engish">
+          <camunda:formField id="AD_CoCApp" label="'Upload File'"  type="file" />
+          <camunda:formField id="Language" label="'Language'"  type="string" defaultValue="Engish">
             <camunda:properties>
               <camunda:property id="group" value="PCRApproval" />
               <camunda:property id="file_data" value="AD_CoCApp" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="Date" label="Version Date" type="date">
+          <camunda:formField id="Date" label="'Version Date'"  type="date">
             <camunda:properties>
               <camunda:property id="group" value="PCRApproval" />
               <camunda:property id="file_data" value="AD_CoCApp" />
diff --git a/tests/data/form_expressions/form_expressions.bpmn b/tests/data/form_expressions/form_expressions.bpmn
index 1de016da..7dd66e85 100644
--- a/tests/data/form_expressions/form_expressions.bpmn
+++ b/tests/data/form_expressions/form_expressions.bpmn
@@ -11,8 +11,8 @@
     <bpmn:userTask id="Activity_1jpj09a" name="Do Hide" camunda:formKey="My Form">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="showNextField" label="Should I show the next field?" type="boolean" defaultValue="False" />
-          <camunda:formField id="likeSpam" label="Do you like Spam?" type="boolean">
+          <camunda:formField id="showNextField" label="'Should I show the next field?'"  type="boolean" defaultValue="False" />
+          <camunda:formField id="likeSpam" label="'Do you like Spam?'"  type="boolean">
             <camunda:properties>
               <camunda:property id="hide_expression" value="showNextField == False" />
             </camunda:properties>
@@ -26,8 +26,8 @@
     <bpmn:userTask id="Activity_1npmm8p" name="Do Label Change" camunda:formKey="change_label">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="my_label" label="Set Label for next field" type="string" defaultValue="&#39;My Label&#39;" />
-          <camunda:formField id="custom_field" label="Custom Label" type="string" />
+          <camunda:formField id="my_label" label="'Set Label for next field'"  type="string" defaultValue="&#39;My Label&#39;" />
+          <camunda:formField id="custom_field" label="'Custom Label'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0y96gip</bpmn:incoming>
@@ -50,8 +50,8 @@ This takes the label from the previous form and uses it as the default value in
     <bpmn:userTask id="Activity_0otfiwr" name="Do Require" camunda:formKey="required_fields">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="require_next_field" label="Require Next Field?" type="boolean" defaultValue="True" />
-          <camunda:formField id="my_required_field" label="Required Field" type="string">
+          <camunda:formField id="require_next_field" label="'Require Next Field?'"  type="boolean" defaultValue="True" />
+          <camunda:formField id="my_required_field" label="'Required Field'"  type="string">
             <camunda:properties>
               <camunda:property id="required_expression" value="require_next_field" />
             </camunda:properties>
@@ -65,15 +65,15 @@ This takes the label from the previous form and uses it as the default value in
     <bpmn:userTask id="Activity_1btzxi7" name="Do Hide Group" camunda:formKey="repeat_form">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="show_repeat" label="Show Repeating Section?" type="boolean" defaultValue="True" />
-          <camunda:formField id="first_name" label="First Name" type="string">
+          <camunda:formField id="show_repeat" label="'Show Repeating Section?'"  type="boolean" defaultValue="True" />
+          <camunda:formField id="first_name" label="'First Name'"  type="string">
             <camunda:properties>
               <camunda:property id="repeat" value="name" />
               <camunda:property id="repeat_title" value="Add People" />
               <camunda:property id="repeat_hide_expression" value="show_repeat == False" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="last_name" label="Last Name" type="string">
+          <camunda:formField id="last_name" label="'Last Name'"  type="string">
             <camunda:properties>
               <camunda:property id="repeat" value="name" />
             </camunda:properties>
diff --git a/tests/data/form_extentsions/form_extentsions.bpmn b/tests/data/form_extentsions/form_extentsions.bpmn
index 89c7e81f..e6d4f12c 100644
--- a/tests/data/form_extentsions/form_extentsions.bpmn
+++ b/tests/data/form_extentsions/form_extentsions.bpmn
@@ -17,7 +17,7 @@
     <bpmn:userTask id="Activity_0q620ux" name="test task exentsions" camunda:formKey="formkey">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="field1" label="should clear the data on return" type="string" />
+          <camunda:formField id="field1" label="'should clear the data on return'"  type="string" />
         </camunda:formData>
         <camunda:properties>
           <camunda:property name="clear_data" value="True" />
diff --git a/tests/data/get_email_data/get_email_data.bpmn b/tests/data/get_email_data/get_email_data.bpmn
index 38555b5b..6aad3bd6 100644
--- a/tests/data/get_email_data/get_email_data.bpmn
+++ b/tests/data/get_email_data/get_email_data.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Activity_GetData" name="Get Data" camunda:formKey="DataForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="email_id" label="Email ID" type="string">
+          <camunda:formField id="email_id" label="'Email ID'"  type="string">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
diff --git a/tests/data/get_email_data_by_workflow/get_email_data_by_workflow.bpmn b/tests/data/get_email_data_by_workflow/get_email_data_by_workflow.bpmn
index 2bf8769d..e107f4e6 100644
--- a/tests/data/get_email_data_by_workflow/get_email_data_by_workflow.bpmn
+++ b/tests/data/get_email_data_by_workflow/get_email_data_by_workflow.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Activity_GetData" name="Get Data" camunda:formKey="DataForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="workflow_spec_id" label="Workflow Spec ID" type="string" />
+          <camunda:formField id="workflow_spec_id" label="'Workflow Spec ID'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1erkgz2</bpmn:incoming>
diff --git a/tests/data/get_localtime/get_localtime.bpmn b/tests/data/get_localtime/get_localtime.bpmn
index e8d91c63..7c35ec9b 100644
--- a/tests/data/get_localtime/get_localtime.bpmn
+++ b/tests/data/get_localtime/get_localtime.bpmn
@@ -45,18 +45,18 @@ else:
       <bpmn:documentation>This is my email</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="with_timestamp" label="With Timestamp" type="boolean" defaultValue="False">
+          <camunda:formField id="with_timestamp" label="'With Timestamp'"  type="boolean" defaultValue="False">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
           </camunda:formField>
-          <camunda:formField id="with_timezone" label="With Timezone" type="boolean" defaultValue="False">
+          <camunda:formField id="with_timezone" label="'With Timezone'"  type="boolean" defaultValue="False">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
           </camunda:formField>
-          <camunda:formField id="timestamp" label="Timestamp" type="string" />
-          <camunda:formField id="timezone" label="Timezone" type="string" />
+          <camunda:formField id="timestamp" label="'Timestamp'"  type="string" />
+          <camunda:formField id="timezone" label="'Timezone'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0lnc9x0</bpmn:incoming>
diff --git a/tests/data/get_workflow_status/get_workflow_status.bpmn b/tests/data/get_workflow_status/get_workflow_status.bpmn
index e50b0960..7bb8d5b1 100644
--- a/tests/data/get_workflow_status/get_workflow_status.bpmn
+++ b/tests/data/get_workflow_status/get_workflow_status.bpmn
@@ -38,7 +38,7 @@
     <bpmn:userTask id="Activity_WorkflowID" name="Get Workflow ID" camunda:formKey="WorkflowIDForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="search_workflow_id" label="Workflow ID" type="long" defaultValue="1">
+          <camunda:formField id="search_workflow_id" label="'Workflow ID'"  type="long" defaultValue="1">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
diff --git a/tests/data/get_zip_file/get_zip_file.bpmn b/tests/data/get_zip_file/get_zip_file.bpmn
index acdaa50b..af892efb 100644
--- a/tests/data/get_zip_file/get_zip_file.bpmn
+++ b/tests/data/get_zip_file/get_zip_file.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Activity_GetFileIDs" name="Get File IDs" camunda:formKey="GetName">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="file_id" label="File ID" type="long">
+          <camunda:formField id="file_id" label="'File ID'"  type="long">
             <camunda:properties>
               <camunda:property id="repeat" value="file_ids" />
             </camunda:properties>
diff --git a/tests/data/hello_world/hello_world.bpmn b/tests/data/hello_world/hello_world.bpmn
index 168aee1a..9d6b7071 100644
--- a/tests/data/hello_world/hello_world.bpmn
+++ b/tests/data/hello_world/hello_world.bpmn
@@ -10,7 +10,7 @@
       <bpmn:documentation>Hello</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Name" type="string" defaultValue="World" />
+          <camunda:formField id="name" label="'Name'"  type="string" defaultValue="World" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0qyd2b7</bpmn:incoming>
diff --git a/tests/data/hidden_file_data_field/hidden_file_data_field.bpmn b/tests/data/hidden_file_data_field/hidden_file_data_field.bpmn
index 291c42a4..517f04ce 100644
--- a/tests/data/hidden_file_data_field/hidden_file_data_field.bpmn
+++ b/tests/data/hidden_file_data_field/hidden_file_data_field.bpmn
@@ -7,13 +7,13 @@
     <bpmn:userTask id="Activity_FileUpload" name="File Upload" camunda:formKey="UploadFile">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="UploadFile" label="Select File" type="file" />
-          <camunda:formField id="Name" label="Enter Name" type="string">
+          <camunda:formField id="UploadFile" label="'Select File'"  type="file" />
+          <camunda:formField id="Name" label="'Enter Name'"  type="string">
             <camunda:properties>
               <camunda:property id="file_data" value="UploadFile" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="ExtraField" label="Could Be Hidden" type="string" defaultValue="Extra Field String">
+          <camunda:formField id="ExtraField" label="'Could Be Hidden'"  type="string" defaultValue="Extra Field String">
             <camunda:properties>
               <camunda:property id="hide_expression" value="hide_field" />
               <camunda:property id="file_data" value="UploadFile" />
@@ -38,7 +38,7 @@
     <bpmn:userTask id="Activity_AddData" name="Add Data" camunda:formKey="HideData">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="hide_field" label="Hide Field?" type="boolean">
+          <camunda:formField id="hide_field" label="'Hide Field?'"  type="boolean">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
diff --git a/tests/data/hidden_required_field/hidden_required_field.bpmn b/tests/data/hidden_required_field/hidden_required_field.bpmn
index 6c1eafcd..d90a30d6 100644
--- a/tests/data/hidden_required_field/hidden_required_field.bpmn
+++ b/tests/data/hidden_required_field/hidden_required_field.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Activity_HiddenField" name="Hidden Field" camunda:formKey="HiddenFieldForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Name" type="string">
+          <camunda:formField id="name" label="'Name'"  type="string">
             <camunda:properties>
               <camunda:property id="hide_expression" value="hide_yes_no" />
             </camunda:properties>
@@ -52,7 +52,7 @@ if not 'hide_yes_no' in globals():
     <bpmn:userTask id="Activity_CheckDefault" name="Check Default" camunda:formKey="CheckDefaultForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="color" label="Color" type="string" defaultValue="Gray">
+          <camunda:formField id="color" label="'Color'"  type="string" defaultValue="Gray">
             <camunda:properties>
               <camunda:property id="hide_expression" value="True" />
             </camunda:properties>
diff --git a/tests/data/hidden_required_field_pass/hidden_required_field_pass.bpmn b/tests/data/hidden_required_field_pass/hidden_required_field_pass.bpmn
index 1192ab35..5c48808e 100644
--- a/tests/data/hidden_required_field_pass/hidden_required_field_pass.bpmn
+++ b/tests/data/hidden_required_field_pass/hidden_required_field_pass.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Activity_HiddenField" name="Hidden Field" camunda:formKey="HiddenFieldForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Name" type="string" defaultValue="&#39;World&#39;">
+          <camunda:formField id="name" label="'Name'"  type="string" defaultValue="&#39;World&#39;">
             <camunda:properties>
               <camunda:property id="hide_expression" value="hide_yes_no" />
             </camunda:properties>
diff --git a/tests/data/hidden_required_field_pass_expression/hidden_required_field_pass_expression.bpmn b/tests/data/hidden_required_field_pass_expression/hidden_required_field_pass_expression.bpmn
index cffd95a8..ec829a87 100644
--- a/tests/data/hidden_required_field_pass_expression/hidden_required_field_pass_expression.bpmn
+++ b/tests/data/hidden_required_field_pass_expression/hidden_required_field_pass_expression.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Activity_HiddenField" name="Hidden Field" camunda:formKey="HiddenFieldForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Name" type="string" defaultValue="value_expression_value">
+          <camunda:formField id="name" label="'Name'"  type="string" defaultValue="value_expression_value">
             <camunda:properties>
               <camunda:property id="hide_expression" value="True" />
             </camunda:properties>
diff --git a/tests/data/invalid_custom_field/invalid_custom_field.bpmn b/tests/data/invalid_custom_field/invalid_custom_field.bpmn
index 6c13a74b..c3421e64 100644
--- a/tests/data/invalid_custom_field/invalid_custom_field.bpmn
+++ b/tests/data/invalid_custom_field/invalid_custom_field.bpmn
@@ -10,7 +10,7 @@
     <bpmn:userTask id="Activity_InvalidField" name="Invalid Custom Field" camunda:formKey="SomeForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="TextBadArea" label="Short Description" type="noSuchType" />
+          <camunda:formField id="TextBadArea" label="'Short Description'"  type="noSuchType" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_12ulmn8</bpmn:incoming>
diff --git a/tests/data/invalid_expression/invalid_expression.bpmn b/tests/data/invalid_expression/invalid_expression.bpmn
index 0a5f01b4..852e56d5 100644
--- a/tests/data/invalid_expression/invalid_expression.bpmn
+++ b/tests/data/invalid_expression/invalid_expression.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Task_Has_Bananas" name="Has Bananas?" camunda:formKey="bananas_form">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="has_bananas" label="Do you have bananas?" type="boolean" defaultValue="False" />
+          <camunda:formField id="has_bananas" label="'Do you have bananas?'"  type="boolean" defaultValue="False" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1pnq3kg</bpmn:incoming>
@@ -29,7 +29,7 @@
     <bpmn:userTask id="Task_Num_Bananas" name="Number of Bananas" camunda:formKey="banana_count">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="num_bananas" label="How Many Bananas do you have?" type="long" defaultValue="1" />
+          <camunda:formField id="num_bananas" label="'How Many Bananas do you have?'"  type="long" defaultValue="1" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_Yes_Bananas</bpmn:incoming>
@@ -38,7 +38,7 @@
     <bpmn:userTask id="Task_Why_No_Bananas" name="Why no bananas" camunda:formKey="no_bananas">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="why_no_bananas" label="Why you have no bananas?" type="string" defaultValue="&#39;I don\&#39;t know.&#39;" />
+          <camunda:formField id="why_no_bananas" label="'Why you have no bananas?'"  type="string" defaultValue="&#39;I don\&#39;t know.&#39;" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_No_Bananas</bpmn:incoming>
diff --git a/tests/data/invalid_roles/invalid_roles.bpmn b/tests/data/invalid_roles/invalid_roles.bpmn
index 1c8efee9..0195a628 100644
--- a/tests/data/invalid_roles/invalid_roles.bpmn
+++ b/tests/data/invalid_roles/invalid_roles.bpmn
@@ -23,9 +23,9 @@
       <bpmn:documentation># Answer me these questions 3, ere the other side you see!</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="favorite_color" label="What is your favorite color?" type="string" defaultValue="&#39;Yellow&#39;" />
-          <camunda:formField id="quest" label="What is your quest?" type="string" defaultValue="&#39;To seek the holly Grail!&#39;" />
-          <camunda:formField id="swallow_speed" label="What is the air speed velocity of an unladen swallow?" type="string" defaultValue="&#39;About 24 miles per hour&#39;" />
+          <camunda:formField id="favorite_color" label="'What is your favorite color?'"  type="string" defaultValue="&#39;Yellow&#39;" />
+          <camunda:formField id="quest" label="'What is your quest?'"  type="string" defaultValue="&#39;To seek the holly Grail!&#39;" />
+          <camunda:formField id="swallow_speed" label="'What is the air speed velocity of an unladen swallow?'"  type="string" defaultValue="&#39;About 24 miles per hour&#39;" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0a7090c</bpmn:incoming>
@@ -69,8 +69,8 @@ Please press save to re-try the questions, and submit your responses again.</bpm
     <bpmn:userTask id="Activity_14eor1x" name="Approve Responses" camunda:formKey="form2">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="approval" label="I approve of this information" type="boolean" defaultValue="False" />
-          <camunda:formField id="feedback" label="Feedback" type="string" defaultValue="&#39;Please provide any feedback you have here.&#39;" />
+          <camunda:formField id="approval" label="'I approve of this information'"  type="boolean" defaultValue="False" />
+          <camunda:formField id="feedback" label="'Feedback'"  type="string" defaultValue="&#39;Please provide any feedback you have here.&#39;" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1hcpt7c</bpmn:incoming>
diff --git a/tests/data/invalid_spec/invalid_spec.bpmn b/tests/data/invalid_spec/invalid_spec.bpmn
index 30a75fb4..94554c7f 100644
--- a/tests/data/invalid_spec/invalid_spec.bpmn
+++ b/tests/data/invalid_spec/invalid_spec.bpmn
@@ -5,7 +5,7 @@
     <bpmn:userTask name="Has Bananas?" camunda:formKey="bananas_form">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="has_bananas" label="Do you have bananas?" type="boolean" />
+          <camunda:formField id="has_bananas" label="'Do you have bananas?'"  type="boolean" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1pnq3kg</bpmn:incoming>
@@ -23,7 +23,7 @@
     <bpmn:userTask id="Task_Num_Bananas" name="Number of Bananas" camunda:formKey="banana_count">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="num_bananas" label="How Many Bananas do you have?" type="long" defaultValue="1" />
+          <camunda:formField id="num_bananas" label="'How Many Bananas do you have?'"  type="long" defaultValue="1" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_Yes_Bananas</bpmn:incoming>
@@ -32,7 +32,7 @@
     <bpmn:userTask id="Task_Why_No_Bananas" name="Why no bananas" camunda:formKey="no_bananas">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="why_no_bananas" label="Why you have no bananas?" type="string" defaultValue="I don&#39;t know." />
+          <camunda:formField id="why_no_bananas" label="'Why you have no bananas?'"  type="string" defaultValue="I don&#39;t know." />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_No_Bananas</bpmn:incoming>
diff --git a/tests/data/irb_api_personnel/irb_api_personnel.bpmn b/tests/data/irb_api_personnel/irb_api_personnel.bpmn
index e6ea57f7..5446d1e5 100644
--- a/tests/data/irb_api_personnel/irb_api_personnel.bpmn
+++ b/tests/data/irb_api_personnel/irb_api_personnel.bpmn
@@ -31,9 +31,9 @@
 ##### Affiliation: {{ pi.PI.affiliation }}</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="pi.edit_access" label="Should the Principal Investigator have full editing access in the system?" type="boolean" defaultValue="true" />
-          <camunda:formField id="pi.emails" label="Should the Principal Investigator receive automated email notifications?" type="boolean" defaultValue="true" />
-          <camunda:formField id="pi.experience" label="Investigator&#39;s Experience" type="textarea">
+          <camunda:formField id="pi.edit_access" label="'Should the Principal Investigator have full editing access in the system?'"  type="boolean" defaultValue="true" />
+          <camunda:formField id="pi.emails" label="'Should the Principal Investigator receive automated email notifications?'"  type="boolean" defaultValue="true" />
+          <camunda:formField id="pi.experience" label="'Investigator&#39;s Experience'"  type="textarea">
             <camunda:properties>
               <camunda:property id="rows" value="5" />
             </camunda:properties>
@@ -93,8 +93,8 @@
 ##### Affiliation: {{ sc.affiliation }}</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="sc.access" label="Should this Study Coordinator have full editing access in the system?" type="boolean" />
-          <camunda:formField id="sc.emails" label="Should this Study Coordinator receive automated email notifications?" type="boolean" defaultValue="yes" />
+          <camunda:formField id="sc.access" label="'Should this Study Coordinator have full editing access in the system?'"  type="boolean" />
+          <camunda:formField id="sc.emails" label="'Should this Study Coordinator receive automated email notifications?'"  type="boolean" defaultValue="yes" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0xifvai</bpmn:incoming>
diff --git a/tests/data/jinja_email/jinja_email.bpmn b/tests/data/jinja_email/jinja_email.bpmn
index 2d72f9f0..caceb7f9 100644
--- a/tests/data/jinja_email/jinja_email.bpmn
+++ b/tests/data/jinja_email/jinja_email.bpmn
@@ -14,14 +14,14 @@
     <bpmn:userTask id="Activity_15btti7" name="Get Email Data" camunda:formKey="DataForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="subject" label="Subject" type="string" />
-          <camunda:formField id="recipients" label="Recipients" type="string" />
-          <camunda:formField id="include_me" label="Included Template" type="string">
+          <camunda:formField id="subject" label="'Subject'"  type="string" />
+          <camunda:formField id="recipients" label="'Recipients'"  type="string" />
+          <camunda:formField id="include_me" label="'Included Template'"  type="string">
             <camunda:properties>
               <camunda:property id="Property_01o03tf" value="&#39;My Value&#39;" />
             </camunda:properties>
           </camunda:formField>
-          <camunda:formField id="name" label="Name" type="string" />
+          <camunda:formField id="name" label="'Name'"  type="string" />
         </camunda:formData>
         <camunda:properties>
           <camunda:property name="my_extension" value="&#39;My Value&#39;" />
diff --git a/tests/data/ldap_lookup/ldap_lookup.bpmn b/tests/data/ldap_lookup/ldap_lookup.bpmn
index 8f89c0d8..3553e280 100644
--- a/tests/data/ldap_lookup/ldap_lookup.bpmn
+++ b/tests/data/ldap_lookup/ldap_lookup.bpmn
@@ -12,7 +12,7 @@
     <bpmn:userTask id="Task_14svgcu" name="Enum Lookup Form in Ldap" camunda:formKey="EnumForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="Person" label="Select a value" type="autocomplete">
+          <camunda:formField id="Person" label="'Select a value'"  type="autocomplete">
             <camunda:properties>
               <camunda:property id="ldap.lookup" value="true" />
             </camunda:properties>
diff --git a/tests/data/ldap_script/ldap_script.bpmn b/tests/data/ldap_script/ldap_script.bpmn
index ddda26ef..6cf62de3 100644
--- a/tests/data/ldap_script/ldap_script.bpmn
+++ b/tests/data/ldap_script/ldap_script.bpmn
@@ -20,8 +20,8 @@ me = ldap()</bpmn:script>
     <bpmn:userTask id="Activity_1l9vih3" name="Set UIDs" camunda:formKey="SetUids">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="Supervisor" label="Approver" type="string" />
-          <camunda:formField id="Investigator" label="Primary Investigator" type="string" />
+          <camunda:formField id="Supervisor" label="'Approver'"  type="string" />
+          <camunda:formField id="Investigator" label="'Primary Investigator'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1synsig</bpmn:incoming>
diff --git a/tests/data/manual_task_with_external_documentation/manual_task_with_external_documentation.bpmn b/tests/data/manual_task_with_external_documentation/manual_task_with_external_documentation.bpmn
index 1aa2d55e..9a33aa85 100644
--- a/tests/data/manual_task_with_external_documentation/manual_task_with_external_documentation.bpmn
+++ b/tests/data/manual_task_with_external_documentation/manual_task_with_external_documentation.bpmn
@@ -17,7 +17,7 @@
     <bpmn:userTask id="Task_Form" name="Name Form" camunda:formKey="my_form">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Please Enter you Name:" type="string" />
+          <camunda:formField id="name" label="'Please Enter you Name:'"  type="string" />
         </camunda:formData>
         <camunda:properties>
           <camunda:property name="JustAKey" value="JustAValue" />
diff --git a/tests/data/message_event/message_event.bpmn b/tests/data/message_event/message_event.bpmn
index 04b5bc9b..37ef5dce 100644
--- a/tests/data/message_event/message_event.bpmn
+++ b/tests/data/message_event/message_event.bpmn
@@ -12,7 +12,7 @@ print('New Title')</bpmn:script>
     <bpmn:userTask id="Activity_GetData" name="GetData" camunda:formKey="FirstTaskForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="formdata" label="Gimme some data" type="string" />
+          <camunda:formField id="formdata" label="'Gimme some data'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1rvh899</bpmn:incoming>
@@ -39,7 +39,7 @@ printdata = formdata</bpmn:script>
     <bpmn:userTask id="Activity_HowMany" name="HowMany" camunda:formKey="HowMany">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="how_many" label="How many?" type="long" defaultValue="1" />
+          <camunda:formField id="how_many" label="'How many?'"  type="long" defaultValue="1" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1n1fs6z</bpmn:incoming>
diff --git a/tests/data/missing_form_key/missing_form_key.bpmn b/tests/data/missing_form_key/missing_form_key.bpmn
index 8a94500b..6ea34643 100644
--- a/tests/data/missing_form_key/missing_form_key.bpmn
+++ b/tests/data/missing_form_key/missing_form_key.bpmn
@@ -13,7 +13,7 @@
     <bpmn:userTask id="Activity_GetName" name="Get Name">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Please enter your name" type="string" defaultValue="World" />
+          <camunda:formField id="name" label="'Please enter your name'"  type="string" defaultValue="World" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1dl9zdu</bpmn:incoming>
diff --git a/tests/data/missing_library/missing_library.bpmn b/tests/data/missing_library/missing_library.bpmn
index 63bd3326..e4d14770 100644
--- a/tests/data/missing_library/missing_library.bpmn
+++ b/tests/data/missing_library/missing_library.bpmn
@@ -25,12 +25,12 @@
     <bpmn:userTask id="Activity_GetNumbers" name="Get Numbers" camunda:formKey="NumberForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="num_1" label="First Number" type="long">
+          <camunda:formField id="num_1" label="'First Number'"  type="long">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
           </camunda:formField>
-          <camunda:formField id="num_2" label="Second Number" type="long" />
+          <camunda:formField id="num_2" label="'Second Number'"  type="long" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1w8il3k</bpmn:incoming>
diff --git a/tests/data/multi_instance/multi_instance.bpmn b/tests/data/multi_instance/multi_instance.bpmn
index beef6465..0ebdf45c 100644
--- a/tests/data/multi_instance/multi_instance.bpmn
+++ b/tests/data/multi_instance/multi_instance.bpmn
@@ -15,7 +15,7 @@
 ## Role: {{investigator.INVESTIGATORTYPEFULL}}</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="email" label="Email Address:" type="string" />
+          <camunda:formField id="email" label="'Email Address:'"  type="string" />
         </camunda:formData>
         <camunda:properties>
           <camunda:property name="display_name" value="investigator.label" />
diff --git a/tests/data/multi_instance_parallel/multi_instance_parallel.bpmn b/tests/data/multi_instance_parallel/multi_instance_parallel.bpmn
index afd7ec29..0a516174 100644
--- a/tests/data/multi_instance_parallel/multi_instance_parallel.bpmn
+++ b/tests/data/multi_instance_parallel/multi_instance_parallel.bpmn
@@ -15,7 +15,7 @@
 ## Role: {{investigator.type_full}}</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="investigator.email" label="Email Address:" type="string" />
+          <camunda:formField id="investigator.email" label="'Email Address:'"  type="string" />
         </camunda:formData>
         <camunda:properties>
           <camunda:property name="display_name" value="investigator.label" />
diff --git a/tests/data/parallel_tasks/parallel_tasks.bpmn b/tests/data/parallel_tasks/parallel_tasks.bpmn
index 2f7afff6..ebd70208 100644
--- a/tests/data/parallel_tasks/parallel_tasks.bpmn
+++ b/tests/data/parallel_tasks/parallel_tasks.bpmn
@@ -38,15 +38,15 @@
     <bpmn:userTask id="Task_1sxp42p" name="Do the dishes" camunda:formKey="form_a_1">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_1ojqdk5" label="How big a mess is your kitchen?" type="enum">
+          <camunda:formField id="FormField_1ojqdk5" label="'How big a mess is your kitchen?'"  type="enum">
             <camunda:value id="Value_0ehrqjb" name="Perfectly clean!" />
             <camunda:value id="Value_04hjtaa" name="Not too bad." />
             <camunda:value id="Value_2fb98di" name="We&#39;re gonna be here a while." />
             <camunda:value id="Value_0l52r92" name="I&#39;ve got a bad feeling about this." />
             <camunda:value id="Value_3fpalk7" name="Run away! Run away!" />
           </camunda:formField>
-          <camunda:formField id="FormField_3vtabe9" label="Files" type="files" />
-          <camunda:formField id="FormField_0eg7ror" label="One file" type="file" />
+          <camunda:formField id="FormField_3vtabe9" label="'Files'"  type="files" />
+          <camunda:formField id="FormField_0eg7ror" label="'One file'"  type="file" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0pfke5z</bpmn:incoming>
@@ -55,8 +55,8 @@
     <bpmn:userTask id="Task_1dbfcq0" name="Take out the trash" camunda:formKey="form_b_1">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_331jajn" label="Is tomorrow trash day?" type="boolean" />
-          <camunda:formField id="FormField_0b2vddh" label="How many trash cans are there?" type="long" />
+          <camunda:formField id="FormField_331jajn" label="'Is tomorrow trash day?'"  type="boolean" />
+          <camunda:formField id="FormField_0b2vddh" label="'How many trash cans are there?'"  type="long" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1kar3r1</bpmn:incoming>
@@ -65,7 +65,7 @@
     <bpmn:userTask id="Task_1q3s7gs" name="Make the coffee" camunda:formKey="form_c_1">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_1kj5msi" label="How many cups of coffee do you want to make?" type="long" />
+          <camunda:formField id="FormField_1kj5msi" label="'How many cups of coffee do you want to make?'"  type="long" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0vtu9qd</bpmn:incoming>
@@ -74,7 +74,7 @@
     <bpmn:userTask id="Task_0oxu2ne" name="Do the monster mash" camunda:formKey="form_d_1">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_2c0nbbu" label="What kind of monster?" type="enum">
+          <camunda:formField id="FormField_2c0nbbu" label="'What kind of monster?'"  type="enum">
             <camunda:value id="Value_17btpjh" name="Purple People Eater" />
             <camunda:value id="Value_1r00nte" name="Dr. Frankenfurter" />
             <camunda:value id="Value_3crfv5j" name="Addams Family" />
@@ -87,7 +87,7 @@
     <bpmn:userTask id="Task_1o1we8w" name="Dishes" camunda:formKey="form_a_2">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_3479k9o" label="Finished yet?" type="boolean" />
+          <camunda:formField id="FormField_3479k9o" label="'Finished yet?'"  type="boolean" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1hsb3c5</bpmn:incoming>
@@ -96,7 +96,7 @@
     <bpmn:userTask id="Task_19r6r37" name="Trash" camunda:formKey="form_b_2">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_3uiple6" label="Finished yet?" type="boolean" />
+          <camunda:formField id="FormField_3uiple6" label="'Finished yet?'"  type="boolean" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_18jx43l</bpmn:incoming>
@@ -105,7 +105,7 @@
     <bpmn:userTask id="Task_0n6vigs" name="Coffee" camunda:formKey="form_c_2">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_0jctp35" label="Finished yet?" type="boolean" />
+          <camunda:formField id="FormField_0jctp35" label="'Finished yet?'"  type="boolean" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0rcgayc</bpmn:incoming>
@@ -114,7 +114,7 @@
     <bpmn:userTask id="Task_03u4wg2" name="Mash" camunda:formKey="form_d_2">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_16eseth" label="Finished yet?" type="boolean" />
+          <camunda:formField id="FormField_16eseth" label="'Finished yet?'"  type="boolean" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_18z9ub0</bpmn:incoming>
@@ -124,7 +124,7 @@
     <bpmn:userTask id="Task_0c7seuo" name="Time warp" camunda:formKey="last_form">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_159qrqu" label="Do the time warp again?" type="boolean" />
+          <camunda:formField id="FormField_159qrqu" label="'Do the time warp again?'"  type="boolean" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_06rqrvw</bpmn:incoming>
diff --git a/tests/data/prefer_task_data_over_previous_form_submission/prefer_task_data_over_previous_form_submission.bpmn b/tests/data/prefer_task_data_over_previous_form_submission/prefer_task_data_over_previous_form_submission.bpmn
index 1cda8836..f8bb4415 100644
--- a/tests/data/prefer_task_data_over_previous_form_submission/prefer_task_data_over_previous_form_submission.bpmn
+++ b/tests/data/prefer_task_data_over_previous_form_submission/prefer_task_data_over_previous_form_submission.bpmn
@@ -30,7 +30,7 @@
     <bpmn:userTask id="complete_word" name="Write a word that starts with letter" camunda:formKey="wordForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="template" label="complete the word" type="string" />
+          <camunda:formField id="template" label="'complete the word'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_04lkxb1</bpmn:incoming>
diff --git a/tests/data/random_fact/random_fact.bpmn b/tests/data/random_fact/random_fact.bpmn
index b8918cfb..7e92bba4 100644
--- a/tests/data/random_fact/random_fact.bpmn
+++ b/tests/data/random_fact/random_fact.bpmn
@@ -107,7 +107,7 @@ Autoconverted link https://github.com/nodeca/pica (enable linkify to see)
 ![Stormtroopocat](https://octodex.github.com/images/stormtroopocat.jpg "The Stormtroopocat")</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="type" label="Type" type="enum" defaultValue="&#39;cat&#39;">
+          <camunda:formField id="type" label="'Type'"  type="enum" defaultValue="&#39;cat&#39;">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
diff --git a/tests/data/random_fact/random_fact2.bpmn b/tests/data/random_fact/random_fact2.bpmn
index bd0a9ef5..22d580f2 100644
--- a/tests/data/random_fact/random_fact2.bpmn
+++ b/tests/data/random_fact/random_fact2.bpmn
@@ -107,7 +107,7 @@ Autoconverted link https://github.com/nodeca/pica (enable linkify to see)
 ![Stormtroopocat](https://octodex.github.com/images/stormtroopocat.jpg "The Stormtroopocat")</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="type" label="Type" type="enum" defaultValue="cat">
+          <camunda:formField id="type" label="'Type'"  type="enum" defaultValue="cat">
             <camunda:validation>
               <camunda:constraint name="required" config="true" />
             </camunda:validation>
diff --git a/tests/data/read_only_field/read_only_field.bpmn b/tests/data/read_only_field/read_only_field.bpmn
index 542f8c08..2b008841 100644
--- a/tests/data/read_only_field/read_only_field.bpmn
+++ b/tests/data/read_only_field/read_only_field.bpmn
@@ -19,7 +19,7 @@
     <bpmn:userTask id="Activity_DisplayOnlyField" name="Display Only Field&#10;" camunda:formKey="ReadOnlyFormField">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="read_only_field" label="Read Only" type="string" defaultValue="string_value">
+          <camunda:formField id="read_only_field" label="'Read Only'"  type="string" defaultValue="string_value">
             <camunda:properties>
               <camunda:property id="read_only" value="True" />
             </camunda:properties>
diff --git a/tests/data/repeat_form/repeat_form.bpmn b/tests/data/repeat_form/repeat_form.bpmn
index d6cf27c4..18c76400 100644
--- a/tests/data/repeat_form/repeat_form.bpmn
+++ b/tests/data/repeat_form/repeat_form.bpmn
@@ -12,7 +12,7 @@
     <bpmn:userTask id="Task_14svgcu" name="Repeating Form" camunda:formKey="RepeatForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Add a cat name" type="string" defaultValue="&#39;couger buttons&#39;">
+          <camunda:formField id="name" label="'Add a cat name'"  type="string" defaultValue="&#39;couger buttons&#39;">
             <camunda:properties>
               <camunda:property id="repeat" value="cats" />
             </camunda:properties>
diff --git a/tests/data/required_fields/required_fields.bpmn b/tests/data/required_fields/required_fields.bpmn
index 73c18c39..d0b3049b 100644
--- a/tests/data/required_fields/required_fields.bpmn
+++ b/tests/data/required_fields/required_fields.bpmn
@@ -12,13 +12,13 @@
     <bpmn:userTask id="Task_Required_Fields" name="Required fields" camunda:formKey="RequiredForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="string_required" label="String" type="string" defaultValue="&#39;some string&#39;">
+          <camunda:formField id="string_required" label="'String'"  type="string" defaultValue="&#39;some string&#39;">
             <camunda:validation>
               <camunda:constraint name="required" config="true" />
             </camunda:validation>
           </camunda:formField>
           <camunda:formField id="string_not_required" type="string" />
-          <camunda:formField id="enum_with_default" label="My Enum" type="enum" defaultValue="&#39;maybe&#39;">
+          <camunda:formField id="enum_with_default" label="'My Enum'"  type="enum" defaultValue="&#39;maybe&#39;">
             <camunda:value id="yes" name="Yes" />
             <camunda:value id="no" name="No" />
             <camunda:value id="maybe" name="Maybe so, I don&#39;t know." />
diff --git a/tests/data/reset_workflow/reset_workflow.bpmn b/tests/data/reset_workflow/reset_workflow.bpmn
index 1f2eaccf..b199cf6c 100644
--- a/tests/data/reset_workflow/reset_workflow.bpmn
+++ b/tests/data/reset_workflow/reset_workflow.bpmn
@@ -15,7 +15,7 @@
     <bpmn:userTask id="Task_GetWorkflow" name="Get Workflow" camunda:formKey="WorkflowForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="workflow_name" label="Workflow Name" type="string">
+          <camunda:formField id="workflow_name" label="'Workflow Name'"  type="string">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
diff --git a/tests/data/roles/roles.bpmn b/tests/data/roles/roles.bpmn
index 48f9bfe6..a9707dec 100644
--- a/tests/data/roles/roles.bpmn
+++ b/tests/data/roles/roles.bpmn
@@ -23,10 +23,10 @@
       <bpmn:documentation># Answer me these questions 3, ere the other side you see!</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="favorite_color" label="What is your favorite color?" type="string" defaultValue="&#39;Yellow&#39;" />
-          <camunda:formField id="quest" label="What is your quest?" type="string" defaultValue="&#39;To seek the holly Grail!&#39;" />
-          <camunda:formField id="swallow_speed" label="What is the air speed velocity of an unladen swallow?" type="string" defaultValue="&#39;About 24 miles per hour&#39;" />
-          <camunda:formField id="supervisor" label="Please enter the UVA Id of your supervisor" type="string" defaultValue="&#39;dhf8r&#39;" />
+          <camunda:formField id="favorite_color" label="'What is your favorite color?'"  type="string" defaultValue="&#39;Yellow&#39;" />
+          <camunda:formField id="quest" label="'What is your quest?'"  type="string" defaultValue="&#39;To seek the holly Grail!&#39;" />
+          <camunda:formField id="swallow_speed" label="'What is the air speed velocity of an unladen swallow?'"  type="string" defaultValue="&#39;About 24 miles per hour&#39;" />
+          <camunda:formField id="supervisor" label="'Please enter the UVA Id of your supervisor'"  type="string" defaultValue="&#39;dhf8r&#39;" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0a7090c</bpmn:incoming>
@@ -80,8 +80,8 @@ Please press save to re-try the questions, and submit your responses again.</bpm
     <bpmn:userTask id="Activity_14eor1x" name="Approve Responses" camunda:formKey="approval_form_key">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="approval" label="I approve of this information" type="boolean" />
-          <camunda:formField id="feedback" label="Feedback" type="string" defaultValue="&#39;Please provide any feedback you have here.&#39;" />
+          <camunda:formField id="approval" label="'I approve of this information'"  type="boolean" />
+          <camunda:formField id="feedback" label="'Feedback'"  type="string" defaultValue="&#39;Please provide any feedback you have here.&#39;" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1hcpt7c</bpmn:incoming>
diff --git a/tests/data/script_with_name_error/script_with_name_error.bpmn b/tests/data/script_with_name_error/script_with_name_error.bpmn
index e02eacda..0b148f1b 100644
--- a/tests/data/script_with_name_error/script_with_name_error.bpmn
+++ b/tests/data/script_with_name_error/script_with_name_error.bpmn
@@ -18,8 +18,8 @@
     <bpmn:userTask id="Activity_GetData" name="Get Data" camunda:formKey="DataForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="user" label="User" type="string" defaultValue="&#39;World&#39;" />
-          <camunda:formField id="spam" label="Spam" type="boolean" defaultValue="False" />
+          <camunda:formField id="user" label="'User'"  type="string" defaultValue="&#39;World&#39;" />
+          <camunda:formField id="spam" label="'Spam'"  type="boolean" defaultValue="False" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_13jyds8</bpmn:incoming>
diff --git a/tests/data/set_study_progress_status/set_study_progress_status.bpmn b/tests/data/set_study_progress_status/set_study_progress_status.bpmn
index 8db37829..64a34711 100644
--- a/tests/data/set_study_progress_status/set_study_progress_status.bpmn
+++ b/tests/data/set_study_progress_status/set_study_progress_status.bpmn
@@ -7,7 +7,7 @@
     <bpmn:userTask id="Activity_GetSelectedStatus" name="Get Selected Status" camunda:formKey="SelectStudyStatus">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="selected_status" label="Select Study Status" type="enum">
+          <camunda:formField id="selected_status" label="'Select Study Status'"  type="enum">
             <camunda:value id="approved" name="Approved" />
             <camunda:value id="disapproved" name="Disapproved" />
           </camunda:formField>
diff --git a/tests/data/spec_from_id/spec_from_id.bpmn b/tests/data/spec_from_id/spec_from_id.bpmn
index 2c104af1..1b40d87b 100644
--- a/tests/data/spec_from_id/spec_from_id.bpmn
+++ b/tests/data/spec_from_id/spec_from_id.bpmn
@@ -14,7 +14,7 @@
     <bpmn:userTask id="Activity_GetSpecID" name="Get Spec ID" camunda:formKey="SpecIDForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="spec_id" label="Spec ID" type="string">
+          <camunda:formField id="spec_id" label="'Spec ID'"  type="string">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
diff --git a/tests/data/spec_from_workflow_id/spec_from_workflow_id.bpmn b/tests/data/spec_from_workflow_id/spec_from_workflow_id.bpmn
index 88adf592..f851f092 100644
--- a/tests/data/spec_from_workflow_id/spec_from_workflow_id.bpmn
+++ b/tests/data/spec_from_workflow_id/spec_from_workflow_id.bpmn
@@ -14,7 +14,7 @@
     <bpmn:userTask id="Activity_0jto0z6" name="Get Workflow ID" camunda:formKey="IDForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="workflow_id" label="Workflow ID" type="long">
+          <camunda:formField id="workflow_id" label="'Workflow ID'"  type="long">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
diff --git a/tests/data/study_cancellations/study_cancellations.bpmn b/tests/data/study_cancellations/study_cancellations.bpmn
index bcda7821..69596b6e 100644
--- a/tests/data/study_cancellations/study_cancellations.bpmn
+++ b/tests/data/study_cancellations/study_cancellations.bpmn
@@ -14,7 +14,7 @@ print('New Title')</bpmn:script>
     <bpmn:userTask id="Activity_HowMany" name="HowMany" camunda:formKey="HowMany">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="how_many" label="How many?" type="long" defaultValue="1" />
+          <camunda:formField id="how_many" label="'How many?'"  type="long" defaultValue="1" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1e9j7mj</bpmn:incoming>
@@ -51,7 +51,7 @@ print('Second Title')</bpmn:script>
       <bpmn:userTask id="Activity_Modify" name="Modify" camunda:formKey="FormModify">
         <bpmn:extensionElements>
           <camunda:formData>
-            <camunda:formField id="modify" label="Modify Data?" type="boolean" defaultValue="True" />
+            <camunda:formField id="modify" label="'Modify Data?'"  type="boolean" defaultValue="True" />
           </camunda:formData>
         </bpmn:extensionElements>
         <bpmn:incoming>Flow_0tbg5qf</bpmn:incoming>
diff --git a/tests/data/study_info_script/study_info_script.bpmn b/tests/data/study_info_script/study_info_script.bpmn
index 9a32791d..33d6b2fc 100644
--- a/tests/data/study_info_script/study_info_script.bpmn
+++ b/tests/data/study_info_script/study_info_script.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Task_WhichInfo" name="Which Info" camunda:formKey="WhichForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="which" label="Which" type="enum">
+          <camunda:formField id="which" label="'Which'"  type="enum">
             <camunda:value id="info" name="Info" />
             <camunda:value id="investigators" name="Investigators" />
             <camunda:value id="roles" name="Roles" />
diff --git a/tests/data/subprocess/subprocess.bpmn b/tests/data/subprocess/subprocess.bpmn
index 9eb777a6..c01ffcfd 100644
--- a/tests/data/subprocess/subprocess.bpmn
+++ b/tests/data/subprocess/subprocess.bpmn
@@ -15,7 +15,7 @@
         <bpmn:documentation>Enter Form1</bpmn:documentation>
         <bpmn:extensionElements>
           <camunda:formData>
-            <camunda:formField id="FieldA" label="Fill out A" type="string" />
+            <camunda:formField id="FieldA" label="'Fill out A'"  type="string" />
           </camunda:formData>
         </bpmn:extensionElements>
         <bpmn:incoming>Flow_2</bpmn:incoming>
@@ -32,7 +32,7 @@
       <bpmn:documentation>Enter form 2</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FieldB" label="Enter B" type="string" />
+          <camunda:formField id="FieldB" label="'Enter B'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_4</bpmn:incoming>
diff --git a/tests/data/test_value_expression/test_value_expression.bpmn b/tests/data/test_value_expression/test_value_expression.bpmn
index a3363dcf..cc51386e 100644
--- a/tests/data/test_value_expression/test_value_expression.bpmn
+++ b/tests/data/test_value_expression/test_value_expression.bpmn
@@ -16,7 +16,7 @@
     <bpmn:userTask id="Activity_Data" name="Data" camunda:formKey="DataForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="color" label="Select" type="enum" defaultValue="value_expression_value">
+          <camunda:formField id="color" label="'Select'"  type="enum" defaultValue="value_expression_value">
             <camunda:value id="black" name="Black" />
             <camunda:value id="white" name="White" />
           </camunda:formField>
diff --git a/tests/data/two_forms/modified/two_forms_struc_mod.bpmn b/tests/data/two_forms/modified/two_forms_struc_mod.bpmn
index c726289a..485841c6 100644
--- a/tests/data/two_forms/modified/two_forms_struc_mod.bpmn
+++ b/tests/data/two_forms/modified/two_forms_struc_mod.bpmn
@@ -12,7 +12,7 @@
     <bpmn:userTask id="StepOne" name="Step 1" camunda:formKey="StepOneForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="color" label="What is your favorite color?" type="string" />
+          <camunda:formField id="color" label="'What is your favorite color?'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0myefwb</bpmn:incoming>
@@ -22,7 +22,7 @@
     <bpmn:userTask id="Task_1i59nh4" name="New Step" camunda:formKey="MyNewForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="FormField_01vbdk5" label="I forgot to ask you about this, what is your quest?" type="string" defaultValue="To seak the holy grail!" />
+          <camunda:formField id="FormField_01vbdk5" label="'I forgot to ask you about this, what is your quest?'"  type="string" defaultValue="To seak the holy grail!" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_00p5po6</bpmn:incoming>
diff --git a/tests/data/two_forms/modified/two_forms_text_mod.bpmn b/tests/data/two_forms/modified/two_forms_text_mod.bpmn
index 56867333..cb3a5d8f 100644
--- a/tests/data/two_forms/modified/two_forms_text_mod.bpmn
+++ b/tests/data/two_forms/modified/two_forms_text_mod.bpmn
@@ -14,7 +14,7 @@
       <bpmn:documentation># This is some documentation I wanted to add.</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="color" label="What is your favorite color?" type="string" />
+          <camunda:formField id="color" label="'What is your favorite color?'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0myefwb</bpmn:incoming>
@@ -23,7 +23,7 @@
     <bpmn:userTask id="StepTwo" name="Step 2" camunda:formKey="StepTwoForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="capital" label="What is the capital of Assyria?" type="string" />
+          <camunda:formField id="capital" label="'What is the capital of Assyria?'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_00p5po6</bpmn:incoming>
diff --git a/tests/data/two_forms/two_forms.bpmn b/tests/data/two_forms/two_forms.bpmn
index 7f14b405..db62d771 100644
--- a/tests/data/two_forms/two_forms.bpmn
+++ b/tests/data/two_forms/two_forms.bpmn
@@ -13,7 +13,7 @@
     <bpmn:userTask id="StepOne" name="Step 1" camunda:formKey="StepOneForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="color" label="What is your favorite color?" type="string" />
+          <camunda:formField id="color" label="'What is your favorite color?'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0myefwb</bpmn:incoming>
@@ -22,7 +22,7 @@
     <bpmn:userTask id="StepTwo" name="Step 2" camunda:formKey="StepTwoForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="capital" label="What is the capital of Assyria?" type="string" />
+          <camunda:formField id="capital" label="'What is the capital of Assyria?'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_00p5po6</bpmn:incoming>
diff --git a/tests/data/two_user_tasks/two_user_tasks.bpmn b/tests/data/two_user_tasks/two_user_tasks.bpmn
index 0a2fe9a9..0128751e 100644
--- a/tests/data/two_user_tasks/two_user_tasks.bpmn
+++ b/tests/data/two_user_tasks/two_user_tasks.bpmn
@@ -10,7 +10,7 @@
     <bpmn:userTask id="Task_GetName" name="Get Name" camunda:formKey="NameForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Name" type="string">
+          <camunda:formField id="name" label="'Name'"  type="string">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
@@ -23,7 +23,7 @@
     <bpmn:userTask id="Task_GetAge" name="Get Age" camunda:formKey="AgeForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="age" label="Age" type="long">
+          <camunda:formField id="age" label="'Age'"  type="long">
             <camunda:validation>
               <camunda:constraint name="required" config="True" />
             </camunda:validation>
diff --git a/tests/data/update_study_info/update_study_info.bpmn b/tests/data/update_study_info/update_study_info.bpmn
index ccaa7b05..b04d62b2 100644
--- a/tests/data/update_study_info/update_study_info.bpmn
+++ b/tests/data/update_study_info/update_study_info.bpmn
@@ -8,8 +8,8 @@
     <bpmn:userTask id="Activity_GetData" name="Get Data" camunda:formKey="GetDataForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="short_name" label="Short Name" type="string" />
-          <camunda:formField id="proposal_name" label="Proposal Name" type="string" />
+          <camunda:formField id="short_name" label="'Short Name'"  type="string" />
+          <camunda:formField id="proposal_name" label="'Proposal Name'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0g8e1jy</bpmn:incoming>
diff --git a/tests/data/workflow_form_field_name/workflow_form_field_name.bpmn b/tests/data/workflow_form_field_name/workflow_form_field_name.bpmn
index 81d30619..ebda159c 100644
--- a/tests/data/workflow_form_field_name/workflow_form_field_name.bpmn
+++ b/tests/data/workflow_form_field_name/workflow_form_field_name.bpmn
@@ -13,8 +13,8 @@
     <bpmn:userTask id="Activity_GetName" name="Get Name" camunda:formKey="GetName">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Name" type="string" defaultValue="&#39;World&#39;" />
-          <camunda:formField id="me.name" label="Enter" type="string" />
+          <camunda:formField id="name" label="'Name'"  type="string" defaultValue="&#39;World&#39;" />
+          <camunda:formField id="me.name" label="'Enter'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1hytves</bpmn:incoming>
@@ -24,7 +24,7 @@
     <bpmn:userTask id="Activity_GetTitle" name="Get Title" camunda:formKey="GetTitle">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="user-title" label="Title" type="string" />
+          <camunda:formField id="user-title" label="'Title'"  type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1iphrck</bpmn:incoming>
diff --git a/tests/data/workflow_form_field_type/workflow_form_field_type.bpmn b/tests/data/workflow_form_field_type/workflow_form_field_type.bpmn
index aa4b010f..34a107d3 100644
--- a/tests/data/workflow_form_field_type/workflow_form_field_type.bpmn
+++ b/tests/data/workflow_form_field_type/workflow_form_field_type.bpmn
@@ -14,7 +14,7 @@
     <bpmn:userTask id="Activity_GetName" name="Get Name" camunda:formKey="GetNameForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="name" label="Name: " defaultValue="World" />
+          <camunda:formField id="name" label="'Name: '"  defaultValue="World" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1wfzn0v</bpmn:incoming>
diff --git a/tests/data/workflow_sync_responses/random_fact2.bpmn b/tests/data/workflow_sync_responses/random_fact2.bpmn
index f502a238..9e2dddce 100644
--- a/tests/data/workflow_sync_responses/random_fact2.bpmn
+++ b/tests/data/workflow_sync_responses/random_fact2.bpmn
@@ -11,7 +11,7 @@
 ![Stormtroopocat](https://octodex.github.com/images/stormtroopocat.jpg "The Stormtroopocat")</bpmn:documentation>
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="type" label="Type" type="enum" defaultValue="cat">
+          <camunda:formField id="type" label="'Type'"  type="enum" defaultValue="cat">
             <camunda:validation>
               <camunda:constraint name="required" config="true" />
             </camunda:validation>