diff --git a/test/testCode/BS001ContainerBasicScenario.php b/test/testCode/BS001ContainerBasicScenario.php
index 660f16f..f8f8242 100644
--- a/test/testCode/BS001ContainerBasicScenario.php
+++ b/test/testCode/BS001ContainerBasicScenario.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS004ContainerPutGet.php b/test/testCode/BS004ContainerPutGet.php
index 230cf0a..141ac4f 100644
--- a/test/testCode/BS004ContainerPutGet.php
+++ b/test/testCode/BS004ContainerPutGet.php
@@ -1,32 +1,38 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
-require_once('config.php');
-require_once('utility.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once ('griddb_php_client.php');
+}
+require_once ('config.php');
+require_once ('utility.php');
 
-class BS004ContainerPutGet extends TestCase {
+class BS004ContainerPutGet extends TestCase
+{
     protected static $gridstore;
 
     public static function setUpBeforeClass(): void {
         $factory = \StoreFactory::getInstance();
         try {
-            $storeInfo = ["host" => GRIDDB_NOTIFICATION_ADDRESS,
-                          "port" => (int)GRIDDB_NOTIFICATION_PORT,
-                          "clusterName" => GRIDDB_CLUSTER_NAME,
-                          "username" => GRIDDB_USERNAME,
-                          "password" => GRIDDB_PASSWORD];
+            $storeInfo = [
+                "host" => GRIDDB_NOTIFICATION_ADDRESS,
+                "port" => (int) GRIDDB_NOTIFICATION_PORT,
+                "clusterName" => GRIDDB_CLUSTER_NAME,
+                "username" => GRIDDB_USERNAME,
+                "password" => GRIDDB_PASSWORD,
+            ];
 
             self::$gridstore = $factory->getStore($storeInfo);
-        } catch (\GSException $e){
-            for ($i= 0; $i < $e->getErrorStackSize(); $i++) {
-                echo("\n[$i]\n");
-                echo($e->getErrorCode($i)."\n");
-                echo($e->getLocation($i)."\n");
-                echo($e->getErrorMessage($i)."\n");
+        } catch (\GSException $e) {
+            for ($i = 0; $i < $e->getErrorStackSize(); $i++) {
+                echo "\n[$i]\n";
+                echo $e->getErrorCode($i) . "\n";
+                echo $e->getLocation($i) . "\n";
+                echo $e->getErrorMessage($i) . "\n";
             }
         } catch (\Exception $e1) {
-            echo($e1."\n");
+            echo $e1 . "\n";
         }
     }
 
@@ -40,12 +46,20 @@ public function providerDataTest() {
     /**
      * @dataProvider providerDataTest
      */
-    public function testContainerPutGet($testId, $containerType,
-                                        $stringVal, $timestampVal, $byteVal,
-                                        $shortVal, $integerVal, $boolVal,
-                                        $floatVal, $doubleVal, $blobVal,
-                                        $expectedOutput)
-    {
+    public function testContainerPutGet(
+        $testId,
+        $containerType,
+        $stringVal,
+        $timestampVal,
+        $byteVal,
+        $shortVal,
+        $integerVal,
+        $boolVal,
+        $floatVal,
+        $doubleVal,
+        $blobVal,
+        $expectedOutput
+    ) {
         echo sprintf("Test case: %s put: %s:\n", $testId, $containerType);
         echo sprintf(" Expected has exception = %s\n", $expectedOutput);
 
@@ -66,64 +80,88 @@ public function testContainerPutGet($testId, $containerType,
 
         // Test putRow
         try {
-            if ($containerType == "GS_CONTAINER_COLLECTION") {
+            if (strcmp($containerType, "GS_CONTAINER_COLLECTION")) {
                 $containerName = "col01Collection";
-                $columnInfoList = [["A", \Type::STRING],
-                                   ["B", \Type::TIMESTAMP],
-                                   ["C", \Type::BYTE],
-                                   ["D", \Type::SHORT],
-                                   ["E", \Type::INTEGER],
-                                   ["F", \Type::BOOL],
-                                   ["G", \Type::FLOAT],
-                                   ["H", \Type::DOUBLE],
-                                   ["I", \Type::BLOB]];
-                $containerType = \ContainerType::COLLECTION;
+                $columnInfoList = [
+                    ["A", \Type::STRING],
+                    ["B", \Type::TIMESTAMP],
+                    ["C", \Type::BYTE],
+                    ["D", \Type::SHORT],
+                    ["E", \Type::INTEGER],
+                    ["F", \Type::BOOL],
+                    ["G", \Type::FLOAT],
+                    ["H", \Type::DOUBLE],
+                    ["I", \Type::BLOB],
+                ];
+                $containerTypeObj = \ContainerType::COLLECTION;
             } else {
                 $containerName = "col01Timeseries";
-                $columnInfoList = [["A", \Type::TIMESTAMP],
-                                   ["B", \Type::STRING],
-                                   ["C", \Type::BYTE],
-                                   ["D", \Type::SHORT],
-                                   ["E", \Type::INTEGER],
-                                   ["F", \Type::BOOL],
-                                   ["G", \Type::FLOAT],
-                                   ["H", \Type::DOUBLE],
-                                   ["I", \Type::BLOB]];
-                $containerType = \ContainerType::TIME_SERIES;
+                $columnInfoList = [
+                    ["A", \Type::TIMESTAMP],
+                    ["B", \Type::STRING],
+                    ["C", \Type::BYTE],
+                    ["D", \Type::SHORT],
+                    ["E", \Type::INTEGER],
+                    ["F", \Type::BOOL],
+                    ["G", \Type::FLOAT],
+                    ["H", \Type::DOUBLE],
+                    ["I", \Type::BLOB],
+                ];
+                $containerTypeObj = \ContainerType::TIME_SERIES;
             }
-            $containerInfo = new \ContainerInfo(["name" => $containerName,
-                                                 "columnInfoArray" => $columnInfoList,
-                                                 "type" => $containerType,
-                                                 "rowKey" => $rowKeyAssigned]);
+            $containerInfo = new \ContainerInfo([
+                "name" => $containerName,
+                "columnInfoArray" => $columnInfoList,
+                "type" => $containerTypeObj,
+                "rowKey" => $rowKeyAssigned,
+            ]);
             self::$gridstore->dropContainer($containerName);
-            $container = self::$gridstore->putContainer($containerInfo,
-                                                        $modifiable);
-            if ($containerType == "GS_CONTAINER_COLLECTION") {
-                $rowData = [$stringVal, $timestampVal, $byteVal,
-                            $shortVal, $integerVal, $boolVal,
-                            $floatVal, $doubleVal, $blobVal];
+            $container = self::$gridstore->putContainer(
+                $containerInfo,
+                $modifiable
+            );
+            if (strcmp($containerType, "GS_CONTAINER_COLLECTION")) {
+                $rowData = [
+                    $stringVal,
+                    $timestampVal,
+                    $byteVal,
+                    $shortVal,
+                    $integerVal,
+                    $boolVal,
+                    $floatVal,
+                    $doubleVal,
+                    $blobVal,
+                ];
             } else {
-                $rowData = [$timestampVal, $stringVal, $byteVal,
-                                    $shortVal, $integerVal, $boolVal,
-                                    $floatVal, $doubleVal, $blobVal];
+                $rowData = [
+                    $timestampVal,
+                    $stringVal,
+                    $byteVal,
+                    $shortVal,
+                    $integerVal,
+                    $boolVal,
+                    $floatVal,
+                    $doubleVal,
+                    $blobVal,
+                ];
             }
             $existed = $container->put($rowData);
-            if ($containerType == "GS_CONTAINER_COLLECTION") {
+            if (strcmp($containerType, "GS_CONTAINER_COLLECTION")) {
                 $rowDataGet = $container->get($stringVal);
             } else {
                 $rowDataGet = $container->get($timestampVal);
             }
             self::$gridstore->dropContainer($containerName);
         } catch (\GSException $e) {
-            for ($i= 0; $i < $e->getErrorStackSize(); $i++) {
-                echo("\n[$i]\n");
-                echo($e->getErrorCode($i)."\n");
-                echo($e->getLocation($i)."\n");
-                echo($e->getErrorMessage($i)."\n");
+            for ($i = 0; $i < $e->getErrorStackSize(); $i++) {
+                echo "\n[$i]\n";
+                echo $e->getErrorCode($i) . "\n";
+                echo $e->getLocation($i) . "\n";
+                echo $e->getErrorMessage($i) . "\n";
             }
             $hasException = "1";
         } catch (\Exception $e1) {
-            echo($e1."\n");
+            echo $e1 . "\n";
             $hasException = "1";
         }
 
@@ -132,4 +170,3 @@ public function testContainerPutGet($testId, $containerType,
     }
 }
 ?>
-
diff --git a/test/testCode/BS004ContainerPutGetNullSpec.php b/test/testCode/BS004ContainerPutGetNullSpec.php
index 4cd84b0..952bcfa 100644
--- a/test/testCode/BS004ContainerPutGetNullSpec.php
+++ b/test/testCode/BS004ContainerPutGetNullSpec.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS005ContainerIndex.php b/test/testCode/BS005ContainerIndex.php
index de130f8..4b51e14 100644
--- a/test/testCode/BS005ContainerIndex.php
+++ b/test/testCode/BS005ContainerIndex.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS007AggregationWithDoubleTimestamp.php b/test/testCode/BS007AggregationWithDoubleTimestamp.php
index f88a5db..175cbe2 100644
--- a/test/testCode/BS007AggregationWithDoubleTimestamp.php
+++ b/test/testCode/BS007AggregationWithDoubleTimestamp.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS008ContainerPutGetRemoveSpec.php b/test/testCode/BS008ContainerPutGetRemoveSpec.php
index befb4e1..67100b2 100644
--- a/test/testCode/BS008ContainerPutGetRemoveSpec.php
+++ b/test/testCode/BS008ContainerPutGetRemoveSpec.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS009RowSetManualCommitSpec.php b/test/testCode/BS009RowSetManualCommitSpec.php
index cab531a..8c33d98 100644
--- a/test/testCode/BS009RowSetManualCommitSpec.php
+++ b/test/testCode/BS009RowSetManualCommitSpec.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS010QueryWithLimitSpec.php b/test/testCode/BS010QueryWithLimitSpec.php
index ec4e371..a32a918 100644
--- a/test/testCode/BS010QueryWithLimitSpec.php
+++ b/test/testCode/BS010QueryWithLimitSpec.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS012ErrorUtilitySpec.php b/test/testCode/BS012ErrorUtilitySpec.php
index a04b764..a07d21e 100644
--- a/test/testCode/BS012ErrorUtilitySpec.php
+++ b/test/testCode/BS012ErrorUtilitySpec.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS013PartitionController.php b/test/testCode/BS013PartitionController.php
index 6b06539..c429cdf 100644
--- a/test/testCode/BS013PartitionController.php
+++ b/test/testCode/BS013PartitionController.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS015ContainerInfoSetGetSpec.php b/test/testCode/BS015ContainerInfoSetGetSpec.php
index 16a0294..95bdcf1 100644
--- a/test/testCode/BS015ContainerInfoSetGetSpec.php
+++ b/test/testCode/BS015ContainerInfoSetGetSpec.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS016ExpirationInfoSetGetSpec.php b/test/testCode/BS016ExpirationInfoSetGetSpec.php
index d6213a4..05798e2 100644
--- a/test/testCode/BS016ExpirationInfoSetGetSpec.php
+++ b/test/testCode/BS016ExpirationInfoSetGetSpec.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS018EnumSpec.php b/test/testCode/BS018EnumSpec.php
index e1861db..cb2538f 100644
--- a/test/testCode/BS018EnumSpec.php
+++ b/test/testCode/BS018EnumSpec.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS019AttributeSpec.php b/test/testCode/BS019AttributeSpec.php
index c7b9465..9b7ea07 100644
--- a/test/testCode/BS019AttributeSpec.php
+++ b/test/testCode/BS019AttributeSpec.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');
 
diff --git a/test/testCode/BS021KeywordParametersSpec.php b/test/testCode/BS021KeywordParametersSpec.php
index e0b9b98..2de47de 100644
--- a/test/testCode/BS021KeywordParametersSpec.php
+++ b/test/testCode/BS021KeywordParametersSpec.php
@@ -1,7 +1,10 @@
 <?php
 namespace Tests;
 use PHPUnit\Framework\TestCase;
-require_once ('griddb_php_client.php');
+if (file_exists('griddb_php_client.php')) {
+    // File php wrapper is generated with SWIG 4.0.2 and below
+    require_once('griddb_php_client.php');
+}
 require_once('config.php');
 require_once('utility.php');