diff --git a/mysql-test/suite/rdrs/t/rdrs.cnf b/mysql-test/suite/rdrs/t/rdrs.cnf
index 8848db68aeb9..09e0db78d57a 100644
--- a/mysql-test/suite/rdrs/t/rdrs.cnf
+++ b/mysql-test/suite/rdrs/t/rdrs.cnf
@@ -2,3 +2,4 @@
 
 [cluster_config.1]
 DataMemory=200M
+MaxNoOfTables=4096
diff --git a/mysql-test/suite/rdrs_multi_cluster/r/rdrs.result b/mysql-test/suite/rdrs_multi_cluster/r/rdrs.result
index ea04cf3e7dae..650ae6215c35 100644
--- a/mysql-test/suite/rdrs_multi_cluster/r/rdrs.result
+++ b/mysql-test/suite/rdrs_multi_cluster/r/rdrs.result
@@ -8,7 +8,7 @@ Result of command: 0
 include/master-slave.inc
 Warnings:
 Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	####	Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
+Note	####	Storing MySQL user name or password information in the connection metadata repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START REPLICA; see the 'START REPLICA Syntax' in the MySQL Manual for more information.
 [connection master]
 Clean-up rdrs_config.json file
 Clean-up have_rdrs_result.inc file
diff --git a/mysql-test/suite/rdrs_multi_cluster/t/rdrs.cnf b/mysql-test/suite/rdrs_multi_cluster/t/rdrs.cnf
index 4b0cb79e70a2..3086ed422d39 100644
--- a/mysql-test/suite/rdrs_multi_cluster/t/rdrs.cnf
+++ b/mysql-test/suite/rdrs_multi_cluster/t/rdrs.cnf
@@ -2,3 +2,10 @@
 
 [cluster_config.1]
 DataMemory=200M
+MaxNoOfTables=4096
+
+[cluster_config.slave]
+DataMemory=200M
+MaxNoOfTables=4096
+
+
diff --git a/storage/ndb/rest-server/rest-api-server/internal/integrationtests/feature_store/handler_test.go b/storage/ndb/rest-server/rest-api-server/internal/integrationtests/feature_store/handler_test.go
index 3be7721ea715..6b5681d792d2 100644
--- a/storage/ndb/rest-server/rest-api-server/internal/integrationtests/feature_store/handler_test.go
+++ b/storage/ndb/rest-server/rest-api-server/internal/integrationtests/feature_store/handler_test.go
@@ -1838,7 +1838,7 @@ func Test_IncludeDetailedStatus_JoinedTablePartialKey(t *testing.T) {
 			if ds.FeatureGroupId == -1 {
 				t.Fatalf("FeatureGroupId should have been parsed correctly from OperationId")
 			}
-			if (ds.FeatureGroupId ==2076 && ds.HttpStatus != http.StatusOK) || (ds.FeatureGroupId ==2069 && ds.HttpStatus != http.StatusBadRequest) {
+			if (ds.FeatureGroupId == 2076 && ds.HttpStatus != http.StatusOK) || (ds.FeatureGroupId == 2069 && ds.HttpStatus != http.StatusBadRequest) {
 				t.Fatalf("HttpStatus should be 200 or 400")
 			}
 		}
@@ -1871,7 +1871,7 @@ func Test_IncludeDetailedStatus_JoinedTablePartialKeyAndMissingRow(t *testing.T)
 		if ds.FeatureGroupId == -1 {
 			t.Fatalf("FeatureGroupId should have been parsed correctly from OperationId")
 		}
-		if (ds.FeatureGroupId ==2069 && ds.HttpStatus != http.StatusNotFound) || (ds.FeatureGroupId ==2076 && ds.HttpStatus != http.StatusBadRequest) {
+		if (ds.FeatureGroupId == 2069 && ds.HttpStatus != http.StatusNotFound) || (ds.FeatureGroupId == 2076 && ds.HttpStatus != http.StatusBadRequest) {
 			t.Fatalf("HttpStatus should be 404 or 400")
 		}
 	}
@@ -1889,7 +1889,7 @@ func Test_GetFeatureVector_Success_ComplexType_With_Schema_Change(t *testing.T)
 	time.Sleep(2 * time.Second)
 
 	log.Debug("Changing the schema for the test")
-	err := testutils.RunQueriesOnDataCluster(testdbs.HopsworksUpdateScheme)
+	err := testutils.RunQueriesOnMetadataCluster(testdbs.HopsworksUpdateScheme)
 	if err != nil {
 		t.Fatalf("failed to change schema. Error: %v", err)
 	}
@@ -1906,4 +1906,4 @@ func work(t *testing.T, stop *bool, done chan int) {
 	for !*stop {
 		Test_GetFeatureVector_Success_ComplexType(t)
 	}
-}
\ No newline at end of file
+}
diff --git a/storage/ndb/rest-server/rest-api-server/resources/testdbs/fixed/hopsworks_40_schema.sql b/storage/ndb/rest-server/rest-api-server/resources/testdbs/fixed/hopsworks_40_schema.sql
index 0093b7b2dcd5..38fecf440975 100644
--- a/storage/ndb/rest-server/rest-api-server/resources/testdbs/fixed/hopsworks_40_schema.sql
+++ b/storage/ndb/rest-server/rest-api-server/resources/testdbs/fixed/hopsworks_40_schema.sql
@@ -37,6 +37,7 @@ CREATE DATABASE hopsworks;
 USE hopsworks;
 
 SET FOREIGN_KEY_CHECKS=0;
+
 --
 -- Table structure for table `account_audit`
 --
@@ -2554,16 +2555,6 @@ CREATE TABLE IF NOT EXISTS `pki_certificate`
   DEFAULT CHARSET = latin1
   COLLATE = latin1_general_cs;
 
-CREATE TABLE IF NOT EXISTS `pki_crl`
-(
-    `type` VARCHAR(20) NOT NULL,
-    `crl`  MEDIUMBLOB  NOT NULL,
-    PRIMARY KEY (`type`) USING HASH
-) /*!50100 TABLESPACE `ts_1` STORAGE DISK */
-           ENGINE = ndbcluster COMMENT ='NDB_TABLE=READ_BACKUP=1'
-           DEFAULT CHARSET = latin1
-           COLLATE = latin1_general_cs;
-
 CREATE TABLE IF NOT EXISTS `pki_key`
 (
     `owner` VARCHAR(100)    NOT NULL,