diff --git a/build.gradle b/build.gradle
index b49b6ef7..359e50f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@ import org.opensearch.gradle.test.RestIntegTestTask
 buildscript {
     ext {
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "3.2.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "3.3.0-SNAPSHOT")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         // e.g. 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
@@ -465,6 +465,7 @@ int endJmxPort = startJmxPort
 integTest {
     useCluster testClusters.leaderCluster
     useCluster testClusters.followCluster
+    systemProperty 'testclusters.dir', project.layout.buildDirectory.get().file("testclusters").asFile.absolutePath
     systemProperty "password", "admin" // setting it to `admin` explicitly since its a custom security setup
 
     if(knnEnabled){
diff --git a/src/main/kotlin/org/opensearch/replication/util/Extensions.kt b/src/main/kotlin/org/opensearch/replication/util/Extensions.kt
index df8986df..8fc060d4 100644
--- a/src/main/kotlin/org/opensearch/replication/util/Extensions.kt
+++ b/src/main/kotlin/org/opensearch/replication/util/Extensions.kt
@@ -207,7 +207,7 @@ fun User.overrideFgacRole(fgacRole: String?): User? {
         roles = listOf(fgacRole)
     }
     return User(this.name, this.backendRoles, roles,
-            this.customAttNames, this.requestedTenant)
+            mapOf<String, String>(), this.requestedTenant)
 }
 
 fun User.toInjectedUser(): String? {
diff --git a/src/main/kotlin/org/opensearch/replication/util/SecurityContext.kt b/src/main/kotlin/org/opensearch/replication/util/SecurityContext.kt
index 4eb607fc..f43a121c 100644
--- a/src/main/kotlin/org/opensearch/replication/util/SecurityContext.kt
+++ b/src/main/kotlin/org/opensearch/replication/util/SecurityContext.kt
@@ -42,7 +42,7 @@ class SecurityContext {
         const val OPENDISTRO_SECURITY_INJECTED_ROLES_VALIDATION = "opendistro_security_injected_roles_validation"
         const val REPLICATION_PLUGIN_USER = "ccr_user"
 
-        val ADMIN_USER = User(REPLICATION_PLUGIN_USER, null, listOf("all_access"), null)
+        val ADMIN_USER = User(REPLICATION_PLUGIN_USER, null, listOf("all_access"), mapOf<String, String>())
 
         val ALL_TRANSIENTS = listOf(ConfigConstants.OPENSEARCH_SECURITY_INJECTED_ROLES,
                 ConfigConstants.INJECTED_USER, OPENDISTRO_SECURITY_USER)