diff --git a/wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/ConnectionStringHostListProvider.java b/wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/ConnectionStringHostListProvider.java
index c6afda329..d4298b5aa 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/ConnectionStringHostListProvider.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/ConnectionStringHostListProvider.java
@@ -63,7 +63,6 @@ public ConnectionStringHostListProvider(
       final @NonNull HostListProviderService hostListProviderService,
       final @NonNull ConnectionUrlParser connectionUrlParser) {
 
-    // TODO: check properties for relevant parameters
     this.isSingleWriterConnectionString = SINGLE_WRITER_CONNECTION_STRING.getBoolean(properties);
     this.initialUrl = initialUrl;
     this.connectionUrlParser = connectionUrlParser;
diff --git a/wrapper/src/main/java/software/amazon/jdbc/wrapper/ConnectionWrapper.java b/wrapper/src/main/java/software/amazon/jdbc/wrapper/ConnectionWrapper.java
index d2405d288..2ffd60eed 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/wrapper/ConnectionWrapper.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/wrapper/ConnectionWrapper.java
@@ -67,8 +67,8 @@ public class ConnectionWrapper implements Connection, CanReleaseResources {
   protected HostListProviderService hostListProviderService;
 
   protected PluginManagerService pluginManagerService;
-  protected String targetDriverProtocol; // TODO: consider moving to PluginService
-  protected String originalUrl; // TODO: consider moving to PluginService
+  protected String targetDriverProtocol;
+  protected String originalUrl;
   protected @Nullable ConfigurationProfile configurationProfile;
 
   protected @Nullable Throwable openConnectionStacktrace;
diff --git a/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingTests.java b/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingTests.java
index f4387c665..ff246863c 100644
--- a/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingTests.java
+++ b/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingTests.java
@@ -244,9 +244,7 @@ public void test_setReadOnlyFalseInTransaction_setAutocommitFalse() throws SQLEx
 
       final Statement stmt = conn.createStatement();
       conn.setAutoCommit(false);
-      stmt.executeQuery(
-          // TODO: can we replace it with something less database specific?
-          "SELECT COUNT(*) FROM information_schema.tables");
+      stmt.executeQuery("SELECT 1");
 
       final SQLException exception =
           assertThrows(SQLException.class, () -> conn.setReadOnly(false));