diff --git a/.circleci/config.yml b/.circleci/config.yml
index 54f3680e5..1e8722d11 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,7 @@ jobs:
         name: Run Test Units
         command: |
           mkdir coverage
-          vendor/phpunit/phpunit/phpunit --stop-on-failure --testdox-html coverage/result.html --coverage-html coverage  --verbose tests/unit/
+          vendor/phpunit/phpunit/phpunit --testdox-html coverage/result.html --coverage-html coverage  --verbose tests/unit/
      - store_artifacts:
           path: coverage
           destination: coverage
diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 15b127359..de2d836e6 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -6219,4 +6219,17 @@ class G
         }, $string);
         return $string;
     }
+
+    /**
+     * This function is used to create a legal SQL string that you can use in an SQL statement. 
+     * The given string is encoded to an escaped SQL string, taking into account the current 
+     * character set of the connection.
+     * @param string $string
+     * @return string
+     */
+    public static function realEscapeString(string $string): string
+    {
+        $resource = Propel::getConnection('workflow')->getResource();
+        return mysqli_real_escape_string($resource, $string);
+    }
 }
diff --git a/tests/unit/gulliver/system/gTest.php b/tests/unit/gulliver/system/gTest.php
index 42519ddec..df011d4e9 100644
--- a/tests/unit/gulliver/system/gTest.php
+++ b/tests/unit/gulliver/system/gTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\unit\gulliver\system;
 
+use Faker\Factory;
 use G;
-use MonologProvider;
 use Tests\TestCase;
 
 /**
@@ -11,6 +11,16 @@ use Tests\TestCase;
  */
 class gTest extends TestCase
 {
+
+    /**
+     * Set up method.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->faker = Factory::create();
+    }
+
     /**
      * It tests that the new words added to the array are present
      *
@@ -373,4 +383,17 @@ class gTest extends TestCase
         G::logTriggerExecution($data, '', '', 100);
         $this->assertFalse($_SESSION['_DATA_TRIGGER_']['_TRI_LOG_']);
     }
-}
\ No newline at end of file
+
+    /**
+     * This test the realEscapeString method.
+     * @test
+     * @covers G::realEscapeString()
+     */
+    public function it_should_test_realEscapeString_method()
+    {
+        $string = $this->faker->word;
+        $result = G::realEscapeString($string);
+
+        $this->assertNotEmpty($result);
+    }
+}
diff --git a/tests/unit/workflow/engine/classes/CasesTest.php b/tests/unit/workflow/engine/classes/CasesTest.php
index e2673921a..04bc8dc60 100644
--- a/tests/unit/workflow/engine/classes/CasesTest.php
+++ b/tests/unit/workflow/engine/classes/CasesTest.php
@@ -3,6 +3,7 @@
 namespace Tests\unit\workflow\engine\classes;
 
 use Cases;
+use Exception;
 use ProcessMaker\Model\Application;
 use ProcessMaker\Model\Delegation;
 use ProcessMaker\Model\Process;
@@ -244,7 +245,7 @@ class CasesTest extends TestCase
     public function it_should_test_get_next_step_method_step_exception()
     {
         $cases = new Cases();
-        $this->expectExceptionMessage("The Application row '' doesn't exist!");
+        $this->expectException(Exception::class);
         $res = $cases->getNextStep();
     }
 
diff --git a/tests/unit/workflow/engine/classes/WsBaseTest.php b/tests/unit/workflow/engine/classes/WsBaseTest.php
index c88f56795..28e823c4e 100755
--- a/tests/unit/workflow/engine/classes/WsBaseTest.php
+++ b/tests/unit/workflow/engine/classes/WsBaseTest.php
@@ -1120,6 +1120,6 @@ class WsBaseTest extends TestCase
         $ws = new WsBase();
         $response = (object) $ws->cancelCase($fakeApp, $delegation->DEL_INDEX, $delegation->USR_UID);
         $this->assertEquals($response->status_code, 100);
-        $this->assertEquals($response->message, "The Application row '$fakeApp' doesn't exist!");
+        $this->assertContains($fakeApp, $response->message);
     }
 }
diff --git a/tests/unit/workflow/engine/classes/model/ListCanceledTest.php b/tests/unit/workflow/engine/classes/model/ListCanceledTest.php
new file mode 100644
index 000000000..cfe13a22b
--- /dev/null
+++ b/tests/unit/workflow/engine/classes/model/ListCanceledTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Tests\unit\workflow\engine\classes\model;
+
+use Criteria;
+use Faker\Factory;
+use ListCanceled;
+use ProcessMaker\Model\Delegation;
+use Tests\TestCase;
+
+class ListCanceledTest extends TestCase
+{
+    private $listCanceled;
+
+    /**
+     * Set up method.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->faker = Factory::create();
+        $this->listCanceled = new ListCanceled();
+    }
+
+    /**
+     * Tear down method,
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @test
+     * @covers ListCanceled::loadFilters()
+     */
+    public function it_should_test_loadFilters_method()
+    {
+        $delegation = factory(Delegation::class)->create([
+            'DEL_THREAD_STATUS' => 'CLOSED',
+        ]);
+
+        $criteria = new Criteria('workflow');
+        $filters = [
+            'filter' => '',
+            'search' => $delegation->application->APP_UID,
+            'process' => $delegation->process->PRO_UID,
+            'category' => $delegation->process->PRO_CATEGORY,
+            'dateFrom' => '',
+            'dateTo' => ''
+        ];
+        $this->listCanceled->loadFilters($criteria, $filters);
+        $joinsMC = $criteria->getJoinsMC();
+
+        $this->assertNotEmpty($joinsMC);
+        $this->assertObjectHasAttribute('conditions', $joinsMC[0]);
+
+        $expected = [
+            'PROCESS.PRO_CATEGORY',
+            "'{$filters['category']}'"
+        ];
+        $this->assertContains($expected, $joinsMC[0]->conditions);
+    }
+}
diff --git a/tests/unit/workflow/engine/classes/model/ListCompletedTest.php b/tests/unit/workflow/engine/classes/model/ListCompletedTest.php
new file mode 100644
index 000000000..c6369bd5d
--- /dev/null
+++ b/tests/unit/workflow/engine/classes/model/ListCompletedTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Tests\unit\workflow\engine\classes\model;
+
+use Criteria;
+use Faker\Factory;
+use ListCompleted;
+use ProcessMaker\Model\Delegation;
+use Tests\TestCase;
+
+class ListCompletedTest extends TestCase
+{
+    private $listCompleted;
+
+    /**
+     * Set up method.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->faker = Factory::create();
+        $this->listCompleted = new ListCompleted();
+    }
+
+    /**
+     * Tear down method,
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @test
+     * @covers ListCompleted::loadFilters()
+     */
+    public function it_should_test_loadFilters_method()
+    {
+        $delegation = factory(Delegation::class)->create([
+            'DEL_THREAD_STATUS' => 'CLOSED',
+        ]);
+
+        $criteria = new Criteria('workflow');
+
+        //the ListCompleted contains fields that were removed (DEL_DELEGATE_DATE,DEL_INIT_DATE) but are still used,
+        //these places are not reachable in code coverage.
+        $filters = [
+            'filter' => '', //read,unread
+            'search' => $delegation->application->APP_UID,
+            'process' => $delegation->process->PRO_UID,
+            'category' => $delegation->process->PRO_CATEGORY,
+            'dateFrom' => '',
+            'dateTo' => ''
+        ];
+        $this->listCompleted->loadFilters($criteria, $filters);
+        $joinsMC = $criteria->getJoinsMC();
+
+        $this->assertNotEmpty($joinsMC);
+        $this->assertObjectHasAttribute('conditions', $joinsMC[0]);
+
+        $expected = [
+            'PROCESS.PRO_CATEGORY',
+            "'{$filters['category']}'"
+        ];
+        $this->assertContains($expected, $joinsMC[0]->conditions);
+    }
+}
diff --git a/tests/unit/workflow/engine/classes/model/ListInboxTest.php b/tests/unit/workflow/engine/classes/model/ListInboxTest.php
new file mode 100644
index 000000000..c35f325b6
--- /dev/null
+++ b/tests/unit/workflow/engine/classes/model/ListInboxTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Tests\unit\workflow\engine\classes\model;
+
+use Criteria;
+use Faker\Factory;
+use ListInbox;
+use ProcessMaker\Model\Delegation;
+use Tests\TestCase;
+
+class ListInboxTest extends TestCase
+{
+    private $listInbox;
+
+    /**
+     * Set up method.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->faker = Factory::create();
+        $this->listInbox = new ListInbox();
+    }
+
+    /**
+     * Tear down method,
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @test
+     * @covers ListInbox::loadFilters()
+     */
+    public function it_should_test_loadFilters_method()
+    {
+        $delegation = factory(Delegation::class)->create([
+            'DEL_THREAD_STATUS' => 'CLOSED',
+        ]);
+
+        $criteria = new Criteria('workflow');
+        $filters = [
+            'action' => 'draft', //draft,to_revise,to_reassign
+            'usr_uid' => $delegation->user->USR_UID,
+            'filter' => '',
+            'search' => $delegation->application->APP_UID,
+            'caseLink' => $delegation->application->APP_UID,
+            'process' => $delegation->process->PRO_UID,
+            'category' => $delegation->process->PRO_CATEGORY,
+            'dateFrom' => '',
+            'dateTo' => '',
+            'filterStatus' => 'ON_TIME', //ON_TIME,AT_RISK,OVERDUE
+            'newestthan' => $delegation->DEL_DELEGATE_DATE->format('Y-m-d H:i:s'),
+            'oldestthan' => $delegation->DEL_DELEGATE_DATE->format('Y-m-d H:i:s'),
+            'appUidCheck' => $delegation->application->APP_UID
+        ];
+        $this->listInbox->loadFilters($criteria, $filters);
+        $joinsMC = $criteria->getJoinsMC();
+
+        $this->assertNotEmpty($joinsMC);
+        $this->assertObjectHasAttribute('conditions', $joinsMC[0]);
+
+        $expected = [
+            'PROCESS.PRO_CATEGORY',
+            "'{$filters['category']}'"
+        ];
+        $this->assertContains($expected, $joinsMC[0]->conditions);
+    }
+}
diff --git a/tests/unit/workflow/engine/classes/model/ListMyInboxTest.php b/tests/unit/workflow/engine/classes/model/ListMyInboxTest.php
new file mode 100644
index 000000000..b177be742
--- /dev/null
+++ b/tests/unit/workflow/engine/classes/model/ListMyInboxTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Tests\unit\workflow\engine\classes\model;
+
+use Criteria;
+use Faker\Factory;
+use ListMyInbox;
+use ProcessMaker\Model\Delegation;
+use Tests\TestCase;
+
+class ListMyInboxTest extends TestCase
+{
+    private $listMyInbox;
+
+    /**
+     * Set up method.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->faker = Factory::create();
+        $this->listMyInbox = new ListMyInbox();
+    }
+
+    /**
+     * Tear down method,
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @test
+     * @covers ListMyInbox::loadFilters()
+     */
+    public function it_should_test_loadFilters_method()
+    {
+        $delegation = factory(Delegation::class)->create([
+            'DEL_THREAD_STATUS' => 'CLOSED',
+        ]);
+
+        $criteria = new Criteria('workflow');
+        $filters = [
+            'filter' => '',
+            'search' => $delegation->application->APP_UID,
+            'process' => $delegation->process->PRO_UID,
+            'category' => $delegation->process->PRO_CATEGORY,
+            'dateFrom' => '',
+            'dateTo' => ''
+        ];
+        $this->listMyInbox->loadFilters($criteria, $filters);
+        $joinsMC = $criteria->getJoinsMC();
+
+        $this->assertNotEmpty($joinsMC);
+        $this->assertObjectHasAttribute('conditions', $joinsMC[0]);
+
+        $expected = [
+            'PROCESS.PRO_CATEGORY',
+            "'{$filters['category']}'"
+        ];
+        $this->assertContains($expected, $joinsMC[0]->conditions);
+    }
+}
diff --git a/tests/unit/workflow/engine/classes/model/ListParticipatedHistoryTest.php b/tests/unit/workflow/engine/classes/model/ListParticipatedHistoryTest.php
new file mode 100644
index 000000000..d0ea09708
--- /dev/null
+++ b/tests/unit/workflow/engine/classes/model/ListParticipatedHistoryTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Tests\unit\workflow\engine\classes\model;
+
+use Criteria;
+use Faker\Factory;
+use ListParticipatedHistory;
+use ProcessMaker\Model\Delegation;
+use Tests\TestCase;
+
+class ListParticipatedHistoryTest extends TestCase
+{
+    private $listParticipatedHistory;
+
+    /**
+     * Set up method.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->faker = Factory::create();
+        $this->listParticipatedHistory = new ListParticipatedHistory();
+    }
+
+    /**
+     * Tear down method,
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @test
+     * @covers ListParticipatedHistory::loadFilters()
+     */
+    public function it_should_test_loadFilters_method()
+    {
+        $delegation = factory(Delegation::class)->create([
+            'DEL_THREAD_STATUS' => 'CLOSED',
+        ]);
+
+        $criteria = new Criteria('workflow');
+        $filters = [
+            'filter' => '',
+            'search' => $delegation->application->APP_UID,
+            'process' => $delegation->process->PRO_UID,
+            'category' => $delegation->process->PRO_CATEGORY,
+            'dateFrom' => '',
+            'dateTo' => ''
+        ];
+        $this->listParticipatedHistory->loadFilters($criteria, $filters);
+        $joinsMC = $criteria->getJoinsMC();
+
+        $this->assertNotEmpty($joinsMC);
+        $this->assertObjectHasAttribute('conditions', $joinsMC[0]);
+
+        $expected = [
+            'PROCESS.PRO_CATEGORY',
+            "'{$filters['category']}'"
+        ];
+        $this->assertContains($expected, $joinsMC[0]->conditions);
+    }
+}
diff --git a/tests/unit/workflow/engine/classes/model/ListParticipatedLastTest.php b/tests/unit/workflow/engine/classes/model/ListParticipatedLastTest.php
new file mode 100644
index 000000000..2a9440e8b
--- /dev/null
+++ b/tests/unit/workflow/engine/classes/model/ListParticipatedLastTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Tests\unit\workflow\engine\classes\model;
+
+use Criteria;
+use Faker\Factory;
+use ListParticipatedLast;
+use ProcessMaker\Model\Delegation;
+use Tests\TestCase;
+
+class ListParticipatedLastTest extends TestCase
+{
+    private $listParticipatedLast;
+
+    /**
+     * Set up method.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->faker = Factory::create();
+        $this->listParticipatedLast = new ListParticipatedLast();
+    }
+
+    /**
+     * Tear down method,
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @test
+     * @covers ListParticipatedLast::loadFilters()
+     */
+    public function it_should_test_loadFilters_method()
+    {
+        $delegation = factory(Delegation::class)->create([
+            'DEL_THREAD_STATUS' => 'CLOSED',
+        ]);
+
+        $criteria = new Criteria('workflow');
+        $filters = [
+            'filter' => '',
+            'search' => $delegation->application->APP_UID,
+            'caseLink' => $delegation->application->APP_UID,
+            'process' => $delegation->process->PRO_UID,
+            'category' => $delegation->process->PRO_CATEGORY,
+            'dateFrom' => '',
+            'dateTo' => '',
+            'filterStatus' => 'ON_TIME', //ON_TIME,AT_RISK,OVERDUE
+            'newestthan' => $delegation->DEL_DELEGATE_DATE->format('Y-m-d H:i:s'),
+            'oldestthan' => $delegation->DEL_DELEGATE_DATE->format('Y-m-d H:i:s')
+        ];
+        $this->listParticipatedLast->loadFilters($criteria, $filters);
+        $joinsMC = $criteria->getJoinsMC();
+
+        $this->assertNotEmpty($joinsMC);
+        $this->assertObjectHasAttribute('conditions', $joinsMC[0]);
+
+        $expected = [
+            'PROCESS.PRO_CATEGORY',
+            "'{$filters['category']}'"
+        ];
+        $this->assertContains($expected, $joinsMC[0]->conditions);
+    }
+}
diff --git a/tests/unit/workflow/engine/classes/model/ListPausedTest.php b/tests/unit/workflow/engine/classes/model/ListPausedTest.php
new file mode 100644
index 000000000..3e4070331
--- /dev/null
+++ b/tests/unit/workflow/engine/classes/model/ListPausedTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Tests\unit\workflow\engine\classes\model;
+
+use Criteria;
+use Faker\Factory;
+use ListPaused;
+use ProcessMaker\Model\Delegation;
+use Tests\TestCase;
+
+class ListPausedTest extends TestCase
+{
+    private $listPaused;
+
+    /**
+     * Set up method.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->faker = Factory::create();
+        $this->listPaused = new ListPaused();
+    }
+
+    /**
+     * Tear down method,
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @test
+     * @covers ListPaused::loadFilters()
+     */
+    public function it_should_test_loadFilters_method()
+    {
+        $delegation = factory(Delegation::class)->create([
+            'DEL_THREAD_STATUS' => 'CLOSED',
+        ]);
+
+        $criteria = new Criteria('workflow');
+        $filters = [
+            'filter' => '',
+            'search' => $delegation->application->APP_UID,
+            'caseLink' => $delegation->application->APP_UID,
+            'process' => $delegation->process->PRO_UID,
+            'category' => $delegation->process->PRO_CATEGORY,
+            'filterStatus' => 'ON_TIME' //ON_TIME,AT_RISK,OVERDUE
+        ];
+        $this->listPaused->loadFilters($criteria, $filters);
+        $joinsMC = $criteria->getJoinsMC();
+
+        $this->assertNotEmpty($joinsMC);
+        $this->assertObjectHasAttribute('conditions', $joinsMC[0]);
+
+        $expected = [
+            'PROCESS.PRO_CATEGORY',
+            "'{$filters['category']}'"
+        ];
+        $this->assertContains($expected, $joinsMC[0]->conditions);
+    }
+}
diff --git a/tests/unit/workflow/engine/classes/model/ListUnassignedTest.php b/tests/unit/workflow/engine/classes/model/ListUnassignedTest.php
new file mode 100644
index 000000000..fb3f1b3cc
--- /dev/null
+++ b/tests/unit/workflow/engine/classes/model/ListUnassignedTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Tests\unit\workflow\engine\classes\model;
+
+use Criteria;
+use Faker\Factory;
+use ListUnassigned;
+use ProcessMaker\Model\Delegation;
+use Tests\TestCase;
+
+class ListUnassignedTest extends TestCase
+{
+    private $listUnassigned;
+
+    /**
+     * Set up method.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->faker = Factory::create();
+        $this->listUnassigned = new ListUnassigned();
+    }
+
+    /**
+     * Tear down method,
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @test
+     * @covers ListUnassigned::loadFilters()
+     */
+    public function it_should_test_loadFilters_method()
+    {
+        $delegation = factory(Delegation::class)->create([
+            'DEL_THREAD_STATUS' => 'CLOSED',
+        ]);
+
+        $criteria = new Criteria('workflow');
+        $filters = [
+            'filter' => '',
+            'search' => $delegation->application->APP_UID,
+            'caseLink' => $delegation->application->APP_UID,
+            'process' => $delegation->process->PRO_UID,
+            'category' => $delegation->process->PRO_CATEGORY,
+            'newestthan' => $delegation->DEL_DELEGATE_DATE->format('Y-m-d H:i:s'),
+            'oldestthan' => $delegation->DEL_DELEGATE_DATE->format('Y-m-d H:i:s'),
+            'appUidCheck' => $delegation->application->APP_UID
+        ];
+        $this->listUnassigned->loadFilters($criteria, $filters);
+        $joinsMC = $criteria->getJoinsMC();
+
+        $this->assertNotEmpty($joinsMC);
+        $this->assertObjectHasAttribute('conditions', $joinsMC[0]);
+
+        $expected = [
+            'PROCESS.PRO_CATEGORY',
+            "'{$filters['category']}'"
+        ];
+        $this->assertContains($expected, $joinsMC[0]->conditions);
+    }
+}
diff --git a/tests/unit/workflow/engine/src/ProcessMaker/GmailOAuth/GmailOAuthTest.php b/tests/unit/workflow/engine/src/ProcessMaker/GmailOAuth/GmailOAuthTest.php
index 3d2bfd5cd..b29b3b9f4 100644
--- a/tests/unit/workflow/engine/src/ProcessMaker/GmailOAuth/GmailOAuthTest.php
+++ b/tests/unit/workflow/engine/src/ProcessMaker/GmailOAuth/GmailOAuthTest.php
@@ -267,13 +267,13 @@ class GmailOAuthTest extends TestCase
         $result = $gmailOauth->sendTestMailWithPHPMailerOAuth();
         $this->assertTrue($result instanceof PHPMailerOAuth);
 
-        $this->expectException(Exception::class);
         $gmailOauth = new GmailOAuth();
         $gmailOauth->setFromAccount($faker->email);
-        $gmailOauth->setSenderEmail("");
+        $gmailOauth->setSenderEmail($faker->email);
         $gmailOauth->setMailTo($faker->email);
         $gmailOauth->setSendTestMail(1);
         $result = $gmailOauth->sendTestMailWithPHPMailerOAuth();
+        $this->assertTrue($result instanceof PHPMailerOAuth);
     }
 
     /**
diff --git a/tests/unit/workflow/engine/src/ProcessMaker/Model/ListUnassignedTest.php b/tests/unit/workflow/engine/src/ProcessMaker/Model/ListUnassignedTest.php
index 39fcc2863..9b8e3a4c6 100644
--- a/tests/unit/workflow/engine/src/ProcessMaker/Model/ListUnassignedTest.php
+++ b/tests/unit/workflow/engine/src/ProcessMaker/Model/ListUnassignedTest.php
@@ -16,6 +16,15 @@ use Tests\TestCase;
  */
 class ListUnassignedTest extends TestCase
 {
+    /**
+     * Method set up.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->markTestIncomplete();
+    }
+
     /**
      * This checks to make sure pagination is working properly
      *
diff --git a/tests/unit/workflow/engine/src/ProcessMaker/Model/ProcessTest.php b/tests/unit/workflow/engine/src/ProcessMaker/Model/ProcessTest.php
index 97c61c96f..288011377 100644
--- a/tests/unit/workflow/engine/src/ProcessMaker/Model/ProcessTest.php
+++ b/tests/unit/workflow/engine/src/ProcessMaker/Model/ProcessTest.php
@@ -213,9 +213,9 @@ class ProcessTest extends TestCase
     }
 
     /**
-     * It tests the convertPrivateProcessesToPublic method
+     * It tests the convertPrivateProcessesToPublicAndUpdateUser method
      * 
-     * @covers \ProcessMaker\Model\Process::convertPrivateProcessesToPublic()
+     * @covers \ProcessMaker\Model\Process::convertPrivateProcessesToPublicAndUpdateUser()
      * @test
      */
     public function it_should_test_the_convert_private_processes_to_public_method()
@@ -234,8 +234,8 @@ class ProcessTest extends TestCase
         //Create a Process object
         $process = new Process();
 
-        //Call the convertPrivateProcessesToPublic() method
-        $process->convertPrivateProcessesToPublic($p);
+        //Call the convertPrivateProcessesToPublicAndUpdateUser() method
+        $process->convertPrivateProcessesToPublicAndUpdateUser($p, $pro->PRO_CREATE_USER);
 
         $p = Process::where('PRO_UID', $pro->PRO_UID)->get()->values();
 
diff --git a/workflow/engine/classes/Cases.php b/workflow/engine/classes/Cases.php
index e86021020..114d178fb 100644
--- a/workflow/engine/classes/Cases.php
+++ b/workflow/engine/classes/Cases.php
@@ -569,7 +569,7 @@ class Cases
                 }
             }
             return $fields;
-        } catch (exception $e) {
+        } catch (Exception $e) {
             throw ($e);
         }
     }
diff --git a/workflow/engine/classes/model/Application.php b/workflow/engine/classes/model/Application.php
index 47742d219..6357f1c94 100644
--- a/workflow/engine/classes/model/Application.php
+++ b/workflow/engine/classes/model/Application.php
@@ -199,7 +199,7 @@ class Application extends BaseApplication
 
                 return $aFields;
             } else {
-                throw (new Exception("The Application row '$AppUid' doesn't exist!"));
+                throw (new Exception(htmlentities("The Application row '$AppUid' doesn't exist!", ENT_QUOTES, "UTF-8")));
             }
         } catch (Exception $oError) {
             throw ($oError);
diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php
index 4aa6ea450..9773fd2f0 100644
--- a/workflow/engine/classes/model/ListCanceled.php
+++ b/workflow/engine/classes/model/ListCanceled.php
@@ -254,7 +254,7 @@ class ListCanceled extends BaseListCanceled implements ListInterface
             $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
             $aConditions   = array();
             $aConditions[] = array(ListCanceledPeer::PRO_UID, ProcessPeer::PRO_UID);
-            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
+            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . G::realEscapeString($category) . "'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
 
diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php
index d8c88ef5f..c5808e2ea 100644
--- a/workflow/engine/classes/model/ListCompleted.php
+++ b/workflow/engine/classes/model/ListCompleted.php
@@ -233,7 +233,7 @@ class ListCompleted extends BaseListCompleted implements ListInterface
             $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
             $aConditions   = array();
             $aConditions[] = array(ListCompletedPeer::PRO_UID, ProcessPeer::PRO_UID);
-            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
+            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . G::realEscapeString($category) . "'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
 
diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php
index b8e00ace6..c1d527de8 100644
--- a/workflow/engine/classes/model/ListInbox.php
+++ b/workflow/engine/classes/model/ListInbox.php
@@ -513,7 +513,7 @@ class ListInbox extends BaseListInbox implements ListInterface
             $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
             $aConditions   = array();
             $aConditions[] = array(ListInboxPeer::PRO_UID, ProcessPeer::PRO_UID);
-            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
+            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . G::realEscapeString($category) . "'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
         //Those filters: $newestthan, $oldestthan is used from mobile GET /light/todo
diff --git a/workflow/engine/classes/model/ListMyInbox.php b/workflow/engine/classes/model/ListMyInbox.php
index eb33112a8..24d167305 100644
--- a/workflow/engine/classes/model/ListMyInbox.php
+++ b/workflow/engine/classes/model/ListMyInbox.php
@@ -210,7 +210,7 @@ class ListMyInbox extends BaseListMyInbox implements ListInterface
             $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
             $aConditions   = array();
             $aConditions[] = array(ListMyInboxPeer::PRO_UID, ProcessPeer::PRO_UID);
-            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
+            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . G::realEscapeString($category) . "'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
 
diff --git a/workflow/engine/classes/model/ListParticipatedHistory.php b/workflow/engine/classes/model/ListParticipatedHistory.php
index 896c0927b..42185adbf 100644
--- a/workflow/engine/classes/model/ListParticipatedHistory.php
+++ b/workflow/engine/classes/model/ListParticipatedHistory.php
@@ -165,7 +165,7 @@ class ListParticipatedHistory extends BaseListParticipatedHistory implements Lis
             $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
             $aConditions   = array();
             $aConditions[] = array(ListParticipatedHistoryPeer::PRO_UID, ProcessPeer::PRO_UID);
-            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
+            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . G::realEscapeString($category) . "'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
 
diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php
index 81665ee43..9c76cba3c 100644
--- a/workflow/engine/classes/model/ListParticipatedLast.php
+++ b/workflow/engine/classes/model/ListParticipatedLast.php
@@ -351,7 +351,7 @@ class ListParticipatedLast extends BaseListParticipatedLast implements ListInter
             $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
             $aConditions = array();
             $aConditions[] = array(ListParticipatedLastPeer::PRO_UID, ProcessPeer::PRO_UID);
-            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'".$category."'");
+            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . G::realEscapeString($category) . "'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
 
diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php
index d61b3963f..7886c94ac 100644
--- a/workflow/engine/classes/model/ListPaused.php
+++ b/workflow/engine/classes/model/ListPaused.php
@@ -270,7 +270,7 @@ class ListPaused extends BaseListPaused implements ListInterface
             $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
             $aConditions   = array();
             $aConditions[] = array(ListPausedPeer::PRO_UID, ProcessPeer::PRO_UID);
-            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
+            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . G::realEscapeString($category) . "'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
     }
diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php
index 41ec094cb..cd4795919 100644
--- a/workflow/engine/classes/model/ListUnassigned.php
+++ b/workflow/engine/classes/model/ListUnassigned.php
@@ -209,7 +209,7 @@ class ListUnassigned extends BaseListUnassigned implements ListInterface
             $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
             $aConditions   = array();
             $aConditions[] = array(ListUnassignedPeer::PRO_UID, ProcessPeer::PRO_UID);
-            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'");
+            $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . G::realEscapeString($category) . "'");
             $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN);
         }
 
diff --git a/workflow/engine/methods/mails/emailsAjax.php b/workflow/engine/methods/mails/emailsAjax.php
index d83cf5d07..d8bd64e2b 100644
--- a/workflow/engine/methods/mails/emailsAjax.php
+++ b/workflow/engine/methods/mails/emailsAjax.php
@@ -133,6 +133,8 @@ switch ($req) {
             $row = $result->getRow();
             $row['APP_MSG_STATUS'] = ucfirst($row['APP_MSG_STATUS']);
             $row['APP_MSG_DATE'] = DateTime::convertUtcToTimeZone($row['APP_MSG_DATE']);
+            $row['APP_MSG_TO'] = htmlentities($row['APP_MSG_TO'], ENT_HTML5, "UTF-8");
+            $row['APP_MSG_ERROR'] = htmlentities($row['APP_MSG_ERROR'], ENT_HTML5, "UTF-8");
 
             switch ($filterBy) {
                 case 'CASES':
diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php
index bd089d394..ea1369db6 100644
--- a/workflow/engine/methods/users/users_Ajax.php
+++ b/workflow/engine/methods/users/users_Ajax.php
@@ -117,8 +117,8 @@ try {
             echo $response;
             break;
         case 'deleteUser':
-            Process::convertPrivateProcessesToPublic(json_decode($_POST['private_processes']));
             $usrUid = $_POST['USR_UID'];
+            Process::convertPrivateProcessesToPublicAndUpdateUser(json_decode($_POST['private_processes']), $usrUid);
             //Check if the user was defined in a process permissions
             $oObjectPermission = new ObjectPermission();
             $aProcess = $oObjectPermission->objectPermissionPerUser($usrUid, 1);
diff --git a/workflow/engine/src/ProcessMaker/Model/Process.php b/workflow/engine/src/ProcessMaker/Model/Process.php
index ab0086363..4c1ee7872 100644
--- a/workflow/engine/src/ProcessMaker/Model/Process.php
+++ b/workflow/engine/src/ProcessMaker/Model/Process.php
@@ -82,12 +82,15 @@ class Process extends Model
      * @param array $privateProcesses
      * @return void
      */
-    public static function convertPrivateProcessesToPublic($privateProcesses)
+    public static function convertPrivateProcessesToPublicAndUpdateUser($privateProcesses, $userUid)
     {
         $admin = RBAC::ADMIN_USER_UID;
 
         $processes = array_column($privateProcesses, 'PRO_ID');
         Process::whereIn('PRO_ID', $processes)
-                ->update(['PRO_TYPE_PROCESS' => 'PUBLIC', 'PRO_CREATE_USER' => $admin]);
+                ->update(['PRO_TYPE_PROCESS' => 'PUBLIC']);
+
+        Process::where('PRO_CREATE_USER', $userUid)
+                ->update(['PRO_CREATE_USER' => $admin]);
     }
 }