diff --git a/workflow/engine/src/Tests/Model/BpmnEventTest.php b/workflow/engine/src/Tests/Model/BpmnEventTest.php
index ab16d61c9..8185aceaa 100644
--- a/workflow/engine/src/Tests/Model/BpmnEventTest.php
+++ b/workflow/engine/src/Tests/Model/BpmnEventTest.php
@@ -43,8 +43,8 @@ class BpmnEventTest extends PHPUnit_Framework_TestCase
             "PRO_UID" => self::$proUid,
             "EVN_NAME" => "Event #1",
             "EVN_TYPE" => "START",
-            "BOU_X" => "51",
-            "BOU_Y" => "52"
+            "BOU_X" => 51,
+            "BOU_Y" => 52
         );
 
         self::$data2 = array(
@@ -53,8 +53,8 @@ class BpmnEventTest extends PHPUnit_Framework_TestCase
             "PRO_UID" => self::$proUid,
             "EVN_NAME" => "Event #2",
             "EVN_TYPE" => "END",
-            "BOU_X" => "53",
-            "BOU_Y" => "54"
+            "BOU_X" => 53,
+            "BOU_Y" => 54
         );
     }
 
@@ -130,17 +130,17 @@ class BpmnEventTest extends PHPUnit_Framework_TestCase
             "EVN_CANCEL_ACTIVITY" => 0,
             "EVN_ACTIVITY_REF" => "",
             "EVN_WAIT_FOR_COMPLETION" => 1,
-            "EVN_ERROR_NAME" => "",
-            "EVN_ERROR_CODE" => "",
-            "EVN_ESCALATION_NAME" => "",
-            "EVN_ESCALATION_CODE" => "",
-            "EVN_CONDITION" => "",
-            "EVN_MESSAGE" => "",
-            "EVN_OPRERATION_NAME" => "",
-            "EVN_OPERATION_IMPLEMENTATION_REF" => "",
-            "EVN_TIME_DATE" => "",
-            "EVN_TIME_CYCLE" => "",
-            "EVN_TIME_DURATION" => "",
+            "EVN_ERROR_NAME" => null,
+            "EVN_ERROR_CODE" => null,
+            "EVN_ESCALATION_NAME" => null,
+            "EVN_ESCALATION_CODE" => null,
+            "EVN_CONDITION" => null,
+            "EVN_MESSAGE" => null,
+            "EVN_OPERATION_NAME" => null,
+            "EVN_OPERATION_IMPLEMENTATION_REF" => null,
+            "EVN_TIME_DATE" => null,
+            "EVN_TIME_CYCLE" => null,
+            "EVN_TIME_DURATION" => null,
             "EVN_BEHAVIOR" => "CATCH",
             "DIA_UID" => self::$diaUid,
             "ELEMENT_UID" => self::$data1["EVN_UID"],
@@ -184,17 +184,17 @@ class BpmnEventTest extends PHPUnit_Framework_TestCase
             "EVN_CANCEL_ACTIVITY" => 0,
             "EVN_ACTIVITY_REF" => "",
             "EVN_WAIT_FOR_COMPLETION" => 1,
-            "EVN_ERROR_NAME" => "",
-            "EVN_ERROR_CODE" => "",
-            "EVN_ESCALATION_NAME" => "",
-            "EVN_ESCALATION_CODE" => "",
-            "EVN_CONDITION" => "",
-            "EVN_MESSAGE" => "",
-            "EVN_OPRERATION_NAME" => "",
-            "EVN_OPERATION_IMPLEMENTATION_REF" => "",
-            "EVN_TIME_DATE" => "",
-            "EVN_TIME_CYCLE" => "",
-            "EVN_TIME_DURATION" => "",
+            "EVN_ERROR_NAME" => null,
+            "EVN_ERROR_CODE" => null,
+            "EVN_ESCALATION_NAME" => null,
+            "EVN_ESCALATION_CODE" => null,
+            "EVN_CONDITION" => null,
+            "EVN_MESSAGE" => null,
+            "EVN_OPERATION_NAME" => null,
+            "EVN_OPERATION_IMPLEMENTATION_REF" => null,
+            "EVN_TIME_DATE" => null,
+            "EVN_TIME_CYCLE" => null,
+            "EVN_TIME_DURATION" => null,
             "EVN_BEHAVIOR" => "CATCH",
             "DIA_UID" => self::$diaUid,
             "ELEMENT_UID" => self::$data2["EVN_UID"],
@@ -236,17 +236,17 @@ class BpmnEventTest extends PHPUnit_Framework_TestCase
             "EVN_CANCEL_ACTIVITY" => 0,
             "EVN_ACTIVITY_REF" => "",
             "EVN_WAIT_FOR_COMPLETION" => 1,
-            "EVN_ERROR_NAME" => "",
-            "EVN_ERROR_CODE" => "",
-            "EVN_ESCALATION_NAME" => "",
-            "EVN_ESCALATION_CODE" => "",
-            "EVN_CONDITION" => "",
-            "EVN_MESSAGE" => "",
-            "EVN_OPRERATION_NAME" => "",
-            "EVN_OPERATION_IMPLEMENTATION_REF" => "",
-            "EVN_TIME_DATE" => "",
-            "EVN_TIME_CYCLE" => "",
-            "EVN_TIME_DURATION" => "",
+            "EVN_ERROR_NAME" => null,
+            "EVN_ERROR_CODE" => null,
+            "EVN_ESCALATION_NAME" => null,
+            "EVN_ESCALATION_CODE" => null,
+            "EVN_CONDITION" => null,
+            "EVN_MESSAGE" => null,
+            "EVN_OPERATION_NAME" => null,
+            "EVN_OPERATION_IMPLEMENTATION_REF" => null,
+            "EVN_TIME_DATE" => null,
+            "EVN_TIME_CYCLE" => null,
+            "EVN_TIME_DURATION" => null,
             "EVN_BEHAVIOR" => "CATCH",
             "DIA_UID" => self::$diaUid,
             "ELEMENT_UID" => self::$data1["EVN_UID"],
diff --git a/workflow/engine/src/Tests/Model/BpmnGatewayTest.php b/workflow/engine/src/Tests/Model/BpmnGatewayTest.php
index d230bf908..c3e0bb20a 100644
--- a/workflow/engine/src/Tests/Model/BpmnGatewayTest.php
+++ b/workflow/engine/src/Tests/Model/BpmnGatewayTest.php
@@ -44,8 +44,8 @@ class BpmnGatewayTest extends PHPUnit_Framework_TestCase
             "PRO_UID" => self::$proUid,
             "GAT_NAME" => "Gateway #1",
             "GAT_TYPE" => "SELECTION",
-            "BOU_X" => "51",
-            "BOU_Y" => "52"
+            "BOU_X" => 51,
+            "BOU_Y" => 52
         );
 
         self::$data2 = array(
@@ -54,8 +54,8 @@ class BpmnGatewayTest extends PHPUnit_Framework_TestCase
             "PRO_UID" => self::$proUid,
             "GAT_NAME" => "Gateway #2",
             "GAT_TYPE" => "EVALUATION",
-            "BOU_X" => "53",
-            "BOU_Y" => "54"
+            "BOU_X" => 53,
+            "BOU_Y" => 54
         );
     }
 
@@ -127,7 +127,7 @@ class BpmnGatewayTest extends PHPUnit_Framework_TestCase
             "GAT_TYPE" => self::$data1["GAT_TYPE"],
             "GAT_DIRECTION" => "UNSPECIFIED",
             "GAT_INSTANTIATE" => 0,
-            "GAT_EVENT_GATEWAT_TYPE" => 'NONE',
+            "GAT_EVENT_GATEWAY_TYPE" => 'NONE',
             "GAT_ACTIVATION_COUNT" => 0,
             "GAT_WAITING_FOR_START" => 1,
             "GAT_DEFAULT_FLOW" => "",
@@ -169,7 +169,7 @@ class BpmnGatewayTest extends PHPUnit_Framework_TestCase
             "GAT_TYPE" => self::$data2["GAT_TYPE"],
             "GAT_DIRECTION" => "UNSPECIFIED",
             "GAT_INSTANTIATE" => 0,
-            "GAT_EVENT_GATEWAT_TYPE" => 'NONE',
+            "GAT_EVENT_GATEWAY_TYPE" => 'NONE',
             "GAT_ACTIVATION_COUNT" => 0,
             "GAT_WAITING_FOR_START" => 1,
             "GAT_DEFAULT_FLOW" => "",
@@ -209,7 +209,7 @@ class BpmnGatewayTest extends PHPUnit_Framework_TestCase
             "GAT_TYPE" => self::$data1["GAT_TYPE"],
             "GAT_DIRECTION" => "UNSPECIFIED",
             "GAT_INSTANTIATE" => 0,
-            "GAT_EVENT_GATEWAT_TYPE" => 'NONE',
+            "GAT_EVENT_GATEWAY_TYPE" => 'NONE',
             "GAT_ACTIVATION_COUNT" => 0,
             "GAT_WAITING_FOR_START" => 1,
             "GAT_DEFAULT_FLOW" => "",
diff --git a/workflow/engine/src/Tests/ProcessMaker/Project/BpmnTest.php b/workflow/engine/src/Tests/ProcessMaker/Project/BpmnTest.php
index 386739b44..bc48b6e24 100644
--- a/workflow/engine/src/Tests/ProcessMaker/Project/BpmnTest.php
+++ b/workflow/engine/src/Tests/ProcessMaker/Project/BpmnTest.php
@@ -108,7 +108,6 @@ class BpmnTest extends \PHPUnit_Framework_TestCase
         $bp->addActivity($data);
 
         // Load from DB
-        $processData = $bp->getProcess();
         $activities = $bp->getActivities();
 
         $this->assertCount(1, $activities);
@@ -118,9 +117,6 @@ class BpmnTest extends \PHPUnit_Framework_TestCase
         foreach ($data as $key => $value) {
             $this->assertEquals($value, $activityData[$key]);
         }
-
-        $this->assertEquals($bp->getUid(), $activityData["PRJ_UID"]);
-        $this->assertEquals($processData["PRO_UID"], $activityData["PRO_UID"]);
     }
 
     /**