diff --git a/wrapper/src/test/java/integration/container/tests/AutoscalingTests.java b/wrapper/src/test/java/integration/container/tests/AutoscalingTests.java
index b2642d06d..80c50cfd9 100644
--- a/wrapper/src/test/java/integration/container/tests/AutoscalingTests.java
+++ b/wrapper/src/test/java/integration/container/tests/AutoscalingTests.java
@@ -28,8 +28,8 @@
 import integration.TestEnvironmentInfo;
 import integration.TestInstanceInfo;
 import integration.container.ConnectionStringHelper;
-import integration.container.TestEnvironment;
 import integration.container.TestDriverProvider;
+import integration.container.TestEnvironment;
 import integration.container.condition.EnableOnDatabaseEngineDeployment;
 import integration.container.condition.EnableOnNumOfInstances;
 import integration.container.condition.EnableOnTestFeature;
diff --git a/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingPerformanceTest.java b/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingPerformanceTest.java
index 4d78c5a5e..1bf956de2 100644
--- a/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingPerformanceTest.java
+++ b/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingPerformanceTest.java
@@ -19,8 +19,8 @@
 import com.zaxxer.hikari.HikariConfig;
 import integration.TestEnvironmentFeatures;
 import integration.container.ConnectionStringHelper;
-import integration.container.TestEnvironment;
 import integration.container.TestDriverProvider;
+import integration.container.TestEnvironment;
 import integration.container.condition.EnableOnNumOfInstances;
 import integration.container.condition.EnableOnTestFeature;
 import java.io.File;
diff --git a/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingTests.java b/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingTests.java
index 72f3252e6..138090bd7 100644
--- a/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingTests.java
+++ b/wrapper/src/test/java/integration/container/tests/ReadWriteSplittingTests.java
@@ -34,10 +34,10 @@
 import integration.TestEnvironmentInfo;
 import integration.TestInstanceInfo;
 import integration.container.ConnectionStringHelper;
-import integration.container.TestEnvironment;
 import integration.container.ProxyHelper;
 import integration.container.TestDriver;
 import integration.container.TestDriverProvider;
+import integration.container.TestEnvironment;
 import integration.container.aurora.TestPluginServiceImpl;
 import integration.container.condition.DisableOnTestDriver;
 import integration.container.condition.DisableOnTestFeature;
diff --git a/wrapper/src/test/java/integration/host/TestEnvironment.java b/wrapper/src/test/java/integration/host/TestEnvironment.java
index e5b0e1566..35d18af0c 100644
--- a/wrapper/src/test/java/integration/host/TestEnvironment.java
+++ b/wrapper/src/test/java/integration/host/TestEnvironment.java
@@ -32,8 +32,8 @@
 import integration.TestProxyDatabaseInfo;
 import integration.TestTelemetryInfo;
 import integration.host.TestEnvironmentProvider.EnvPreCreateInfo;
-import integration.util.ContainerHelper;
 import integration.util.AuroraTestUtility;
+import integration.util.ContainerHelper;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
diff --git a/wrapper/src/test/java/integration/util/AuroraTestUtility.java b/wrapper/src/test/java/integration/util/AuroraTestUtility.java
index e944bd3c7..fe64fe3b0 100644
--- a/wrapper/src/test/java/integration/util/AuroraTestUtility.java
+++ b/wrapper/src/test/java/integration/util/AuroraTestUtility.java
@@ -190,11 +190,9 @@ protected static Region getRegionInternal(String rdsRegion) {
   }
 
   /**
-   * Performs the following:
-   * - creates an RDS cluster based on the passed in details
-   * - waits until it is available
-   * - adds the current IP address as an inbound rule to the security group so that the cluster can be accessed
-   * - creates a database with the given name within the cluster
+   * Creates an RDS cluster based on the passed in details. After the cluster is created, this method will wait
+   * until it is available, adds the current IP address to the default security group, and create a database with the
+   * given name within the cluster.
    *
    * @param username      the master username for access to the database
    * @param password      the master password for access to the database
@@ -227,6 +225,7 @@ public void createCluster(
       case AURORA:
         createAuroraCluster(
             username, password, dbName, identifier, region, engine, instanceClass, version, numInstances);
+        break;
       case RDS_MULTI_AZ_CLUSTER:
         if (numInstances != MULTI_AZ_SIZE) {
           throw new RuntimeException(
@@ -236,17 +235,16 @@ public void createCluster(
 
         createMultiAzCluster(
             username, password, dbName, identifier, region, engine, instanceClass, version);
+        break;
       default:
         throw new UnsupportedOperationException(deployment.toString());
     }
   }
 
   /**
-   * Performs the following:
-   * - creates an RDS Aurora cluster based on the passed in details
-   * - waits until it is available
-   * - adds the current IP address as an inbound rule to the security group so that the cluster can be accessed
-   * - creates a database with the given name within the cluster
+   * Creates an RDS Aurora cluster based on the passed in details. After the cluster is created, this method will wait
+   * until it is available, adds the current IP address to the default security group, and create a database with the
+   * given name within the cluster.
    *
    * @param username      the master username for access to the database
    * @param password      the master password for access to the database
@@ -321,11 +319,9 @@ public void createAuroraCluster(
   }
 
   /**
-   * Performs the following:
-   * - creates an RDS multi-az cluster based on the passed in details
-   * - waits until it is available
-   * - adds the current IP address as an inbound rule to the security group so that the cluster can be accessed
-   * - creates a database with the given name within the cluster
+   * Creates an RDS multi-az cluster based on the passed in details. After the cluster is created, this method will wait
+   * until it is available, adds the current IP address to the default security group, and create a database with the
+   * given name within the cluster.
    *
    * @param username      the master username for access to the database
    * @param password      the master password for access to the database