diff --git a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerChangeTable.java b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerChangeTable.java
index 999684545..35e02a60e 100644
--- a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerChangeTable.java
+++ b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerChangeTable.java
@@ -7,8 +7,8 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
+import io.debezium.annotation.Immutable;
 import io.debezium.relational.ChangeTable;
 import io.debezium.relational.TableId;
 
@@ -35,8 +35,9 @@ public class SqlServerChangeTable extends ChangeTable {
     private Lsn stopLsn;
 
     /**
-     * List of columns captured by the cdc table.
+     * List of columns captured by the CDC table.
      */
+    @Immutable
     private final List<String> capturedColumns;
 
     public SqlServerChangeTable(TableId sourceTableId, String captureInstance, int changeTableObjectId, Lsn startLsn, Lsn stopLsn,
@@ -44,7 +45,7 @@ public SqlServerChangeTable(TableId sourceTableId, String captureInstance, int c
         super(captureInstance, sourceTableId, resolveChangeTableId(sourceTableId, captureInstance), changeTableObjectId);
         this.startLsn = startLsn;
         this.stopLsn = stopLsn;
-        this.capturedColumns = Optional.ofNullable(capturedColumns).orElse(Collections.emptyList());
+        this.capturedColumns = capturedColumns != null ? Collections.unmodifiableList(capturedColumns) : Collections.emptyList();
     }
 
     public SqlServerChangeTable(String captureInstance, int changeTableObjectId, Lsn startLsn, Lsn stopLsn) {
diff --git a/debezium-core/src/main/java/io/debezium/relational/TableEditorImpl.java b/debezium-core/src/main/java/io/debezium/relational/TableEditorImpl.java
index 8ada9d1e6..51525c176 100644
--- a/debezium-core/src/main/java/io/debezium/relational/TableEditorImpl.java
+++ b/debezium-core/src/main/java/io/debezium/relational/TableEditorImpl.java
@@ -276,8 +276,4 @@ public Table create() {
         });
         return new TableImpl(id, columns, primaryKeyColumnNames(), defaultCharsetName);
     }
-
-    public LinkedHashMap<String, Column> getSortedColumns() {
-        return sortedColumns;
-    }
 }
diff --git a/debezium-embedded/src/test/java/io/debezium/embedded/AbstractConnectorTest.java b/debezium-embedded/src/test/java/io/debezium/embedded/AbstractConnectorTest.java
index 01e5286f0..a27191050 100644
--- a/debezium-embedded/src/test/java/io/debezium/embedded/AbstractConnectorTest.java
+++ b/debezium-embedded/src/test/java/io/debezium/embedded/AbstractConnectorTest.java
@@ -29,6 +29,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import javax.management.InstanceNotFoundException;
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
@@ -875,6 +876,7 @@ public static void waitForSnapshotToBeCompleted(String connector, String server)
                 .alias("Streaming was not started on time")
                 .pollInterval(100, TimeUnit.MILLISECONDS)
                 .atMost(60, TimeUnit.SECONDS)
+                .ignoreException(InstanceNotFoundException.class)
                 .until(() -> {
                     boolean snapshotCompleted = (boolean) mbeanServer
                             .getAttribute(getSnapshotMetricsObjectName(connector, server), "SnapshotCompleted");
@@ -894,6 +896,7 @@ public static void waitForStreamingRunning(String connector, String server, Stri
                 .alias("Streaming was not started on time")
                 .pollInterval(100, TimeUnit.MILLISECONDS)
                 .atMost(60, TimeUnit.SECONDS)
+                .ignoreException(InstanceNotFoundException.class)
                 .until(() -> {
                     boolean connected = (boolean) mbeanServer
                             .getAttribute(getStreamingMetricsObjectName(connector, server, contextName), "Connected");