diff --git a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/cdc/DatabaseOverrideRRMTIT.java b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/cdc/DatabaseOverrideRRMTIT.java
index 303937881..bdda2f8d0 100644
--- a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/cdc/DatabaseOverrideRRMTIT.java
+++ b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/cdc/DatabaseOverrideRRMTIT.java
@@ -67,11 +67,11 @@ public void startContainers() throws InterruptedException {
                 .withExposedPorts(8123);
                 //.waitingFor(new HttpWaitStrategy().forPort(zookeeperContainer.getFirstMappedPort()));
         clickHouseContainer.withNetwork(network).withNetworkAliases("clickhouse");
-//        clickHouseContainer.start();
+        //clickHouseContainer.start();
 
         BasicConfigurator.configure();
         mySqlContainer.start();
-     //   clickHouseContainer.start();
+       clickHouseContainer.start();
         Thread.sleep(35000);
 
     }
diff --git a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/AutoCreateTableIT.java b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/AutoCreateTableIT.java
index 8276c6a30..36935a37c 100644
--- a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/AutoCreateTableIT.java
+++ b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/AutoCreateTableIT.java
@@ -91,7 +91,7 @@ public void testAutoCreateTable(String clickHouseServerVersion) throws Exception
 
         BaseDbWriter writer = ITCommon.getDBWriter(clickHouseContainer);
         Thread.sleep(10000);
-        ResultSet dateTimeResult = writer.executeQueryWithResultSet("select count(*) from `employees.new-table`");
+        ResultSet dateTimeResult = writer.executeQueryWithResultSet("select count(*) from employees.`new-table`");
         boolean resultReceived = false;
 
         while(dateTimeResult.next()) {
diff --git a/sink-connector/src/main/java/com/altinity/clickhouse/sink/connector/db/DbWriter.java b/sink-connector/src/main/java/com/altinity/clickhouse/sink/connector/db/DbWriter.java
index e186f4922..00aab04c0 100644
--- a/sink-connector/src/main/java/com/altinity/clickhouse/sink/connector/db/DbWriter.java
+++ b/sink-connector/src/main/java/com/altinity/clickhouse/sink/connector/db/DbWriter.java
@@ -18,6 +18,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import static io.debezium.storage.jdbc.JdbcCommonConfig.CONFIGURATION_FIELD_PREFIX_STRING;
+
 /**
  * Class that abstracts all functionality
  * related to interacting with Clickhouse DB.
@@ -164,7 +166,7 @@ public String getOffsetStorageDatabaseName() {
 
         String offsetSchemaHistoryTable = null;
         try {
-            offsetSchemaHistoryTable = config.getString(JdbcOffsetBackingStoreConfig.PROP_TABLE_NAME.name());
+            offsetSchemaHistoryTable = config.getString(CONFIGURATION_FIELD_PREFIX_STRING  + JdbcOffsetBackingStoreConfig.PROP_TABLE_NAME.name());
         } catch(Exception e) {
             log.error("***** Error retrieving offset store configuration ****", e);
         }