diff --git a/.gitignore b/.gitignore
index 0c77f18af..b5945bbd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ workflow/public_html/translations/
 build-prod.zip
 node_modules
 /workflow/engine/config/system-tables.ini
+test_shared/
diff --git a/tests/automated/gulliver/system/classControllerTest.php b/old_tests/automated/gulliver/system/classControllerTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classControllerTest.php
rename to old_tests/automated/gulliver/system/classControllerTest.php
diff --git a/tests/automated/gulliver/system/classDBTableTest.php b/old_tests/automated/gulliver/system/classDBTableTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classDBTableTest.php
rename to old_tests/automated/gulliver/system/classDBTableTest.php
diff --git a/tests/automated/gulliver/system/classDataBaseMaintenanceTest.php b/old_tests/automated/gulliver/system/classDataBaseMaintenanceTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classDataBaseMaintenanceTest.php
rename to old_tests/automated/gulliver/system/classDataBaseMaintenanceTest.php
diff --git a/tests/automated/gulliver/system/classFormTest.php b/old_tests/automated/gulliver/system/classFormTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classFormTest.php
rename to old_tests/automated/gulliver/system/classFormTest.php
diff --git a/tests/automated/gulliver/system/classGTest.php b/old_tests/automated/gulliver/system/classGTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classGTest.php
rename to old_tests/automated/gulliver/system/classGTest.php
diff --git a/tests/automated/gulliver/system/classG_ErrorTest.php b/old_tests/automated/gulliver/system/classG_ErrorTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classG_ErrorTest.php
rename to old_tests/automated/gulliver/system/classG_ErrorTest.php
diff --git a/tests/automated/gulliver/system/classHelperTest.php b/old_tests/automated/gulliver/system/classHelperTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classHelperTest.php
rename to old_tests/automated/gulliver/system/classHelperTest.php
diff --git a/tests/automated/gulliver/system/classHttpProxyControllerTest.php b/old_tests/automated/gulliver/system/classHttpProxyControllerTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classHttpProxyControllerTest.php
rename to old_tests/automated/gulliver/system/classHttpProxyControllerTest.php
diff --git a/tests/automated/gulliver/system/classMenuTest.php b/old_tests/automated/gulliver/system/classMenuTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classMenuTest.php
rename to old_tests/automated/gulliver/system/classMenuTest.php
diff --git a/tests/automated/gulliver/system/classPHPSQLParserTest.php b/old_tests/automated/gulliver/system/classPHPSQLParserTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classPHPSQLParserTest.php
rename to old_tests/automated/gulliver/system/classPHPSQLParserTest.php
diff --git a/tests/automated/gulliver/system/classPMExceptionTest.php b/old_tests/automated/gulliver/system/classPMExceptionTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classPMExceptionTest.php
rename to old_tests/automated/gulliver/system/classPMExceptionTest.php
diff --git a/tests/automated/gulliver/system/classPublisherTest.php b/old_tests/automated/gulliver/system/classPublisherTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classPublisherTest.php
rename to old_tests/automated/gulliver/system/classPublisherTest.php
diff --git a/tests/automated/gulliver/system/classRBACTest.php b/old_tests/automated/gulliver/system/classRBACTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classRBACTest.php
rename to old_tests/automated/gulliver/system/classRBACTest.php
diff --git a/tests/automated/gulliver/system/classRestClientTest.php b/old_tests/automated/gulliver/system/classRestClientTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classRestClientTest.php
rename to old_tests/automated/gulliver/system/classRestClientTest.php
diff --git a/tests/automated/gulliver/system/classTableTest.php b/old_tests/automated/gulliver/system/classTableTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classTableTest.php
rename to old_tests/automated/gulliver/system/classTableTest.php
diff --git a/tests/automated/gulliver/system/classTemplatePowerParserTest.php b/old_tests/automated/gulliver/system/classTemplatePowerParserTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classTemplatePowerParserTest.php
rename to old_tests/automated/gulliver/system/classTemplatePowerParserTest.php
diff --git a/tests/automated/gulliver/system/classTemplatePowerTest.php b/old_tests/automated/gulliver/system/classTemplatePowerTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classTemplatePowerTest.php
rename to old_tests/automated/gulliver/system/classTemplatePowerTest.php
diff --git a/tests/automated/gulliver/system/classTreeTest.php b/old_tests/automated/gulliver/system/classTreeTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classTreeTest.php
rename to old_tests/automated/gulliver/system/classTreeTest.php
diff --git a/tests/automated/gulliver/system/classXmlFormTest.php b/old_tests/automated/gulliver/system/classXmlFormTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlFormTest.php
rename to old_tests/automated/gulliver/system/classXmlFormTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_FieldTest.php b/old_tests/automated/gulliver/system/classXmlForm_FieldTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_FieldTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_FieldTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_ButtonTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_ButtonTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_ButtonTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_ButtonTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_CaptionCurrencyTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_CaptionCurrencyTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_CaptionCurrencyTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_CaptionCurrencyTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_CaptionPercentageTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_CaptionPercentageTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_CaptionPercentageTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_CaptionPercentageTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_CaptionTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_CaptionTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_CaptionTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_CaptionTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_CheckGroupTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_CheckGroupTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_CheckGroupTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_CheckGroupTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_CheckGroupViewTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_CheckGroupViewTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_CheckGroupViewTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_CheckGroupViewTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_Checkbox2Test.php b/old_tests/automated/gulliver/system/classXmlForm_Field_Checkbox2Test.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_Checkbox2Test.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_Checkbox2Test.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_CheckboxTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_CheckboxTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_CheckboxTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_CheckboxTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_CheckboxptTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_CheckboxptTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_CheckboxptTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_CheckboxptTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_CurrencyTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_CurrencyTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_CurrencyTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_CurrencyTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_DVEditorTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_DVEditorTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_DVEditorTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_DVEditorTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_Date2Test.php b/old_tests/automated/gulliver/system/classXmlForm_Field_Date2Test.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_Date2Test.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_Date2Test.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_Date5Test.php b/old_tests/automated/gulliver/system/classXmlForm_Field_Date5Test.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_Date5Test.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_Date5Test.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_DateTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_DateTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_DateTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_DateTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_DateViewTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_DateViewTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_DateViewTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_DateViewTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_DropdownTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_DropdownTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_DropdownTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_DropdownTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_DropdownptTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_DropdownptTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_DropdownptTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_DropdownptTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_FastSearchTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_FastSearchTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_FastSearchTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_FastSearchTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_FileTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_FileTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_FileTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_FileTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_GridTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_GridTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_GridTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_GridTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_HiddenTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_HiddenTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_HiddenTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_HiddenTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_ImageTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_ImageTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_ImageTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_ImageTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_JavaScriptTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_JavaScriptTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_JavaScriptTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_JavaScriptTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_LabelTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_LabelTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_LabelTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_LabelTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_LinkTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_LinkTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_LinkTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_LinkTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_ListboxTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_ListboxTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_ListboxTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_ListboxTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_PasswordTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_PasswordTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_PasswordTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_PasswordTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_PercentageTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_PercentageTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_PercentageTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_PercentageTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_PrintTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_PrintTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_PrintTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_PrintTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_RadioGroupTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_RadioGroupTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_RadioGroupTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_RadioGroupTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_RadioGroupViewTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_RadioGroupViewTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_RadioGroupViewTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_RadioGroupViewTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_ResetTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_ResetTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_ResetTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_ResetTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_SimpleTextTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_SimpleTextTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_SimpleTextTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_SimpleTextTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_SubmitTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_SubmitTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_SubmitTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_SubmitTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_SubtitleTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_SubtitleTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_SubtitleTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_SubtitleTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_SuggestTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_SuggestTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_SuggestTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_SuggestTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_TextTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_TextTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_TextTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_TextTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_TextareaTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_TextareaTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_TextareaTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_TextareaTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_TitleTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_TitleTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_TitleTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_TitleTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_XmlMenuTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_XmlMenuTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_XmlMenuTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_XmlMenuTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_XmlformTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_XmlformTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_XmlformTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_XmlformTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_YesNoTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_YesNoTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_YesNoTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_YesNoTest.php
diff --git a/tests/automated/gulliver/system/classXmlForm_Field_cellMarkTest.php b/old_tests/automated/gulliver/system/classXmlForm_Field_cellMarkTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXmlForm_Field_cellMarkTest.php
rename to old_tests/automated/gulliver/system/classXmlForm_Field_cellMarkTest.php
diff --git a/tests/automated/gulliver/system/classXml_NodeTest.php b/old_tests/automated/gulliver/system/classXml_NodeTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXml_NodeTest.php
rename to old_tests/automated/gulliver/system/classXml_NodeTest.php
diff --git a/tests/automated/gulliver/system/classXml_documentTest.php b/old_tests/automated/gulliver/system/classXml_documentTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classXml_documentTest.php
rename to old_tests/automated/gulliver/system/classXml_documentTest.php
diff --git a/tests/automated/gulliver/system/classdatabase_baseTest.php b/old_tests/automated/gulliver/system/classdatabase_baseTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classdatabase_baseTest.php
rename to old_tests/automated/gulliver/system/classdatabase_baseTest.php
diff --git a/tests/automated/gulliver/system/classdynaFormHandlerTest.php b/old_tests/automated/gulliver/system/classdynaFormHandlerTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classdynaFormHandlerTest.php
rename to old_tests/automated/gulliver/system/classdynaFormHandlerTest.php
diff --git a/tests/automated/gulliver/system/classfilterFormTest.php b/old_tests/automated/gulliver/system/classfilterFormTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classfilterFormTest.php
rename to old_tests/automated/gulliver/system/classfilterFormTest.php
diff --git a/tests/automated/gulliver/system/classheadPublisherTest.php b/old_tests/automated/gulliver/system/classheadPublisherTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classheadPublisherTest.php
rename to old_tests/automated/gulliver/system/classheadPublisherTest.php
diff --git a/tests/automated/gulliver/system/classi18n_POTest.php b/old_tests/automated/gulliver/system/classi18n_POTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classi18n_POTest.php
rename to old_tests/automated/gulliver/system/classi18n_POTest.php
diff --git a/tests/automated/gulliver/system/classmailerTest.php b/old_tests/automated/gulliver/system/classmailerTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classmailerTest.php
rename to old_tests/automated/gulliver/system/classmailerTest.php
diff --git a/tests/automated/gulliver/system/classobjectTemplateTest.php b/old_tests/automated/gulliver/system/classobjectTemplateTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classobjectTemplateTest.php
rename to old_tests/automated/gulliver/system/classobjectTemplateTest.php
diff --git a/tests/automated/gulliver/system/classpagedTableTest.php b/old_tests/automated/gulliver/system/classpagedTableTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classpagedTableTest.php
rename to old_tests/automated/gulliver/system/classpagedTableTest.php
diff --git a/tests/automated/gulliver/system/classxmlMenuTest.php b/old_tests/automated/gulliver/system/classxmlMenuTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classxmlMenuTest.php
rename to old_tests/automated/gulliver/system/classxmlMenuTest.php
diff --git a/tests/automated/gulliver/system/classxmlformTemplateTest.php b/old_tests/automated/gulliver/system/classxmlformTemplateTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classxmlformTemplateTest.php
rename to old_tests/automated/gulliver/system/classxmlformTemplateTest.php
diff --git a/tests/automated/gulliver/system/classymlTestCasesTest.php b/old_tests/automated/gulliver/system/classymlTestCasesTest.php
similarity index 100%
rename from tests/automated/gulliver/system/classymlTestCasesTest.php
rename to old_tests/automated/gulliver/system/classymlTestCasesTest.php
diff --git a/tests/automated/workflow/engine/classes/classAppSolrTest.php b/old_tests/automated/workflow/engine/classes/classAppSolrTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classAppSolrTest.php
rename to old_tests/automated/workflow/engine/classes/classAppSolrTest.php
diff --git a/tests/automated/workflow/engine/classes/classApplicationWithoutDelegationRecordsExceptionTest.php b/old_tests/automated/workflow/engine/classes/classApplicationWithoutDelegationRecordsExceptionTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classApplicationWithoutDelegationRecordsExceptionTest.php
rename to old_tests/automated/workflow/engine/classes/classApplicationWithoutDelegationRecordsExceptionTest.php
diff --git a/tests/automated/workflow/engine/classes/classApplicationsTest.php b/old_tests/automated/workflow/engine/classes/classApplicationsTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classApplicationsTest.php
rename to old_tests/automated/workflow/engine/classes/classApplicationsTest.php
diff --git a/tests/automated/workflow/engine/classes/classBpmnEngine_SearchIndexAccess_SolrTest.php b/old_tests/automated/workflow/engine/classes/classBpmnEngine_SearchIndexAccess_SolrTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classBpmnEngine_SearchIndexAccess_SolrTest.php
rename to old_tests/automated/workflow/engine/classes/classBpmnEngine_SearchIndexAccess_SolrTest.php
diff --git a/tests/automated/workflow/engine/classes/classBpmnEngine_Services_SearchIndexTest.php b/old_tests/automated/workflow/engine/classes/classBpmnEngine_Services_SearchIndexTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classBpmnEngine_Services_SearchIndexTest.php
rename to old_tests/automated/workflow/engine/classes/classBpmnEngine_Services_SearchIndexTest.php
diff --git a/tests/automated/workflow/engine/classes/classCLITest.php b/old_tests/automated/workflow/engine/classes/classCLITest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classCLITest.php
rename to old_tests/automated/workflow/engine/classes/classCLITest.php
diff --git a/tests/automated/workflow/engine/classes/classCasesTest.php b/old_tests/automated/workflow/engine/classes/classCasesTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classCasesTest.php
rename to old_tests/automated/workflow/engine/classes/classCasesTest.php
diff --git a/tests/automated/workflow/engine/classes/classConfigurationsTest.php b/old_tests/automated/workflow/engine/classes/classConfigurationsTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classConfigurationsTest.php
rename to old_tests/automated/workflow/engine/classes/classConfigurationsTest.php
diff --git a/tests/automated/workflow/engine/classes/classDerivationTest.php b/old_tests/automated/workflow/engine/classes/classDerivationTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classDerivationTest.php
rename to old_tests/automated/workflow/engine/classes/classDerivationTest.php
diff --git a/tests/automated/workflow/engine/classes/classDynaFormFieldTest.php b/old_tests/automated/workflow/engine/classes/classDynaFormFieldTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classDynaFormFieldTest.php
rename to old_tests/automated/workflow/engine/classes/classDynaFormFieldTest.php
diff --git a/tests/automated/workflow/engine/classes/classFieldValidatorTest.php b/old_tests/automated/workflow/engine/classes/classFieldValidatorTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classFieldValidatorTest.php
rename to old_tests/automated/workflow/engine/classes/classFieldValidatorTest.php
diff --git a/tests/automated/workflow/engine/classes/classFileCacheTest.php b/old_tests/automated/workflow/engine/classes/classFileCacheTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classFileCacheTest.php
rename to old_tests/automated/workflow/engine/classes/classFileCacheTest.php
diff --git a/tests/automated/workflow/engine/classes/classGroupsTest.php b/old_tests/automated/workflow/engine/classes/classGroupsTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classGroupsTest.php
rename to old_tests/automated/workflow/engine/classes/classGroupsTest.php
diff --git a/tests/automated/workflow/engine/classes/classInstallerTest.php b/old_tests/automated/workflow/engine/classes/classInstallerTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classInstallerTest.php
rename to old_tests/automated/workflow/engine/classes/classInstallerTest.php
diff --git a/tests/automated/workflow/engine/classes/classInvalidIndexSearchTextExceptionTest.php b/old_tests/automated/workflow/engine/classes/classInvalidIndexSearchTextExceptionTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classInvalidIndexSearchTextExceptionTest.php
rename to old_tests/automated/workflow/engine/classes/classInvalidIndexSearchTextExceptionTest.php
diff --git a/tests/automated/workflow/engine/classes/classJavaBridgePMTest.php b/old_tests/automated/workflow/engine/classes/classJavaBridgePMTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classJavaBridgePMTest.php
rename to old_tests/automated/workflow/engine/classes/classJavaBridgePMTest.php
diff --git a/tests/automated/workflow/engine/classes/classNETTest.php b/old_tests/automated/workflow/engine/classes/classNETTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classNETTest.php
rename to old_tests/automated/workflow/engine/classes/classNETTest.php
diff --git a/tests/automated/workflow/engine/classes/classObjectCellectionTest.php b/old_tests/automated/workflow/engine/classes/classObjectCellectionTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classObjectCellectionTest.php
rename to old_tests/automated/workflow/engine/classes/classObjectCellectionTest.php
diff --git a/tests/automated/workflow/engine/classes/classObjectDocumentTest.php b/old_tests/automated/workflow/engine/classes/classObjectDocumentTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classObjectDocumentTest.php
rename to old_tests/automated/workflow/engine/classes/classObjectDocumentTest.php
diff --git a/tests/automated/workflow/engine/classes/classPMDashletTest.php b/old_tests/automated/workflow/engine/classes/classPMDashletTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classPMDashletTest.php
rename to old_tests/automated/workflow/engine/classes/classPMDashletTest.php
diff --git a/tests/automated/workflow/engine/classes/classPMPluginRegistryTest.php b/old_tests/automated/workflow/engine/classes/classPMPluginRegistryTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classPMPluginRegistryTest.php
rename to old_tests/automated/workflow/engine/classes/classPMPluginRegistryTest.php
diff --git a/tests/automated/workflow/engine/classes/classPMPluginTest.php b/old_tests/automated/workflow/engine/classes/classPMPluginTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classPMPluginTest.php
rename to old_tests/automated/workflow/engine/classes/classPMPluginTest.php
diff --git a/tests/automated/workflow/engine/classes/classPMScriptTest.php b/old_tests/automated/workflow/engine/classes/classPMScriptTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classPMScriptTest.php
rename to old_tests/automated/workflow/engine/classes/classPMScriptTest.php
diff --git a/tests/automated/workflow/engine/classes/classPMmemcachedTest.php b/old_tests/automated/workflow/engine/classes/classPMmemcachedTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classPMmemcachedTest.php
rename to old_tests/automated/workflow/engine/classes/classPMmemcachedTest.php
diff --git a/tests/automated/workflow/engine/classes/classPmTableTest.php b/old_tests/automated/workflow/engine/classes/classPmTableTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classPmTableTest.php
rename to old_tests/automated/workflow/engine/classes/classPmTableTest.php
diff --git a/tests/automated/workflow/engine/classes/classProcessesTest.php b/old_tests/automated/workflow/engine/classes/classProcessesTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classProcessesTest.php
rename to old_tests/automated/workflow/engine/classes/classProcessesTest.php
diff --git a/tests/automated/workflow/engine/classes/classReportTablesTest.php b/old_tests/automated/workflow/engine/classes/classReportTablesTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classReportTablesTest.php
rename to old_tests/automated/workflow/engine/classes/classReportTablesTest.php
diff --git a/tests/automated/workflow/engine/classes/classReportTest.php b/old_tests/automated/workflow/engine/classes/classReportTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classReportTest.php
rename to old_tests/automated/workflow/engine/classes/classReportTest.php
diff --git a/tests/automated/workflow/engine/classes/classSessionsTest.php b/old_tests/automated/workflow/engine/classes/classSessionsTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classSessionsTest.php
rename to old_tests/automated/workflow/engine/classes/classSessionsTest.php
diff --git a/tests/automated/workflow/engine/classes/classStatTest.php b/old_tests/automated/workflow/engine/classes/classStatTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classStatTest.php
rename to old_tests/automated/workflow/engine/classes/classStatTest.php
diff --git a/tests/automated/workflow/engine/classes/classTasksTest.php b/old_tests/automated/workflow/engine/classes/classTasksTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classTasksTest.php
rename to old_tests/automated/workflow/engine/classes/classTasksTest.php
diff --git a/tests/automated/workflow/engine/classes/classToolBarTest.php b/old_tests/automated/workflow/engine/classes/classToolBarTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classToolBarTest.php
rename to old_tests/automated/workflow/engine/classes/classToolBarTest.php
diff --git a/tests/automated/workflow/engine/classes/classXMLConnectionTest.php b/old_tests/automated/workflow/engine/classes/classXMLConnectionTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classXMLConnectionTest.php
rename to old_tests/automated/workflow/engine/classes/classXMLConnectionTest.php
diff --git a/tests/automated/workflow/engine/classes/classXMLDBTest.php b/old_tests/automated/workflow/engine/classes/classXMLDBTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classXMLDBTest.php
rename to old_tests/automated/workflow/engine/classes/classXMLDBTest.php
diff --git a/tests/automated/workflow/engine/classes/classXMLResultTest.php b/old_tests/automated/workflow/engine/classes/classXMLResultTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classXMLResultTest.php
rename to old_tests/automated/workflow/engine/classes/classXMLResultTest.php
diff --git a/tests/automated/workflow/engine/classes/classXmlForm_Field_CheckBoxTableTest.php b/old_tests/automated/workflow/engine/classes/classXmlForm_Field_CheckBoxTableTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classXmlForm_Field_CheckBoxTableTest.php
rename to old_tests/automated/workflow/engine/classes/classXmlForm_Field_CheckBoxTableTest.php
diff --git a/tests/automated/workflow/engine/classes/classXmlForm_Field_TextPMTest.php b/old_tests/automated/workflow/engine/classes/classXmlForm_Field_TextPMTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classXmlForm_Field_TextPMTest.php
rename to old_tests/automated/workflow/engine/classes/classXmlForm_Field_TextPMTest.php
diff --git a/tests/automated/workflow/engine/classes/classXmlForm_Field_TextareaPMTest.php b/old_tests/automated/workflow/engine/classes/classXmlForm_Field_TextareaPMTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classXmlForm_Field_TextareaPMTest.php
rename to old_tests/automated/workflow/engine/classes/classXmlForm_Field_TextareaPMTest.php
diff --git a/tests/automated/workflow/engine/classes/classXmlForm_Field_ToolBarTest.php b/old_tests/automated/workflow/engine/classes/classXmlForm_Field_ToolBarTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classXmlForm_Field_ToolBarTest.php
rename to old_tests/automated/workflow/engine/classes/classXmlForm_Field_ToolBarTest.php
diff --git a/tests/automated/workflow/engine/classes/classXmlForm_Field_hoursTest.php b/old_tests/automated/workflow/engine/classes/classXmlForm_Field_hoursTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classXmlForm_Field_hoursTest.php
rename to old_tests/automated/workflow/engine/classes/classXmlForm_Field_hoursTest.php
diff --git a/tests/automated/workflow/engine/classes/classXmlForm_Field_popupOptionTest.php b/old_tests/automated/workflow/engine/classes/classXmlForm_Field_popupOptionTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classXmlForm_Field_popupOptionTest.php
rename to old_tests/automated/workflow/engine/classes/classXmlForm_Field_popupOptionTest.php
diff --git a/tests/automated/workflow/engine/classes/classXmlForm_Field_toolButtonTest.php b/old_tests/automated/workflow/engine/classes/classXmlForm_Field_toolButtonTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classXmlForm_Field_toolButtonTest.php
rename to old_tests/automated/workflow/engine/classes/classXmlForm_Field_toolButtonTest.php
diff --git a/tests/automated/workflow/engine/classes/classarchiveTest.php b/old_tests/automated/workflow/engine/classes/classarchiveTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classarchiveTest.php
rename to old_tests/automated/workflow/engine/classes/classarchiveTest.php
diff --git a/tests/automated/workflow/engine/classes/classbzip_fileTest.php b/old_tests/automated/workflow/engine/classes/classbzip_fileTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classbzip_fileTest.php
rename to old_tests/automated/workflow/engine/classes/classbzip_fileTest.php
diff --git a/tests/automated/workflow/engine/classes/classcalendarTest.php b/old_tests/automated/workflow/engine/classes/classcalendarTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classcalendarTest.php
rename to old_tests/automated/workflow/engine/classes/classcalendarTest.php
diff --git a/tests/automated/workflow/engine/classes/classcaseSchedulerPluginTest.php b/old_tests/automated/workflow/engine/classes/classcaseSchedulerPluginTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classcaseSchedulerPluginTest.php
rename to old_tests/automated/workflow/engine/classes/classcaseSchedulerPluginTest.php
diff --git a/tests/automated/workflow/engine/classes/classcssFileTest.php b/old_tests/automated/workflow/engine/classes/classcssFileTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classcssFileTest.php
rename to old_tests/automated/workflow/engine/classes/classcssFileTest.php
diff --git a/tests/automated/workflow/engine/classes/classdashboardPageTest.php b/old_tests/automated/workflow/engine/classes/classdashboardPageTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classdashboardPageTest.php
rename to old_tests/automated/workflow/engine/classes/classdashboardPageTest.php
diff --git a/tests/automated/workflow/engine/classes/classdashletOpenVSCompletedTest.php b/old_tests/automated/workflow/engine/classes/classdashletOpenVSCompletedTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classdashletOpenVSCompletedTest.php
rename to old_tests/automated/workflow/engine/classes/classdashletOpenVSCompletedTest.php
diff --git a/tests/automated/workflow/engine/classes/classdashletProcessMakerCommunityTest.php b/old_tests/automated/workflow/engine/classes/classdashletProcessMakerCommunityTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classdashletProcessMakerCommunityTest.php
rename to old_tests/automated/workflow/engine/classes/classdashletProcessMakerCommunityTest.php
diff --git a/tests/automated/workflow/engine/classes/classdashletProcessMakerEnterpriseTest.php b/old_tests/automated/workflow/engine/classes/classdashletProcessMakerEnterpriseTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classdashletProcessMakerEnterpriseTest.php
rename to old_tests/automated/workflow/engine/classes/classdashletProcessMakerEnterpriseTest.php
diff --git a/tests/automated/workflow/engine/classes/classdashletRssReaderTest.php b/old_tests/automated/workflow/engine/classes/classdashletRssReaderTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classdashletRssReaderTest.php
rename to old_tests/automated/workflow/engine/classes/classdashletRssReaderTest.php
diff --git a/tests/automated/workflow/engine/classes/classdatesTest.php b/old_tests/automated/workflow/engine/classes/classdatesTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classdatesTest.php
rename to old_tests/automated/workflow/engine/classes/classdatesTest.php
diff --git a/tests/automated/workflow/engine/classes/classdynaformEditorAjaxTest.php b/old_tests/automated/workflow/engine/classes/classdynaformEditorAjaxTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classdynaformEditorAjaxTest.php
rename to old_tests/automated/workflow/engine/classes/classdynaformEditorAjaxTest.php
diff --git a/tests/automated/workflow/engine/classes/classdynaformEditorTest.php b/old_tests/automated/workflow/engine/classes/classdynaformEditorTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classdynaformEditorTest.php
rename to old_tests/automated/workflow/engine/classes/classdynaformEditorTest.php
diff --git a/tests/automated/workflow/engine/classes/classfolderDataTest.php b/old_tests/automated/workflow/engine/classes/classfolderDataTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classfolderDataTest.php
rename to old_tests/automated/workflow/engine/classes/classfolderDataTest.php
diff --git a/tests/automated/workflow/engine/classes/classfolderDetailTest.php b/old_tests/automated/workflow/engine/classes/classfolderDetailTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classfolderDetailTest.php
rename to old_tests/automated/workflow/engine/classes/classfolderDetailTest.php
diff --git a/tests/automated/workflow/engine/classes/classgzip_fileTest.php b/old_tests/automated/workflow/engine/classes/classgzip_fileTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classgzip_fileTest.php
rename to old_tests/automated/workflow/engine/classes/classgzip_fileTest.php
diff --git a/tests/automated/workflow/engine/classes/classloginInfoTest.php b/old_tests/automated/workflow/engine/classes/classloginInfoTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classloginInfoTest.php
rename to old_tests/automated/workflow/engine/classes/classloginInfoTest.php
diff --git a/tests/automated/workflow/engine/classes/classmenuDetailTest.php b/old_tests/automated/workflow/engine/classes/classmenuDetailTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classmenuDetailTest.php
rename to old_tests/automated/workflow/engine/classes/classmenuDetailTest.php
diff --git a/tests/automated/workflow/engine/classes/classpluginDetailTest.php b/old_tests/automated/workflow/engine/classes/classpluginDetailTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classpluginDetailTest.php
rename to old_tests/automated/workflow/engine/classes/classpluginDetailTest.php
diff --git a/tests/automated/workflow/engine/classes/classpmGaugeTest.php b/old_tests/automated/workflow/engine/classes/classpmGaugeTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classpmGaugeTest.php
rename to old_tests/automated/workflow/engine/classes/classpmGaugeTest.php
diff --git a/tests/automated/workflow/engine/classes/classpmPhingTest.php b/old_tests/automated/workflow/engine/classes/classpmPhingTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classpmPhingTest.php
rename to old_tests/automated/workflow/engine/classes/classpmPhingTest.php
diff --git a/tests/automated/workflow/engine/classes/classpopupMenuTest.php b/old_tests/automated/workflow/engine/classes/classpopupMenuTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classpopupMenuTest.php
rename to old_tests/automated/workflow/engine/classes/classpopupMenuTest.php
diff --git a/tests/automated/workflow/engine/classes/classprocessMapTest.php b/old_tests/automated/workflow/engine/classes/classprocessMapTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classprocessMapTest.php
rename to old_tests/automated/workflow/engine/classes/classprocessMapTest.php
diff --git a/tests/automated/workflow/engine/classes/classpropelTableTest.php b/old_tests/automated/workflow/engine/classes/classpropelTableTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classpropelTableTest.php
rename to old_tests/automated/workflow/engine/classes/classpropelTableTest.php
diff --git a/tests/automated/workflow/engine/classes/classredirectDetailTest.php b/old_tests/automated/workflow/engine/classes/classredirectDetailTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classredirectDetailTest.php
rename to old_tests/automated/workflow/engine/classes/classredirectDetailTest.php
diff --git a/tests/automated/workflow/engine/classes/classreplacementLogoTest.php b/old_tests/automated/workflow/engine/classes/classreplacementLogoTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classreplacementLogoTest.php
rename to old_tests/automated/workflow/engine/classes/classreplacementLogoTest.php
diff --git a/tests/automated/workflow/engine/classes/classserverConfTest.php b/old_tests/automated/workflow/engine/classes/classserverConfTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classserverConfTest.php
rename to old_tests/automated/workflow/engine/classes/classserverConfTest.php
diff --git a/tests/automated/workflow/engine/classes/classspoolRunTest.php b/old_tests/automated/workflow/engine/classes/classspoolRunTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classspoolRunTest.php
rename to old_tests/automated/workflow/engine/classes/classspoolRunTest.php
diff --git a/tests/automated/workflow/engine/classes/classstepDetailTest.php b/old_tests/automated/workflow/engine/classes/classstepDetailTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classstepDetailTest.php
rename to old_tests/automated/workflow/engine/classes/classstepDetailTest.php
diff --git a/tests/automated/workflow/engine/classes/classtar_fileTest.php b/old_tests/automated/workflow/engine/classes/classtar_fileTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classtar_fileTest.php
rename to old_tests/automated/workflow/engine/classes/classtar_fileTest.php
diff --git a/tests/automated/workflow/engine/classes/classtaskExtendedPropertyTest.php b/old_tests/automated/workflow/engine/classes/classtaskExtendedPropertyTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classtaskExtendedPropertyTest.php
rename to old_tests/automated/workflow/engine/classes/classtaskExtendedPropertyTest.php
diff --git a/tests/automated/workflow/engine/classes/classtoolbarDetailTest.php b/old_tests/automated/workflow/engine/classes/classtoolbarDetailTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classtoolbarDetailTest.php
rename to old_tests/automated/workflow/engine/classes/classtoolbarDetailTest.php
diff --git a/tests/automated/workflow/engine/classes/classtriggerDetailTest.php b/old_tests/automated/workflow/engine/classes/classtriggerDetailTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classtriggerDetailTest.php
rename to old_tests/automated/workflow/engine/classes/classtriggerDetailTest.php
diff --git a/tests/automated/workflow/engine/classes/classtriggerLibraryTest.php b/old_tests/automated/workflow/engine/classes/classtriggerLibraryTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classtriggerLibraryTest.php
rename to old_tests/automated/workflow/engine/classes/classtriggerLibraryTest.php
diff --git a/tests/automated/workflow/engine/classes/classuploadDocumentDataTest.php b/old_tests/automated/workflow/engine/classes/classuploadDocumentDataTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classuploadDocumentDataTest.php
rename to old_tests/automated/workflow/engine/classes/classuploadDocumentDataTest.php
diff --git a/tests/automated/workflow/engine/classes/classworkspaceToolsTest.php b/old_tests/automated/workflow/engine/classes/classworkspaceToolsTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classworkspaceToolsTest.php
rename to old_tests/automated/workflow/engine/classes/classworkspaceToolsTest.php
diff --git a/tests/automated/workflow/engine/classes/classwsBaseTest.php b/old_tests/automated/workflow/engine/classes/classwsBaseTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classwsBaseTest.php
rename to old_tests/automated/workflow/engine/classes/classwsBaseTest.php
diff --git a/tests/automated/workflow/engine/classes/classwsCreateDepartmentResponseTest.php b/old_tests/automated/workflow/engine/classes/classwsCreateDepartmentResponseTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classwsCreateDepartmentResponseTest.php
rename to old_tests/automated/workflow/engine/classes/classwsCreateDepartmentResponseTest.php
diff --git a/tests/automated/workflow/engine/classes/classwsCreateGroupResponseTest.php b/old_tests/automated/workflow/engine/classes/classwsCreateGroupResponseTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classwsCreateGroupResponseTest.php
rename to old_tests/automated/workflow/engine/classes/classwsCreateGroupResponseTest.php
diff --git a/tests/automated/workflow/engine/classes/classwsCreateUserResponseTest.php b/old_tests/automated/workflow/engine/classes/classwsCreateUserResponseTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classwsCreateUserResponseTest.php
rename to old_tests/automated/workflow/engine/classes/classwsCreateUserResponseTest.php
diff --git a/tests/automated/workflow/engine/classes/classwsGetCaseNotesResponseTest.php b/old_tests/automated/workflow/engine/classes/classwsGetCaseNotesResponseTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classwsGetCaseNotesResponseTest.php
rename to old_tests/automated/workflow/engine/classes/classwsGetCaseNotesResponseTest.php
diff --git a/tests/automated/workflow/engine/classes/classwsGetVariableResponseTest.php b/old_tests/automated/workflow/engine/classes/classwsGetVariableResponseTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classwsGetVariableResponseTest.php
rename to old_tests/automated/workflow/engine/classes/classwsGetVariableResponseTest.php
diff --git a/tests/automated/workflow/engine/classes/classwsResponseTest.php b/old_tests/automated/workflow/engine/classes/classwsResponseTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classwsResponseTest.php
rename to old_tests/automated/workflow/engine/classes/classwsResponseTest.php
diff --git a/tests/automated/workflow/engine/classes/classzip_fileTest.php b/old_tests/automated/workflow/engine/classes/classzip_fileTest.php
similarity index 100%
rename from tests/automated/workflow/engine/classes/classzip_fileTest.php
rename to old_tests/automated/workflow/engine/classes/classzip_fileTest.php
diff --git a/tests/fixtures/README.txt b/old_tests/fixtures/README.txt
similarity index 100%
rename from tests/fixtures/README.txt
rename to old_tests/fixtures/README.txt
diff --git a/tests/fixtures/os/db.php b/old_tests/fixtures/os/db.php
similarity index 100%
rename from tests/fixtures/os/db.php
rename to old_tests/fixtures/os/db.php
diff --git a/tests/functional/README.txt b/old_tests/functional/README.txt
similarity index 100%
rename from tests/functional/README.txt
rename to old_tests/functional/README.txt
diff --git a/tests/functional/pom.xml b/old_tests/functional/pom.xml
similarity index 100%
rename from tests/functional/pom.xml
rename to old_tests/functional/pom.xml
diff --git a/tests/functional/src/main/app.conf b/old_tests/functional/src/main/app.conf
similarity index 100%
rename from tests/functional/src/main/app.conf
rename to old_tests/functional/src/main/app.conf
diff --git a/tests/functional/src/main/default.conf b/old_tests/functional/src/main/default.conf
similarity index 100%
rename from tests/functional/src/main/default.conf
rename to old_tests/functional/src/main/default.conf
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/Browser.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/Browser.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/Browser.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/Browser.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/BrowserConfiguration.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/BrowserConfiguration.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/BrowserConfiguration.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/BrowserConfiguration.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/BrowserInstance.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/BrowserInstance.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/BrowserInstance.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/BrowserInstance.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/BrowserSettings.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/BrowserSettings.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/BrowserSettings.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/BrowserSettings.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/ConfigurationSettings.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/ConfigurationSettings.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/ConfigurationSettings.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/ConfigurationSettings.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/Constant.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/Constant.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/Constant.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/Constant.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/FieldKeyType.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/FieldKeyType.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/FieldKeyType.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/FieldKeyType.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/FieldType.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/FieldType.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/FieldType.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/FieldType.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/InvalidPageException.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/InvalidPageException.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/InvalidPageException.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/InvalidPageException.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/Logger.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/Logger.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/Logger.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/Logger.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/Registry.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/Registry.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/Registry.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/Registry.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/Utils.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/Utils.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/Utils.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/Utils.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/WaitTool.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/WaitTool.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/WaitTool.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/WaitTool.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/ControlOptions.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/ControlOptions.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/ControlOptions.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/ControlOptions.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/DependentFieldsApplicableBehavior.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/DependentFieldsApplicableBehavior.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/DependentFieldsApplicableBehavior.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/DependentFieldsApplicableBehavior.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/DependentFieldsApplicableOption.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/DependentFieldsApplicableOption.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/DependentFieldsApplicableOption.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/DependentFieldsApplicableOption.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/DependentFieldsNotApplicableOption.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/DependentFieldsNotApplicableOption.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/DependentFieldsNotApplicableOption.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/DependentFieldsNotApplicableOption.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/InputControlOptions.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/InputControlOptions.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/InputControlOptions.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/InputControlOptions.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/NumericOptions.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/NumericOptions.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/NumericOptions.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/NumericOptions.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/PasswordOptions.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/PasswordOptions.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/PasswordOptions.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/PasswordOptions.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/SuggestOptions.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/SuggestOptions.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/SuggestOptions.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/SuggestOptions.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/TextAreaOptions.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/TextAreaOptions.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/TextAreaOptions.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/TextAreaOptions.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/TextFieldOptions.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/TextFieldOptions.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/TextFieldOptions.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/input/TextFieldOptions.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/DropDownOption.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/DropDownOption.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/DropDownOption.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/DropDownOption.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/DropDownOptions.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/DropDownOptions.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/DropDownOptions.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/DropDownOptions.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/ListBoxOptions.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/ListBoxOptions.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/ListBoxOptions.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/ListBoxOptions.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/YesNoOptions.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/YesNoOptions.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/YesNoOptions.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/controlOptions/selection/YesNoOptions.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSFloatingMenu.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSFloatingMenu.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSFloatingMenu.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSFloatingMenu.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSForm.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSForm.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSForm.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSForm.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSFormItem.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSFormItem.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSFormItem.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSFormItem.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSGrid.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSGrid.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSGrid.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSGrid.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSGridHeader.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSGridHeader.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSGridHeader.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSGridHeader.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSGridRow.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSGridRow.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSGridRow.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSGridRow.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSMenuItem.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSMenuItem.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSMenuItem.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSMenuItem.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSToolbar.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSToolbar.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSToolbar.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSToolbar.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSToolbarCell.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSToolbarCell.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSToolbarCell.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSToolbarCell.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSTree.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSTree.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSTree.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSTree.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSTreeNode.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSTreeNode.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSTreeNode.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSTreeNode.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSWindow.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSWindow.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSWindow.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSWindow.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSWindowToolbar.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSWindowToolbar.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSWindowToolbar.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/common/extJs/ExtJSWindowToolbar.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/pages/Page.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/pages/Page.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/pages/Page.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/pages/Page.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/pages/Pages.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/pages/Pages.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/pages/Pages.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/pages/Pages.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/tests/common/Test.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/tests/common/Test.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/tests/common/Test.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/tests/common/Test.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/tests/common/WebDriverFunctionsPMOS2.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/tests/common/WebDriverFunctionsPMOS2.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/tests/common/WebDriverFunctionsPMOS2.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/tests/common/WebDriverFunctionsPMOS2.java
diff --git a/tests/functional/src/main/java/com/colosa/qa/automatization/tests/test/Example.java b/old_tests/functional/src/main/java/com/colosa/qa/automatization/tests/test/Example.java
similarity index 100%
rename from tests/functional/src/main/java/com/colosa/qa/automatization/tests/test/Example.java
rename to old_tests/functional/src/main/java/com/colosa/qa/automatization/tests/test/Example.java
diff --git a/tests/functional/src/test/java/com/colosa/qa/automatization/TestSuiteAll.java b/old_tests/functional/src/test/java/com/colosa/qa/automatization/TestSuiteAll.java
similarity index 100%
rename from tests/functional/src/test/java/com/colosa/qa/automatization/TestSuiteAll.java
rename to old_tests/functional/src/test/java/com/colosa/qa/automatization/TestSuiteAll.java
diff --git a/tests/tools/generateTestUnit.php b/old_tests/tools/generateTestUnit.php
similarity index 100%
rename from tests/tools/generateTestUnit.php
rename to old_tests/tools/generateTestUnit.php
diff --git a/tests/unit/backend/README.txt b/old_tests/unit/backend/README.txt
similarity index 100%
rename from tests/unit/backend/README.txt
rename to old_tests/unit/backend/README.txt
diff --git a/tests/unit/backend/gulliver/system/GTest.php b/old_tests/unit/backend/gulliver/system/GTest.php
similarity index 100%
rename from tests/unit/backend/gulliver/system/GTest.php
rename to old_tests/unit/backend/gulliver/system/GTest.php
diff --git a/tests/unit/backend/gulliver/system/PHPSQLParserTest.php b/old_tests/unit/backend/gulliver/system/PHPSQLParserTest.php
similarity index 100%
rename from tests/unit/backend/gulliver/system/PHPSQLParserTest.php
rename to old_tests/unit/backend/gulliver/system/PHPSQLParserTest.php
diff --git a/tests/unit/backend/gulliver/system/dynaFormHandlerTest.php b/old_tests/unit/backend/gulliver/system/dynaFormHandlerTest.php
similarity index 100%
rename from tests/unit/backend/gulliver/system/dynaFormHandlerTest.php
rename to old_tests/unit/backend/gulliver/system/dynaFormHandlerTest.php
diff --git a/tests/unit/backend/gulliver/system/i18n_POTest.php b/old_tests/unit/backend/gulliver/system/i18n_POTest.php
similarity index 100%
rename from tests/unit/backend/gulliver/system/i18n_POTest.php
rename to old_tests/unit/backend/gulliver/system/i18n_POTest.php
diff --git a/tests/unit/backend/services/AppOwnerTest.php b/old_tests/unit/backend/services/AppOwnerTest.php
similarity index 100%
rename from tests/unit/backend/services/AppOwnerTest.php
rename to old_tests/unit/backend/services/AppOwnerTest.php
diff --git a/tests/unit/backend/services/ApplicationTest.php b/old_tests/unit/backend/services/ApplicationTest.php
similarity index 100%
rename from tests/unit/backend/services/ApplicationTest.php
rename to old_tests/unit/backend/services/ApplicationTest.php
diff --git a/tests/unit/backend/services/CalendarDefinitionTest.php b/old_tests/unit/backend/services/CalendarDefinitionTest.php
similarity index 100%
rename from tests/unit/backend/services/CalendarDefinitionTest.php
rename to old_tests/unit/backend/services/CalendarDefinitionTest.php
diff --git a/tests/unit/backend/services/ContentTest.php b/old_tests/unit/backend/services/ContentTest.php
similarity index 100%
rename from tests/unit/backend/services/ContentTest.php
rename to old_tests/unit/backend/services/ContentTest.php
diff --git a/tests/unit/backend/services/ProcessTest.php b/old_tests/unit/backend/services/ProcessTest.php
similarity index 100%
rename from tests/unit/backend/services/ProcessTest.php
rename to old_tests/unit/backend/services/ProcessTest.php
diff --git a/tests/unit/backend/services/Rest/CRUD.java b/old_tests/unit/backend/services/Rest/CRUD.java
similarity index 100%
rename from tests/unit/backend/services/Rest/CRUD.java
rename to old_tests/unit/backend/services/Rest/CRUD.java
diff --git a/tests/unit/backend/services/Rest/CURLMessage.php b/old_tests/unit/backend/services/Rest/CURLMessage.php
similarity index 100%
rename from tests/unit/backend/services/Rest/CURLMessage.php
rename to old_tests/unit/backend/services/Rest/CURLMessage.php
diff --git a/tests/unit/backend/services/Rest/FormatedMessage.php b/old_tests/unit/backend/services/Rest/FormatedMessage.php
similarity index 100%
rename from tests/unit/backend/services/Rest/FormatedMessage.php
rename to old_tests/unit/backend/services/Rest/FormatedMessage.php
diff --git a/tests/unit/backend/services/Rest/JsonMessage.php b/old_tests/unit/backend/services/Rest/JsonMessage.php
similarity index 100%
rename from tests/unit/backend/services/Rest/JsonMessage.php
rename to old_tests/unit/backend/services/Rest/JsonMessage.php
diff --git a/tests/unit/backend/services/Rest/RestMessage.php b/old_tests/unit/backend/services/Rest/RestMessage.php
similarity index 100%
rename from tests/unit/backend/services/Rest/RestMessage.php
rename to old_tests/unit/backend/services/Rest/RestMessage.php
diff --git a/tests/unit/backend/services/Rest/SimpleMessage.php b/old_tests/unit/backend/services/Rest/SimpleMessage.php
similarity index 100%
rename from tests/unit/backend/services/Rest/SimpleMessage.php
rename to old_tests/unit/backend/services/Rest/SimpleMessage.php
diff --git a/tests/unit/backend/services/Rest/XmlMessage.php b/old_tests/unit/backend/services/Rest/XmlMessage.php
similarity index 100%
rename from tests/unit/backend/services/Rest/XmlMessage.php
rename to old_tests/unit/backend/services/Rest/XmlMessage.php
diff --git a/tests/unit/backend/services/Rest/fixtures/application.xml b/old_tests/unit/backend/services/Rest/fixtures/application.xml
similarity index 100%
rename from tests/unit/backend/services/Rest/fixtures/application.xml
rename to old_tests/unit/backend/services/Rest/fixtures/application.xml
diff --git a/tests/unit/backend/services/Rest/testing.php b/old_tests/unit/backend/services/Rest/testing.php
similarity index 100%
rename from tests/unit/backend/services/Rest/testing.php
rename to old_tests/unit/backend/services/Rest/testing.php
diff --git a/tests/unit/backend/services/SessionTest.php b/old_tests/unit/backend/services/SessionTest.php
similarity index 100%
rename from tests/unit/backend/services/SessionTest.php
rename to old_tests/unit/backend/services/SessionTest.php
diff --git a/tests/unit/backend/services/StepTest.php b/old_tests/unit/backend/services/StepTest.php
similarity index 100%
rename from tests/unit/backend/services/StepTest.php
rename to old_tests/unit/backend/services/StepTest.php
diff --git a/tests/unit/backend/services/TranslationTest.php b/old_tests/unit/backend/services/TranslationTest.php
similarity index 100%
rename from tests/unit/backend/services/TranslationTest.php
rename to old_tests/unit/backend/services/TranslationTest.php
diff --git a/tests/unit/backend/services/UsersPropertiesTest.php b/old_tests/unit/backend/services/UsersPropertiesTest.php
similarity index 100%
rename from tests/unit/backend/services/UsersPropertiesTest.php
rename to old_tests/unit/backend/services/UsersPropertiesTest.php
diff --git a/tests/unit/backend/services/UsersTest.php b/old_tests/unit/backend/services/UsersTest.php
similarity index 100%
rename from tests/unit/backend/services/UsersTest.php
rename to old_tests/unit/backend/services/UsersTest.php
diff --git a/tests/unit/backend/workflow/engine/classes/AppSolrTest.php b/old_tests/unit/backend/workflow/engine/classes/AppSolrTest.php
similarity index 100%
rename from tests/unit/backend/workflow/engine/classes/AppSolrTest.php
rename to old_tests/unit/backend/workflow/engine/classes/AppSolrTest.php
diff --git a/tests/unit/backend/workflow/engine/classes/triggers/pmAlfrescoFunctionsTest.php b/old_tests/unit/backend/workflow/engine/classes/triggers/pmAlfrescoFunctionsTest.php
similarity index 100%
rename from tests/unit/backend/workflow/engine/classes/triggers/pmAlfrescoFunctionsTest.php
rename to old_tests/unit/backend/workflow/engine/classes/triggers/pmAlfrescoFunctionsTest.php
diff --git a/tests/unit/frontend/README.txt b/old_tests/unit/frontend/README.txt
similarity index 100%
rename from tests/unit/frontend/README.txt
rename to old_tests/unit/frontend/README.txt
diff --git a/phpunit.xml b/phpunit.xml
index fe75d4cad..bdec9bbb5 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -4,49 +4,60 @@
          backupStaticAttributes="false"
          colors="false"
          convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
+         convertNoticesToExceptions="false"
+         convertWarningsToExceptions="false"
          processIsolation="false"
-         stopOnFailure="true"
+         stopOnFailure="false"
          syntaxCheck="true"
          bootstrap="tests/bootstrap.php"
 >
     <testsuites>
-        <testsuite name="automated">
+<!--        <testsuite name="automated">
             <directory>./tests/automated/</directory>
         </testsuite>
-<!--
+
         <testsuite name="unit">
             <directory>./tests/unit/</directory>
         </testsuite>
--->
+
         <testsuite name="api">
             <directory>./workflow/engine/src/</directory>
+        </testsuite>-->
+        <testsuite name="workflow">
+            <directory>./tests/workflow/engine/src/</directory>
         </testsuite>
     </testsuites>
 
-<!--     <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./gulliver</directory>
-                <directory>./workflow</directory>
-                <directory>./rbac</directory>
-            </exclude>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="false">
+            <directory suffix=".php">./workflow/engine/classes</directory>
+           <!-- <directory suffix=".php">./workflow/engine/controllers</directory>
+            <directory suffix=".php">./workflow/engine/methods</directory> -->
+            <directory suffix=".php">./workflow/engine/src</directory>
+           <!-- <directory suffix=".php">./gulliver/bin</directory> -->
+           <!-- <directory suffix=".php">./gulliver/system</directory> -->
         </whitelist>
-    </filter> -->
+        <exclude>
+            <directory>./workflow/engine/classes/model/map</directory>
+            <directory>./workflow/engine/classes/model/om</directory>
+            <directory>./workflow/engine/src/Tests</directory>
+            <directory>./workflow/public_html</directory>
+        </exclude>
+    </filter>
 
     <php>
         <var name="SYS_SYS" value="os" />
         <var name="SYS_LANG" value="en" />
         <var name="SYS_SKIN" value="classic" />
-        <var name="zDB_ADAPTER" value="mysql" />
-        <var name="zDB_HOST" value="localhost" />
-        <var name="zDB_NAME" value="wf_os" />
-        <var name="zDB_USER" value="root" />
-        <var name="zDB_PASS" value="password" />
-        <var name="PATH_DB" value="/shared/workflow_data/sites/" />
-        <var name="PATH_DATA" value="/shared/workflow_data/sites/" />
+        <var name="DB_ADAPTER" value="mysql" />
+        <var name="DB_HOST" value="localhost" />
+        <var name="DB_NAME" value="wf_test" />
+        <var name="DB_USER" value="root" />
+        <var name="DB_PASS" value="" />
+        <var name="PATH_DB" value="./test_shared/workflow_data/sites/" />
+        <var name="PATH_DATA" value="./test_shared/workflow_data/sites/" />
+        <var name="APP_HOST" value="localhost" />
+        <var name="HTTPS" value="off" />
     </php>
 
     <logging>
diff --git a/tests/WorkflowTestCase.php b/tests/WorkflowTestCase.php
new file mode 100644
index 000000000..d283f8f7e
--- /dev/null
+++ b/tests/WorkflowTestCase.php
@@ -0,0 +1,80 @@
+<?php
+
+use ProcessMaker\Importer\XmlImporter;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test case that could instance a workspace DB
+ *
+ */
+class WorkflowTestCase extends TestCase
+{
+
+    /**
+     * Create and install the database.
+     */
+    protected function setupDB()
+    {
+        //Install Database
+        $pdo0 = new PDO("mysql:host=".DB_HOST, DB_USER, DB_PASS);
+        $pdo0->query('DROP DATABASE IF EXISTS '.DB_NAME);
+        $pdo0->query('CREATE DATABASE '.DB_NAME);
+        $pdo = new PDO("mysql:host=".DB_HOST.";dbname=".DB_NAME, DB_USER,
+                       DB_PASS);
+        $pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, 0);
+        //inmemory
+        /* $inmemory = false;
+          if ($inmemory) {
+          $sql = str_replace(
+          ['ENGINE=InnoDB', 'MEDIUMTEXT'],
+          ['ENGINE=MEMORY', 'VARCHAR(2000)'],
+          file_get_contents(PATH_CORE.'data/mysql/schema.sql')
+          );
+          } else {
+          $sql = file_get_contents(PATH_CORE.'data/mysql/schema.sql');
+          }
+          $pdo->exec($sql); */
+        $pdo->exec(file_get_contents(PATH_CORE.'data/mysql/schema.sql'));
+        $pdo->exec(file_get_contents(PATH_RBAC_CORE.'data/mysql/schema.sql'));
+        $pdo->exec(file_get_contents(PATH_CORE.'data/mysql/insert.sql'));
+        $pdo->exec(file_get_contents(PATH_RBAC_CORE.'data/mysql/insert.sql'));
+    }
+
+    /**
+     * Drop the database.
+     */
+    protected function dropDB()
+    {
+        //Install Database
+        $pdo0 = new PDO("mysql:host=".DB_HOST, DB_USER, DB_PASS);
+        $pdo0->query('DROP DATABASE IF EXISTS '.DB_NAME);
+    }
+
+    /**
+     * Import a process to the database.
+     * 
+     * @param type $filename ProcessMaker file to be imported
+     * @return string PRO_UID
+     */
+    protected function import($filename)
+    {
+        $importer = new XmlImporter();
+        $importer->setSourceFile($filename);
+        return $importer->import(
+                XmlImporter::IMPORT_OPTION_CREATE_NEW,
+                XmlImporter::GROUP_IMPORT_OPTION_CREATE_NEW, true
+        );
+    }
+
+    /**
+     * Rebuild workflow's schema.sql
+     */
+    protected function rebuildModel()
+    {
+        $pwd = getcwd();
+        chdir(PATH_CORE);
+        exec('../../gulliver/bin/gulliver propel-build-sql mysql');
+        exec('../../gulliver/bin/gulliver propel-build-model');
+        chdir($pwd);
+    }
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index c54e11d21..423a98ed6 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -2,17 +2,25 @@
 // ProcessMaker Test Unit Bootstrap
 // Defining the PATH_SEP constant, he we are defining if the the path separator symbol will be '\\' or '/'
 
+error_reporting(E_ALL ^ E_STRICT);
 define('PATH_SEP', '/');
 
 if (!defined('__DIR__')) {
-  define ('__DIR__', dirname(__FILE__));
+    define('__DIR__', dirname(__FILE__));
 }
+$_SERVER["HTTP_HOST"] = $GLOBALS['APP_HOST'];
+$_SERVER['HTTPS'] = $GLOBALS['HTTPS'];
 
 // Defining the Home Directory
-define('PATH_TRUNK', realpath(__DIR__ . '/../') . PATH_SEP);
-define('PATH_HOME',  PATH_TRUNK . 'workflow' . PATH_SEP);
+define('PATH_TRUNK', realpath(__DIR__.'/../').PATH_SEP);
+define('PATH_HOME', PATH_TRUNK.'workflow'.PATH_SEP);
 
 define('SYS_SYS', $GLOBALS['SYS_SYS']);
+//Variable from phpunit.xml
+if (!file_exists($GLOBALS['PATH_DB'].SYS_SYS)) {
+    mkdir($GLOBALS['PATH_DB'].SYS_SYS, 0777, true);
+}
+
 define('SYS_LANG', $GLOBALS['SYS_LANG']);
 define('SYS_SKIN', $GLOBALS['SYS_SKIN']);
 //define('DB_ADAPTER', $GLOBALS['DB_ADAPTER']);
@@ -20,118 +28,207 @@ define('SYS_SKIN', $GLOBALS['SYS_SKIN']);
 //define('DB_USER', $GLOBALS['DB_USER']);
 //define('DB_PASS', $GLOBALS['DB_PASS']);
 //define('DB_HOST', $GLOBALS['DB_HOST']);
-define('PATH_DB', $GLOBALS['PATH_DB']);
-define('PATH_DATA', $GLOBALS['PATH_DATA']);
-define('PATH_C', PATH_TRUNK . 'tmp/' );
-define('PATH_SMARTY_C', PATH_TRUNK . 'tmp/' );
-define('PATH_SMARTY_CACHE', PATH_TRUNK . 'tmp/' );
+define('PATH_DB', realpath($GLOBALS['PATH_DB']).'/');
+define('PATH_DATA', realpath($GLOBALS['PATH_DATA']).'/');
+define('PATH_C', PATH_TRUNK.'tmp/');
+define('PATH_SMARTY_C', PATH_TRUNK.'tmp/');
+define('PATH_SMARTY_CACHE', PATH_TRUNK.'tmp/');
+
+define('PATH_DATA_SITE', PATH_DATA.'sites/'.SYS_SYS.'/');
+define('PATH_DOCUMENT', PATH_DATA_SITE.'files/');
+define('PATH_DATA_MAILTEMPLATES', PATH_DATA_SITE.'mailTemplates/');
+define('PATH_DATA_PUBLIC', PATH_DATA_SITE.'public/');
+define('PATH_DATA_REPORTS', PATH_DATA_SITE.'reports/');
+define('PATH_DYNAFORM', PATH_DATA_SITE.'xmlForms/');
+define('PATH_IMAGES_ENVIRONMENT_FILES', PATH_DATA_SITE.'usersFiles'.PATH_SEP);
+define('PATH_IMAGES_ENVIRONMENT_USERS',
+       PATH_DATA_SITE.'usersPhotographies'.PATH_SEP);
 
-@mkdir (PATH_C);
 
 //require  PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php';
-  // Defining RBAC Paths constants
-  define( 'PATH_RBAC_HOME',     PATH_TRUNK . 'rbac' . PATH_SEP );
+// Defining RBAC Paths constants
+define('PATH_RBAC_HOME', PATH_TRUNK.'rbac'.PATH_SEP);
 
-  // Defining Gulliver framework paths constants
-  define( 'PATH_GULLIVER_HOME', PATH_TRUNK . 'gulliver'  . PATH_SEP );
-  define( 'PATH_GULLIVER',      PATH_GULLIVER_HOME . 'system' . PATH_SEP );   //gulliver system classes
-  define( 'PATH_GULLIVER_BIN',  PATH_GULLIVER_HOME . 'bin' . PATH_SEP );   //gulliver bin classes
-  define( 'PATH_TEMPLATE',      PATH_GULLIVER_HOME . 'templates' . PATH_SEP );
-  define( 'PATH_THIRDPARTY',    PATH_GULLIVER_HOME . 'thirdparty' . PATH_SEP );
-  define( 'PATH_RBAC',          PATH_RBAC_HOME .     'engine'  . PATH_SEP . 'classes' . PATH_SEP );  //to enable rbac version 2
-  define( 'PATH_RBAC_CORE',     PATH_RBAC_HOME .     'engine'  . PATH_SEP );
-  define( 'PATH_HTML',          PATH_HOME .          'public_html' . PATH_SEP );
+// Defining Gulliver framework paths constants
+define('PATH_GULLIVER_HOME', PATH_TRUNK.'gulliver'.PATH_SEP);
+define('PATH_GULLIVER', PATH_GULLIVER_HOME.'system'.PATH_SEP);   //gulliver system classes
+define('PATH_GULLIVER_BIN', PATH_GULLIVER_HOME.'bin'.PATH_SEP);   //gulliver bin classes
+define('PATH_TEMPLATE', PATH_GULLIVER_HOME.'templates'.PATH_SEP);
+define('PATH_THIRDPARTY', PATH_GULLIVER_HOME.'thirdparty'.PATH_SEP);
+define('PATH_RBAC', PATH_RBAC_HOME.'engine'.PATH_SEP.'classes'.PATH_SEP);  //to enable rbac version 2
+define('PATH_RBAC_CORE', PATH_RBAC_HOME.'engine'.PATH_SEP);
+define('PATH_HTML', PATH_HOME.'public_html'.PATH_SEP);
 
-  // Defining PMCore Path constants
-  define( 'PATH_CORE',        PATH_HOME . 'engine'       . PATH_SEP );
-  define( 'PATH_SKINS',       PATH_CORE . 'skins'        . PATH_SEP );
-  define( 'PATH_SKIN_ENGINE', PATH_CORE . 'skinEngine'   . PATH_SEP );
-  define( 'PATH_METHODS',     PATH_CORE . 'methods'      . PATH_SEP );
-  define( 'PATH_XMLFORM',     PATH_CORE . 'xmlform'      . PATH_SEP );
-  define( 'PATH_CONFIG',      PATH_CORE . 'config'       . PATH_SEP );
-  define( 'PATH_PLUGINS',     PATH_CORE . 'plugins'      . PATH_SEP  );
-  define( 'PATH_HTMLMAIL',    PATH_CORE . 'html_templates' . PATH_SEP );
-  define( 'PATH_TPL',         PATH_CORE . 'templates'    . PATH_SEP );
-  define( 'PATH_TEST',        PATH_CORE . 'test'         . PATH_SEP );
-  define( 'PATH_FIXTURES',    PATH_TEST . 'fixtures'     . PATH_SEP );
-  define( 'PATH_RTFDOCS' ,    PATH_CORE . 'rtf_templates' . PATH_SEP );
-  define( 'PATH_DYNACONT',    PATH_CORE . 'content' . PATH_SEP . 'dynaform' . PATH_SEP );
-  //define( 'PATH_LANGUAGECONT',PATH_CORE . 'content' . PATH_SEP . 'languages' . PATH_SEP );
-  define( 'SYS_UPLOAD_PATH',  PATH_HOME . "public_html/files/" );
-  define( 'PATH_UPLOAD',      PATH_HTML . 'files' . PATH_SEP);
+// Defining PMCore Path constants
+define('PATH_CORE', PATH_HOME.'engine'.PATH_SEP);
+define('PATH_SKINS', PATH_CORE.'skins'.PATH_SEP);
+define('PATH_SKIN_ENGINE', PATH_CORE.'skinEngine'.PATH_SEP);
+define('PATH_METHODS', PATH_CORE.'methods'.PATH_SEP);
+define('PATH_XMLFORM', PATH_CORE.'xmlform'.PATH_SEP);
+define('PATH_CONFIG', PATH_CORE.'config'.PATH_SEP);
+define('PATH_PLUGINS', PATH_CORE.'plugins'.PATH_SEP);
+define('PATH_HTMLMAIL', PATH_CORE.'html_templates'.PATH_SEP);
+define('PATH_TPL', PATH_CORE.'templates'.PATH_SEP);
+define('PATH_TEST', PATH_CORE.'test'.PATH_SEP);
+define('PATH_FIXTURES', PATH_TEST.'fixtures'.PATH_SEP);
+define('PATH_RTFDOCS', PATH_CORE.'rtf_templates'.PATH_SEP);
+define('PATH_DYNACONT', PATH_CORE.'content'.PATH_SEP.'dynaform'.PATH_SEP);
+//define( 'PATH_LANGUAGECONT',PATH_CORE . 'content' . PATH_SEP . 'languages' . PATH_SEP );
+define('SYS_UPLOAD_PATH', PATH_HOME."public_html/files/");
+define('PATH_UPLOAD', PATH_HTML.'files'.PATH_SEP);
 
-  define( 'PATH_WORKFLOW_MYSQL_DATA', PATH_CORE . 'data' . PATH_SEP.'mysql'.PATH_SEP);
-  define( 'PATH_RBAC_MYSQL_DATA',     PATH_RBAC_CORE . 'data' . PATH_SEP.'mysql'.PATH_SEP);
-  define( 'FILE_PATHS_INSTALLED',     PATH_CORE . 'config' . PATH_SEP . 'paths_installed.php' );
-  define( 'PATH_WORKFLOW_MSSQL_DATA', PATH_CORE . 'data' . PATH_SEP.'mssql'.PATH_SEP);
-  define( 'PATH_RBAC_MSSQL_DATA',     PATH_RBAC_CORE . 'data' . PATH_SEP.'mssql'.PATH_SEP);
-  define( 'PATH_CONTROLLERS',         PATH_CORE . 'controllers' . PATH_SEP );
-  define( 'PATH_SERVICES_REST',       PATH_CORE . 'services' . PATH_SEP . 'rest' . PATH_SEP);
+define('PATH_WORKFLOW_MYSQL_DATA', PATH_CORE.'data'.PATH_SEP.'mysql'.PATH_SEP);
+define('PATH_RBAC_MYSQL_DATA', PATH_RBAC_CORE.'data'.PATH_SEP.'mysql'.PATH_SEP);
+define('FILE_PATHS_INSTALLED', PATH_CORE.'config'.PATH_SEP.'paths_installed.php');
+define('PATH_WORKFLOW_MSSQL_DATA', PATH_CORE.'data'.PATH_SEP.'mssql'.PATH_SEP);
+define('PATH_RBAC_MSSQL_DATA', PATH_RBAC_CORE.'data'.PATH_SEP.'mssql'.PATH_SEP);
+define('PATH_CONTROLLERS', PATH_CORE.'controllers'.PATH_SEP);
+define('PATH_SERVICES_REST', PATH_CORE.'services'.PATH_SEP.'rest'.PATH_SEP);
+define('PATH_CLASSES', PATH_HOME."engine".PATH_SEP."classes".PATH_SEP);
+define('PATH_WORKSPACE', PATH_DB.SYS_SYS.PATH_SEP);
 
-  define("URL_KEY", 'c0l0s40pt1mu59r1m3' );
 
+define("URL_KEY", 'c0l0s40pt1mu59r1m3');
+define('DEBUG_SQL', 1);
+
+//
+@mkdir(PATH_C);
+
+/**
+ * Install an test environment
+ */
+function bootPMTest()
+{
+    $db_php = <<<EOL
+<?php
+// Processmaker configuration
+  define ('DB_ADAPTER',     '{$GLOBALS["DB_ADAPTER"]}' );
+  define ('DB_HOST',        '{$GLOBALS["DB_HOST"]}' );
+  define ('DB_NAME',        '{$GLOBALS["DB_NAME"]}' );
+  define ('DB_USER',        '{$GLOBALS["DB_USER"]}' );
+  define ('DB_PASS',        '{$GLOBALS["DB_PASS"]}' );
+  define ('DB_RBAC_HOST',   '{$GLOBALS["DB_HOST"]}' );
+  define ('DB_RBAC_NAME',   '{$GLOBALS["DB_NAME"]}' );
+  define ('DB_RBAC_USER',   '{$GLOBALS["DB_USER"]}' );
+  define ('DB_RBAC_PASS',   '{$GLOBALS["DB_PASS"]}' );
+  define ('DB_REPORT_HOST', '{$GLOBALS["DB_HOST"]}' );
+  define ('DB_REPORT_NAME', '{$GLOBALS["DB_NAME"]}' );
+  define ('DB_REPORT_USER', '{$GLOBALS["DB_USER"]}' );
+  define ('DB_REPORT_PASS', '{$GLOBALS["DB_PASS"]}' );
+EOL;
+    file_put_contents(PATH_DB.SYS_SYS.'/db.php', $db_php);
+    require_once PATH_DB.SYS_SYS.'/db.php';
+    $rootDir = PATH_TRUNK;
+    require $rootDir."framework/src/Maveriks/Util/ClassLoader.php";
+    $loader = Maveriks\Util\ClassLoader::getInstance();
+    $loader->add($rootDir.'framework/src/', "Maveriks");
+
+    if (!is_dir($rootDir.'vendor')) {
+        if (file_exists($rootDir.'composer.phar')) {
+            throw new Exception(
+            "ERROR: Vendors are missing!".PHP_EOL.
+            "Please execute the following command to install vendors:".PHP_EOL.PHP_EOL.
+            "$>php composer.phar install"
+            );
+        } else {
+            throw new Exception(
+            "ERROR: Vendors are missing!".PHP_EOL.
+            "Please execute the following commands to prepare/install vendors:".PHP_EOL.PHP_EOL.
+            "$>curl -sS https://getcomposer.org/installer | php".PHP_EOL.
+            "$>php composer.phar install"
+            );
+        }
+    }
+    $loader->addModelClassPath($rootDir."workflow/engine/classes/model/");
+    $loader->add($rootDir.'workflow/engine/src/', "ProcessMaker");
+    $loader->add($rootDir.'workflow/engine/src/');
+    $loader->add($rootDir.'vendor/luracast/restler/vendor', "Luracast");
+    $loader->add($rootDir.'vendor/bshaffer/oauth2-server-php/src/', "OAuth2");
+    $loader->addClass("Bootstrap",
+                      $rootDir.'gulliver/system/class.bootstrap.php');
+}
+///////
 set_include_path(
-    PATH_CORE . PATH_SEPARATOR .
-    PATH_THIRDPARTY . PATH_SEPARATOR .
-    PATH_THIRDPARTY . 'pear'. PATH_SEPARATOR .
-    PATH_RBAC_CORE . PATH_SEPARATOR .
+    PATH_CORE.PATH_SEPARATOR.
+    PATH_THIRDPARTY.PATH_SEPARATOR.
+    PATH_THIRDPARTY.'pear'.PATH_SEPARATOR.
+    PATH_RBAC_CORE.PATH_SEPARATOR.
     get_include_path()
 );
 
 // include bootstrap Class
-require_once (PATH_GULLIVER . PATH_SEP . 'class.bootstrap.php');
-  // include Gulliver Class
-//  require_once( PATH_GULLIVER . PATH_SEP . 'class.g.php');
-
-// perpare propel env.
-//require_once "propel/Propel.php";
-//require_once "creole/Creole.php";
-
-
-//initialize required classes
-//G::LoadClass ('dbtable');
-//G::LoadClass ('system');
+require_once(PATH_GULLIVER.PATH_SEP.'class.bootstrap.php');
 
 
 //testing the autoloader feature
 spl_autoload_register(array('Bootstrap', 'autoloadClass'));
-Bootstrap::registerClass('headPublisher', PATH_GULLIVER . "class.headPublisher.php");
-Bootstrap::registerClass('G', PATH_GULLIVER . "class.g.php");
-Bootstrap::registerClass('System',        PATH_HOME . "engine/classes/class.system.php");
-Bootstrap::registerClass('headPublisher', PATH_GULLIVER . "class.headPublisher.php");
-Bootstrap::registerClass('publisher', PATH_GULLIVER . "class.publisher.php");
-Bootstrap::registerClass('xmlform', PATH_GULLIVER . "class.xmlform.php");
-Bootstrap::registerClass('XmlForm_Field', PATH_GULLIVER . "class.xmlform.php");
-Bootstrap::registerClass('xmlformExtension', PATH_GULLIVER . "class.xmlformExtension.php");
-Bootstrap::registerClass('form',         PATH_GULLIVER . "class.form.php");
-Bootstrap::registerClass('menu',         PATH_GULLIVER . "class.menu.php");
-Bootstrap::registerClass('Xml_Document', PATH_GULLIVER . "class.xmlDocument.php");
-Bootstrap::registerClass('DBSession',    PATH_GULLIVER . "class.dbsession.php");
-Bootstrap::registerClass('DBConnection', PATH_GULLIVER . "class.dbconnection.php");
-Bootstrap::registerClass('DBRecordset',  PATH_GULLIVER . "class.dbrecordset.php");
-Bootstrap::registerClass('DBTable',      PATH_GULLIVER . "class.dbtable.php");
-Bootstrap::registerClass('xmlMenu',      PATH_GULLIVER . "class.xmlMenu.php");
-Bootstrap::registerClass('XmlForm_Field_FastSearch', PATH_GULLIVER . "class.xmlformExtension.php");
-Bootstrap::registerClass('XmlForm_Field_XmlMenu', PATH_GULLIVER . "class.xmlMenu.php");
-Bootstrap::registerClass('XmlForm_Field_WYSIWYG_EDITOR',  PATH_GULLIVER . "class.wysiwygEditor.php");
-Bootstrap::registerClass('Controller',          PATH_GULLIVER . "class.controller.php");
-Bootstrap::registerClass('HttpProxyController', PATH_GULLIVER . "class.httpProxyController.php");
-Bootstrap::registerClass('templatePower',            PATH_GULLIVER . "class.templatePower.php");
-Bootstrap::registerClass('XmlForm_Field_SimpleText', PATH_GULLIVER . "class.xmlformExtension.php");
-Bootstrap::registerClass('Groups',       PATH_HOME . "engine/classes/class.groups.php");
-Bootstrap::registerClass('Tasks',        PATH_HOME . "engine/classes/class.tasks.php");
-Bootstrap::registerClass('Calendar',     PATH_HOME . "engine/classes/class.calendar.php");
-Bootstrap::registerClass('processMap',   PATH_HOME . "engine/classes/class.processMap.php");
+bootPMTest();
+Bootstrap::registerClass('headPublisher',
+                         PATH_GULLIVER."class.headPublisher.php");
+Bootstrap::registerClass('G', PATH_GULLIVER."class.g.php");
+Bootstrap::registerClass('System', PATH_HOME."engine/classes/class.system.php");
+Bootstrap::registerClass('headPublisher',
+                         PATH_GULLIVER."class.headPublisher.php");
+Bootstrap::registerClass('publisher', PATH_GULLIVER."class.publisher.php");
+Bootstrap::registerClass('xmlform', PATH_GULLIVER."class.xmlform.php");
+Bootstrap::registerClass('XmlForm_Field', PATH_GULLIVER."class.xmlform.php");
+Bootstrap::registerClass('xmlformExtension',
+                         PATH_GULLIVER."class.xmlformExtension.php");
+Bootstrap::registerClass('form', PATH_GULLIVER."class.form.php");
+Bootstrap::registerClass('menu', PATH_GULLIVER."class.menu.php");
+Bootstrap::registerClass('Xml_Document', PATH_GULLIVER."class.xmlDocument.php");
+Bootstrap::registerClass('DBSession', PATH_GULLIVER."class.dbsession.php");
+Bootstrap::registerClass('DBConnection', PATH_GULLIVER."class.dbconnection.php");
+Bootstrap::registerClass('DBRecordset', PATH_GULLIVER."class.dbrecordset.php");
+Bootstrap::registerClass('DBTable', PATH_GULLIVER."class.dbtable.php");
+Bootstrap::registerClass('xmlMenu', PATH_GULLIVER."class.xmlMenu.php");
+Bootstrap::registerClass('XmlForm_Field_FastSearch',
+                         PATH_GULLIVER."class.xmlformExtension.php");
+Bootstrap::registerClass('XmlForm_Field_XmlMenu',
+                         PATH_GULLIVER."class.xmlMenu.php");
+Bootstrap::registerClass('XmlForm_Field_WYSIWYG_EDITOR',
+                         PATH_GULLIVER."class.wysiwygEditor.php");
+Bootstrap::registerClass('Controller', PATH_GULLIVER."class.controller.php");
+Bootstrap::registerClass('HttpProxyController',
+                         PATH_GULLIVER."class.httpProxyController.php");
+Bootstrap::registerClass('templatePower',
+                         PATH_GULLIVER."class.templatePower.php");
+Bootstrap::registerClass('XmlForm_Field_SimpleText',
+                         PATH_GULLIVER."class.xmlformExtension.php");
+Bootstrap::registerClass('Groups', PATH_HOME."engine/classes/class.groups.php");
+Bootstrap::registerClass('Tasks', PATH_HOME."engine/classes/class.tasks.php");
+Bootstrap::registerClass('Calendar',
+                         PATH_HOME."engine/classes/class.calendar.php");
+Bootstrap::registerClass('processMap',
+                         PATH_HOME."engine/classes/class.processMap.php");
 
 Bootstrap::registerSystemClasses();
+Bootstrap::initVendors();
+Bootstrap::LoadSystem('monologProvider');
+// including workspace shared classes -> particularlly for pmTables
+set_include_path(get_include_path().PATH_SEPARATOR.PATH_WORKSPACE);
 
+$arraySystemConfiguration = \System::getSystemConfiguration();
+
+ini_set('date.timezone', $arraySystemConfiguration['time_zone']); //Set Time Zone
+// set include path
+set_include_path(
+    PATH_CORE.PATH_SEPARATOR.
+    PATH_THIRDPARTY.PATH_SEPARATOR.
+    PATH_THIRDPARTY."pear".PATH_SEPARATOR.
+    PATH_RBAC_CORE.PATH_SEPARATOR.
+    get_include_path()
+);
 
 require_once "pear/Net/JSON.php";
-Propel::init( PATH_CORE . "config/databases.php" );
+Propel::init(PATH_CORE."config/databases.php");
+Creole::registerDriver('dbarray', 'creole.contrib.DBArrayConnection');
 
 //read memcached configuration
-$config = System::getSystemConfiguration ('', '', SYS_SYS);
-define ('MEMCACHED_ENABLED', $config ['memcached']);
-define ('MEMCACHED_SERVER', $config ['memcached_server']);
-define ('TIME_ZONE', $config ['time_zone']);
+$config = System::getSystemConfiguration('', '', SYS_SYS);
+define('MEMCACHED_ENABLED', $config ['memcached']);
+define('MEMCACHED_SERVER', $config ['memcached_server']);
+define('TIME_ZONE', $config ['time_zone']);
 
+require_once 'WorkflowTestCase.php';
+require_once(PATH_CLASSES.'model/Task.php');
diff --git a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEventTest.php b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEventTest.php
new file mode 100644
index 000000000..12a262b74
--- /dev/null
+++ b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEventTest.php
@@ -0,0 +1,457 @@
+<?php
+
+namespace ProcessMaker\BusinessModel;
+
+/**
+ * WebEntryEventTest test
+ */
+class WebEntryEventTest extends \WorkflowTestCase
+{
+    /**
+     * @var WebEntryEvent
+     */
+    protected $object;
+    private $processUid;
+    private $processUid2;
+    private $adminUid = '00000000000000000000000000000001';
+    private $customTitle = 'CUSTOM TITLE';
+    private $domain = 'http://domain.localhost';
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->setupDB();
+        $this->processUid = $this->import(__DIR__.'/WebEntryEventTest.pmx');
+        $this->processUid2 = $this->import(__DIR__.'/WebEntryEventTest2.pmx');
+        $this->object = new WebEntryEvent;
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+        //$this->dropDB();
+    }
+
+    /**
+     * @covers ProcessMaker\BusinessModel\WebEntryEvent::getWebEntryEvents
+     */
+    public function testGetWebEntryEvents()
+    {
+        $entryEvents = $this->object->getWebEntryEvents($this->processUid);
+        $this->assertCount(2, $entryEvents);
+        $this->assertNotNull($entryEvents[0]['TAS_UID']);
+        $this->assertNull($entryEvents[0]['WE_CUSTOM_TITLE']);
+        $this->assertEquals($entryEvents[0]['WE_AUTHENTICATION'], 'ANONYMOUS');
+        $this->assertEquals($entryEvents[0]['WE_HIDE_INFORMATION_BAR'], '0');
+        $this->assertEquals($entryEvents[0]['WE_CALLBACK'], 'PROCESS_MAKER');
+        $this->assertNull($entryEvents[0]['WE_CALLBACK_URL']);
+        $this->assertEquals($entryEvents[0]['WE_LINK_GENERATION'], 'DEFAULT');
+        $this->assertNull($entryEvents[0]['WE_LINK_SKIN']);
+        $this->assertNull($entryEvents[0]['WE_LINK_LANGUAGE']);
+        $this->assertNull($entryEvents[0]['WE_LINK_DOMAIN']);
+    }
+
+    /**
+     * @covers ProcessMaker\BusinessModel\WebEntryEvent::getAllWebEntryEvents
+     */
+    public function testGetAllWebEntryEvents()
+    {
+        $entryEvents = $this->object->getAllWebEntryEvents();
+        $this->assertCount(3, $entryEvents);
+        $this->assertNull($entryEvents[0]['WE_CUSTOM_TITLE']);
+        //$this->assertNull($entryEvents[0]['WE_MULTIPLE_UID']);
+        $this->assertEquals($entryEvents[0]['WE_AUTHENTICATION'], 'ANONYMOUS');
+        $this->assertEquals($entryEvents[0]['WE_HIDE_INFORMATION_BAR'], '0');
+        $this->assertEquals($entryEvents[0]['WE_CALLBACK'], 'PROCESS_MAKER');
+        $this->assertNull($entryEvents[0]['WE_CALLBACK_URL']);
+        $this->assertEquals($entryEvents[0]['WE_LINK_GENERATION'], 'DEFAULT');
+        $this->assertNull($entryEvents[0]['WE_LINK_SKIN']);
+        $this->assertNull($entryEvents[0]['WE_LINK_LANGUAGE']);
+        $this->assertNull($entryEvents[0]['WE_LINK_DOMAIN']);
+    }
+
+    /**
+     * @covers ProcessMaker\BusinessModel\WebEntryEvent::getWebEntryEvent
+     */
+    public function testGetWebEntryEvent()
+    {
+        $entryEvents = $this->object->getWebEntryEvents($this->processUid);
+        $entry = $this->object->getWebEntryEvent($entryEvents[0]['WEE_UID']);
+        $this->assertEquals($entryEvents[0], $entry);
+    }
+
+    public function testCreateSingleNonAuthAlreadyRegistered()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('**ID_WEB_ENTRY_EVENT_ALREADY_REGISTERED**');
+        $entryEvents = $this->object->getWebEntryEvents($this->processUid);
+        $dynaform = $this->getADynaform();
+        $this->object->create(
+            $this->processUid, $this->adminUid,
+            [
+            'EVN_UID'    => $entryEvents[0]['EVN_UID'],
+            'ACT_UID'    => $entryEvents[0]['ACT_UID'],
+            'DYN_UID'    => $dynaform->getDynUid(),
+            'WEE_STATUS' => 'ENABLED',
+            'USR_UID'    => $this->adminUid,
+            ]
+        );
+        $this->assertEquals(
+            $this->getSimpleWebEntryUrl($webEntry), $entryEvent['WEE_URL'],
+                                        'Wrong single web entry url (backward compativility)'
+        );
+    }
+
+    /**
+     * Create a new empty single non auth WE
+     * @cover ProcessMaker\BusinessModel\WebEntryEvent::create
+     */
+    public function testCreateSingleNonAuth()
+    {
+        $processUid = $this->processUid2;
+        $entryEvents = $this->object->getWebEntryEvents($processUid);
+        list($webEntry, $entryEvent) = $this->createWebEntryEvent(
+            $processUid, $entryEvents,
+            [
+            'DYN_UID' => $entryEvents[0]['DYN_UID'],
+            ]
+        );
+        $this->assertEquals(
+            $this->getSimpleWebEntryUrl($webEntry), $entryEvent['WEE_URL'],
+                                        'Wrong single web entry url (backward compativility)'
+        );
+    }
+
+    /**
+     * Create a new empty multiple non auth WE
+     * @cover ProcessMaker\BusinessModel\WebEntryEvent::create
+     */
+    public function testCreateNewMultipleNonAuth()
+    {
+        $processUid = $this->processUid2;
+        $entryEvents = $this->object->getWebEntryEvents($processUid);
+        $this->createWebEntryEvent(
+            $processUid, $entryEvents,
+            [
+            'WEE_URL'                 => $this->domain."/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/".$processUid."/custom.php",
+            'WE_TYPE'                 => "SINGLE",
+            'WE_CUSTOM_TITLE'         => $this->customTitle,
+            'WE_AUTHENTICATION'       => 'ANONYMOUS',
+            'WE_HIDE_INFORMATION_BAR' => "0",
+            'WE_CALLBACK'             => "PROCESS_MAKER",
+            'WE_CALLBACK_URL'         => "http://domain.localhost/callback",
+            'WE_LINK_GENERATION'      => "ADVANCED",
+            'WE_LINK_SKIN'            => SYS_SKIN,
+            'WE_LINK_LANGUAGE'        => SYS_LANG,
+            'WE_LINK_DOMAIN'          => $this->domain,
+            ]
+        );
+    }
+
+    /**
+     * Delete a webentry
+     * @cover ProcessMaker\BusinessModel\WebEntryEvent::delete
+     */
+    public function testDelete()
+    {
+        $processUid = $this->processUid;
+        $criteria = new \Criteria;
+        $criteria->add(\WebEntryPeer::PRO_UID, $processUid);
+        $entryEvents = $this->object->getWebEntryEvents($processUid);
+        $this->assertCount(2, $entryEvents);
+        $this->assertCount(2, \WebEntryPeer::doSelect($criteria));
+        $this->object->delete($entryEvents[0]['WEE_UID']);
+        $entryEvents = $this->object->getWebEntryEvents($processUid);
+        $this->assertCount(1, $entryEvents);
+        $this->assertCount(1, \WebEntryPeer::doSelect($criteria));
+        $this->object->delete($entryEvents[0]['WEE_UID']);
+        $entryEvents = $this->object->getWebEntryEvents($processUid);
+        $this->assertCount(0, $entryEvents);
+        $this->assertCount(0, \WebEntryPeer::doSelect($criteria));
+    }
+
+    /**
+     * Create different combinations of WE
+     * @cover ProcessMaker\BusinessModel\WebEntryEvent::create
+     */
+    public function testCreate()
+    {
+        /* @var $webEntry \WebEntry */
+        $processUid = $this->processUid2;
+        $entryEvents = $this->object->getWebEntryEvents($processUid);
+        $this->assertCount(1, $entryEvents);
+        $rows = $this->getCombinationsFor([
+            'WE_LINK_GENERATION' => ['DEFAULT', 'ADVANCED'],
+            'WEE_URL'            => [
+                $this->domain."/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/".$processUid."/custom.php",
+                null
+            ],
+            //'WE_TYPE'            => ['SINGLE', 'MULTIPLE'],
+            //'WE_AUTHENTICATION'  => ['ANONYMOUS', 'LOGIN_REQUIRED'],
+            //'WE_HIDE_INFORMATION_BAR'=>['0', '1'],
+            //'WE_CALLBACK'=>['PROCESS_MAKER', 'CUSTOM', 'CUSTOM_CLEAR'],
+            'WE_LINK_SKIN'       => [SYS_SKIN, null],
+            'WE_LINK_LANGUAGE'   => [SYS_LANG, null],
+        ]);
+        $criteria = new \Criteria();
+        $criteria->add(\BpmnEventPeer::PRJ_UID, $processUid);
+        $criteria->add(\BpmnEventPeer::EVN_NAME, 'simple start');
+        $event = \BpmnEventPeer::doSelectOne($criteria);
+        foreach ($rows as $row) {
+            try {
+                $data = [
+                    'EVN_UID'    => $event->getEvnUid(),
+                    'ACT_UID'    => $entryEvents[0]['ACT_UID'],
+                    'WEE_STATUS' => 'ENABLED',
+                    'USR_UID'    => $this->adminUid,
+                    'WEE_TITLE'  => $event->getEvnUid(),
+                ];
+                foreach ($row as $key => $value) {
+                    if (isset($value)) $data[$key] = $value;
+                }
+                $this->object->create($processUid, $this->adminUid, $data);
+                $entryEvents2 = $this->object->getWebEntryEvents($processUid);
+                foreach ($entryEvents2 as $entryEvent) {
+                    if ($entryEvent['EVN_UID'] === $event->getEvnUid()) {
+                        break;
+                    }
+                }
+                $webEntry = $this->getWebEntry($entryEvent);
+                $this->assertCount(2, $entryEvents2,
+                                   'Expected 2 events after create');
+                $this->object->delete($entryEvent['WEE_UID']);
+                foreach ($data as $key => $value) {
+                    $this->assertEquals($value, $entryEvent[$key], ">$key<");
+                }
+            } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+                if (
+                    $row['WE_LINK_GENERATION'] === 'DEFAULT' &&
+                    preg_match('/>WEE_URL</', $e->getMessage())
+                ) {
+                    $this->assertEquals(
+                        $this->getSimpleWebEntryUrl($webEntry),
+                                                    $entryEvent['WEE_URL'],
+                                                    'Wrong single web entry url (backward compativility)'
+                    );
+                } else {
+                    throw $e;
+                }
+            }
+        }
+    }
+
+    /**
+     * Create a WE with invalid parameters
+     * @cover ProcessMaker\BusinessModel\WebEntryEvent::create
+     */
+    public function testInvalidCreate()
+    {
+        $processUid = $this->processUid2;
+        $entryEvents = $this->object->getWebEntryEvents($processUid);
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessageRegExp('/(Please enter a valid value for (WE_TYPE|WE_AUTHENTICATION|WE_CALLBACK|WE_LINK_GENERATION)\s*){4,4}/');
+        $this->createWebEntryEvent(
+            $processUid, $entryEvents,
+            [
+            'WEE_URL'                 => $this->domain."/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/".$processUid."/custom.php",
+            'WE_TYPE'                 => "NOT-VALID-SINGLE",
+            'WE_CUSTOM_TITLE'         => $this->customTitle,
+            'WE_AUTHENTICATION'       => 'NOT-VALID-ANONYMOUS',
+            'WE_HIDE_INFORMATION_BAR' => "0",
+            'WE_CALLBACK'             => "NOT-VALID-PROCESS_MAKER",
+            'WE_CALLBACK_URL'         => "http://domain.localhost/callback",
+            'WE_LINK_GENERATION'      => "NOT-VALID-ADVANCED",
+            'WE_LINK_SKIN'            => SYS_SKIN,
+            'WE_LINK_LANGUAGE'        => SYS_LANG,
+            'WE_LINK_DOMAIN'          => $this->domain,
+            ]
+        );
+    }
+
+    /**
+     * Update different combinations of web entries
+     * @throws \PHPUnit_Framework_ExpectationFailedException
+     * @cover ProcessMaker\BusinessModel\WebEntryEvent::update
+     */
+    public function testUpdate()
+    {
+        $processUid = $this->processUid;
+        $entryEvents = $this->object->getWebEntryEvents($processUid);
+        $entryEvent = $entryEvents[0];
+        $webEntryEventUid = $entryEvent['WEE_UID'];
+        $userUidUpdater = $this->adminUid;
+
+        $criteria = new \Criteria;
+        $criteria->add(\DynaformPeer::PRO_UID, $processUid);
+        $dynaforms = \DynaformPeer::doSelect($criteria);
+        $dynaformIds = [null];
+        foreach ($dynaforms as $dyn) {
+            $dynaformIds[] = $dyn->getDynUid();
+        }
+
+        $rows = $this->getCombinationsFor([
+            'WE_LINK_GENERATION' => ['DEFAULT', 'ADVANCED'],
+            'WEE_URL'            => [
+                $this->domain."/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/".$processUid."/custom.php",
+                null
+            ],
+            'DYN_UID'            => $dynaformIds,
+            //WEE_STATUS DELETE THE WEB_ENTRY (NOT USED FROM UI)
+            //'WEE_STATUS'            => ['ENABLED', 'DISABLED'],
+            //'WE_AUTHENTICATION'  => ['ANONYMOUS', 'LOGIN_REQUIRED'],
+            //'WE_HIDE_INFORMATION_BAR'=>['0', '1'],
+            //'WE_CALLBACK'=>['PROCESS_MAKER', 'CUSTOM', 'CUSTOM_CLEAR'],
+            'WE_LINK_SKIN'     => [SYS_SKIN, null],
+            'WE_LINK_LANGUAGE' => [SYS_LANG, null],
+        ]);
+        foreach ($rows as $row) {
+            try {
+                $this->object->update($webEntryEventUid, $userUidUpdater, $row);
+                $entryEvent = $this->object->getWebEntryEvent($webEntryEventUid);
+                $webEntry = $this->getWebEntry($entryEvent);
+                foreach ($row as $key => $value) {
+                    $this->assertEquals($value, $entryEvent[$key], ">$key<");
+                }
+            } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+                if (
+                    $row['WE_LINK_GENERATION'] === 'DEFAULT' &&
+                    preg_match('/>WEE_URL</', $e->getMessage())
+                ) {
+                    $this->assertEquals(
+                        $this->getSimpleWebEntryUrl($webEntry),
+                                                    $entryEvent['WEE_URL'],
+                                                    'Wrong single web entry url (backward compativility)'
+                    );
+                } else {
+                    throw $e;
+                }
+            }
+        }
+    }
+
+    /**
+     * Update WE with invalid parameters
+     * @cover ProcessMaker\BusinessModel\WebEntryEvent::update
+     */
+    public function testInvalidUpdate()
+    {
+        $processUid = $this->processUid;
+        $entryEvents = $this->object->getWebEntryEvents($processUid);
+        $entryEvent = $entryEvents[0];
+        $webEntryEventUid = $entryEvent['WEE_UID'];
+        $userUidUpdater = $this->adminUid;
+        
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessageRegExp('/(Please enter a valid value for (WE_TYPE|WE_AUTHENTICATION|WE_CALLBACK|WE_LINK_GENERATION)\s*){4,4}/');
+        $this->object->update($webEntryEventUid, $userUidUpdater,
+            [
+            'WEE_URL'                 => $this->domain."/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/".$processUid."/custom.php",
+            'WE_TYPE'                 => "NOT-VALID-SINGLE",
+            'WE_CUSTOM_TITLE'         => $this->customTitle,
+            'WE_AUTHENTICATION'       => 'NOT-VALID-ANONYMOUS',
+            'WE_HIDE_INFORMATION_BAR' => "0",
+            'WE_CALLBACK'             => "NOT-VALID-PROCESS_MAKER",
+            'WE_CALLBACK_URL'         => "http://domain.localhost/callback",
+            'WE_LINK_GENERATION'      => "NOT-VALID-ADVANCED",
+            'WE_LINK_SKIN'            => SYS_SKIN,
+            'WE_LINK_LANGUAGE'        => SYS_LANG,
+            'WE_LINK_DOMAIN'          => $this->domain,
+            ]
+        );
+    }
+
+    //Auxiliar methods
+
+    /**
+     * get a dynaform
+     * @return type
+     */
+    private function getADynaform()
+    {
+        $criteria = new \Criteria;
+        $criteria->add(\DynaformPeer::PRO_UID, $this->processUid);
+        return \DynaformPeer::doSelectOne($criteria);
+    }
+
+    /**
+     *
+     * @param type $webEntryEvent
+     * @return \WebEntry
+     */
+    private function getWebEntry($webEntryEvent)
+    {
+        $wee = \WebEntryEventPeer::retrieveByPK($webEntryEvent['WEE_UID']);
+        return \WebEntryPeer::retrieveByPK($wee->getWeeWeUid());
+    }
+
+    private function getSimpleWebEntryUrl(\WebEntry $we)
+    {
+        return (\G::is_https() ? "https://" : "http://").
+            $_SERVER["HTTP_HOST"]."/sys".SYS_SYS."/".
+            SYS_LANG."/".SYS_SKIN."/".$we->getProUid()."/".$we->getWeData();
+    }
+
+    private function createWebEntryEvent($processUid, $entryEvents, $config)
+    {
+        $this->assertCount(1, $entryEvents,
+                           'Expected 1 event with web entry in process WebEntry2');
+        $criteria = new \Criteria();
+        $criteria->add(\BpmnEventPeer::PRJ_UID, $processUid);
+        $criteria->add(\BpmnEventPeer::EVN_NAME, 'simple start');
+        $event = \BpmnEventPeer::doSelectOne($criteria);
+        $data = [
+            'EVN_UID'    => $event->getEvnUid(),
+            'ACT_UID'    => $entryEvents[0]['ACT_UID'],
+            'WEE_STATUS' => 'ENABLED',
+            'USR_UID'    => $this->adminUid,
+            'WEE_TITLE'  => $event->getEvnUid(),
+        ];
+        foreach ($config as $key => $value) {
+            $data[$key] = $value;
+        }
+        $this->object->create($processUid, $this->adminUid, $data);
+        $entryEvents2 = $this->object->getWebEntryEvents($processUid);
+        foreach ($entryEvents2 as $entryEvent) {
+            if ($entryEvent['EVN_UID'] === $event->getEvnUid()) {
+                break;
+            }
+        }
+        $webEntry = $this->getWebEntry($entryEvent);
+        $this->assertCount(2, $entryEvents2, 'Expected 2 events after create');
+        foreach ($data as $key => $value) {
+            $this->assertEquals($value, $entryEvent[$key], "> $key");
+        }
+        return [$webEntry, $entryEvent];
+    }
+
+    /**
+     * Create combination rows
+     * @param type $combinations
+     * @return array
+     */
+    private function getCombinationsFor($combinations = [])
+    {
+        $j = 1;
+        foreach ($combinations as $key => $values) {
+            $j*=count($values);
+        }
+        $rows = [];
+        for ($i = 0; $i < $j; $i++) {
+            $row = [];
+            $ii = $i;
+            foreach ($combinations as $key => $values) {
+                $c = count($values);
+                $row[$key] = $values[$ii % $c];
+                $ii = floor($ii / $c);
+            }
+            $rows[] = $row;
+        }
+        return $rows;
+    }
+}
diff --git a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEventTest.pmx b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEventTest.pmx
new file mode 100644
index 000000000..561e6551d
--- /dev/null
+++ b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEventTest.pmx
@@ -0,0 +1,802 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProcessMaker-Project version="3.0">
+  <metadata>
+    <meta key="vendor_version"><![CDATA[(Branch feature/HOR-3207)]]></meta>
+    <meta key="vendor_version_code">Michelangelo</meta>
+    <meta key="export_timestamp">1495111434</meta>
+    <meta key="export_datetime"><![CDATA[2017-05-18T12:43:54+00:00]]></meta>
+    <meta key="export_server_addr"><![CDATA[127.0.0.1:8080]]></meta>
+    <meta key="export_server_os">Darwin</meta>
+    <meta key="export_server_php_version">50621</meta>
+    <meta key="export_version">1</meta>
+    <meta key="workspace">hor3207a</meta>
+    <meta key="name">WebEntryEvent</meta>
+    <meta key="uid">441299927591d969ff284b7005303758</meta>
+  </metadata>
+  <definition class="BPMN">
+    <table name="ACTIVITY">
+      <record>
+        <act_uid>382310413591d96b6cb34d7077964801</act_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <pro_uid>684563509591d96a01cbab3088210120</pro_uid>
+        <act_name>Task 1</act_name>
+        <act_type>TASK</act_type>
+        <act_is_for_compensation>0</act_is_for_compensation>
+        <act_start_quantity>1</act_start_quantity>
+        <act_completion_quantity>0</act_completion_quantity>
+        <act_task_type>EMPTY</act_task_type>
+        <act_implementation></act_implementation>
+        <act_instantiate>0</act_instantiate>
+        <act_script_type></act_script_type>
+        <act_script></act_script>
+        <act_loop_type>EMPTY</act_loop_type>
+        <act_test_before>0</act_test_before>
+        <act_loop_maximum>0</act_loop_maximum>
+        <act_loop_condition>0</act_loop_condition>
+        <act_loop_cardinality>0</act_loop_cardinality>
+        <act_loop_behavior>0</act_loop_behavior>
+        <act_is_adhoc>0</act_is_adhoc>
+        <act_is_collapsed>0</act_is_collapsed>
+        <act_completion_condition>0</act_completion_condition>
+        <act_ordering>0</act_ordering>
+        <act_cancel_remaining_instances>1</act_cancel_remaining_instances>
+        <act_protocol>0</act_protocol>
+        <act_method>0</act_method>
+        <act_is_global>0</act_is_global>
+        <act_referer>0</act_referer>
+        <act_default_flow>0</act_default_flow>
+        <act_master_diagram>0</act_master_diagram>
+        <bou_uid>635529260591d96b6cbfcb7051450866</bou_uid>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <element_uid>382310413591d96b6cb34d7077964801</element_uid>
+        <bou_element>891718728591d96a426dd25018705242</bou_element>
+        <bou_element_type>bpmnActivity</bou_element_type>
+        <bou_x>256</bou_x>
+        <bou_y>79</bou_y>
+        <bou_width>150</bou_width>
+        <bou_height>75</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+    </table>
+    <table name="ARTIFACT"/>
+    <table name="BOUND">
+      <record>
+        <bou_uid>214544408591d96f0071200088162965</bou_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <element_uid>754852677591d96f0066c53097043776</element_uid>
+        <bou_element>891718728591d96a426dd25018705242</bou_element>
+        <bou_element_type>bpmnEvent</bou_element_type>
+        <bou_x>100</bou_x>
+        <bou_y>213</bou_y>
+        <bou_width>33</bou_width>
+        <bou_height>33</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+      <record>
+        <bou_uid>635529260591d96b6cbfcb7051450866</bou_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <element_uid>382310413591d96b6cb34d7077964801</element_uid>
+        <bou_element>891718728591d96a426dd25018705242</bou_element>
+        <bou_element_type>bpmnActivity</bou_element_type>
+        <bou_x>256</bou_x>
+        <bou_y>79</bou_y>
+        <bou_width>150</bou_width>
+        <bou_height>75</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+      <record>
+        <bou_uid>735358742591d96b70622c8075629514</bou_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <element_uid>349681056591d96b7059a07092140602</element_uid>
+        <bou_element>891718728591d96a426dd25018705242</bou_element>
+        <bou_element_type>bpmnEvent</bou_element_type>
+        <bou_x>100</bou_x>
+        <bou_y>100</bou_y>
+        <bou_width>33</bou_width>
+        <bou_height>33</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+      <record>
+        <bou_uid>908599339591d96b70910b0020050417</bou_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <element_uid>132598392591d96b7084aa6048071487</element_uid>
+        <bou_element>891718728591d96a426dd25018705242</bou_element>
+        <bou_element_type>bpmnEvent</bou_element_type>
+        <bou_x>545</bou_x>
+        <bou_y>100</bou_y>
+        <bou_width>33</bou_width>
+        <bou_height>33</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+    </table>
+    <table name="DATA"/>
+    <table name="DIAGRAM">
+      <record>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <dia_name>WebEntryEvent</dia_name>
+        <dia_is_closable>0</dia_is_closable>
+      </record>
+    </table>
+    <table name="DOCUMENTATION"/>
+    <table name="EVENT">
+      <record>
+        <evn_uid>754852677591d96f0066c53097043776</evn_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <pro_uid>684563509591d96a01cbab3088210120</pro_uid>
+        <evn_name></evn_name>
+        <evn_type>START</evn_type>
+        <evn_marker>EMPTY</evn_marker>
+        <evn_is_interrupting>1</evn_is_interrupting>
+        <evn_attached_to></evn_attached_to>
+        <evn_cancel_activity>0</evn_cancel_activity>
+        <evn_activity_ref></evn_activity_ref>
+        <evn_wait_for_completion>0</evn_wait_for_completion>
+        <evn_error_name></evn_error_name>
+        <evn_error_code></evn_error_code>
+        <evn_escalation_name></evn_escalation_name>
+        <evn_escalation_code></evn_escalation_code>
+        <evn_condition></evn_condition>
+        <evn_message>LEAD</evn_message>
+        <evn_operation_name></evn_operation_name>
+        <evn_operation_implementation_ref></evn_operation_implementation_ref>
+        <evn_time_date></evn_time_date>
+        <evn_time_cycle></evn_time_cycle>
+        <evn_time_duration></evn_time_duration>
+        <evn_behavior>CATCH</evn_behavior>
+        <bou_uid>214544408591d96f0071200088162965</bou_uid>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <element_uid>754852677591d96f0066c53097043776</element_uid>
+        <bou_element>891718728591d96a426dd25018705242</bou_element>
+        <bou_element_type>bpmnEvent</bou_element_type>
+        <bou_x>100</bou_x>
+        <bou_y>213</bou_y>
+        <bou_width>33</bou_width>
+        <bou_height>33</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+      <record>
+        <evn_uid>349681056591d96b7059a07092140602</evn_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <pro_uid>684563509591d96a01cbab3088210120</pro_uid>
+        <evn_name>first</evn_name>
+        <evn_type>START</evn_type>
+        <evn_marker>EMPTY</evn_marker>
+        <evn_is_interrupting>1</evn_is_interrupting>
+        <evn_attached_to></evn_attached_to>
+        <evn_cancel_activity>0</evn_cancel_activity>
+        <evn_activity_ref></evn_activity_ref>
+        <evn_wait_for_completion>0</evn_wait_for_completion>
+        <evn_error_name></evn_error_name>
+        <evn_error_code></evn_error_code>
+        <evn_escalation_name></evn_escalation_name>
+        <evn_escalation_code></evn_escalation_code>
+        <evn_condition></evn_condition>
+        <evn_message>LEAD</evn_message>
+        <evn_operation_name></evn_operation_name>
+        <evn_operation_implementation_ref></evn_operation_implementation_ref>
+        <evn_time_date></evn_time_date>
+        <evn_time_cycle></evn_time_cycle>
+        <evn_time_duration></evn_time_duration>
+        <evn_behavior>CATCH</evn_behavior>
+        <bou_uid>735358742591d96b70622c8075629514</bou_uid>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <element_uid>349681056591d96b7059a07092140602</element_uid>
+        <bou_element>891718728591d96a426dd25018705242</bou_element>
+        <bou_element_type>bpmnEvent</bou_element_type>
+        <bou_x>100</bou_x>
+        <bou_y>100</bou_y>
+        <bou_width>33</bou_width>
+        <bou_height>33</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+      <record>
+        <evn_uid>132598392591d96b7084aa6048071487</evn_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <pro_uid>684563509591d96a01cbab3088210120</pro_uid>
+        <evn_name></evn_name>
+        <evn_type>END</evn_type>
+        <evn_marker>EMPTY</evn_marker>
+        <evn_is_interrupting>1</evn_is_interrupting>
+        <evn_attached_to></evn_attached_to>
+        <evn_cancel_activity>0</evn_cancel_activity>
+        <evn_activity_ref></evn_activity_ref>
+        <evn_wait_for_completion>0</evn_wait_for_completion>
+        <evn_error_name></evn_error_name>
+        <evn_error_code></evn_error_code>
+        <evn_escalation_name></evn_escalation_name>
+        <evn_escalation_code></evn_escalation_code>
+        <evn_condition></evn_condition>
+        <evn_message></evn_message>
+        <evn_operation_name></evn_operation_name>
+        <evn_operation_implementation_ref></evn_operation_implementation_ref>
+        <evn_time_date></evn_time_date>
+        <evn_time_cycle></evn_time_cycle>
+        <evn_time_duration></evn_time_duration>
+        <evn_behavior>THROW</evn_behavior>
+        <bou_uid>908599339591d96b70910b0020050417</bou_uid>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <element_uid>132598392591d96b7084aa6048071487</element_uid>
+        <bou_element>891718728591d96a426dd25018705242</bou_element>
+        <bou_element_type>bpmnEvent</bou_element_type>
+        <bou_x>545</bou_x>
+        <bou_y>100</bou_y>
+        <bou_width>33</bou_width>
+        <bou_height>33</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+    </table>
+    <table name="EXTENSION"/>
+    <table name="FLOW">
+      <record>
+        <flo_uid>714921265591d96f01e21a0012216876</flo_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <flo_type>SEQUENCE</flo_type>
+        <flo_name> </flo_name>
+        <flo_element_origin>754852677591d96f0066c53097043776</flo_element_origin>
+        <flo_element_origin_type>bpmnEvent</flo_element_origin_type>
+        <flo_element_origin_port>0</flo_element_origin_port>
+        <flo_element_dest>382310413591d96b6cb34d7077964801</flo_element_dest>
+        <flo_element_dest_type>bpmnActivity</flo_element_dest_type>
+        <flo_element_dest_port>0</flo_element_dest_port>
+        <flo_is_inmediate>1</flo_is_inmediate>
+        <flo_condition></flo_condition>
+        <flo_x1>133</flo_x1>
+        <flo_y1>230</flo_y1>
+        <flo_x2>332</flo_x2>
+        <flo_y2>154</flo_y2>
+        <flo_state><![CDATA[[{"x":133,"y":230},{"x":332,"y":230},{"x":332,"y":154}]]]></flo_state>
+        <flo_position>1</flo_position>
+      </record>
+      <record>
+        <flo_uid>755827041591d96b7215314058494878</flo_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <flo_type>SEQUENCE</flo_type>
+        <flo_name> </flo_name>
+        <flo_element_origin>349681056591d96b7059a07092140602</flo_element_origin>
+        <flo_element_origin_type>bpmnEvent</flo_element_origin_type>
+        <flo_element_origin_port>0</flo_element_origin_port>
+        <flo_element_dest>382310413591d96b6cb34d7077964801</flo_element_dest>
+        <flo_element_dest_type>bpmnActivity</flo_element_dest_type>
+        <flo_element_dest_port>0</flo_element_dest_port>
+        <flo_is_inmediate>1</flo_is_inmediate>
+        <flo_condition></flo_condition>
+        <flo_x1>133</flo_x1>
+        <flo_y1>117</flo_y1>
+        <flo_x2>256</flo_x2>
+        <flo_y2>117</flo_y2>
+        <flo_state><![CDATA[[{"x":133,"y":117},{"x":256,"y":117}]]]></flo_state>
+        <flo_position>1</flo_position>
+      </record>
+      <record>
+        <flo_uid>957678631591d96b7217c76024693278</flo_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <flo_type>SEQUENCE</flo_type>
+        <flo_name> </flo_name>
+        <flo_element_origin>382310413591d96b6cb34d7077964801</flo_element_origin>
+        <flo_element_origin_type>bpmnActivity</flo_element_origin_type>
+        <flo_element_origin_port>0</flo_element_origin_port>
+        <flo_element_dest>132598392591d96b7084aa6048071487</flo_element_dest>
+        <flo_element_dest_type>bpmnEvent</flo_element_dest_type>
+        <flo_element_dest_port>0</flo_element_dest_port>
+        <flo_is_inmediate>1</flo_is_inmediate>
+        <flo_condition></flo_condition>
+        <flo_x1>407</flo_x1>
+        <flo_y1>117</flo_y1>
+        <flo_x2>545</flo_x2>
+        <flo_y2>117</flo_y2>
+        <flo_state><![CDATA[[{"x":407,"y":117},{"x":545,"y":117}]]]></flo_state>
+        <flo_position>1</flo_position>
+      </record>
+    </table>
+    <table name="GATEWAY"/>
+    <table name="LANE"/>
+    <table name="LANESET"/>
+    <table name="PARTICIPANT"/>
+    <table name="PROCESS">
+      <record>
+        <pro_uid>684563509591d96a01cbab3088210120</pro_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <dia_uid>358612266591d96a014d1e6034604444</dia_uid>
+        <pro_name>WebEntryEvent</pro_name>
+        <pro_type>NONE</pro_type>
+        <pro_is_executable>0</pro_is_executable>
+        <pro_is_closed>0</pro_is_closed>
+        <pro_is_subprocess>0</pro_is_subprocess>
+      </record>
+    </table>
+    <table name="PROJECT">
+      <record>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <prj_name>WebEntryEvent</prj_name>
+        <prj_description></prj_description>
+        <prj_target_namespace></prj_target_namespace>
+        <prj_expresion_language></prj_expresion_language>
+        <prj_type_language></prj_type_language>
+        <prj_exporter></prj_exporter>
+        <prj_exporter_version></prj_exporter_version>
+        <prj_create_date><![CDATA[2017-05-18 12:42:08]]></prj_create_date>
+        <prj_update_date><![CDATA[2017-05-18 12:43:27]]></prj_update_date>
+        <prj_author>00000000000000000000000000000001</prj_author>
+        <prj_author_version></prj_author_version>
+        <prj_original_source></prj_original_source>
+      </record>
+    </table>
+  </definition>
+  <definition class="workflow">
+    <table name="process">
+      <record>
+        <pro_uid>441299927591d969ff284b7005303758</pro_uid>
+        <pro_title>WebEntryEvent</pro_title>
+        <pro_description></pro_description>
+        <pro_parent>441299927591d969ff284b7005303758</pro_parent>
+        <pro_time>1</pro_time>
+        <pro_timeunit>DAYS</pro_timeunit>
+        <pro_status>ACTIVE</pro_status>
+        <pro_type_day></pro_type_day>
+        <pro_type>NORMAL</pro_type>
+        <pro_assignment>FALSE</pro_assignment>
+        <pro_show_map>0</pro_show_map>
+        <pro_show_message>0</pro_show_message>
+        <pro_subprocess>0</pro_subprocess>
+        <pro_tri_create></pro_tri_create>
+        <pro_tri_open></pro_tri_open>
+        <pro_tri_deleted></pro_tri_deleted>
+        <pro_tri_canceled></pro_tri_canceled>
+        <pro_tri_paused></pro_tri_paused>
+        <pro_tri_reassigned></pro_tri_reassigned>
+        <pro_tri_unpaused></pro_tri_unpaused>
+        <pro_type_process>PUBLIC</pro_type_process>
+        <pro_show_delegate>0</pro_show_delegate>
+        <pro_show_dynaform>0</pro_show_dynaform>
+        <pro_category></pro_category>
+        <pro_sub_category></pro_sub_category>
+        <pro_industry>0</pro_industry>
+        <pro_update_date><![CDATA[2017-05-18 12:43:27]]></pro_update_date>
+        <pro_create_date><![CDATA[2017-05-18 12:42:08]]></pro_create_date>
+        <pro_create_user>00000000000000000000000000000001</pro_create_user>
+        <pro_height>5000</pro_height>
+        <pro_width>10000</pro_width>
+        <pro_title_x>0</pro_title_x>
+        <pro_title_y>0</pro_title_y>
+        <pro_debug>0</pro_debug>
+        <pro_dynaforms></pro_dynaforms>
+        <pro_derivation_screen_tpl></pro_derivation_screen_tpl>
+        <pro_cost>0</pro_cost>
+        <pro_unit_cost></pro_unit_cost>
+        <pro_itee>1</pro_itee>
+        <pro_action_done><![CDATA[a:1:{i:0;s:41:"GATEWAYTOGATEWAY_DELETE_CORRUPTED_RECORDS";}]]></pro_action_done>
+        <pro_category_label>No Category</pro_category_label>
+        <pro_bpmn>1</pro_bpmn>
+      </record>
+    </table>
+    <table name="tasks">
+      <record>
+        <pro_uid>441299927591d969ff284b7005303758</pro_uid>
+        <tas_uid>382310413591d96b6cb34d7077964801</tas_uid>
+        <tas_title>Task 1</tas_title>
+        <tas_description></tas_description>
+        <tas_def_title></tas_def_title>
+        <tas_def_subject_message></tas_def_subject_message>
+        <tas_def_proc_code></tas_def_proc_code>
+        <tas_def_message></tas_def_message>
+        <tas_def_description></tas_def_description>
+        <tas_type>NORMAL</tas_type>
+        <tas_duration>1</tas_duration>
+        <tas_delay_type></tas_delay_type>
+        <tas_temporizer>0</tas_temporizer>
+        <tas_type_day></tas_type_day>
+        <tas_timeunit>DAYS</tas_timeunit>
+        <tas_alert>FALSE</tas_alert>
+        <tas_priority_variable></tas_priority_variable>
+        <tas_assign_type>BALANCED</tas_assign_type>
+        <tas_assign_variable><![CDATA[@@SYS_NEXT_USER_TO_BE_ASSIGNED]]></tas_assign_variable>
+        <tas_group_variable></tas_group_variable>
+        <tas_mi_instance_variable><![CDATA[@@SYS_VAR_TOTAL_INSTANCE]]></tas_mi_instance_variable>
+        <tas_mi_complete_variable><![CDATA[@@SYS_VAR_TOTAL_INSTANCES_COMPLETE]]></tas_mi_complete_variable>
+        <tas_assign_location>FALSE</tas_assign_location>
+        <tas_assign_location_adhoc>FALSE</tas_assign_location_adhoc>
+        <tas_transfer_fly>FALSE</tas_transfer_fly>
+        <tas_last_assigned>0</tas_last_assigned>
+        <tas_user>0</tas_user>
+        <tas_can_upload>FALSE</tas_can_upload>
+        <tas_view_upload>FALSE</tas_view_upload>
+        <tas_view_additional_documentation>FALSE</tas_view_additional_documentation>
+        <tas_can_cancel>FALSE</tas_can_cancel>
+        <tas_owner_app>FALSE</tas_owner_app>
+        <stg_uid></stg_uid>
+        <tas_can_pause>FALSE</tas_can_pause>
+        <tas_can_send_message>TRUE</tas_can_send_message>
+        <tas_can_delete_docs>FALSE</tas_can_delete_docs>
+        <tas_self_service>FALSE</tas_self_service>
+        <tas_start>TRUE</tas_start>
+        <tas_to_last_user>FALSE</tas_to_last_user>
+        <tas_send_last_email>FALSE</tas_send_last_email>
+        <tas_derivation>NORMAL</tas_derivation>
+        <tas_posx>256</tas_posx>
+        <tas_posy>79</tas_posy>
+        <tas_width>110</tas_width>
+        <tas_height>60</tas_height>
+        <tas_color></tas_color>
+        <tas_evn_uid></tas_evn_uid>
+        <tas_boundary></tas_boundary>
+        <tas_derivation_screen_tpl></tas_derivation_screen_tpl>
+        <tas_selfservice_timeout>0</tas_selfservice_timeout>
+        <tas_selfservice_time>0</tas_selfservice_time>
+        <tas_selfservice_time_unit></tas_selfservice_time_unit>
+        <tas_selfservice_trigger_uid></tas_selfservice_trigger_uid>
+        <tas_selfservice_execution>EVERY_TIME</tas_selfservice_execution>
+        <tas_not_email_from_format>0</tas_not_email_from_format>
+        <tas_offline>FALSE</tas_offline>
+        <tas_email_server_uid></tas_email_server_uid>
+        <tas_auto_root>FALSE</tas_auto_root>
+        <tas_receive_server_uid></tas_receive_server_uid>
+        <tas_receive_last_email>FALSE</tas_receive_last_email>
+        <tas_receive_email_from_format>0</tas_receive_email_from_format>
+        <tas_receive_message_type>text</tas_receive_message_type>
+        <tas_receive_message_template>alert_message.html</tas_receive_message_template>
+        <tas_receive_subject_message></tas_receive_subject_message>
+        <tas_receive_message></tas_receive_message>
+        <tas_average></tas_average>
+        <tas_sdv></tas_sdv>
+      </record>
+      <record>
+        <pro_uid>441299927591d969ff284b7005303758</pro_uid>
+        <tas_uid>wee-54929591d96cebdc838076843684</tas_uid>
+        <tas_title>WEBENTRYEVENT</tas_title>
+        <tas_description></tas_description>
+        <tas_def_title></tas_def_title>
+        <tas_def_subject_message></tas_def_subject_message>
+        <tas_def_proc_code></tas_def_proc_code>
+        <tas_def_message></tas_def_message>
+        <tas_def_description></tas_def_description>
+        <tas_type>WEBENTRYEVENT</tas_type>
+        <tas_duration>1</tas_duration>
+        <tas_delay_type></tas_delay_type>
+        <tas_temporizer>0</tas_temporizer>
+        <tas_type_day></tas_type_day>
+        <tas_timeunit>DAYS</tas_timeunit>
+        <tas_alert>FALSE</tas_alert>
+        <tas_priority_variable></tas_priority_variable>
+        <tas_assign_type>BALANCED</tas_assign_type>
+        <tas_assign_variable><![CDATA[@@SYS_NEXT_USER_TO_BE_ASSIGNED]]></tas_assign_variable>
+        <tas_group_variable></tas_group_variable>
+        <tas_mi_instance_variable><![CDATA[@@SYS_VAR_TOTAL_INSTANCE]]></tas_mi_instance_variable>
+        <tas_mi_complete_variable><![CDATA[@@SYS_VAR_TOTAL_INSTANCES_COMPLETE]]></tas_mi_complete_variable>
+        <tas_assign_location>FALSE</tas_assign_location>
+        <tas_assign_location_adhoc>FALSE</tas_assign_location_adhoc>
+        <tas_transfer_fly>FALSE</tas_transfer_fly>
+        <tas_last_assigned>0</tas_last_assigned>
+        <tas_user>0</tas_user>
+        <tas_can_upload>FALSE</tas_can_upload>
+        <tas_view_upload>FALSE</tas_view_upload>
+        <tas_view_additional_documentation>FALSE</tas_view_additional_documentation>
+        <tas_can_cancel>FALSE</tas_can_cancel>
+        <tas_owner_app>FALSE</tas_owner_app>
+        <stg_uid></stg_uid>
+        <tas_can_pause>FALSE</tas_can_pause>
+        <tas_can_send_message>TRUE</tas_can_send_message>
+        <tas_can_delete_docs>FALSE</tas_can_delete_docs>
+        <tas_self_service>FALSE</tas_self_service>
+        <tas_start>TRUE</tas_start>
+        <tas_to_last_user>FALSE</tas_to_last_user>
+        <tas_send_last_email>FALSE</tas_send_last_email>
+        <tas_derivation>NORMAL</tas_derivation>
+        <tas_posx>100</tas_posx>
+        <tas_posy>100</tas_posy>
+        <tas_width>110</tas_width>
+        <tas_height>60</tas_height>
+        <tas_color></tas_color>
+        <tas_evn_uid></tas_evn_uid>
+        <tas_boundary></tas_boundary>
+        <tas_derivation_screen_tpl></tas_derivation_screen_tpl>
+        <tas_selfservice_timeout>0</tas_selfservice_timeout>
+        <tas_selfservice_time>0</tas_selfservice_time>
+        <tas_selfservice_time_unit></tas_selfservice_time_unit>
+        <tas_selfservice_trigger_uid></tas_selfservice_trigger_uid>
+        <tas_selfservice_execution>EVERY_TIME</tas_selfservice_execution>
+        <tas_not_email_from_format>0</tas_not_email_from_format>
+        <tas_offline>FALSE</tas_offline>
+        <tas_email_server_uid></tas_email_server_uid>
+        <tas_auto_root>FALSE</tas_auto_root>
+        <tas_receive_server_uid></tas_receive_server_uid>
+        <tas_receive_last_email>FALSE</tas_receive_last_email>
+        <tas_receive_email_from_format>0</tas_receive_email_from_format>
+        <tas_receive_message_type>text</tas_receive_message_type>
+        <tas_receive_message_template>alert_message.html</tas_receive_message_template>
+        <tas_receive_subject_message></tas_receive_subject_message>
+        <tas_receive_message></tas_receive_message>
+        <tas_average></tas_average>
+        <tas_sdv></tas_sdv>
+      </record>
+      <record>
+        <pro_uid>441299927591d969ff284b7005303758</pro_uid>
+        <tas_uid>wee-64523591d96fc408bb5096940569</tas_uid>
+        <tas_title>WEBENTRYEVENT</tas_title>
+        <tas_description></tas_description>
+        <tas_def_title></tas_def_title>
+        <tas_def_subject_message></tas_def_subject_message>
+        <tas_def_proc_code></tas_def_proc_code>
+        <tas_def_message></tas_def_message>
+        <tas_def_description></tas_def_description>
+        <tas_type>WEBENTRYEVENT</tas_type>
+        <tas_duration>1</tas_duration>
+        <tas_delay_type></tas_delay_type>
+        <tas_temporizer>0</tas_temporizer>
+        <tas_type_day></tas_type_day>
+        <tas_timeunit>DAYS</tas_timeunit>
+        <tas_alert>FALSE</tas_alert>
+        <tas_priority_variable></tas_priority_variable>
+        <tas_assign_type>BALANCED</tas_assign_type>
+        <tas_assign_variable><![CDATA[@@SYS_NEXT_USER_TO_BE_ASSIGNED]]></tas_assign_variable>
+        <tas_group_variable></tas_group_variable>
+        <tas_mi_instance_variable><![CDATA[@@SYS_VAR_TOTAL_INSTANCE]]></tas_mi_instance_variable>
+        <tas_mi_complete_variable><![CDATA[@@SYS_VAR_TOTAL_INSTANCES_COMPLETE]]></tas_mi_complete_variable>
+        <tas_assign_location>FALSE</tas_assign_location>
+        <tas_assign_location_adhoc>FALSE</tas_assign_location_adhoc>
+        <tas_transfer_fly>FALSE</tas_transfer_fly>
+        <tas_last_assigned>0</tas_last_assigned>
+        <tas_user>0</tas_user>
+        <tas_can_upload>FALSE</tas_can_upload>
+        <tas_view_upload>FALSE</tas_view_upload>
+        <tas_view_additional_documentation>FALSE</tas_view_additional_documentation>
+        <tas_can_cancel>FALSE</tas_can_cancel>
+        <tas_owner_app>FALSE</tas_owner_app>
+        <stg_uid></stg_uid>
+        <tas_can_pause>FALSE</tas_can_pause>
+        <tas_can_send_message>TRUE</tas_can_send_message>
+        <tas_can_delete_docs>FALSE</tas_can_delete_docs>
+        <tas_self_service>FALSE</tas_self_service>
+        <tas_start>TRUE</tas_start>
+        <tas_to_last_user>FALSE</tas_to_last_user>
+        <tas_send_last_email>FALSE</tas_send_last_email>
+        <tas_derivation>NORMAL</tas_derivation>
+        <tas_posx>100</tas_posx>
+        <tas_posy>213</tas_posy>
+        <tas_width>110</tas_width>
+        <tas_height>60</tas_height>
+        <tas_color></tas_color>
+        <tas_evn_uid></tas_evn_uid>
+        <tas_boundary></tas_boundary>
+        <tas_derivation_screen_tpl></tas_derivation_screen_tpl>
+        <tas_selfservice_timeout>0</tas_selfservice_timeout>
+        <tas_selfservice_time>0</tas_selfservice_time>
+        <tas_selfservice_time_unit></tas_selfservice_time_unit>
+        <tas_selfservice_trigger_uid></tas_selfservice_trigger_uid>
+        <tas_selfservice_execution>EVERY_TIME</tas_selfservice_execution>
+        <tas_not_email_from_format>0</tas_not_email_from_format>
+        <tas_offline>FALSE</tas_offline>
+        <tas_email_server_uid></tas_email_server_uid>
+        <tas_auto_root>FALSE</tas_auto_root>
+        <tas_receive_server_uid></tas_receive_server_uid>
+        <tas_receive_last_email>FALSE</tas_receive_last_email>
+        <tas_receive_email_from_format>0</tas_receive_email_from_format>
+        <tas_receive_message_type>text</tas_receive_message_type>
+        <tas_receive_message_template>alert_message.html</tas_receive_message_template>
+        <tas_receive_subject_message></tas_receive_subject_message>
+        <tas_receive_message></tas_receive_message>
+        <tas_average></tas_average>
+        <tas_sdv></tas_sdv>
+      </record>
+    </table>
+    <table name="routes">
+      <record>
+        <rou_uid>184293535591d96f02bc533028984423</rou_uid>
+        <rou_parent>0</rou_parent>
+        <pro_uid>441299927591d969ff284b7005303758</pro_uid>
+        <tas_uid>382310413591d96b6cb34d7077964801</tas_uid>
+        <rou_next_task>-1</rou_next_task>
+        <rou_case>1</rou_case>
+        <rou_type>SEQUENTIAL</rou_type>
+        <rou_default>0</rou_default>
+        <rou_condition></rou_condition>
+        <rou_to_last_user>FALSE</rou_to_last_user>
+        <rou_optional>FALSE</rou_optional>
+        <rou_send_email>TRUE</rou_send_email>
+        <rou_sourceanchor>1</rou_sourceanchor>
+        <rou_targetanchor>0</rou_targetanchor>
+        <rou_to_port>1</rou_to_port>
+        <rou_from_port>2</rou_from_port>
+        <rou_evn_uid></rou_evn_uid>
+        <gat_uid></gat_uid>
+      </record>
+      <record>
+        <rou_uid>674628874591d96fc547a04006969081</rou_uid>
+        <rou_parent>0</rou_parent>
+        <pro_uid>441299927591d969ff284b7005303758</pro_uid>
+        <tas_uid>wee-64523591d96fc408bb5096940569</tas_uid>
+        <rou_next_task>382310413591d96b6cb34d7077964801</rou_next_task>
+        <rou_case>1</rou_case>
+        <rou_type>SEQUENTIAL</rou_type>
+        <rou_default>0</rou_default>
+        <rou_condition></rou_condition>
+        <rou_to_last_user>FALSE</rou_to_last_user>
+        <rou_optional>FALSE</rou_optional>
+        <rou_send_email>TRUE</rou_send_email>
+        <rou_sourceanchor>1</rou_sourceanchor>
+        <rou_targetanchor>0</rou_targetanchor>
+        <rou_to_port>1</rou_to_port>
+        <rou_from_port>2</rou_from_port>
+        <rou_evn_uid></rou_evn_uid>
+        <gat_uid></gat_uid>
+      </record>
+      <record>
+        <rou_uid>777329623591d96f04965b8071665220</rou_uid>
+        <rou_parent>0</rou_parent>
+        <pro_uid>441299927591d969ff284b7005303758</pro_uid>
+        <tas_uid>wee-54929591d96cebdc838076843684</tas_uid>
+        <rou_next_task>382310413591d96b6cb34d7077964801</rou_next_task>
+        <rou_case>1</rou_case>
+        <rou_type>SEQUENTIAL</rou_type>
+        <rou_default>0</rou_default>
+        <rou_condition></rou_condition>
+        <rou_to_last_user>FALSE</rou_to_last_user>
+        <rou_optional>FALSE</rou_optional>
+        <rou_send_email>TRUE</rou_send_email>
+        <rou_sourceanchor>1</rou_sourceanchor>
+        <rou_targetanchor>0</rou_targetanchor>
+        <rou_to_port>1</rou_to_port>
+        <rou_from_port>2</rou_from_port>
+        <rou_evn_uid></rou_evn_uid>
+        <gat_uid></gat_uid>
+      </record>
+    </table>
+    <table name="lanes"/>
+    <table name="gateways"/>
+    <table name="inputs"/>
+    <table name="outputs"/>
+    <table name="dynaforms">
+      <record>
+        <dyn_uid>361249164591d96e6edcb81084086222</dyn_uid>
+        <dyn_title>Form2</dyn_title>
+        <dyn_description></dyn_description>
+        <pro_uid>441299927591d969ff284b7005303758</pro_uid>
+        <dyn_type>xmlform</dyn_type>
+        <dyn_filename><![CDATA[441299927591d969ff284b7005303758/361249164591d96e6edcb81084086222]]></dyn_filename>
+        <dyn_content><![CDATA[{"name":"Form2","description":"","items":[{"type":"form","variable":"","var_uid":"","dataType":"","id":"361249164591d96e6edcb81084086222","name":"Form2","description":"","mode":"edit","script":"","language":"en","externalLibs":"","printable":false,"items":[],"variables":[]}]}]]></dyn_content>
+        <dyn_label></dyn_label>
+        <dyn_version>2</dyn_version>
+        <dyn_update_date><![CDATA[2017-05-18 12:43:18]]></dyn_update_date>
+      </record>
+      <record>
+        <dyn_uid>839383145591d96c1331811037017265</dyn_uid>
+        <dyn_title>Form1</dyn_title>
+        <dyn_description></dyn_description>
+        <pro_uid>441299927591d969ff284b7005303758</pro_uid>
+        <dyn_type>xmlform</dyn_type>
+        <dyn_filename><![CDATA[441299927591d969ff284b7005303758/839383145591d96c1331811037017265]]></dyn_filename>
+        <dyn_content><![CDATA[{"name":"Form1","description":"","items":[{"type":"form","variable":"","var_uid":"","dataType":"","id":"839383145591d96c1331811037017265","name":"Form1","description":"","mode":"edit","script":"","language":"en","externalLibs":"","printable":false,"items":[],"variables":[]}]}]]></dyn_content>
+        <dyn_label></dyn_label>
+        <dyn_version>2</dyn_version>
+        <dyn_update_date><![CDATA[2017-05-18 12:42:41]]></dyn_update_date>
+      </record>
+    </table>
+    <table name="steps">
+      <record>
+        <step_uid>184891718591d96fc460179075100311</step_uid>
+        <pro_uid>441299927591d969ff284b7005303758</pro_uid>
+        <tas_uid>wee-64523591d96fc408bb5096940569</tas_uid>
+        <step_type_obj>DYNAFORM</step_type_obj>
+        <step_uid_obj>361249164591d96e6edcb81084086222</step_uid_obj>
+        <step_condition></step_condition>
+        <step_position>1</step_position>
+        <step_mode>EDIT</step_mode>
+      </record>
+      <record>
+        <step_uid>593687534591d96ceca0ba3047943309</step_uid>
+        <pro_uid>441299927591d969ff284b7005303758</pro_uid>
+        <tas_uid>wee-54929591d96cebdc838076843684</tas_uid>
+        <step_type_obj>DYNAFORM</step_type_obj>
+        <step_uid_obj>839383145591d96c1331811037017265</step_uid_obj>
+        <step_condition></step_condition>
+        <step_position>1</step_position>
+        <step_mode>EDIT</step_mode>
+      </record>
+    </table>
+    <table name="triggers"/>
+    <table name="taskusers"/>
+    <table name="groupwfs"/>
+    <table name="steptriggers"/>
+    <table name="dbconnections"/>
+    <table name="reportTables"/>
+    <table name="reportTablesVars"/>
+    <table name="stepSupervisor"/>
+    <table name="objectPermissions"/>
+    <table name="subProcess"/>
+    <table name="caseTracker"/>
+    <table name="caseTrackerObject"/>
+    <table name="stage"/>
+    <table name="fieldCondition"/>
+    <table name="event"/>
+    <table name="caseScheduler"/>
+    <table name="processCategory"/>
+    <table name="taskExtraProperties"/>
+    <table name="processUser"/>
+    <table name="processVariables"/>
+    <table name="webEntry"/>
+    <table name="webEntryEvent">
+      <record>
+        <wee_uid>738419055591d96cf2b41c2097553491</wee_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <evn_uid>349681056591d96b7059a07092140602</evn_uid>
+        <act_uid>382310413591d96b6cb34d7077964801</act_uid>
+        <dyn_uid>839383145591d96c1331811037017265</dyn_uid>
+        <usr_uid>00000000000000000000000000000001</usr_uid>
+        <wee_title>349681056591d96b7059a07092140602</wee_title>
+        <wee_description></wee_description>
+        <wee_status>ENABLED</wee_status>
+        <wee_we_uid>601692046591d96cf02f3c6044834198</wee_we_uid>
+        <wee_we_tas_uid>wee-54929591d96cebdc838076843684</wee_we_tas_uid>
+        <wee_we_url>349681056591d96b7059a07092140602.php</wee_we_url>
+      </record>
+      <record>
+        <wee_uid>994230525591d96fc6eb5c3089474099</wee_uid>
+        <prj_uid>441299927591d969ff284b7005303758</prj_uid>
+        <evn_uid>754852677591d96f0066c53097043776</evn_uid>
+        <act_uid>382310413591d96b6cb34d7077964801</act_uid>
+        <dyn_uid>361249164591d96e6edcb81084086222</dyn_uid>
+        <usr_uid>00000000000000000000000000000001</usr_uid>
+        <wee_title>754852677591d96f0066c53097043776</wee_title>
+        <wee_description></wee_description>
+        <wee_status>ENABLED</wee_status>
+        <wee_we_uid>628282652591d96fc61ddc3005225961</wee_we_uid>
+        <wee_we_tas_uid>wee-64523591d96fc408bb5096940569</wee_we_tas_uid>
+        <wee_we_url>754852677591d96f0066c53097043776.php</wee_we_url>
+      </record>
+    </table>
+    <table name="messageType"/>
+    <table name="messageTypeVariable"/>
+    <table name="messageEventDefinition"/>
+    <table name="scriptTask"/>
+    <table name="timerEvent"/>
+    <table name="emailEvent"/>
+    <table name="filesManager"/>
+    <table name="abeConfiguration"/>
+    <table name="elementTask"/>
+  </definition>
+  <workflow-files>
+    <file target="dynaforms">
+      <file_name>Form2</file_name>
+      <file_path><![CDATA[441299927591d969ff284b7005303758/361249164591d96e6edcb81084086222.xml]]></file_path>
+      <file_content><![CDATA[PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPGR5bmFGb3JtIHR5cGU9InhtbGZvcm0iIG5hbWU9IjQ0MTI5OTkyNzU5MWQ5NjlmZjI4NGI3MDA1MzAzNzU4LzM2MTI0OTE2NDU5MWQ5NmU2ZWRjYjgxMDg0MDg2MjIyIiB3aWR0aD0iNTAwIiBlbmFibGV0ZW1wbGF0ZT0iMCIgbW9kZT0iIiBuZXh0c3RlcHNhdmU9InByb21wdCI+CjwvZHluYUZvcm0+]]></file_content>
+    </file>
+    <file target="dynaforms">
+      <file_name>Form1</file_name>
+      <file_path><![CDATA[441299927591d969ff284b7005303758/839383145591d96c1331811037017265.xml]]></file_path>
+      <file_content><![CDATA[PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPGR5bmFGb3JtIHR5cGU9InhtbGZvcm0iIG5hbWU9IjQ0MTI5OTkyNzU5MWQ5NjlmZjI4NGI3MDA1MzAzNzU4LzgzOTM4MzE0NTU5MWQ5NmMxMzMxODExMDM3MDE3MjY1IiB3aWR0aD0iNTAwIiBlbmFibGV0ZW1wbGF0ZT0iMCIgbW9kZT0iIiBuZXh0c3RlcHNhdmU9InByb21wdCI+CjwvZHluYUZvcm0+]]></file_content>
+    </file>
+    <file target="public">
+      <file_name>349681056591d96b7059a07092140602Info.php</file_name>
+      <file_path><![CDATA[441299927591d969ff284b7005303758/349681056591d96b7059a07092140602Info.php]]></file_path>
+      <file_content><![CDATA[PD9waHAKCiRHX1BVQkxJU0ggPSBuZXcgUHVibGlzaGVyKCk7CiRzaG93ID0gImxvZ2luL3Nob3dNZXNzYWdlIjsKJG1lc3NhZ2UgPSAiIjsKaWYgKGlzc2V0KCRfU0VTU0lPTlsiX193ZWJFbnRyeVN1Y2Nlc3NfXyJdKSkgewogICAgJHNob3cgPSAibG9naW4vc2hvd0luZm8iOwogICAgJG1lc3NhZ2UgPSAkX1NFU1NJT05bIl9fd2ViRW50cnlTdWNjZXNzX18iXTsKfSBlbHNlIHsKICAgICRzaG93ID0gImxvZ2luL3Nob3dNZXNzYWdlIjsKICAgICRtZXNzYWdlID0gJF9TRVNTSU9OWyJfX3dlYkVudHJ5RXJyb3JfXyJdOwp9CiRHX1BVQkxJU0gtPkFkZENvbnRlbnQoInhtbGZvcm0iLCAieG1sZm9ybSIsICRzaG93LCAiIiwgJG1lc3NhZ2UpOwpHOjpSZW5kZXJQYWdlKCJwdWJsaXNoIiwgImJsYW5rIik7Cgo=]]></file_content>
+    </file>
+    <file target="public">
+      <file_name>754852677591d96f0066c53097043776Info.php</file_name>
+      <file_path><![CDATA[441299927591d969ff284b7005303758/754852677591d96f0066c53097043776Info.php]]></file_path>
+      <file_content><![CDATA[PD9waHAKCiRHX1BVQkxJU0ggPSBuZXcgUHVibGlzaGVyKCk7CiRzaG93ID0gImxvZ2luL3Nob3dNZXNzYWdlIjsKJG1lc3NhZ2UgPSAiIjsKaWYgKGlzc2V0KCRfU0VTU0lPTlsiX193ZWJFbnRyeVN1Y2Nlc3NfXyJdKSkgewogICAgJHNob3cgPSAibG9naW4vc2hvd0luZm8iOwogICAgJG1lc3NhZ2UgPSAkX1NFU1NJT05bIl9fd2ViRW50cnlTdWNjZXNzX18iXTsKfSBlbHNlIHsKICAgICRzaG93ID0gImxvZ2luL3Nob3dNZXNzYWdlIjsKICAgICRtZXNzYWdlID0gJF9TRVNTSU9OWyJfX3dlYkVudHJ5RXJyb3JfXyJdOwp9CiRHX1BVQkxJU0gtPkFkZENvbnRlbnQoInhtbGZvcm0iLCAieG1sZm9ybSIsICRzaG93LCAiIiwgJG1lc3NhZ2UpOwpHOjpSZW5kZXJQYWdlKCJwdWJsaXNoIiwgImJsYW5rIik7Cgo=]]></file_content>
+    </file>
+  </workflow-files>
+</ProcessMaker-Project>
diff --git a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEventTest2.pmx b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEventTest2.pmx
new file mode 100644
index 000000000..a178f07a2
--- /dev/null
+++ b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEventTest2.pmx
@@ -0,0 +1,667 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProcessMaker-Project version="3.0">
+  <metadata>
+    <meta key="vendor_version"><![CDATA[(Branch feature/HOR-3207)]]></meta>
+    <meta key="vendor_version_code">Michelangelo</meta>
+    <meta key="export_timestamp">1495125086</meta>
+    <meta key="export_datetime"><![CDATA[2017-05-18T16:31:26+00:00]]></meta>
+    <meta key="export_server_addr"><![CDATA[127.0.0.1:8080]]></meta>
+    <meta key="export_server_os">Darwin</meta>
+    <meta key="export_server_php_version">50621</meta>
+    <meta key="export_version">2</meta>
+    <meta key="workspace">hor3207a</meta>
+    <meta key="name">WebEntryEvent2</meta>
+    <meta key="uid">764314601591da882ee7360035898228</meta>
+  </metadata>
+  <definition class="BPMN">
+    <table name="ACTIVITY">
+      <record>
+        <act_uid>699674969591da8ad2c8e29094085586</act_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <pro_uid>827725863591da88311f126098111677</pro_uid>
+        <act_name>Task 1</act_name>
+        <act_type>TASK</act_type>
+        <act_is_for_compensation>0</act_is_for_compensation>
+        <act_start_quantity>1</act_start_quantity>
+        <act_completion_quantity>0</act_completion_quantity>
+        <act_task_type>EMPTY</act_task_type>
+        <act_implementation></act_implementation>
+        <act_instantiate>0</act_instantiate>
+        <act_script_type></act_script_type>
+        <act_script></act_script>
+        <act_loop_type>EMPTY</act_loop_type>
+        <act_test_before>0</act_test_before>
+        <act_loop_maximum>0</act_loop_maximum>
+        <act_loop_condition>0</act_loop_condition>
+        <act_loop_cardinality>0</act_loop_cardinality>
+        <act_loop_behavior>0</act_loop_behavior>
+        <act_is_adhoc>0</act_is_adhoc>
+        <act_is_collapsed>0</act_is_collapsed>
+        <act_completion_condition>0</act_completion_condition>
+        <act_ordering>0</act_ordering>
+        <act_cancel_remaining_instances>0</act_cancel_remaining_instances>
+        <act_protocol>0</act_protocol>
+        <act_method>0</act_method>
+        <act_is_global>0</act_is_global>
+        <act_referer>0</act_referer>
+        <act_default_flow>0</act_default_flow>
+        <act_master_diagram>0</act_master_diagram>
+        <bou_uid>796773032591da8ad2d78f9070801311</bou_uid>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <element_uid>699674969591da8ad2c8e29094085586</element_uid>
+        <bou_element>592748205591dcc43e17925091079095</bou_element>
+        <bou_element_type>bpmnActivity</bou_element_type>
+        <bou_x>359</bou_x>
+        <bou_y>74</bou_y>
+        <bou_width>150</bou_width>
+        <bou_height>75</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+    </table>
+    <table name="ARTIFACT"/>
+    <table name="BOUND">
+      <record>
+        <bou_uid>644078661591da8ad49b168076298122</bou_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <element_uid>629345707591da8ad4948a3022146882</element_uid>
+        <bou_element>592748205591dcc43e17925091079095</bou_element>
+        <bou_element_type>bpmnEvent</bou_element_type>
+        <bou_x>606</bou_x>
+        <bou_y>95</bou_y>
+        <bou_width>33</bou_width>
+        <bou_height>33</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+      <record>
+        <bou_uid>720886708591dcc59beb096016129290</bou_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <element_uid>757752922591dcc59bdaed3079376019</element_uid>
+        <bou_element>592748205591dcc43e17925091079095</bou_element>
+        <bou_element_type>bpmnEvent</bou_element_type>
+        <bou_x>240</bou_x>
+        <bou_y>187</bou_y>
+        <bou_width>33</bou_width>
+        <bou_height>33</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+      <record>
+        <bou_uid>784735656591da8ad4749e5074175364</bou_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <element_uid>103520741591da8ad46aa47032601056</element_uid>
+        <bou_element>592748205591dcc43e17925091079095</bou_element>
+        <bou_element_type>bpmnEvent</bou_element_type>
+        <bou_x>240</bou_x>
+        <bou_y>95</bou_y>
+        <bou_width>33</bou_width>
+        <bou_height>33</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+      <record>
+        <bou_uid>796773032591da8ad2d78f9070801311</bou_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <element_uid>699674969591da8ad2c8e29094085586</element_uid>
+        <bou_element>592748205591dcc43e17925091079095</bou_element>
+        <bou_element_type>bpmnActivity</bou_element_type>
+        <bou_x>359</bou_x>
+        <bou_y>74</bou_y>
+        <bou_width>150</bou_width>
+        <bou_height>75</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+    </table>
+    <table name="DATA"/>
+    <table name="DIAGRAM">
+      <record>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <dia_name>WebEntryEvent2</dia_name>
+        <dia_is_closable>0</dia_is_closable>
+      </record>
+    </table>
+    <table name="DOCUMENTATION"/>
+    <table name="EVENT">
+      <record>
+        <evn_uid>629345707591da8ad4948a3022146882</evn_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <pro_uid>827725863591da88311f126098111677</pro_uid>
+        <evn_name></evn_name>
+        <evn_type>END</evn_type>
+        <evn_marker>EMPTY</evn_marker>
+        <evn_is_interrupting>1</evn_is_interrupting>
+        <evn_attached_to></evn_attached_to>
+        <evn_cancel_activity>0</evn_cancel_activity>
+        <evn_activity_ref></evn_activity_ref>
+        <evn_wait_for_completion>0</evn_wait_for_completion>
+        <evn_error_name></evn_error_name>
+        <evn_error_code></evn_error_code>
+        <evn_escalation_name></evn_escalation_name>
+        <evn_escalation_code></evn_escalation_code>
+        <evn_condition></evn_condition>
+        <evn_message></evn_message>
+        <evn_operation_name></evn_operation_name>
+        <evn_operation_implementation_ref></evn_operation_implementation_ref>
+        <evn_time_date></evn_time_date>
+        <evn_time_cycle></evn_time_cycle>
+        <evn_time_duration></evn_time_duration>
+        <evn_behavior>THROW</evn_behavior>
+        <bou_uid>644078661591da8ad49b168076298122</bou_uid>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <element_uid>629345707591da8ad4948a3022146882</element_uid>
+        <bou_element>592748205591dcc43e17925091079095</bou_element>
+        <bou_element_type>bpmnEvent</bou_element_type>
+        <bou_x>606</bou_x>
+        <bou_y>95</bou_y>
+        <bou_width>33</bou_width>
+        <bou_height>33</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+      <record>
+        <evn_uid>757752922591dcc59bdaed3079376019</evn_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <pro_uid>827725863591da88311f126098111677</pro_uid>
+        <evn_name>simple start</evn_name>
+        <evn_type>START</evn_type>
+        <evn_marker>EMPTY</evn_marker>
+        <evn_is_interrupting>1</evn_is_interrupting>
+        <evn_attached_to></evn_attached_to>
+        <evn_cancel_activity>0</evn_cancel_activity>
+        <evn_activity_ref></evn_activity_ref>
+        <evn_wait_for_completion>0</evn_wait_for_completion>
+        <evn_error_name></evn_error_name>
+        <evn_error_code></evn_error_code>
+        <evn_escalation_name></evn_escalation_name>
+        <evn_escalation_code></evn_escalation_code>
+        <evn_condition></evn_condition>
+        <evn_message>LEAD</evn_message>
+        <evn_operation_name></evn_operation_name>
+        <evn_operation_implementation_ref></evn_operation_implementation_ref>
+        <evn_time_date></evn_time_date>
+        <evn_time_cycle></evn_time_cycle>
+        <evn_time_duration></evn_time_duration>
+        <evn_behavior>CATCH</evn_behavior>
+        <bou_uid>720886708591dcc59beb096016129290</bou_uid>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <element_uid>757752922591dcc59bdaed3079376019</element_uid>
+        <bou_element>592748205591dcc43e17925091079095</bou_element>
+        <bou_element_type>bpmnEvent</bou_element_type>
+        <bou_x>240</bou_x>
+        <bou_y>187</bou_y>
+        <bou_width>33</bou_width>
+        <bou_height>33</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+      <record>
+        <evn_uid>103520741591da8ad46aa47032601056</evn_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <pro_uid>827725863591da88311f126098111677</pro_uid>
+        <evn_name></evn_name>
+        <evn_type>START</evn_type>
+        <evn_marker>EMPTY</evn_marker>
+        <evn_is_interrupting>1</evn_is_interrupting>
+        <evn_attached_to></evn_attached_to>
+        <evn_cancel_activity>0</evn_cancel_activity>
+        <evn_activity_ref></evn_activity_ref>
+        <evn_wait_for_completion>0</evn_wait_for_completion>
+        <evn_error_name></evn_error_name>
+        <evn_error_code></evn_error_code>
+        <evn_escalation_name></evn_escalation_name>
+        <evn_escalation_code></evn_escalation_code>
+        <evn_condition></evn_condition>
+        <evn_message>LEAD</evn_message>
+        <evn_operation_name></evn_operation_name>
+        <evn_operation_implementation_ref></evn_operation_implementation_ref>
+        <evn_time_date></evn_time_date>
+        <evn_time_cycle></evn_time_cycle>
+        <evn_time_duration></evn_time_duration>
+        <evn_behavior>CATCH</evn_behavior>
+        <bou_uid>784735656591da8ad4749e5074175364</bou_uid>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <element_uid>103520741591da8ad46aa47032601056</element_uid>
+        <bou_element>592748205591dcc43e17925091079095</bou_element>
+        <bou_element_type>bpmnEvent</bou_element_type>
+        <bou_x>240</bou_x>
+        <bou_y>95</bou_y>
+        <bou_width>33</bou_width>
+        <bou_height>33</bou_height>
+        <bou_rel_position>0</bou_rel_position>
+        <bou_size_identical>0</bou_size_identical>
+        <bou_container>bpmnDiagram</bou_container>
+      </record>
+    </table>
+    <table name="EXTENSION"/>
+    <table name="FLOW">
+      <record>
+        <flo_uid>544425218591da8ad5424e9036223137</flo_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <flo_type>SEQUENCE</flo_type>
+        <flo_name> </flo_name>
+        <flo_element_origin>103520741591da8ad46aa47032601056</flo_element_origin>
+        <flo_element_origin_type>bpmnEvent</flo_element_origin_type>
+        <flo_element_origin_port>0</flo_element_origin_port>
+        <flo_element_dest>699674969591da8ad2c8e29094085586</flo_element_dest>
+        <flo_element_dest_type>bpmnActivity</flo_element_dest_type>
+        <flo_element_dest_port>0</flo_element_dest_port>
+        <flo_is_inmediate>1</flo_is_inmediate>
+        <flo_condition></flo_condition>
+        <flo_x1>273</flo_x1>
+        <flo_y1>112</flo_y1>
+        <flo_x2>359</flo_x2>
+        <flo_y2>112</flo_y2>
+        <flo_state><![CDATA[[{"x":273,"y":112},{"x":359,"y":112}]]]></flo_state>
+        <flo_position>1</flo_position>
+      </record>
+      <record>
+        <flo_uid>664834305591da8ad5445c1002013300</flo_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <flo_type>SEQUENCE</flo_type>
+        <flo_name> </flo_name>
+        <flo_element_origin>699674969591da8ad2c8e29094085586</flo_element_origin>
+        <flo_element_origin_type>bpmnActivity</flo_element_origin_type>
+        <flo_element_origin_port>0</flo_element_origin_port>
+        <flo_element_dest>629345707591da8ad4948a3022146882</flo_element_dest>
+        <flo_element_dest_type>bpmnEvent</flo_element_dest_type>
+        <flo_element_dest_port>0</flo_element_dest_port>
+        <flo_is_inmediate>1</flo_is_inmediate>
+        <flo_condition></flo_condition>
+        <flo_x1>510</flo_x1>
+        <flo_y1>112</flo_y1>
+        <flo_x2>606</flo_x2>
+        <flo_y2>112</flo_y2>
+        <flo_state><![CDATA[[{"x":510,"y":112},{"x":606,"y":112}]]]></flo_state>
+        <flo_position>1</flo_position>
+      </record>
+      <record>
+        <flo_uid>732645293591dcc59c42f67065123627</flo_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <flo_type>SEQUENCE</flo_type>
+        <flo_name> </flo_name>
+        <flo_element_origin>757752922591dcc59bdaed3079376019</flo_element_origin>
+        <flo_element_origin_type>bpmnEvent</flo_element_origin_type>
+        <flo_element_origin_port>0</flo_element_origin_port>
+        <flo_element_dest>699674969591da8ad2c8e29094085586</flo_element_dest>
+        <flo_element_dest_type>bpmnActivity</flo_element_dest_type>
+        <flo_element_dest_port>0</flo_element_dest_port>
+        <flo_is_inmediate>1</flo_is_inmediate>
+        <flo_condition></flo_condition>
+        <flo_x1>273</flo_x1>
+        <flo_y1>204</flo_y1>
+        <flo_x2>435</flo_x2>
+        <flo_y2>149</flo_y2>
+        <flo_state><![CDATA[[{"x":273,"y":204},{"x":435,"y":204},{"x":435,"y":149}]]]></flo_state>
+        <flo_position>1</flo_position>
+      </record>
+    </table>
+    <table name="GATEWAY"/>
+    <table name="LANE"/>
+    <table name="LANESET"/>
+    <table name="PARTICIPANT"/>
+    <table name="PROCESS">
+      <record>
+        <pro_uid>827725863591da88311f126098111677</pro_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <dia_uid>976761549591da883096875051042456</dia_uid>
+        <pro_name>WebEntryEvent2</pro_name>
+        <pro_type>NONE</pro_type>
+        <pro_is_executable>0</pro_is_executable>
+        <pro_is_closed>0</pro_is_closed>
+        <pro_is_subprocess>0</pro_is_subprocess>
+      </record>
+    </table>
+    <table name="PROJECT">
+      <record>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <prj_name>WebEntryEvent2</prj_name>
+        <prj_description></prj_description>
+        <prj_target_namespace></prj_target_namespace>
+        <prj_expresion_language></prj_expresion_language>
+        <prj_type_language></prj_type_language>
+        <prj_exporter></prj_exporter>
+        <prj_exporter_version></prj_exporter_version>
+        <prj_create_date><![CDATA[2017-05-18 13:58:27]]></prj_create_date>
+        <prj_update_date><![CDATA[2017-05-18 16:31:21]]></prj_update_date>
+        <prj_author>00000000000000000000000000000001</prj_author>
+        <prj_author_version></prj_author_version>
+        <prj_original_source></prj_original_source>
+      </record>
+    </table>
+  </definition>
+  <definition class="workflow">
+    <table name="process">
+      <record>
+        <pro_uid>764314601591da882ee7360035898228</pro_uid>
+        <pro_title>WebEntryEvent2</pro_title>
+        <pro_description></pro_description>
+        <pro_parent>764314601591da882ee7360035898228</pro_parent>
+        <pro_time>1</pro_time>
+        <pro_timeunit>DAYS</pro_timeunit>
+        <pro_status>ACTIVE</pro_status>
+        <pro_type_day></pro_type_day>
+        <pro_type>NORMAL</pro_type>
+        <pro_assignment>FALSE</pro_assignment>
+        <pro_show_map>0</pro_show_map>
+        <pro_show_message>0</pro_show_message>
+        <pro_subprocess>0</pro_subprocess>
+        <pro_tri_create></pro_tri_create>
+        <pro_tri_open></pro_tri_open>
+        <pro_tri_deleted></pro_tri_deleted>
+        <pro_tri_canceled></pro_tri_canceled>
+        <pro_tri_paused></pro_tri_paused>
+        <pro_tri_reassigned></pro_tri_reassigned>
+        <pro_tri_unpaused></pro_tri_unpaused>
+        <pro_type_process>PUBLIC</pro_type_process>
+        <pro_show_delegate>0</pro_show_delegate>
+        <pro_show_dynaform>0</pro_show_dynaform>
+        <pro_category></pro_category>
+        <pro_sub_category></pro_sub_category>
+        <pro_industry>0</pro_industry>
+        <pro_update_date><![CDATA[2017-05-18 16:31:21]]></pro_update_date>
+        <pro_create_date><![CDATA[2017-05-18 13:58:26]]></pro_create_date>
+        <pro_create_user>00000000000000000000000000000001</pro_create_user>
+        <pro_height>5000</pro_height>
+        <pro_width>10000</pro_width>
+        <pro_title_x>0</pro_title_x>
+        <pro_title_y>0</pro_title_y>
+        <pro_debug>0</pro_debug>
+        <pro_dynaforms></pro_dynaforms>
+        <pro_derivation_screen_tpl></pro_derivation_screen_tpl>
+        <pro_cost>0</pro_cost>
+        <pro_unit_cost></pro_unit_cost>
+        <pro_itee>1</pro_itee>
+        <pro_action_done><![CDATA[a:1:{i:0;s:41:"GATEWAYTOGATEWAY_DELETE_CORRUPTED_RECORDS";}]]></pro_action_done>
+        <pro_category_label>No Category</pro_category_label>
+        <pro_bpmn>1</pro_bpmn>
+      </record>
+    </table>
+    <table name="tasks">
+      <record>
+        <pro_uid>764314601591da882ee7360035898228</pro_uid>
+        <tas_uid>699674969591da8ad2c8e29094085586</tas_uid>
+        <tas_title>Task 1</tas_title>
+        <tas_description></tas_description>
+        <tas_def_title></tas_def_title>
+        <tas_def_subject_message></tas_def_subject_message>
+        <tas_def_proc_code></tas_def_proc_code>
+        <tas_def_message></tas_def_message>
+        <tas_def_description></tas_def_description>
+        <tas_type>NORMAL</tas_type>
+        <tas_duration>1</tas_duration>
+        <tas_delay_type></tas_delay_type>
+        <tas_temporizer>0</tas_temporizer>
+        <tas_type_day></tas_type_day>
+        <tas_timeunit>DAYS</tas_timeunit>
+        <tas_alert>FALSE</tas_alert>
+        <tas_priority_variable></tas_priority_variable>
+        <tas_assign_type>BALANCED</tas_assign_type>
+        <tas_assign_variable><![CDATA[@@SYS_NEXT_USER_TO_BE_ASSIGNED]]></tas_assign_variable>
+        <tas_group_variable></tas_group_variable>
+        <tas_mi_instance_variable><![CDATA[@@SYS_VAR_TOTAL_INSTANCE]]></tas_mi_instance_variable>
+        <tas_mi_complete_variable><![CDATA[@@SYS_VAR_TOTAL_INSTANCES_COMPLETE]]></tas_mi_complete_variable>
+        <tas_assign_location>FALSE</tas_assign_location>
+        <tas_assign_location_adhoc>FALSE</tas_assign_location_adhoc>
+        <tas_transfer_fly>FALSE</tas_transfer_fly>
+        <tas_last_assigned>0</tas_last_assigned>
+        <tas_user>0</tas_user>
+        <tas_can_upload>FALSE</tas_can_upload>
+        <tas_view_upload>FALSE</tas_view_upload>
+        <tas_view_additional_documentation>FALSE</tas_view_additional_documentation>
+        <tas_can_cancel>FALSE</tas_can_cancel>
+        <tas_owner_app>FALSE</tas_owner_app>
+        <stg_uid></stg_uid>
+        <tas_can_pause>FALSE</tas_can_pause>
+        <tas_can_send_message>TRUE</tas_can_send_message>
+        <tas_can_delete_docs>FALSE</tas_can_delete_docs>
+        <tas_self_service>FALSE</tas_self_service>
+        <tas_start>TRUE</tas_start>
+        <tas_to_last_user>FALSE</tas_to_last_user>
+        <tas_send_last_email>FALSE</tas_send_last_email>
+        <tas_derivation>NORMAL</tas_derivation>
+        <tas_posx>359</tas_posx>
+        <tas_posy>74</tas_posy>
+        <tas_width>110</tas_width>
+        <tas_height>60</tas_height>
+        <tas_color></tas_color>
+        <tas_evn_uid></tas_evn_uid>
+        <tas_boundary></tas_boundary>
+        <tas_derivation_screen_tpl></tas_derivation_screen_tpl>
+        <tas_selfservice_timeout>0</tas_selfservice_timeout>
+        <tas_selfservice_time>0</tas_selfservice_time>
+        <tas_selfservice_time_unit></tas_selfservice_time_unit>
+        <tas_selfservice_trigger_uid></tas_selfservice_trigger_uid>
+        <tas_selfservice_execution>EVERY_TIME</tas_selfservice_execution>
+        <tas_not_email_from_format>0</tas_not_email_from_format>
+        <tas_offline>FALSE</tas_offline>
+        <tas_email_server_uid></tas_email_server_uid>
+        <tas_auto_root>FALSE</tas_auto_root>
+        <tas_receive_server_uid></tas_receive_server_uid>
+        <tas_receive_last_email>FALSE</tas_receive_last_email>
+        <tas_receive_email_from_format>0</tas_receive_email_from_format>
+        <tas_receive_message_type>text</tas_receive_message_type>
+        <tas_receive_message_template>alert_message.html</tas_receive_message_template>
+        <tas_receive_subject_message></tas_receive_subject_message>
+        <tas_receive_message></tas_receive_message>
+        <tas_average></tas_average>
+        <tas_sdv></tas_sdv>
+      </record>
+      <record>
+        <pro_uid>764314601591da882ee7360035898228</pro_uid>
+        <tas_uid>wee-96854591da8b6eda526061044026</tas_uid>
+        <tas_title>WEBENTRYEVENT</tas_title>
+        <tas_description></tas_description>
+        <tas_def_title></tas_def_title>
+        <tas_def_subject_message></tas_def_subject_message>
+        <tas_def_proc_code></tas_def_proc_code>
+        <tas_def_message></tas_def_message>
+        <tas_def_description></tas_def_description>
+        <tas_type>WEBENTRYEVENT</tas_type>
+        <tas_duration>1</tas_duration>
+        <tas_delay_type></tas_delay_type>
+        <tas_temporizer>0</tas_temporizer>
+        <tas_type_day></tas_type_day>
+        <tas_timeunit>DAYS</tas_timeunit>
+        <tas_alert>FALSE</tas_alert>
+        <tas_priority_variable></tas_priority_variable>
+        <tas_assign_type>BALANCED</tas_assign_type>
+        <tas_assign_variable><![CDATA[@@SYS_NEXT_USER_TO_BE_ASSIGNED]]></tas_assign_variable>
+        <tas_group_variable></tas_group_variable>
+        <tas_mi_instance_variable><![CDATA[@@SYS_VAR_TOTAL_INSTANCE]]></tas_mi_instance_variable>
+        <tas_mi_complete_variable><![CDATA[@@SYS_VAR_TOTAL_INSTANCES_COMPLETE]]></tas_mi_complete_variable>
+        <tas_assign_location>FALSE</tas_assign_location>
+        <tas_assign_location_adhoc>FALSE</tas_assign_location_adhoc>
+        <tas_transfer_fly>FALSE</tas_transfer_fly>
+        <tas_last_assigned>0</tas_last_assigned>
+        <tas_user>0</tas_user>
+        <tas_can_upload>FALSE</tas_can_upload>
+        <tas_view_upload>FALSE</tas_view_upload>
+        <tas_view_additional_documentation>FALSE</tas_view_additional_documentation>
+        <tas_can_cancel>FALSE</tas_can_cancel>
+        <tas_owner_app>FALSE</tas_owner_app>
+        <stg_uid></stg_uid>
+        <tas_can_pause>FALSE</tas_can_pause>
+        <tas_can_send_message>TRUE</tas_can_send_message>
+        <tas_can_delete_docs>FALSE</tas_can_delete_docs>
+        <tas_self_service>FALSE</tas_self_service>
+        <tas_start>TRUE</tas_start>
+        <tas_to_last_user>FALSE</tas_to_last_user>
+        <tas_send_last_email>FALSE</tas_send_last_email>
+        <tas_derivation>NORMAL</tas_derivation>
+        <tas_posx>240</tas_posx>
+        <tas_posy>95</tas_posy>
+        <tas_width>110</tas_width>
+        <tas_height>60</tas_height>
+        <tas_color></tas_color>
+        <tas_evn_uid></tas_evn_uid>
+        <tas_boundary></tas_boundary>
+        <tas_derivation_screen_tpl></tas_derivation_screen_tpl>
+        <tas_selfservice_timeout>0</tas_selfservice_timeout>
+        <tas_selfservice_time>0</tas_selfservice_time>
+        <tas_selfservice_time_unit></tas_selfservice_time_unit>
+        <tas_selfservice_trigger_uid></tas_selfservice_trigger_uid>
+        <tas_selfservice_execution>EVERY_TIME</tas_selfservice_execution>
+        <tas_not_email_from_format>0</tas_not_email_from_format>
+        <tas_offline>FALSE</tas_offline>
+        <tas_email_server_uid></tas_email_server_uid>
+        <tas_auto_root>FALSE</tas_auto_root>
+        <tas_receive_server_uid></tas_receive_server_uid>
+        <tas_receive_last_email>FALSE</tas_receive_last_email>
+        <tas_receive_email_from_format>0</tas_receive_email_from_format>
+        <tas_receive_message_type>text</tas_receive_message_type>
+        <tas_receive_message_template>alert_message.html</tas_receive_message_template>
+        <tas_receive_subject_message></tas_receive_subject_message>
+        <tas_receive_message></tas_receive_message>
+        <tas_average></tas_average>
+        <tas_sdv></tas_sdv>
+      </record>
+    </table>
+    <table name="routes">
+      <record>
+        <rou_uid>140127072591dcc59f37b55051754850</rou_uid>
+        <rou_parent>0</rou_parent>
+        <pro_uid>764314601591da882ee7360035898228</pro_uid>
+        <tas_uid>wee-96854591da8b6eda526061044026</tas_uid>
+        <rou_next_task>699674969591da8ad2c8e29094085586</rou_next_task>
+        <rou_case>1</rou_case>
+        <rou_type>SEQUENTIAL</rou_type>
+        <rou_default>0</rou_default>
+        <rou_condition></rou_condition>
+        <rou_to_last_user>FALSE</rou_to_last_user>
+        <rou_optional>FALSE</rou_optional>
+        <rou_send_email>TRUE</rou_send_email>
+        <rou_sourceanchor>1</rou_sourceanchor>
+        <rou_targetanchor>0</rou_targetanchor>
+        <rou_to_port>1</rou_to_port>
+        <rou_from_port>2</rou_from_port>
+        <rou_evn_uid></rou_evn_uid>
+        <gat_uid></gat_uid>
+      </record>
+      <record>
+        <rou_uid>326526437591dcc59d531b0071922316</rou_uid>
+        <rou_parent>0</rou_parent>
+        <pro_uid>764314601591da882ee7360035898228</pro_uid>
+        <tas_uid>699674969591da8ad2c8e29094085586</tas_uid>
+        <rou_next_task>-1</rou_next_task>
+        <rou_case>1</rou_case>
+        <rou_type>SEQUENTIAL</rou_type>
+        <rou_default>0</rou_default>
+        <rou_condition></rou_condition>
+        <rou_to_last_user>FALSE</rou_to_last_user>
+        <rou_optional>FALSE</rou_optional>
+        <rou_send_email>TRUE</rou_send_email>
+        <rou_sourceanchor>1</rou_sourceanchor>
+        <rou_targetanchor>0</rou_targetanchor>
+        <rou_to_port>1</rou_to_port>
+        <rou_from_port>2</rou_from_port>
+        <rou_evn_uid></rou_evn_uid>
+        <gat_uid></gat_uid>
+      </record>
+    </table>
+    <table name="lanes"/>
+    <table name="gateways"/>
+    <table name="inputs"/>
+    <table name="outputs"/>
+    <table name="dynaforms">
+      <record>
+        <dyn_uid>877826579591da8a5465c72072288515</dyn_uid>
+        <dyn_title>Form1</dyn_title>
+        <dyn_description></dyn_description>
+        <pro_uid>764314601591da882ee7360035898228</pro_uid>
+        <dyn_type>xmlform</dyn_type>
+        <dyn_filename><![CDATA[764314601591da882ee7360035898228/877826579591da8a5465c72072288515]]></dyn_filename>
+        <dyn_content><![CDATA[{"name":"Form1","description":"","items":[{"type":"form","variable":"","var_uid":"","dataType":"","id":"877826579591da8a5465c72072288515","name":"Form1","description":"","mode":"edit","script":"","language":"en","externalLibs":"","printable":false,"items":[],"variables":[]}]}]]></dyn_content>
+        <dyn_label></dyn_label>
+        <dyn_version>2</dyn_version>
+        <dyn_update_date><![CDATA[2017-05-18 13:59:01]]></dyn_update_date>
+      </record>
+    </table>
+    <table name="steps">
+      <record>
+        <step_uid>529105626591da8b7076636070339785</step_uid>
+        <pro_uid>764314601591da882ee7360035898228</pro_uid>
+        <tas_uid>wee-96854591da8b6eda526061044026</tas_uid>
+        <step_type_obj>DYNAFORM</step_type_obj>
+        <step_uid_obj>877826579591da8a5465c72072288515</step_uid_obj>
+        <step_condition></step_condition>
+        <step_position>1</step_position>
+        <step_mode>EDIT</step_mode>
+      </record>
+    </table>
+    <table name="triggers"/>
+    <table name="taskusers"/>
+    <table name="groupwfs"/>
+    <table name="steptriggers"/>
+    <table name="dbconnections"/>
+    <table name="reportTables"/>
+    <table name="reportTablesVars"/>
+    <table name="stepSupervisor"/>
+    <table name="objectPermissions"/>
+    <table name="subProcess"/>
+    <table name="caseTracker"/>
+    <table name="caseTrackerObject"/>
+    <table name="stage"/>
+    <table name="fieldCondition"/>
+    <table name="event"/>
+    <table name="caseScheduler"/>
+    <table name="processCategory"/>
+    <table name="taskExtraProperties"/>
+    <table name="processUser"/>
+    <table name="processVariables"/>
+    <table name="webEntry"/>
+    <table name="webEntryEvent">
+      <record>
+        <wee_uid>193368522591da8b76111f9092017469</wee_uid>
+        <prj_uid>764314601591da882ee7360035898228</prj_uid>
+        <evn_uid>103520741591da8ad46aa47032601056</evn_uid>
+        <act_uid>699674969591da8ad2c8e29094085586</act_uid>
+        <dyn_uid>877826579591da8a5465c72072288515</dyn_uid>
+        <usr_uid>00000000000000000000000000000001</usr_uid>
+        <wee_title>103520741591da8ad46aa47032601056</wee_title>
+        <wee_description></wee_description>
+        <wee_status>ENABLED</wee_status>
+        <wee_we_uid>178183036591da8b7340ba1059701145</wee_we_uid>
+        <wee_we_tas_uid>wee-96854591da8b6eda526061044026</wee_we_tas_uid>
+        <wee_we_url>103520741591da8ad46aa47032601056.php</wee_we_url>
+      </record>
+    </table>
+    <table name="messageType"/>
+    <table name="messageTypeVariable"/>
+    <table name="messageEventDefinition"/>
+    <table name="scriptTask"/>
+    <table name="timerEvent"/>
+    <table name="emailEvent"/>
+    <table name="filesManager"/>
+    <table name="abeConfiguration"/>
+    <table name="elementTask"/>
+  </definition>
+  <workflow-files>
+    <file target="dynaforms">
+      <file_name>Form1</file_name>
+      <file_path><![CDATA[764314601591da882ee7360035898228/877826579591da8a5465c72072288515.xml]]></file_path>
+      <file_content><![CDATA[PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPGR5bmFGb3JtIHR5cGU9InhtbGZvcm0iIG5hbWU9Ijc2NDMxNDYwMTU5MWRhODgyZWU3MzYwMDM1ODk4MjI4Lzg3NzgyNjU3OTU5MWRhOGE1NDY1YzcyMDcyMjg4NTE1IiB3aWR0aD0iNTAwIiBlbmFibGV0ZW1wbGF0ZT0iMCIgbW9kZT0iIiBuZXh0c3RlcHNhdmU9InByb21wdCI+CjwvZHluYUZvcm0+]]></file_content>
+    </file>
+    <file target="public">
+      <file_name>103520741591da8ad46aa47032601056Info.php</file_name>
+      <file_path><![CDATA[764314601591da882ee7360035898228/103520741591da8ad46aa47032601056Info.php]]></file_path>
+      <file_content><![CDATA[PD9waHAKCiRHX1BVQkxJU0ggPSBuZXcgUHVibGlzaGVyKCk7CiRzaG93ID0gImxvZ2luL3Nob3dNZXNzYWdlIjsKJG1lc3NhZ2UgPSAiIjsKaWYgKGlzc2V0KCRfU0VTU0lPTlsiX193ZWJFbnRyeVN1Y2Nlc3NfXyJdKSkgewogICAgJHNob3cgPSAibG9naW4vc2hvd0luZm8iOwogICAgJG1lc3NhZ2UgPSAkX1NFU1NJT05bIl9fd2ViRW50cnlTdWNjZXNzX18iXTsKfSBlbHNlIHsKICAgICRzaG93ID0gImxvZ2luL3Nob3dNZXNzYWdlIjsKICAgICRtZXNzYWdlID0gJF9TRVNTSU9OWyJfX3dlYkVudHJ5RXJyb3JfXyJdOwp9CiRHX1BVQkxJU0gtPkFkZENvbnRlbnQoInhtbGZvcm0iLCAieG1sZm9ybSIsICRzaG93LCAiIiwgJG1lc3NhZ2UpOwpHOjpSZW5kZXJQYWdlKCJwdWJsaXNoIiwgImJsYW5rIik7Cgo=]]></file_content>
+    </file>
+  </workflow-files>
+</ProcessMaker-Project>
diff --git a/workflow/engine/classes/model/map/WebEntryEventMapBuilder.php b/workflow/engine/classes/model/map/WebEntryEventMapBuilder.php
index 883025921..a9e04b017 100644
--- a/workflow/engine/classes/model/map/WebEntryEventMapBuilder.php
+++ b/workflow/engine/classes/model/map/WebEntryEventMapBuilder.php
@@ -77,7 +77,7 @@ class WebEntryEventMapBuilder
 
         $tMap->addColumn('ACT_UID', 'ActUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
-        $tMap->addColumn('DYN_UID', 'DynUid', 'string', CreoleTypes::VARCHAR, true, 32);
+        $tMap->addColumn('DYN_UID', 'DynUid', 'string', CreoleTypes::VARCHAR, false, 32);
 
         $tMap->addColumn('USR_UID', 'UsrUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
diff --git a/workflow/engine/classes/model/map/WebEntryMapBuilder.php b/workflow/engine/classes/model/map/WebEntryMapBuilder.php
index c3f1884dd..44adb086a 100644
--- a/workflow/engine/classes/model/map/WebEntryMapBuilder.php
+++ b/workflow/engine/classes/model/map/WebEntryMapBuilder.php
@@ -71,7 +71,7 @@ class WebEntryMapBuilder
 
         $tMap->addColumn('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
-        $tMap->addColumn('DYN_UID', 'DynUid', 'string', CreoleTypes::VARCHAR, true, 32);
+        $tMap->addColumn('DYN_UID', 'DynUid', 'string', CreoleTypes::VARCHAR, false, 32);
 
         $tMap->addColumn('USR_UID', 'UsrUid', 'string', CreoleTypes::VARCHAR, false, 32);
 
@@ -89,6 +89,34 @@ class WebEntryMapBuilder
 
         $tMap->addColumn('WE_UPDATE_DATE', 'WeUpdateDate', 'int', CreoleTypes::TIMESTAMP, false, null);
 
+        $tMap->addColumn('WE_TYPE', 'WeType', 'string', CreoleTypes::VARCHAR, true, 8);
+
+        $tMap->addColumn('WE_CUSTOM_TITLE', 'WeCustomTitle', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
+        $tMap->addColumn('WE_AUTHENTICATION', 'WeAuthentication', 'string', CreoleTypes::VARCHAR, true, 14);
+
+        $tMap->addColumn('WE_HIDE_INFORMATION_BAR', 'WeHideInformationBar', 'boolean', CreoleTypes::BOOLEAN, false, null);
+
+        $tMap->addColumn('WE_CALLBACK', 'WeCallback', 'string', CreoleTypes::VARCHAR, true, 13);
+
+        $tMap->addColumn('WE_CALLBACK_URL', 'WeCallbackUrl', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
+        $tMap->addColumn('WE_LINK_GENERATION', 'WeLinkGeneration', 'string', CreoleTypes::VARCHAR, true, 8);
+
+        $tMap->addColumn('WE_LINK_SKIN', 'WeLinkSkin', 'string', CreoleTypes::VARCHAR, false, 255);
+
+        $tMap->addColumn('WE_LINK_LANGUAGE', 'WeLinkLanguage', 'string', CreoleTypes::VARCHAR, false, 255);
+
+        $tMap->addColumn('WE_LINK_DOMAIN', 'WeLinkDomain', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
+        $tMap->addValidator('WE_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'SINGLE|MULTIPLE', 'Please enter a valid value for WE_TYPE');
+
+        $tMap->addValidator('WE_AUTHENTICATION', 'validValues', 'propel.validator.ValidValuesValidator', 'ANONYMOUS|LOGIN_REQUIRED', 'Please enter a valid value for WE_AUTHENTICATION');
+
+        $tMap->addValidator('WE_CALLBACK', 'validValues', 'propel.validator.ValidValuesValidator', 'PROCESS_MAKER|CUSTOM|CUSTOM_CLEAR', 'Please enter a valid value for WE_CALLBACK');
+
+        $tMap->addValidator('WE_LINK_GENERATION', 'validValues', 'propel.validator.ValidValuesValidator', 'DEFAULT|ADVANCED', 'Please enter a valid value for WE_LINK_GENERATION');
+
     } // doBuild()
 
 } // WebEntryMapBuilder
diff --git a/workflow/engine/classes/model/om/BaseWebEntry.php b/workflow/engine/classes/model/om/BaseWebEntry.php
index 64624b9c2..5d5c018fc 100644
--- a/workflow/engine/classes/model/om/BaseWebEntry.php
+++ b/workflow/engine/classes/model/om/BaseWebEntry.php
@@ -99,6 +99,66 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
      */
     protected $we_update_date;
 
+    /**
+     * The value for the we_type field.
+     * @var        string
+     */
+    protected $we_type = 'SINGLE';
+
+    /**
+     * The value for the we_custom_title field.
+     * @var        string
+     */
+    protected $we_custom_title;
+
+    /**
+     * The value for the we_authentication field.
+     * @var        string
+     */
+    protected $we_authentication = 'ANONYMOUS';
+
+    /**
+     * The value for the we_hide_information_bar field.
+     * @var        boolean
+     */
+    protected $we_hide_information_bar = false;
+
+    /**
+     * The value for the we_callback field.
+     * @var        string
+     */
+    protected $we_callback = 'PROCESS_MAKER';
+
+    /**
+     * The value for the we_callback_url field.
+     * @var        string
+     */
+    protected $we_callback_url;
+
+    /**
+     * The value for the we_link_generation field.
+     * @var        string
+     */
+    protected $we_link_generation = 'DEFAULT';
+
+    /**
+     * The value for the we_link_skin field.
+     * @var        string
+     */
+    protected $we_link_skin;
+
+    /**
+     * The value for the we_link_language field.
+     * @var        string
+     */
+    protected $we_link_language;
+
+    /**
+     * The value for the we_link_domain field.
+     * @var        string
+     */
+    protected $we_link_domain;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -287,6 +347,116 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
         }
     }
 
+    /**
+     * Get the [we_type] column value.
+     * 
+     * @return     string
+     */
+    public function getWeType()
+    {
+
+        return $this->we_type;
+    }
+
+    /**
+     * Get the [we_custom_title] column value.
+     * 
+     * @return     string
+     */
+    public function getWeCustomTitle()
+    {
+
+        return $this->we_custom_title;
+    }
+
+    /**
+     * Get the [we_authentication] column value.
+     * 
+     * @return     string
+     */
+    public function getWeAuthentication()
+    {
+
+        return $this->we_authentication;
+    }
+
+    /**
+     * Get the [we_hide_information_bar] column value.
+     * 
+     * @return     boolean
+     */
+    public function getWeHideInformationBar()
+    {
+
+        return $this->we_hide_information_bar;
+    }
+
+    /**
+     * Get the [we_callback] column value.
+     * 
+     * @return     string
+     */
+    public function getWeCallback()
+    {
+
+        return $this->we_callback;
+    }
+
+    /**
+     * Get the [we_callback_url] column value.
+     * 
+     * @return     string
+     */
+    public function getWeCallbackUrl()
+    {
+
+        return $this->we_callback_url;
+    }
+
+    /**
+     * Get the [we_link_generation] column value.
+     * 
+     * @return     string
+     */
+    public function getWeLinkGeneration()
+    {
+
+        return $this->we_link_generation;
+    }
+
+    /**
+     * Get the [we_link_skin] column value.
+     * 
+     * @return     string
+     */
+    public function getWeLinkSkin()
+    {
+
+        return $this->we_link_skin;
+    }
+
+    /**
+     * Get the [we_link_language] column value.
+     * 
+     * @return     string
+     */
+    public function getWeLinkLanguage()
+    {
+
+        return $this->we_link_language;
+    }
+
+    /**
+     * Get the [we_link_domain] column value.
+     * 
+     * @return     string
+     */
+    public function getWeLinkDomain()
+    {
+
+        return $this->we_link_domain;
+    }
+
     /**
      * Set the value of [we_uid] column.
      * 
@@ -565,6 +735,220 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
 
     } // setWeUpdateDate()
 
+    /**
+     * Set the value of [we_type] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setWeType($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->we_type !== $v || $v === 'SINGLE') {
+            $this->we_type = $v;
+            $this->modifiedColumns[] = WebEntryPeer::WE_TYPE;
+        }
+
+    } // setWeType()
+
+    /**
+     * Set the value of [we_custom_title] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setWeCustomTitle($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->we_custom_title !== $v) {
+            $this->we_custom_title = $v;
+            $this->modifiedColumns[] = WebEntryPeer::WE_CUSTOM_TITLE;
+        }
+
+    } // setWeCustomTitle()
+
+    /**
+     * Set the value of [we_authentication] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setWeAuthentication($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->we_authentication !== $v || $v === 'ANONYMOUS') {
+            $this->we_authentication = $v;
+            $this->modifiedColumns[] = WebEntryPeer::WE_AUTHENTICATION;
+        }
+
+    } // setWeAuthentication()
+
+    /**
+     * Set the value of [we_hide_information_bar] column.
+     * 
+     * @param      boolean $v new value
+     * @return     void
+     */
+    public function setWeHideInformationBar($v)
+    {
+
+        if ($this->we_hide_information_bar !== $v || $v === false) {
+            $this->we_hide_information_bar = $v;
+            $this->modifiedColumns[] = WebEntryPeer::WE_HIDE_INFORMATION_BAR;
+        }
+
+    } // setWeHideInformationBar()
+
+    /**
+     * Set the value of [we_callback] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setWeCallback($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->we_callback !== $v || $v === 'PROCESS_MAKER') {
+            $this->we_callback = $v;
+            $this->modifiedColumns[] = WebEntryPeer::WE_CALLBACK;
+        }
+
+    } // setWeCallback()
+
+    /**
+     * Set the value of [we_callback_url] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setWeCallbackUrl($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->we_callback_url !== $v) {
+            $this->we_callback_url = $v;
+            $this->modifiedColumns[] = WebEntryPeer::WE_CALLBACK_URL;
+        }
+
+    } // setWeCallbackUrl()
+
+    /**
+     * Set the value of [we_link_generation] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setWeLinkGeneration($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->we_link_generation !== $v || $v === 'DEFAULT') {
+            $this->we_link_generation = $v;
+            $this->modifiedColumns[] = WebEntryPeer::WE_LINK_GENERATION;
+        }
+
+    } // setWeLinkGeneration()
+
+    /**
+     * Set the value of [we_link_skin] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setWeLinkSkin($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->we_link_skin !== $v) {
+            $this->we_link_skin = $v;
+            $this->modifiedColumns[] = WebEntryPeer::WE_LINK_SKIN;
+        }
+
+    } // setWeLinkSkin()
+
+    /**
+     * Set the value of [we_link_language] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setWeLinkLanguage($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->we_link_language !== $v) {
+            $this->we_link_language = $v;
+            $this->modifiedColumns[] = WebEntryPeer::WE_LINK_LANGUAGE;
+        }
+
+    } // setWeLinkLanguage()
+
+    /**
+     * Set the value of [we_link_domain] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setWeLinkDomain($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->we_link_domain !== $v) {
+            $this->we_link_domain = $v;
+            $this->modifiedColumns[] = WebEntryPeer::WE_LINK_DOMAIN;
+        }
+
+    } // setWeLinkDomain()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -606,12 +990,32 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
 
             $this->we_update_date = $rs->getTimestamp($startcol + 11, null);
 
+            $this->we_type = $rs->getString($startcol + 12);
+
+            $this->we_custom_title = $rs->getString($startcol + 13);
+
+            $this->we_authentication = $rs->getString($startcol + 14);
+
+            $this->we_hide_information_bar = $rs->getBoolean($startcol + 15);
+
+            $this->we_callback = $rs->getString($startcol + 16);
+
+            $this->we_callback_url = $rs->getString($startcol + 17);
+
+            $this->we_link_generation = $rs->getString($startcol + 18);
+
+            $this->we_link_skin = $rs->getString($startcol + 19);
+
+            $this->we_link_language = $rs->getString($startcol + 20);
+
+            $this->we_link_domain = $rs->getString($startcol + 21);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 12; // 12 = WebEntryPeer::NUM_COLUMNS - WebEntryPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 22; // 22 = WebEntryPeer::NUM_COLUMNS - WebEntryPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating WebEntry object", $e);
@@ -851,6 +1255,36 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
             case 11:
                 return $this->getWeUpdateDate();
                 break;
+            case 12:
+                return $this->getWeType();
+                break;
+            case 13:
+                return $this->getWeCustomTitle();
+                break;
+            case 14:
+                return $this->getWeAuthentication();
+                break;
+            case 15:
+                return $this->getWeHideInformationBar();
+                break;
+            case 16:
+                return $this->getWeCallback();
+                break;
+            case 17:
+                return $this->getWeCallbackUrl();
+                break;
+            case 18:
+                return $this->getWeLinkGeneration();
+                break;
+            case 19:
+                return $this->getWeLinkSkin();
+                break;
+            case 20:
+                return $this->getWeLinkLanguage();
+                break;
+            case 21:
+                return $this->getWeLinkDomain();
+                break;
             default:
                 return null;
                 break;
@@ -883,6 +1317,16 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
             $keys[9] => $this->getWeUpdateUsrUid(),
             $keys[10] => $this->getWeCreateDate(),
             $keys[11] => $this->getWeUpdateDate(),
+            $keys[12] => $this->getWeType(),
+            $keys[13] => $this->getWeCustomTitle(),
+            $keys[14] => $this->getWeAuthentication(),
+            $keys[15] => $this->getWeHideInformationBar(),
+            $keys[16] => $this->getWeCallback(),
+            $keys[17] => $this->getWeCallbackUrl(),
+            $keys[18] => $this->getWeLinkGeneration(),
+            $keys[19] => $this->getWeLinkSkin(),
+            $keys[20] => $this->getWeLinkLanguage(),
+            $keys[21] => $this->getWeLinkDomain(),
         );
         return $result;
     }
@@ -950,6 +1394,36 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
             case 11:
                 $this->setWeUpdateDate($value);
                 break;
+            case 12:
+                $this->setWeType($value);
+                break;
+            case 13:
+                $this->setWeCustomTitle($value);
+                break;
+            case 14:
+                $this->setWeAuthentication($value);
+                break;
+            case 15:
+                $this->setWeHideInformationBar($value);
+                break;
+            case 16:
+                $this->setWeCallback($value);
+                break;
+            case 17:
+                $this->setWeCallbackUrl($value);
+                break;
+            case 18:
+                $this->setWeLinkGeneration($value);
+                break;
+            case 19:
+                $this->setWeLinkSkin($value);
+                break;
+            case 20:
+                $this->setWeLinkLanguage($value);
+                break;
+            case 21:
+                $this->setWeLinkDomain($value);
+                break;
         } // switch()
     }
 
@@ -1021,6 +1495,46 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
             $this->setWeUpdateDate($arr[$keys[11]]);
         }
 
+        if (array_key_exists($keys[12], $arr)) {
+            $this->setWeType($arr[$keys[12]]);
+        }
+
+        if (array_key_exists($keys[13], $arr)) {
+            $this->setWeCustomTitle($arr[$keys[13]]);
+        }
+
+        if (array_key_exists($keys[14], $arr)) {
+            $this->setWeAuthentication($arr[$keys[14]]);
+        }
+
+        if (array_key_exists($keys[15], $arr)) {
+            $this->setWeHideInformationBar($arr[$keys[15]]);
+        }
+
+        if (array_key_exists($keys[16], $arr)) {
+            $this->setWeCallback($arr[$keys[16]]);
+        }
+
+        if (array_key_exists($keys[17], $arr)) {
+            $this->setWeCallbackUrl($arr[$keys[17]]);
+        }
+
+        if (array_key_exists($keys[18], $arr)) {
+            $this->setWeLinkGeneration($arr[$keys[18]]);
+        }
+
+        if (array_key_exists($keys[19], $arr)) {
+            $this->setWeLinkSkin($arr[$keys[19]]);
+        }
+
+        if (array_key_exists($keys[20], $arr)) {
+            $this->setWeLinkLanguage($arr[$keys[20]]);
+        }
+
+        if (array_key_exists($keys[21], $arr)) {
+            $this->setWeLinkDomain($arr[$keys[21]]);
+        }
+
     }
 
     /**
@@ -1080,6 +1594,46 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
             $criteria->add(WebEntryPeer::WE_UPDATE_DATE, $this->we_update_date);
         }
 
+        if ($this->isColumnModified(WebEntryPeer::WE_TYPE)) {
+            $criteria->add(WebEntryPeer::WE_TYPE, $this->we_type);
+        }
+
+        if ($this->isColumnModified(WebEntryPeer::WE_CUSTOM_TITLE)) {
+            $criteria->add(WebEntryPeer::WE_CUSTOM_TITLE, $this->we_custom_title);
+        }
+
+        if ($this->isColumnModified(WebEntryPeer::WE_AUTHENTICATION)) {
+            $criteria->add(WebEntryPeer::WE_AUTHENTICATION, $this->we_authentication);
+        }
+
+        if ($this->isColumnModified(WebEntryPeer::WE_HIDE_INFORMATION_BAR)) {
+            $criteria->add(WebEntryPeer::WE_HIDE_INFORMATION_BAR, $this->we_hide_information_bar);
+        }
+
+        if ($this->isColumnModified(WebEntryPeer::WE_CALLBACK)) {
+            $criteria->add(WebEntryPeer::WE_CALLBACK, $this->we_callback);
+        }
+
+        if ($this->isColumnModified(WebEntryPeer::WE_CALLBACK_URL)) {
+            $criteria->add(WebEntryPeer::WE_CALLBACK_URL, $this->we_callback_url);
+        }
+
+        if ($this->isColumnModified(WebEntryPeer::WE_LINK_GENERATION)) {
+            $criteria->add(WebEntryPeer::WE_LINK_GENERATION, $this->we_link_generation);
+        }
+
+        if ($this->isColumnModified(WebEntryPeer::WE_LINK_SKIN)) {
+            $criteria->add(WebEntryPeer::WE_LINK_SKIN, $this->we_link_skin);
+        }
+
+        if ($this->isColumnModified(WebEntryPeer::WE_LINK_LANGUAGE)) {
+            $criteria->add(WebEntryPeer::WE_LINK_LANGUAGE, $this->we_link_language);
+        }
+
+        if ($this->isColumnModified(WebEntryPeer::WE_LINK_DOMAIN)) {
+            $criteria->add(WebEntryPeer::WE_LINK_DOMAIN, $this->we_link_domain);
+        }
+
 
         return $criteria;
     }
@@ -1156,6 +1710,26 @@ abstract class BaseWebEntry extends BaseObject implements Persistent
 
         $copyObj->setWeUpdateDate($this->we_update_date);
 
+        $copyObj->setWeType($this->we_type);
+
+        $copyObj->setWeCustomTitle($this->we_custom_title);
+
+        $copyObj->setWeAuthentication($this->we_authentication);
+
+        $copyObj->setWeHideInformationBar($this->we_hide_information_bar);
+
+        $copyObj->setWeCallback($this->we_callback);
+
+        $copyObj->setWeCallbackUrl($this->we_callback_url);
+
+        $copyObj->setWeLinkGeneration($this->we_link_generation);
+
+        $copyObj->setWeLinkSkin($this->we_link_skin);
+
+        $copyObj->setWeLinkLanguage($this->we_link_language);
+
+        $copyObj->setWeLinkDomain($this->we_link_domain);
+
 
         $copyObj->setNew(true);
 
diff --git a/workflow/engine/classes/model/om/BaseWebEntryPeer.php b/workflow/engine/classes/model/om/BaseWebEntryPeer.php
index 882af8dc7..e86291fc3 100644
--- a/workflow/engine/classes/model/om/BaseWebEntryPeer.php
+++ b/workflow/engine/classes/model/om/BaseWebEntryPeer.php
@@ -25,7 +25,7 @@ abstract class BaseWebEntryPeer
     const CLASS_DEFAULT = 'classes.model.WebEntry';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 12;
+    const NUM_COLUMNS = 22;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -67,6 +67,36 @@ abstract class BaseWebEntryPeer
     /** the column name for the WE_UPDATE_DATE field */
     const WE_UPDATE_DATE = 'WEB_ENTRY.WE_UPDATE_DATE';
 
+    /** the column name for the WE_TYPE field */
+    const WE_TYPE = 'WEB_ENTRY.WE_TYPE';
+
+    /** the column name for the WE_CUSTOM_TITLE field */
+    const WE_CUSTOM_TITLE = 'WEB_ENTRY.WE_CUSTOM_TITLE';
+
+    /** the column name for the WE_AUTHENTICATION field */
+    const WE_AUTHENTICATION = 'WEB_ENTRY.WE_AUTHENTICATION';
+
+    /** the column name for the WE_HIDE_INFORMATION_BAR field */
+    const WE_HIDE_INFORMATION_BAR = 'WEB_ENTRY.WE_HIDE_INFORMATION_BAR';
+
+    /** the column name for the WE_CALLBACK field */
+    const WE_CALLBACK = 'WEB_ENTRY.WE_CALLBACK';
+
+    /** the column name for the WE_CALLBACK_URL field */
+    const WE_CALLBACK_URL = 'WEB_ENTRY.WE_CALLBACK_URL';
+
+    /** the column name for the WE_LINK_GENERATION field */
+    const WE_LINK_GENERATION = 'WEB_ENTRY.WE_LINK_GENERATION';
+
+    /** the column name for the WE_LINK_SKIN field */
+    const WE_LINK_SKIN = 'WEB_ENTRY.WE_LINK_SKIN';
+
+    /** the column name for the WE_LINK_LANGUAGE field */
+    const WE_LINK_LANGUAGE = 'WEB_ENTRY.WE_LINK_LANGUAGE';
+
+    /** the column name for the WE_LINK_DOMAIN field */
+    const WE_LINK_DOMAIN = 'WEB_ENTRY.WE_LINK_DOMAIN';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -78,10 +108,10 @@ abstract class BaseWebEntryPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('WeUid', 'ProUid', 'TasUid', 'DynUid', 'UsrUid', 'WeMethod', 'WeInputDocumentAccess', 'WeData', 'WeCreateUsrUid', 'WeUpdateUsrUid', 'WeCreateDate', 'WeUpdateDate', ),
-        BasePeer::TYPE_COLNAME => array (WebEntryPeer::WE_UID, WebEntryPeer::PRO_UID, WebEntryPeer::TAS_UID, WebEntryPeer::DYN_UID, WebEntryPeer::USR_UID, WebEntryPeer::WE_METHOD, WebEntryPeer::WE_INPUT_DOCUMENT_ACCESS, WebEntryPeer::WE_DATA, WebEntryPeer::WE_CREATE_USR_UID, WebEntryPeer::WE_UPDATE_USR_UID, WebEntryPeer::WE_CREATE_DATE, WebEntryPeer::WE_UPDATE_DATE, ),
-        BasePeer::TYPE_FIELDNAME => array ('WE_UID', 'PRO_UID', 'TAS_UID', 'DYN_UID', 'USR_UID', 'WE_METHOD', 'WE_INPUT_DOCUMENT_ACCESS', 'WE_DATA', 'WE_CREATE_USR_UID', 'WE_UPDATE_USR_UID', 'WE_CREATE_DATE', 'WE_UPDATE_DATE', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
+        BasePeer::TYPE_PHPNAME => array ('WeUid', 'ProUid', 'TasUid', 'DynUid', 'UsrUid', 'WeMethod', 'WeInputDocumentAccess', 'WeData', 'WeCreateUsrUid', 'WeUpdateUsrUid', 'WeCreateDate', 'WeUpdateDate', 'WeType', 'WeCustomTitle', 'WeAuthentication', 'WeHideInformationBar', 'WeCallback', 'WeCallbackUrl', 'WeLinkGeneration', 'WeLinkSkin', 'WeLinkLanguage', 'WeLinkDomain', ),
+        BasePeer::TYPE_COLNAME => array (WebEntryPeer::WE_UID, WebEntryPeer::PRO_UID, WebEntryPeer::TAS_UID, WebEntryPeer::DYN_UID, WebEntryPeer::USR_UID, WebEntryPeer::WE_METHOD, WebEntryPeer::WE_INPUT_DOCUMENT_ACCESS, WebEntryPeer::WE_DATA, WebEntryPeer::WE_CREATE_USR_UID, WebEntryPeer::WE_UPDATE_USR_UID, WebEntryPeer::WE_CREATE_DATE, WebEntryPeer::WE_UPDATE_DATE, WebEntryPeer::WE_TYPE, WebEntryPeer::WE_CUSTOM_TITLE, WebEntryPeer::WE_AUTHENTICATION, WebEntryPeer::WE_HIDE_INFORMATION_BAR, WebEntryPeer::WE_CALLBACK, WebEntryPeer::WE_CALLBACK_URL, WebEntryPeer::WE_LINK_GENERATION, WebEntryPeer::WE_LINK_SKIN, WebEntryPeer::WE_LINK_LANGUAGE, WebEntryPeer::WE_LINK_DOMAIN, ),
+        BasePeer::TYPE_FIELDNAME => array ('WE_UID', 'PRO_UID', 'TAS_UID', 'DYN_UID', 'USR_UID', 'WE_METHOD', 'WE_INPUT_DOCUMENT_ACCESS', 'WE_DATA', 'WE_CREATE_USR_UID', 'WE_UPDATE_USR_UID', 'WE_CREATE_DATE', 'WE_UPDATE_DATE', 'WE_TYPE', 'WE_CUSTOM_TITLE', 'WE_AUTHENTICATION', 'WE_HIDE_INFORMATION_BAR', 'WE_CALLBACK', 'WE_CALLBACK_URL', 'WE_LINK_GENERATION', 'WE_LINK_SKIN', 'WE_LINK_LANGUAGE', 'WE_LINK_DOMAIN', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, )
     );
 
     /**
@@ -91,10 +121,10 @@ abstract class BaseWebEntryPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('WeUid' => 0, 'ProUid' => 1, 'TasUid' => 2, 'DynUid' => 3, 'UsrUid' => 4, 'WeMethod' => 5, 'WeInputDocumentAccess' => 6, 'WeData' => 7, 'WeCreateUsrUid' => 8, 'WeUpdateUsrUid' => 9, 'WeCreateDate' => 10, 'WeUpdateDate' => 11, ),
-        BasePeer::TYPE_COLNAME => array (WebEntryPeer::WE_UID => 0, WebEntryPeer::PRO_UID => 1, WebEntryPeer::TAS_UID => 2, WebEntryPeer::DYN_UID => 3, WebEntryPeer::USR_UID => 4, WebEntryPeer::WE_METHOD => 5, WebEntryPeer::WE_INPUT_DOCUMENT_ACCESS => 6, WebEntryPeer::WE_DATA => 7, WebEntryPeer::WE_CREATE_USR_UID => 8, WebEntryPeer::WE_UPDATE_USR_UID => 9, WebEntryPeer::WE_CREATE_DATE => 10, WebEntryPeer::WE_UPDATE_DATE => 11, ),
-        BasePeer::TYPE_FIELDNAME => array ('WE_UID' => 0, 'PRO_UID' => 1, 'TAS_UID' => 2, 'DYN_UID' => 3, 'USR_UID' => 4, 'WE_METHOD' => 5, 'WE_INPUT_DOCUMENT_ACCESS' => 6, 'WE_DATA' => 7, 'WE_CREATE_USR_UID' => 8, 'WE_UPDATE_USR_UID' => 9, 'WE_CREATE_DATE' => 10, 'WE_UPDATE_DATE' => 11, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, )
+        BasePeer::TYPE_PHPNAME => array ('WeUid' => 0, 'ProUid' => 1, 'TasUid' => 2, 'DynUid' => 3, 'UsrUid' => 4, 'WeMethod' => 5, 'WeInputDocumentAccess' => 6, 'WeData' => 7, 'WeCreateUsrUid' => 8, 'WeUpdateUsrUid' => 9, 'WeCreateDate' => 10, 'WeUpdateDate' => 11, 'WeType' => 12, 'WeCustomTitle' => 13, 'WeAuthentication' => 14, 'WeHideInformationBar' => 15, 'WeCallback' => 16, 'WeCallbackUrl' => 17, 'WeLinkGeneration' => 18, 'WeLinkSkin' => 19, 'WeLinkLanguage' => 20, 'WeLinkDomain' => 21, ),
+        BasePeer::TYPE_COLNAME => array (WebEntryPeer::WE_UID => 0, WebEntryPeer::PRO_UID => 1, WebEntryPeer::TAS_UID => 2, WebEntryPeer::DYN_UID => 3, WebEntryPeer::USR_UID => 4, WebEntryPeer::WE_METHOD => 5, WebEntryPeer::WE_INPUT_DOCUMENT_ACCESS => 6, WebEntryPeer::WE_DATA => 7, WebEntryPeer::WE_CREATE_USR_UID => 8, WebEntryPeer::WE_UPDATE_USR_UID => 9, WebEntryPeer::WE_CREATE_DATE => 10, WebEntryPeer::WE_UPDATE_DATE => 11, WebEntryPeer::WE_TYPE => 12, WebEntryPeer::WE_CUSTOM_TITLE => 13, WebEntryPeer::WE_AUTHENTICATION => 14, WebEntryPeer::WE_HIDE_INFORMATION_BAR => 15, WebEntryPeer::WE_CALLBACK => 16, WebEntryPeer::WE_CALLBACK_URL => 17, WebEntryPeer::WE_LINK_GENERATION => 18, WebEntryPeer::WE_LINK_SKIN => 19, WebEntryPeer::WE_LINK_LANGUAGE => 20, WebEntryPeer::WE_LINK_DOMAIN => 21, ),
+        BasePeer::TYPE_FIELDNAME => array ('WE_UID' => 0, 'PRO_UID' => 1, 'TAS_UID' => 2, 'DYN_UID' => 3, 'USR_UID' => 4, 'WE_METHOD' => 5, 'WE_INPUT_DOCUMENT_ACCESS' => 6, 'WE_DATA' => 7, 'WE_CREATE_USR_UID' => 8, 'WE_UPDATE_USR_UID' => 9, 'WE_CREATE_DATE' => 10, 'WE_UPDATE_DATE' => 11, 'WE_TYPE' => 12, 'WE_CUSTOM_TITLE' => 13, 'WE_AUTHENTICATION' => 14, 'WE_HIDE_INFORMATION_BAR' => 15, 'WE_CALLBACK' => 16, 'WE_CALLBACK_URL' => 17, 'WE_LINK_GENERATION' => 18, 'WE_LINK_SKIN' => 19, 'WE_LINK_LANGUAGE' => 20, 'WE_LINK_DOMAIN' => 21, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, )
     );
 
     /**
@@ -219,6 +249,26 @@ abstract class BaseWebEntryPeer
 
         $criteria->addSelectColumn(WebEntryPeer::WE_UPDATE_DATE);
 
+        $criteria->addSelectColumn(WebEntryPeer::WE_TYPE);
+
+        $criteria->addSelectColumn(WebEntryPeer::WE_CUSTOM_TITLE);
+
+        $criteria->addSelectColumn(WebEntryPeer::WE_AUTHENTICATION);
+
+        $criteria->addSelectColumn(WebEntryPeer::WE_HIDE_INFORMATION_BAR);
+
+        $criteria->addSelectColumn(WebEntryPeer::WE_CALLBACK);
+
+        $criteria->addSelectColumn(WebEntryPeer::WE_CALLBACK_URL);
+
+        $criteria->addSelectColumn(WebEntryPeer::WE_LINK_GENERATION);
+
+        $criteria->addSelectColumn(WebEntryPeer::WE_LINK_SKIN);
+
+        $criteria->addSelectColumn(WebEntryPeer::WE_LINK_LANGUAGE);
+
+        $criteria->addSelectColumn(WebEntryPeer::WE_LINK_DOMAIN);
+
     }
 
     const COUNT = 'COUNT(WEB_ENTRY.WE_UID)';
@@ -549,6 +599,18 @@ abstract class BaseWebEntryPeer
             }
         } else {
 
+        if ($obj->isNew() || $obj->isColumnModified(WebEntryPeer::WE_TYPE))
+            $columns[WebEntryPeer::WE_TYPE] = $obj->getWeType();
+
+        if ($obj->isNew() || $obj->isColumnModified(WebEntryPeer::WE_AUTHENTICATION))
+            $columns[WebEntryPeer::WE_AUTHENTICATION] = $obj->getWeAuthentication();
+
+        if ($obj->isNew() || $obj->isColumnModified(WebEntryPeer::WE_CALLBACK))
+            $columns[WebEntryPeer::WE_CALLBACK] = $obj->getWeCallback();
+
+        if ($obj->isNew() || $obj->isColumnModified(WebEntryPeer::WE_LINK_GENERATION))
+            $columns[WebEntryPeer::WE_LINK_GENERATION] = $obj->getWeLinkGeneration();
+
         }
 
         return BasePeer::doValidate(WebEntryPeer::DATABASE_NAME, WebEntryPeer::TABLE_NAME, $columns);
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 07c3b44d4..5969a0dcb 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -3317,32 +3317,56 @@
     <column name="PRF_UPDATE_DATE" type="TIMESTAMP" required="false" />
   </table>
 
-  <table name="WEB_ENTRY">
-      <vendor type="mysql">
-          <parameter name="Name" value="WEB_ENTRY" />
-          <parameter name="Engine" value="InnoDB" />
-          <parameter name="Version" value="10" />
-          <parameter name="Row_format" value="Dynamic" />
-          <parameter name="Data_free" value="0" />
-          <parameter name="Auto_increment" value="" />
-          <parameter name="Check_time" value="" />
-          <parameter name="Collation" value="utf8_general_ci" />
-          <parameter name="Checksum" value="" />
-          <parameter name="Create_options" value="" />
-      </vendor>
-      <column name="WE_UID"  type="VARCHAR" size="32" required="true" primaryKey="true" />
-      <column name="PRO_UID" type="VARCHAR" size="32" required="true" />
-      <column name="TAS_UID" type="VARCHAR" size="32" required="true" />
-      <column name="DYN_UID" type="VARCHAR" size="32" required="true" />
-      <column name="USR_UID" type="VARCHAR" size="32" default="" />
-      <column name="WE_METHOD" type="VARCHAR" size="4" default="HTML" />
-      <column name="WE_INPUT_DOCUMENT_ACCESS" type="INTEGER" default="0" />
-      <column name="WE_DATA" type="LONGVARCHAR" />
-      <column name="WE_CREATE_USR_UID" type="VARCHAR" size="32" default="" required="true" />
-      <column name="WE_UPDATE_USR_UID" type="VARCHAR" size="32" default="" />
-      <column name="WE_CREATE_DATE" type="TIMESTAMP" required="true" />
-      <column name="WE_UPDATE_DATE" type="TIMESTAMP" />
-  </table>
+    <table name="WEB_ENTRY">
+        <vendor type="mysql">
+            <parameter name="Name" value="WEB_ENTRY" />
+            <parameter name="Engine" value="InnoDB" />
+            <parameter name="Version" value="10" />
+            <parameter name="Row_format" value="Dynamic" />
+            <parameter name="Data_free" value="0" />
+            <parameter name="Auto_increment" value="" />
+            <parameter name="Check_time" value="" />
+            <parameter name="Collation" value="utf8_general_ci" />
+            <parameter name="Checksum" value="" />
+            <parameter name="Create_options" value="" />
+        </vendor>
+        <column name="WE_UID"  type="VARCHAR" size="32" required="true" primaryKey="true" />
+        <column name="PRO_UID" type="VARCHAR" size="32" required="true" />
+        <column name="TAS_UID" type="VARCHAR" size="32" required="true" />
+        <column name="DYN_UID" type="VARCHAR" size="32" required="false" />
+        <column name="USR_UID" type="VARCHAR" size="32" default="" />
+        <column name="WE_METHOD" type="VARCHAR" size="4" default="HTML" />
+        <column name="WE_INPUT_DOCUMENT_ACCESS" type="INTEGER" default="0" />
+        <column name="WE_DATA" type="LONGVARCHAR" />
+        <column name="WE_CREATE_USR_UID" type="VARCHAR" size="32" default="" required="true" />
+        <column name="WE_UPDATE_USR_UID" type="VARCHAR" size="32" default="" />
+        <column name="WE_CREATE_DATE" type="TIMESTAMP" required="true" />
+        <column name="WE_UPDATE_DATE" type="TIMESTAMP" />
+        <!-- PROD-181: Web Entry 2.0 -->
+        <column name="WE_TYPE" type="VARCHAR" size="8" required="true" default="SINGLE"/>
+<!--        <column name="WE_MULTIPLE_UID" type="VARCHAR" size="32" /> -->
+        <column name="WE_CUSTOM_TITLE" type="LONGVARCHAR" />
+        <column name="WE_AUTHENTICATION" type="VARCHAR" size="14" required="true" default="ANONYMOUS"/>
+        <column name="WE_HIDE_INFORMATION_BAR" type="BOOLEAN" default="0"/>
+        <column name="WE_CALLBACK" type="VARCHAR" size="13" required="true" default="PROCESS_MAKER"/>
+        <column name="WE_CALLBACK_URL" type="LONGVARCHAR" />
+        <column name="WE_LINK_GENERATION" type="VARCHAR" size="8" required="true" default="DEFAULT" />
+        <column name="WE_LINK_SKIN" type="VARCHAR" size="255" />
+        <column name="WE_LINK_LANGUAGE" type="VARCHAR" size="255" />
+        <column name="WE_LINK_DOMAIN" type="LONGVARCHAR" />
+        <validator column="WE_TYPE">
+            <rule name="validValues" value="SINGLE|MULTIPLE" message="Please enter a valid value for WE_TYPE" />
+        </validator>
+        <validator column="WE_AUTHENTICATION">
+            <rule name="validValues" value="ANONYMOUS|LOGIN_REQUIRED" message="Please enter a valid value for WE_AUTHENTICATION" />
+        </validator>
+        <validator column="WE_CALLBACK">
+            <rule name="validValues" value="PROCESS_MAKER|CUSTOM|CUSTOM_CLEAR" message="Please enter a valid value for WE_CALLBACK" />
+        </validator>
+        <validator column="WE_LINK_GENERATION">
+            <rule name="validValues" value="DEFAULT|ADVANCED" message="Please enter a valid value for WE_LINK_GENERATION" />
+        </validator>
+    </table>
 
   <!--
     OAUTH TABLES DEFINITION
@@ -4780,7 +4804,7 @@
         <column name="PRJ_UID"    type="VARCHAR" size="32" required="true" />
         <column name="EVN_UID"    type="VARCHAR" size="32" required="true" />
         <column name="ACT_UID"    type="VARCHAR" size="32" required="true" />
-        <column name="DYN_UID"    type="VARCHAR" size="32" required="true" />
+        <column name="DYN_UID"    type="VARCHAR" size="32" required="false" />
         <column name="USR_UID"    type="VARCHAR" size="32" required="true" />
         <column name="WEE_STATUS" type="VARCHAR" size="10" required="true" default="ENABLED" />
         <column name="WEE_WE_UID"     type="VARCHAR" size="32" required="true" default="" />
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index d3b7af603..3419913d7 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -1652,7 +1652,7 @@ CREATE TABLE `WEB_ENTRY`
 	`WE_UID` VARCHAR(32)  NOT NULL,
 	`PRO_UID` VARCHAR(32)  NOT NULL,
 	`TAS_UID` VARCHAR(32)  NOT NULL,
-	`DYN_UID` VARCHAR(32)  NOT NULL,
+	`DYN_UID` VARCHAR(32),
 	`USR_UID` VARCHAR(32) default '',
 	`WE_METHOD` VARCHAR(4) default 'HTML',
 	`WE_INPUT_DOCUMENT_ACCESS` INTEGER default 0,
@@ -1661,6 +1661,16 @@ CREATE TABLE `WEB_ENTRY`
 	`WE_UPDATE_USR_UID` VARCHAR(32) default '',
 	`WE_CREATE_DATE` DATETIME  NOT NULL,
 	`WE_UPDATE_DATE` DATETIME,
+	`WE_TYPE` VARCHAR(8) default 'SINGLE' NOT NULL,
+	`WE_CUSTOM_TITLE` MEDIUMTEXT,
+	`WE_AUTHENTICATION` VARCHAR(14) default 'ANONYMOUS' NOT NULL,
+	`WE_HIDE_INFORMATION_BAR` INTEGER default 0,
+	`WE_CALLBACK` VARCHAR(13) default 'PROCESS_MAKER' NOT NULL,
+	`WE_CALLBACK_URL` MEDIUMTEXT,
+	`WE_LINK_GENERATION` VARCHAR(8) default 'DEFAULT' NOT NULL,
+	`WE_LINK_SKIN` VARCHAR(255),
+	`WE_LINK_LANGUAGE` VARCHAR(255),
+	`WE_LINK_DOMAIN` MEDIUMTEXT,
 	PRIMARY KEY (`WE_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8';
 #-----------------------------------------------------------------------------
@@ -2724,7 +2734,7 @@ CREATE TABLE `WEB_ENTRY_EVENT`
 	`PRJ_UID` VARCHAR(32)  NOT NULL,
 	`EVN_UID` VARCHAR(32)  NOT NULL,
 	`ACT_UID` VARCHAR(32)  NOT NULL,
-	`DYN_UID` VARCHAR(32)  NOT NULL,
+	`DYN_UID` VARCHAR(32),
 	`USR_UID` VARCHAR(32)  NOT NULL,
 	`WEE_STATUS` VARCHAR(10) default 'ENABLED' NOT NULL,
 	`WEE_WE_UID` VARCHAR(32) default '' NOT NULL,
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
index fc8ff59e3..51a0800e4 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
@@ -171,6 +171,7 @@ class Process
                     $fieldNameAux = (isset($arrayFieldNameForException[$arrayFieldDefinition[$fieldName]['fieldNameAux']]))? $arrayFieldNameForException[$arrayFieldDefinition[$fieldName]['fieldNameAux']] : $fieldName;
 
                     if ($arrayFieldDefinition[$fieldName]["required"] && !isset($arrayData[$fieldName])) {
+                        var_dump($fieldNameAux);
                         throw new \Exception(\G::LoadTranslation('ID_UNDEFINED_VALUE_IS_REQUIRED', [$fieldNameAux]));
                     }
                 }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
index 57f1cb4d6..938ba0372 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
@@ -7,7 +7,7 @@ class WebEntry
         "WE_UID"                   => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(),             "fieldNameAux" => "webEntryUid"),
 
         "TAS_UID"                  => array("type" => "string", "required" => true,  "empty" => false, "defaultValues" => array(),             "fieldNameAux" => "taskUid"),
-        "DYN_UID"                  => array("type" => "string", "required" => true,  "empty" => false, "defaultValues" => array(),             "fieldNameAux" => "dynaFormUid"),
+        "DYN_UID"                  => array("type" => "string", "required" => false,  "empty" => true, "defaultValues" => array(),             "fieldNameAux" => "dynaFormUid"),
         "USR_UID"                  => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(),             "fieldNameAux" => "userUid"),
         "WE_TITLE"                 => array("type" => "string", "required" => false,  "empty" => true, "defaultValues" => array(),             "fieldNameAux" => "webEntryTitle"),
         "WE_DESCRIPTION"           => array("type" => "string", "required" => false, "empty" => true,  "defaultValues" => array(),             "fieldNameAux" => "webEntryDescription"),
@@ -386,7 +386,9 @@ class WebEntry
 
                     $dynaForm = new \Dynaform();
 
-                    $arrayDynaFormData = $dynaForm->Load($arrayWebEntryData["DYN_UID"]);
+                    if(!empty($arrayWebEntryData["DYN_UID"])) {
+                        $arrayDynaFormData = $dynaForm->Load($arrayWebEntryData["DYN_UID"]);
+                    }
 
                     //Creating sys.info;
                     $sitePublicPath = "";
@@ -445,7 +447,7 @@ class WebEntry
                         $template->assign("USR_VAR", "\$USR_UID = -1;");
                     }
 
-                    $template->assign("dynaform", $arrayDynaFormData["DYN_TITLE"]);
+                    $template->assign("dynaform", empty($arrayDynaFormData) ? '' : $arrayDynaFormData["DYN_TITLE"]);
                     $template->assign("timestamp", date("l jS \of F Y h:i:s A"));
                     $template->assign("ws", $this->sysSys);
                     $template->assign("version", \System::getVersion());
@@ -589,7 +591,9 @@ class WebEntry
             $arrayData = array_change_key_case($arrayData, CASE_UPPER);
 
             unset($arrayData["WE_UID"]);
-            unset($arrayData["WE_DATA"]);
+            if (isset($arrayData['WE_LINK_GENERATION']) && $arrayData['WE_LINK_GENERATION']==='DEFAULT') {
+                unset($arrayData["WE_DATA"]);
+            }
 
             //Verify data
             $process->throwExceptionIfNotExistsProcess($processUid, $this->arrayFieldNameForException["processUid"]);
@@ -630,7 +634,9 @@ class WebEntry
                     }
 
                     //Set WE_DATA
-                    $this->setWeData($webEntryUid);
+                    if (isset($arrayData['WE_LINK_GENERATION']) && $arrayData['WE_LINK_GENERATION']==='DEFAULT') {
+                        $this->setWeData($webEntryUid);
+                    }
 
                     //Return
                     return $this->getWebEntry($webEntryUid);
@@ -711,7 +717,9 @@ class WebEntry
                     }
 
                     //Set WE_DATA
-                    $this->setWeData($webEntryUid);
+                    if (isset($arrayData['WE_LINK_GENERATION']) && $arrayData['WE_LINK_GENERATION']==='DEFAULT') {
+                        $this->setWeData($webEntryUid);
+                    }
 
                     //Return
                     if (!$this->formatFieldNameInUppercase) {
@@ -840,7 +848,7 @@ class WebEntry
     public function getWebEntryDataFromRecord(array $record)
     {
         try {
-            if ($record["WE_METHOD"] == "WS") {
+            if ((isset($record['WE_LINK_GENERATION']) && $record['WE_LINK_GENERATION']==='DEFAULT') && $record["WE_METHOD"] == "WS") {
                 $http = (\G::is_https())? "https://" : "http://";
                 $url = $http . $_SERVER["HTTP_HOST"] . "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $record["PRO_UID"];
 
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php
index 4feb57df4..8953fdb33 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntryEvent.php
@@ -8,7 +8,7 @@ class WebEntryEvent
 
         "EVN_UID"         => array("type" => "string", "required" => true,  "empty" => false, "defaultValues" => array(),                      "fieldNameAux" => "eventUid"),
         "ACT_UID"         => array("type" => "string", "required" => true,  "empty" => false, "defaultValues" => array(),                      "fieldNameAux" => "activityUid"),
-        "DYN_UID"         => array("type" => "string", "required" => true,  "empty" => false, "defaultValues" => array(),                      "fieldNameAux" => "dynaFormUid"),
+        "DYN_UID"         => array("type" => "string", "required" => false,  "empty" => true, "defaultValues" => array(),                      "fieldNameAux" => "dynaFormUid"),
         "USR_UID"         => array("type" => "string", "required" => true,  "empty" => false, "defaultValues" => array(),                      "fieldNameAux" => "userUid"),
 
         "WEE_TITLE"       => array("type" => "string", "required" => false,  "empty" => true, "defaultValues" => array(),                      "fieldNameAux" => "webEntryEventTitle"),
@@ -336,7 +336,7 @@ class WebEntryEvent
      *
      * return void
      */
-    public function createWebEntry($projectUid, $eventUid, $activityUid, $dynaFormUid, $userUid, $title, $description, $userUidCreator)
+    public function createWebEntry($projectUid, $eventUid, $activityUid, $dynaFormUid, $userUid, $title, $description, $userUidCreator, $arrayData=[])
     {
         try {
             $bpmn = new \ProcessMaker\Project\Bpmn();
@@ -365,7 +365,9 @@ class WebEntryEvent
             $step = new \Step();
 
             $stepUid = $step->create(array("PRO_UID" => $projectUid, "TAS_UID" => $this->webEntryEventWebEntryTaskUid));
-            $result = $step->update(array("STEP_UID" => $stepUid, "STEP_TYPE_OBJ" => "DYNAFORM", "STEP_UID_OBJ" => $dynaFormUid, "STEP_POSITION" => 1, "STEP_MODE" => "EDIT"));
+            if (!empty($dynaFormUid)) {
+                $result = $step->update(array("STEP_UID" => $stepUid, "STEP_TYPE_OBJ" => "DYNAFORM", "STEP_UID_OBJ" => $dynaFormUid, "STEP_POSITION" => 1, "STEP_MODE" => "EDIT"));
+            }
 
             //Task - User
             $task = new \Tasks();
@@ -378,10 +380,29 @@ class WebEntryEvent
             $result = $workflow->addRoute($this->webEntryEventWebEntryTaskUid, $activityUid, "SEQUENTIAL");
 
             //WebEntry
-            $arrayWebEntryData = $this->webEntry->create(
-                $projectUid,
-                $userUidCreator,
-                array(
+            if(isset($arrayData['WE_LINK_GENERATION']) && $arrayData['WE_LINK_GENERATION']==='ADVANCED') {
+                $arrayData['WE_DATA'] = isset($arrayData['WEE_URL'])?$arrayData['WEE_URL']:null;
+            }
+            $data0 = [];
+            foreach($arrayData as $k => $v) {
+                $exists = array_search($k, [
+                    'WE_DATA',
+                    'WE_TYPE',
+                    'WE_CUSTOM_TITLE',
+                    'WE_AUTHENTICATION',
+                    'WE_HIDE_INFORMATION_BAR',
+                    'WE_CALLBACK',
+                    'WE_CALLBACK_URL',
+                    'WE_LINK_GENERATION',
+                    'WE_LINK_SKIN',
+                    'WE_LINK_LANGUAGE',
+                    'WE_LINK_DOMAIN',
+                ]);
+                if($exists!==false) {
+                    $data0[$k] = $v;
+                }
+            }
+            $data = array_merge($data0, array(
                     "TAS_UID"                  => $this->webEntryEventWebEntryTaskUid,
                     "DYN_UID"                  => $dynaFormUid,
                     "USR_UID"                  => $userUid,
@@ -389,7 +410,11 @@ class WebEntryEvent
                     "WE_DESCRIPTION"           => $description,
                     "WE_METHOD"                => "WS",
                     "WE_INPUT_DOCUMENT_ACCESS" => 1
-                )
+                ));
+            $arrayWebEntryData = $this->webEntry->create(
+                $projectUid,
+                $userUidCreator,
+                $data
             );
 
             $this->webEntryEventWebEntryUid = $arrayWebEntryData[$this->getFieldNameByFormatFieldName("WE_UID")];
@@ -484,11 +509,12 @@ class WebEntryEvent
                         $projectUid,
                         $arrayData["EVN_UID"],
                         $arrayData["ACT_UID"],
-                        $arrayData["DYN_UID"],
+                        empty($arrayData["DYN_UID"])?null:$arrayData["DYN_UID"],
                         $arrayData["USR_UID"],
                         $arrayData["WEE_TITLE"],
                         $arrayData["WEE_DESCRIPTION"],
-                        $userUidCreator
+                        $userUidCreator,
+                        $arrayData
                     );
                 }
 
@@ -614,7 +640,8 @@ class WebEntryEvent
                             $arrayFinalData["USR_UID"],
                             $arrayFinalData["WEE_TITLE"],
                             $arrayFinalData["WEE_DESCRIPTION"],
-                            $userUidUpdater
+                            $userUidUpdater,
+                            $arrayFinalData
                         );
 
                         $arrayData["WEE_WE_UID"] = $this->webEntryEventWebEntryUid;
@@ -688,21 +715,27 @@ class WebEntryEvent
 
                             //WebEntry
                             $arrayDataAux = array();
-
-                            if (isset($arrayData["DYN_UID"])) {
-                                $arrayDataAux["DYN_UID"]  = $arrayData["DYN_UID"];
-                            }
-
-                            if (isset($arrayData["USR_UID"])) {
-                                $arrayDataAux["USR_UID"] = $arrayData["USR_UID"];
-                            }
-
-                            if (isset($arrayData["WEE_TITLE"])) {
-                                $arrayDataAux["WE_TITLE"] = $arrayData["WEE_TITLE"];
-                            }
-
-                            if (isset($arrayData["WEE_DESCRIPTION"])) {
-                                $arrayDataAux["WE_DESCRIPTION"] = $arrayData["WEE_DESCRIPTION"];
+                            $webEntryMap = [
+                                'DYN_UID' => 'DYN_UID',
+                                'USR_UID' => 'USR_UID',
+                                'WE_TYPE' => 'WE_TYPE',
+                                'WE_TITLE' => 'WEE_TITLE',
+                                'WE_DESCRIPTION' => 'WEE_DESCRIPTION',
+                                'WE_CUSTOM_TITLE' => 'WE_CUSTOM_TITLE',
+                                'WE_AUTHENTICATION' => 'WE_AUTHENTICATION',
+                                'WE_HIDE_INFORMATION_BAR' => 'WE_HIDE_INFORMATION_BAR',
+                                'WE_CALLBACK' => 'WE_CALLBACK',
+                                'WE_CALLBACK_URL' => 'WE_CALLBACK_URL',
+                                'WE_LINK_GENERATION' => 'WE_LINK_GENERATION',
+                                'WE_LINK_SKIN' => 'WE_LINK_SKIN',
+                                'WE_LINK_LANGUAGE' => 'WE_LINK_LANGUAGE',
+                                'WE_LINK_DOMAIN' => 'WE_LINK_DOMAIN',
+                                'WE_DATA' => 'WEE_URL',
+                            ];
+                            foreach($webEntryMap as $k => $v) {
+                                if (array_key_exists($v, $arrayData)) {
+                                    $arrayDataAux[$k]  = $arrayData[$v];
+                                }
                             }
 
                             if (count($arrayDataAux) > 0) {
@@ -801,8 +834,13 @@ class WebEntryEvent
 
     /**
      * Get criteria for WebEntry-Event
-     *
-     * return object
+     * 
+     * @category webentry2,PROD-181,webentry1
+     * @link https://processmaker.atlassian.net/browse/PROD-181 Web Entry 2 Feature definition
+     * @link URL description https://processmaker.atlassian.net/browse/PROD-1 Web Entry 1 Feature definition
+     * @group webentry2
+     * @return \Criteria
+     * @throws \Exception
      */
     public function getWebEntryEventCriteria()
     {
@@ -820,6 +858,18 @@ class WebEntryEvent
             $criteria->addSelectColumn(\WebEntryEventPeer::WEE_WE_UID);
             $criteria->addSelectColumn(\WebEntryEventPeer::WEE_WE_TAS_UID);
             $criteria->addSelectColumn(\WebEntryPeer::WE_DATA . " AS WEE_WE_URL");
+            $criteria->addSelectColumn(\WebEntryPeer::WE_CUSTOM_TITLE);
+            $criteria->addSelectColumn(\WebEntryPeer::WE_TYPE);
+            //$criteria->addSelectColumn(\WebEntryPeer::WE_MULTIPLE_UID);
+            $criteria->addSelectColumn(\WebEntryPeer::WE_AUTHENTICATION);
+            $criteria->addSelectColumn(\WebEntryPeer::WE_HIDE_INFORMATION_BAR);
+            $criteria->addSelectColumn(\WebEntryPeer::WE_CALLBACK);
+            $criteria->addSelectColumn(\WebEntryPeer::WE_CALLBACK_URL);
+            $criteria->addSelectColumn(\WebEntryPeer::WE_LINK_GENERATION);
+            $criteria->addSelectColumn(\WebEntryPeer::WE_LINK_SKIN);
+            $criteria->addSelectColumn(\WebEntryPeer::WE_LINK_LANGUAGE);
+            $criteria->addSelectColumn(\WebEntryPeer::WE_LINK_DOMAIN);
+            $criteria->addSelectColumn(\WebEntryPeer::TAS_UID);
             $criteria->addJoin(\WebEntryEventPeer::WEE_WE_UID, \WebEntryPeer::WE_UID, \Criteria::LEFT_JOIN);
             return $criteria;
         } catch (\Exception $e) {
@@ -837,7 +887,10 @@ class WebEntryEvent
     public function getWebEntryEventDataFromRecord(array $record)
     {
         try {
-            if ($record["WEE_WE_UID"] . "" != "") {
+            if (
+                (isset($record['WE_LINK_GENERATION']) && $record['WE_LINK_GENERATION']==='DEFAULT')
+                && $record["WEE_WE_UID"] . "" != ""
+            ) {
                 $http = (\G::is_https())? "https://" : "http://";
                 $url = $http . $_SERVER["HTTP_HOST"] . "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $record["PRJ_UID"];
 
@@ -845,15 +898,27 @@ class WebEntryEvent
             }
 
             return array(
-                $this->getFieldNameByFormatFieldName("WEE_UID")         => $record["WEE_UID"],
-                $this->getFieldNameByFormatFieldName("EVN_UID")         => $record["EVN_UID"],
-                $this->getFieldNameByFormatFieldName("ACT_UID")         => $record["ACT_UID"],
-                $this->getFieldNameByFormatFieldName("DYN_UID")         => $record["DYN_UID"],
-                $this->getFieldNameByFormatFieldName("USR_UID")         => $record["USR_UID"],
-                $this->getFieldNameByFormatFieldName("WEE_TITLE")       => $record["WEE_TITLE"],
-                $this->getFieldNameByFormatFieldName("WEE_DESCRIPTION") => $record["WEE_DESCRIPTION"] . "",
-                $this->getFieldNameByFormatFieldName("WEE_URL")         => $record["WEE_WE_URL"] . "",
-                $this->getFieldNameByFormatFieldName("WEE_STATUS")      => $record["WEE_STATUS"]
+                $this->getFieldNameByFormatFieldName("WEE_UID")                 => $record["WEE_UID"],
+                $this->getFieldNameByFormatFieldName("EVN_UID")                 => $record["EVN_UID"],
+                $this->getFieldNameByFormatFieldName("ACT_UID")                 => $record["ACT_UID"],
+                $this->getFieldNameByFormatFieldName("DYN_UID")                 => $record["DYN_UID"],
+                $this->getFieldNameByFormatFieldName("USR_UID")                 => $record["USR_UID"],
+                $this->getFieldNameByFormatFieldName("WEE_TITLE")               => $record["WEE_TITLE"],
+                $this->getFieldNameByFormatFieldName("WEE_DESCRIPTION")         => $record["WEE_DESCRIPTION"]."",
+                $this->getFieldNameByFormatFieldName("WEE_STATUS")              => $record["WEE_STATUS"]."",
+                $this->getFieldNameByFormatFieldName("WEE_URL")                 => $record["WEE_WE_URL"]."",
+                $this->getFieldNameByFormatFieldName("WE_TYPE")                 => $record["WE_TYPE"],
+                $this->getFieldNameByFormatFieldName("WE_CUSTOM_TITLE")         => $record["WE_CUSTOM_TITLE"],
+                //$this->getFieldNameByFormatFieldName("WE_MULTIPLE_UID")         => $record["WE_MULTIPLE_UID"],
+                $this->getFieldNameByFormatFieldName("WE_AUTHENTICATION")       => $record["WE_AUTHENTICATION"],
+                $this->getFieldNameByFormatFieldName("WE_HIDE_INFORMATION_BAR") => $record["WE_HIDE_INFORMATION_BAR"],
+                $this->getFieldNameByFormatFieldName("WE_CALLBACK")             => $record["WE_CALLBACK"],
+                $this->getFieldNameByFormatFieldName("WE_CALLBACK_URL")         => $record["WE_CALLBACK_URL"],
+                $this->getFieldNameByFormatFieldName("WE_LINK_GENERATION")      => $record["WE_LINK_GENERATION"],
+                $this->getFieldNameByFormatFieldName("WE_LINK_SKIN")            => $record["WE_LINK_SKIN"],
+                $this->getFieldNameByFormatFieldName("WE_LINK_LANGUAGE")        => $record["WE_LINK_LANGUAGE"],
+                $this->getFieldNameByFormatFieldName("WE_LINK_DOMAIN")          => $record["WE_LINK_DOMAIN"],
+                $this->getFieldNameByFormatFieldName("TAS_UID")                 => $record["TAS_UID"],
             );
         } catch (\Exception $e) {
             throw $e;