diff --git a/features/backend/project_property_assignee_resources/activity_assignee.feature b/features/backend/project_property_assignee_resources/activity_assignee.feature
index 2ffdea31d..272221a2b 100644
--- a/features/backend/project_property_assignee_resources/activity_assignee.feature
+++ b/features/backend/project_property_assignee_resources/activity_assignee.feature
@@ -22,7 +22,7 @@ Feature: Assignee Resources
     | check if the list of possible users and groups to be assigned is correct | 4224292655297723eb98691001100052 | 65496814252977243d57684076211485 | 82      | 54731929352d56741de9d42002704749 | group    |
 
 Scenario Outline: Get the list of available users and groups to be assigned to an activity using filter
-    Given I request "project/<project>/activity/<activity>/available-assignee?filter=<filter>&start=<start>&limit=<limit>"
+    Given I request "project/4224292655297723eb98691001100052/activity/65496814252977243d57684076211485/available-assignee?filter=<filter>&start=<start>&limit=<limit>"
     Then the response status code should be 200
     And the response charset is "UTF-8"
     And the content type is "application/json"
@@ -32,11 +32,11 @@ Scenario Outline: Get the list of available users and groups to be assigned to a
     And the "aas_type" property in row 0 equals "<aas_type>"
 
     Examples:
-    | test_description                                               | project                          | activity                         | filter    | start | limit | records | aas_uid                          | aas_type|
-    | Using filter="fin" with no limits should return 2 groups       | 4224292655297723eb98691001100052 | 65496814252977243d57684076211485 | fin       | 0     | 50    | 2       | 66623507552d56742865613066097298 | group   |
-    | Using filter="fin", start="1", limit="1" should return 1 group | 4224292655297723eb98691001100052 | 65496814252977243d57684076211485 | fin       | 0     | 1     | 1       | 66623507552d56742865613066097298 | group   |
-    | Using filter="financial" should return 1 available group       | 4224292655297723eb98691001100052 | 65496814252977243d57684076211485 | financial | 0     | 1     | 1       | 62528621852cda436afe755036997717 | group   |
-    | Using filter="finance"   should return 1 available group       | 4224292655297723eb98691001100052 | 65496814252977243d57684076211485 | finance   | 0     | 1     | 1       | 17707415052cda432dd4774063621869 | group   |
+    | test_description                                               | filter    | start | limit | records | aas_uid                          | aas_type|
+    | Using filter="fin" with no limits should return 2 groups       | fin       | 0     | 50    | 2       | 66623507552d56742865613066097298 | group   |
+    | Using filter="fin", start="1", limit="1" should return 1 group | fin       | 0     | 1     | 1       | 66623507552d56742865613066097298 | group   |
+    | Using filter="financial" should return 1 available group       | financial | 0     | 1     | 1       | 99025456252d567468f0798036479112 | group   |
+    | Using filter="finance"   should return 1 available group       | finance   | 0     | 1     | 1       | 66623507552d56742865613066097298 | group   |
 
 
   Scenario Outline: Assign 2 users and 2 group to an activity
diff --git a/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php b/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php
index 03c044891..7caf0be62 100644
--- a/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php
+++ b/workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php
@@ -496,7 +496,7 @@ class Model
 
     public static function updateDiagram($prjUid, $proUid, $diff)
     {
-        echo 'DIFF'. PHP_EOL; 
+        echo 'DIFF'. PHP_EOL;
         print_r($diff);
 
         //return false;
@@ -606,7 +606,7 @@ class Model
         }
 
     }
-    
+
     public function deleteProject($prjUid)
     {
         $project = self::loadProject($prjUid);
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php
index 8f3b31c34..b12864180 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php
@@ -75,15 +75,15 @@ class DataBaseConnection extends Api
      * @status 201
      */
     public function doPostDataBaseConnection(
-        $projectUid, 
-        $request_data, 
-        $dbs_type, 
+        $projectUid,
+        $request_data,
+        $dbs_type,
         $dbs_server,
-        $dbs_database_name, 
-        $dbs_username, 
-        $dbs_port, 
-        $dbs_encode, 
-        $dbs_password = '', 
+        $dbs_database_name,
+        $dbs_username,
+        $dbs_port,
+        $dbs_encode,
+        $dbs_password = '',
         $dbs_description = ''
     ) {
         try {
@@ -116,16 +116,16 @@ class DataBaseConnection extends Api
      * @url PUT /:projectUid/database-connection/:dbConnecionUid
      */
     public function doPutDataBaseConnection(
-        $projectUid, 
-        $dbConnecionUid, 
-        $request_data, 
-        $dbs_type, 
+        $projectUid,
+        $dbConnecionUid,
+        $request_data,
+        $dbs_type,
         $dbs_server,
-        $dbs_database_name, 
-        $dbs_username, 
-        $dbs_port, 
-        $dbs_encode, 
-        $dbs_password = '', 
+        $dbs_database_name,
+        $dbs_username,
+        $dbs_port,
+        $dbs_encode,
+        $dbs_password = '',
         $dbs_description = ''
     ) {
         try {
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/OutputDocuments.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/OutputDocuments.php
index afd51703a..4a1aed524 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/Project/OutputDocuments.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/OutputDocuments.php
@@ -78,7 +78,7 @@ class OutputDocuments extends Api
      *
      * @param string $prjUid {@min 32} {@max 32}
      * @param string $outputDocumentUid {@min 32} {@max 32}
-     * @param OutputDocumentStructure $request_data     
+     * @param OutputDocumentStructure $request_data
      *
      */
     public function doPutProjectOutputDocument($prjUid, $outputDocumentUid, OutputDocumentStructure $request_data)
@@ -114,7 +114,7 @@ class OutputDocuments extends Api
 }
 
 class OutputDocumentStructure
-{   
+{
     /**
      * @var string {@from body}
      */