diff --git a/ballerina/tests/h2_hospital_persist_client.bal b/ballerina/tests/h2_hospital_persist_client.bal
index e8a689a..bf258e8 100644
--- a/ballerina/tests/h2_hospital_persist_client.bal
+++ b/ballerina/tests/h2_hospital_persist_client.bal
@@ -119,12 +119,12 @@ public isolated client class H2HospitalClient {
                         metadata.schemaName = h2.defaultSchema;
                     }
                     map<JoinMetadata>? joinMetadataMap = metadata.joinMetadata;
-                    if joinMetadataMap != () {
-                        foreach string joinKey in joinMetadataMap.keys() {
-                            JoinMetadata joinMetadata = joinMetadataMap.get(joinKey);
-                            if joinMetadata.refSchema == () {
-                                joinMetadata.refSchema = h2.defaultSchema;
-                            }
+                    if joinMetadataMap == () {
+                        continue;
+                    }
+                    foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() {
+                        if joinMetadata.refSchema == () {
+                            joinMetadata.refSchema = h2.defaultSchema;
                         }
                     }
                 }
diff --git a/ballerina/tests/h2_hospital_with_schema_persist_client.bal b/ballerina/tests/h2_hospital_with_schema_persist_client.bal
index 444af25..134eeb4 100644
--- a/ballerina/tests/h2_hospital_with_schema_persist_client.bal
+++ b/ballerina/tests/h2_hospital_with_schema_persist_client.bal
@@ -120,12 +120,12 @@ public isolated client class H2HospitalWithSchemaClient {
                         metadata.schemaName = h2WithSchema.defaultSchema;
                     }
                     map<JoinMetadata>? joinMetadataMap = metadata.joinMetadata;
-                    if joinMetadataMap != () {
-                        foreach string joinKey in joinMetadataMap.keys() {
-                            JoinMetadata joinMetadata = joinMetadataMap.get(joinKey);
-                            if joinMetadata.refSchema == () {
-                                joinMetadata.refSchema = h2WithSchema.defaultSchema;
-                            }
+                    if joinMetadataMap == () {
+                        continue;
+                    }
+                    foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() {
+                        if joinMetadata.refSchema == () {
+                            joinMetadata.refSchema = h2WithSchema.defaultSchema;
                         }
                     }
                 }
diff --git a/ballerina/tests/mssql_hospital_persist_client.bal b/ballerina/tests/mssql_hospital_persist_client.bal
index b89bcd6..22cd242 100644
--- a/ballerina/tests/mssql_hospital_persist_client.bal
+++ b/ballerina/tests/mssql_hospital_persist_client.bal
@@ -119,12 +119,12 @@ public isolated client class MsSqlHospitalClient {
                         metadata.schemaName = mssql.defaultSchema;
                     }
                     map<JoinMetadata>? joinMetadataMap = metadata.joinMetadata;
-                    if joinMetadataMap != () {
-                        foreach string joinKey in joinMetadataMap.keys() {
-                            JoinMetadata joinMetadata = joinMetadataMap.get(joinKey);
-                            if joinMetadata.refSchema == () {
-                                joinMetadata.refSchema = mssql.defaultSchema;
-                            }
+                    if joinMetadataMap == () {
+                        continue;
+                    }
+                    foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() {
+                        if joinMetadata.refSchema == () {
+                            joinMetadata.refSchema = mssql.defaultSchema;
                         }
                     }
                 }
diff --git a/ballerina/tests/mssql_hospital_with_schema_persist_client.bal b/ballerina/tests/mssql_hospital_with_schema_persist_client.bal
index f02466c..cd6007d 100644
--- a/ballerina/tests/mssql_hospital_with_schema_persist_client.bal
+++ b/ballerina/tests/mssql_hospital_with_schema_persist_client.bal
@@ -120,12 +120,12 @@ public isolated client class MsSqlHospitalWithSchemaClient {
                         metadata.schemaName = mssqlWithSchema.defaultSchema;
                     }
                     map<JoinMetadata>? joinMetadataMap = metadata.joinMetadata;
-                    if joinMetadataMap != () {
-                        foreach string joinKey in joinMetadataMap.keys() {
-                            JoinMetadata joinMetadata = joinMetadataMap.get(joinKey);
-                            if joinMetadata.refSchema == () {
-                                joinMetadata.refSchema = mssqlWithSchema.defaultSchema;
-                            }
+                    if joinMetadataMap == () {
+                        continue;
+                    }
+                    foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() {
+                        if joinMetadata.refSchema == () {
+                            joinMetadata.refSchema = mssqlWithSchema.defaultSchema;
                         }
                     }
                 }
diff --git a/ballerina/tests/postgresql_hospital_persist_client.bal b/ballerina/tests/postgresql_hospital_persist_client.bal
index 41365c8..c2d368e 100644
--- a/ballerina/tests/postgresql_hospital_persist_client.bal
+++ b/ballerina/tests/postgresql_hospital_persist_client.bal
@@ -119,12 +119,12 @@ public isolated client class PostgreSqlHospitalClient {
                         metadata.schemaName = postgresql.defaultSchema;
                     }
                     map<JoinMetadata>? joinMetadataMap = metadata.joinMetadata;
-                    if joinMetadataMap != () {
-                        foreach string joinKey in joinMetadataMap.keys() {
-                            JoinMetadata joinMetadata = joinMetadataMap.get(joinKey);
-                            if joinMetadata.refSchema == () {
-                                joinMetadata.refSchema = postgresql.defaultSchema;
-                            }
+                    if joinMetadataMap == () {
+                        continue;
+                    }
+                    foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() {
+                        if joinMetadata.refSchema == () {
+                            joinMetadata.refSchema = postgresql.defaultSchema;
                         }
                     }
                 }
diff --git a/ballerina/tests/postgresql_hospital_with_schema_persist_client.bal b/ballerina/tests/postgresql_hospital_with_schema_persist_client.bal
index 1ae081d..bef6e36 100644
--- a/ballerina/tests/postgresql_hospital_with_schema_persist_client.bal
+++ b/ballerina/tests/postgresql_hospital_with_schema_persist_client.bal
@@ -120,12 +120,12 @@ public isolated client class PostgreSqlHospitalWithSchemaClient {
                         metadata.schemaName = postgresqlWithSchema.defaultSchema;
                     }
                     map<JoinMetadata>? joinMetadataMap = metadata.joinMetadata;
-                    if joinMetadataMap != () {
-                        foreach string joinKey in joinMetadataMap.keys() {
-                            JoinMetadata joinMetadata = joinMetadataMap.get(joinKey);
-                            if joinMetadata.refSchema == () {
-                                joinMetadata.refSchema = postgresqlWithSchema.defaultSchema;
-                            }
+                    if joinMetadataMap == () {
+                        continue;
+                    }
+                    foreach [string, JoinMetadata][_, joinMetadata] in joinMetadataMap.entries() {
+                        if joinMetadata.refSchema == () {
+                            joinMetadata.refSchema = postgresqlWithSchema.defaultSchema;
                         }
                     }
                 }