diff --git a/env_unittest.sh b/env_unittest.sh
new file mode 100755
index 000000000..2e16d4ded
--- /dev/null
+++ b/env_unittest.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+
+if [ $1 = '-d' ] ; then
+  export PM_UNIT_DB_USER=root
+  export PM_UNIT_DB_NAME=wf_ralph
+  export PM_UNIT_DB_PASS=atopml2005
+  export PM_UNIT_DB_HOST=localhost
+  export HTTP_REFERER="http://192.168.11.30:8080"
+  echo "env unit test set."
+  bash -i
+else
+  if [ $1 = '-u' ] ; then
+    unset PM_UNIT_DB_USER
+    unset PM_UNIT_DB_NAME
+    unset PM_UNIT_DB_PASS
+    unset PM_UNIT_DB_HOST
+    unset HTTP_REFERER
+    echo "env unit test unset."
+    bash -i
+  else
+    echo "Incorrect parameter, please use -d or -u\n";
+  fi
+fi
diff --git a/tests/automated/gulliver/system/classGTest.php b/tests/automated/gulliver/system/classGTest.php
index d92eed40c..7ffe6ea40 100644
--- a/tests/automated/gulliver/system/classGTest.php
+++ b/tests/automated/gulliver/system/classGTest.php
@@ -44,7 +44,7 @@ class classGTest extends PHPUnit_Framework_TestCase
     public function testNumberOfMethodsInThisClass()
     {
         $methods = get_class_methods('G');
-        $this->assertTrue( count($methods) == 139, "now there are " . count($methods) . " methods.");
+        $this->assertTrue( count($methods) == 133, "now there are " . count($methods) . " methods.");
     }
 
     /**
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index a3c083f46..1e8adc2df 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 // ProcessMaker Test Unit Bootstrap
-
 // Defining the PATH_SEP constant, he we are defining if the the path separator symbol will be '\\' or '/'
+
 define('PATH_SEP', '/');
 
 if (!defined('__DIR__')) {
@@ -77,6 +77,9 @@ set_include_path(
     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');
 
@@ -291,9 +294,9 @@ Bootstrap::registerClass('BaseStepTrigger',     PATH_HOME . "engine/classes/mode
 Bootstrap::registerClass('StepTrigger',         PATH_HOME . "engine/classes/model/StepTrigger.php");
 Bootstrap::registerClass('StepTriggerPeer',     PATH_HOME . "engine/classes/model/StepTriggerPeer.php");
 
-Bootstrap::registerClass('SolrRequestData',     PATH_HOME . "engine/classes/entities/SolrRequestData.php");
+Bootstrap::registerClass('Entity_SolrRequestData',   PATH_HOME . "engine/classes/entities/SolrRequestData.php");
 
-Bootstrap::registerClass('SolrUpdateDocument',  PATH_HOME . "engine/classes/entities/SolrUpdateDocument.php");
+Bootstrap::registerClass('Entity_SolrUpdateDocument',PATH_HOME . "engine/classes/entities/SolrUpdateDocument.php");
 
 Bootstrap::registerClass('BaseSwimlanesElements',PATH_HOME . "engine/classes/model/om/BaseSwimlanesElements.php");
 Bootstrap::registerClass('SwimlanesElements',   PATH_HOME . "engine/classes/model/SwimlanesElements.php");
@@ -339,3 +342,4 @@ $config = System::getSystemConfiguration ('', '', SYS_SYS);
 define ('MEMCACHED_ENABLED', $config ['memcached']);
 define ('MEMCACHED_SERVER', $config ['memcached_server']);
 define ('TIME_ZONE', $config ['time_zone']);
+